🐛 Fix incomplete url when expand
This commit is contained in:
parent
3d5ba6ef4c
commit
8bea691f2e
@ -19,7 +19,7 @@ func MapAPIs(app *fiber.App) {
|
|||||||
|
|
||||||
api := app.Group("/api").Name("API")
|
api := app.Group("/api").Name("API")
|
||||||
{
|
{
|
||||||
api.Get("/links/:target", getLinkMeta)
|
api.Get("/links/*", getLinkMeta)
|
||||||
|
|
||||||
api.Use(func(c *fiber.Ctx) error {
|
api.Use(func(c *fiber.Ctx) error {
|
||||||
if err := exts.EnsureAuthenticated(c); err != nil {
|
if err := exts.EnsureAuthenticated(c); err != nil {
|
||||||
|
@ -10,8 +10,8 @@ import (
|
|||||||
var inProgress sync.Map
|
var inProgress sync.Map
|
||||||
|
|
||||||
func getLinkMeta(c *fiber.Ctx) error {
|
func getLinkMeta(c *fiber.Ctx) error {
|
||||||
targetEncoded := c.Params("target")
|
targetEncoded := c.Params("*1")
|
||||||
targetRaw, _ := base64.URLEncoding.DecodeString(targetEncoded)
|
targetRaw, _ := base64.StdEncoding.DecodeString(targetEncoded)
|
||||||
|
|
||||||
if ch, loaded := inProgress.LoadOrStore(targetEncoded, make(chan struct{})); loaded {
|
if ch, loaded := inProgress.LoadOrStore(targetEncoded, make(chan struct{})); loaded {
|
||||||
// If the request is already in progress, wait for it to complete
|
// If the request is already in progress, wait for it to complete
|
||||||
|
@ -96,7 +96,7 @@ func LinkExpand(target string) (*models.LinkMeta, error) {
|
|||||||
log.Debug().Str("url", target).Msg("Expanding link... analyzing")
|
log.Debug().Str("url", target).Msg("Expanding link... analyzing")
|
||||||
})
|
})
|
||||||
c.OnError(func(r *colly.Response, err error) {
|
c.OnError(func(r *colly.Response, err error) {
|
||||||
log.Warn().Err(err).Str("url", target).Str("resp", string(r.Body)).Msg("Expanding link... failed")
|
log.Warn().Err(err).Str("url", target).Msg("Expanding link... failed")
|
||||||
})
|
})
|
||||||
|
|
||||||
c.OnScraped(func(r *colly.Response) {
|
c.OnScraped(func(r *colly.Response) {
|
||||||
|
Loading…
Reference in New Issue
Block a user