diff --git a/web/public/api/activitypub/activityAccept.go b/web/public/api/activitypub/activityAccept.go index 43c6a33..048e3f8 100644 --- a/web/public/api/activitypub/activityAccept.go +++ b/web/public/api/activitypub/activityAccept.go @@ -5,12 +5,14 @@ import ( "encoding/json" "fmt" "net/http" + "strings" webutils "git.mstar.dev/mstar/goutils/http" "github.com/rs/zerolog/hlog" "gorm.io/gorm" "git.mstar.dev/mstar/linstrom/activitypub" + "git.mstar.dev/mstar/linstrom/config" "git.mstar.dev/mstar/linstrom/storage-new" "git.mstar.dev/mstar/linstrom/storage-new/dbgen" "git.mstar.dev/mstar/linstrom/storage-new/models" @@ -66,8 +68,14 @@ func AcceptFromStorage(ctx context.Context, id string) (*ActivityAcceptOut, erro if err != nil { return nil, err } + var outId string + if strings.HasPrefix(id, "http") { + outId = id + } else { + outId = fmt.Sprintf("%s/api/activitypub/activity/accept/%s", config.GlobalConfig.General.GetFullPublicUrl(), id) + } return &ActivityAcceptOut{ - Id: id, + Id: outId, Actor: follow.Object.(string), Type: "Accept", Object: follow,