From f06bc2d382040a5e8add71bd51d6fe22f2a0f2b2 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Mon, 10 Mar 2025 23:48:42 +0800 Subject: [PATCH] :alien: Update attachment related call due to usage check update --- go.mod | 4 +- go.sum | 6 +-- pkg/internal/http/api/articles_api.go | 3 +- pkg/internal/http/api/questions_api.go | 5 +- pkg/internal/http/api/stories_api.go | 3 +- pkg/internal/http/api/videos_api.go | 3 +- pkg/internal/services/posts.go | 66 +++++++++++++++++--------- 7 files changed, 56 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index d7d9c27..17ed782 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.2 require ( git.solsynth.dev/hypernet/insight v0.0.0-20250129172551-974266b2c1d2 git.solsynth.dev/hypernet/nexus v0.0.0-20241123050605-25ab1371739b - git.solsynth.dev/hypernet/paperclip v0.0.0-20250124092128-7c3334a57a94 + git.solsynth.dev/hypernet/paperclip v0.0.0-20250310151112-1d866f317f47 git.solsynth.dev/hypernet/passport v0.0.0-20250128183757-09010d5867ed git.solsynth.dev/hypernet/pusher v0.0.0-20241228030233-50ff8304e465 git.solsynth.dev/hypernet/wallet v0.0.0-20250129150034-87b94cdb5488 @@ -13,6 +13,7 @@ require ( github.com/eko/gocache/lib/v4 v4.1.6 github.com/eko/gocache/store/ristretto/v4 v4.2.2 github.com/fatih/color v1.18.0 + github.com/go-ap/activitypub v0.0.0-20250212090640-aeb6499ba581 github.com/go-playground/validator/v10 v10.22.1 github.com/gofiber/fiber/v2 v2.52.5 github.com/json-iterator/go v1.1.12 @@ -36,7 +37,6 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/go-ap/activitypub v0.0.0-20250212090640-aeb6499ba581 // indirect github.com/go-ap/errors v0.0.0-20250124135319-3da8adefd4a9 // indirect github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 // indirect github.com/go-playground/locales v0.14.1 // indirect diff --git a/go.sum b/go.sum index ccd26e4..1a7672a 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ git.solsynth.dev/hypernet/insight v0.0.0-20250129172551-974266b2c1d2 h1:dPBdssDI git.solsynth.dev/hypernet/insight v0.0.0-20250129172551-974266b2c1d2/go.mod h1:NKSTeRc1mgg726iaCLEBoYEcVroIrGU5w2rnGf92LWE= git.solsynth.dev/hypernet/nexus v0.0.0-20241123050605-25ab1371739b h1:8yB9kMwEMY/nIbmDDxrhH5sTypgmK5PIIiIfP5QXx4s= git.solsynth.dev/hypernet/nexus v0.0.0-20241123050605-25ab1371739b/go.mod h1:PhLCv2lsNoscPVJbkWnxwQnJ141lc4RIEkVffrHwl4s= -git.solsynth.dev/hypernet/paperclip v0.0.0-20250124092128-7c3334a57a94 h1:PYk080kR8USiQhbd1uP/U9zJfjioA/PcTYjwsxaPQY4= -git.solsynth.dev/hypernet/paperclip v0.0.0-20250124092128-7c3334a57a94/go.mod h1:IAmYjvAzQbLWllg0/k9r8az7uXPKILxbZNyXe5yXMts= +git.solsynth.dev/hypernet/paperclip v0.0.0-20250310151112-1d866f317f47 h1:fvu+bNKPTNtQocssnKbEZ66MqR0iBfAxY3HwlqnmYyE= +git.solsynth.dev/hypernet/paperclip v0.0.0-20250310151112-1d866f317f47/go.mod h1:jvxq2qftz2v72x+24+cTFJdQKr9eHQTdk3KVR7cx36s= git.solsynth.dev/hypernet/passport v0.0.0-20250128183757-09010d5867ed h1:+z84T2At6CbfZfo7zvvMQP4zv/+tGM5KlJlCSoIkB8Y= git.solsynth.dev/hypernet/passport v0.0.0-20250128183757-09010d5867ed/go.mod h1:h78BjtyDuchDDlddLtk3HjvDI7DAK8Jzk/uVwqvv2cw= git.solsynth.dev/hypernet/pusher v0.0.0-20241228030233-50ff8304e465 h1:KFtv9lF0JMUGsq1uHwQvop8PTyqdiLuUQuRrd5WmzPk= @@ -97,8 +97,6 @@ github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/ github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/go-ap/activitypub v0.0.0-20250124194921-d52b4c694e14 h1:4VkepceDBxPt9BwsHncwtwIZCCgCuxctFHfosz8aWQA= -github.com/go-ap/activitypub v0.0.0-20250124194921-d52b4c694e14/go.mod h1:IO2PtAsxfGXN5IHrPuOslENFbq7MprYLNOyiiOELoRQ= github.com/go-ap/activitypub v0.0.0-20250212090640-aeb6499ba581 h1:73sFEdBsWBTBut0aDMPgt8HRuMO+ML0fd8AA/zjO8BQ= github.com/go-ap/activitypub v0.0.0-20250212090640-aeb6499ba581/go.mod h1:IO2PtAsxfGXN5IHrPuOslENFbq7MprYLNOyiiOELoRQ= github.com/go-ap/errors v0.0.0-20250124135319-3da8adefd4a9 h1:AJBGzuJVgfkKF3LoXCNQfH9yWmsVDV/oPDJE/zeXOjE= diff --git a/pkg/internal/http/api/articles_api.go b/pkg/internal/http/api/articles_api.go index 82b1bd3..12ea95e 100644 --- a/pkg/internal/http/api/articles_api.go +++ b/pkg/internal/http/api/articles_api.go @@ -182,6 +182,7 @@ func editArticle(c *fiber.Ctx) error { rawBody, _ := jsoniter.Marshal(body) _ = jsoniter.Unmarshal(rawBody, &bodyMapping) + og := item item.Alias = data.Alias item.Body = bodyMapping item.Language = services.DetectLanguage(data.Content) @@ -202,7 +203,7 @@ func editArticle(c *fiber.Ctx) error { item.Visibility = *data.Visibility } - if item, err = services.EditPost(item); err != nil { + if item, err = services.EditPost(item, og); err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } else { _ = authkit.AddEventExt( diff --git a/pkg/internal/http/api/questions_api.go b/pkg/internal/http/api/questions_api.go index f557343..a8b31e0 100644 --- a/pkg/internal/http/api/questions_api.go +++ b/pkg/internal/http/api/questions_api.go @@ -235,6 +235,7 @@ func editQuestion(c *fiber.Ctx) error { rawBody, _ := jsoniter.Marshal(newBody) _ = jsoniter.Unmarshal(rawBody, &newBodyMapping) + og := item item.Alias = data.Alias item.Body = newBodyMapping item.Language = services.DetectLanguage(data.Content) @@ -255,7 +256,7 @@ func editQuestion(c *fiber.Ctx) error { item.Visibility = *data.Visibility } - if item, err = services.EditPost(item); err != nil { + if item, err = services.EditPost(item, og); err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } else { _ = authkit.AddEventExt( @@ -319,7 +320,7 @@ func selectQuestionAnswer(c *fiber.Ctx) error { // Preload publisher data item.Publisher = publisher - if item, err = services.EditPost(item); err != nil { + if item, err = services.EditPost(item, item); err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } else { // Give the reward diff --git a/pkg/internal/http/api/stories_api.go b/pkg/internal/http/api/stories_api.go index 71cbc80..d31be27 100644 --- a/pkg/internal/http/api/stories_api.go +++ b/pkg/internal/http/api/stories_api.go @@ -208,6 +208,7 @@ func editStory(c *fiber.Ctx) error { rawBody, _ := jsoniter.Marshal(body) _ = jsoniter.Unmarshal(rawBody, &bodyMapping) + og := item item.Alias = data.Alias item.Body = bodyMapping item.Language = services.DetectLanguage(data.Content) @@ -229,7 +230,7 @@ func editStory(c *fiber.Ctx) error { item.Visibility = *data.Visibility } - if item, err = services.EditPost(item); err != nil { + if item, err = services.EditPost(item, og); err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } else { _ = authkit.AddEventExt( diff --git a/pkg/internal/http/api/videos_api.go b/pkg/internal/http/api/videos_api.go index db54d0d..f9193ed 100644 --- a/pkg/internal/http/api/videos_api.go +++ b/pkg/internal/http/api/videos_api.go @@ -185,6 +185,7 @@ func editVideo(c *fiber.Ctx) error { rawBody, _ := jsoniter.Marshal(body) _ = jsoniter.Unmarshal(rawBody, &bodyMapping) + og := item item.Alias = data.Alias item.Body = bodyMapping item.Language = services.DetectLanguage(data.Title) @@ -205,7 +206,7 @@ func editVideo(c *fiber.Ctx) error { item.Visibility = *data.Visibility } - if item, err = services.EditPost(item); err != nil { + if item, err = services.EditPost(item, og); err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } else { _ = authkit.AddEventExt( diff --git a/pkg/internal/services/posts.go b/pkg/internal/services/posts.go index ee848c4..cd9ef04 100644 --- a/pkg/internal/services/posts.go +++ b/pkg/internal/services/posts.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "reflect" "regexp" "strconv" "strings" @@ -15,6 +16,7 @@ import ( localCache "git.solsynth.dev/hypernet/interactive/pkg/internal/cache" "git.solsynth.dev/hypernet/interactive/pkg/internal/gap" "git.solsynth.dev/hypernet/nexus/pkg/proto" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit" pproto "git.solsynth.dev/hypernet/paperclip/pkg/proto" "git.solsynth.dev/hypernet/passport/pkg/authkit" authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models" @@ -555,7 +557,7 @@ func NewPost(user models.Publisher, item models.Post) (models.Post, error) { } item.Publisher = user - _ = updatePostAttachmentVisibility(item) + _ = updatePostAttachmentMeta(item) // Notify the original poster its post has been replied if item.ReplyID != nil { @@ -618,7 +620,7 @@ func NewPost(user models.Publisher, item models.Post) (models.Post, error) { return item, nil } -func EditPost(item models.Post) (models.Post, error) { +func EditPost(item models.Post, og models.Post) (models.Post, error) { if _, ok := item.Body["content_truncated"]; ok { return item, fmt.Errorf("prevented from editing post with truncated content") } @@ -656,17 +658,49 @@ func EditPost(item models.Post) (models.Post, error) { if err == nil { item.Publisher = pub - _ = updatePostAttachmentVisibility(item) + _ = updatePostAttachmentMeta(item) } return item, err } -func updatePostAttachmentVisibility(item models.Post) error { - log.Debug().Any("attachments", item.Body["attachments"]).Msg("Updating post attachments visibility...") +func updatePostAttachmentMeta(item models.Post, old ...models.Post) error { + log.Debug().Any("attachments", item.Body["attachments"]).Msg("Updating post attachments meta...") + + sameAsOld := reflect.DeepEqual(old[0].Body, item.Body) + if len(old) > 0 && !sameAsOld { + val, _ := old[0].Body["attachments"].([]string) + if dat, ok := item.Body["thumbnail"].(string); ok { + val = append(val, dat) + } + if dat, ok := item.Body["video"].(string); ok { + val = append(val, dat) + } + if len(val) > 0 { + filekit.CountAttachmentUsage(gap.Nx, &pproto.UpdateUsageRequest{ + Rid: val, + Delta: -1, + }) + } + } + if len(old) == 0 || !sameAsOld { + val, _ := item.Body["attachments"].([]string) + if dat, ok := item.Body["thumbnail"].(string); ok { + val = append(val, dat) + } + if dat, ok := item.Body["video"].(string); ok { + val = append(val, dat) + } + if len(val) > 0 { + filekit.CountAttachmentUsage(gap.Nx, &pproto.UpdateUsageRequest{ + Rid: val, + Delta: 1, + }) + } + } if item.Publisher.AccountID == nil { - log.Warn().Msg("Post publisher did not have account id, skip updating attachments visibility...") + log.Warn().Msg("Post publisher did not have account id, skip updating attachments meta...") return nil } @@ -712,15 +746,8 @@ func DeletePost(item models.Post) error { return nil } - conn, err := gap.Nx.GetClientGrpcConn("uc") - if err != nil { - return nil - } - - pc := pproto.NewAttachmentServiceClient(conn) - _, err = pc.DeleteAttachment(context.Background(), &pproto.DeleteAttachmentRequest{ - Rid: lo.Uniq(val), - UserId: lo.ToPtr(uint64(*item.Publisher.AccountID)), + err := filekit.CountAttachmentUsage(gap.Nx, &pproto.UpdateUsageRequest{ + Rid: lo.Uniq(val), }) if err != nil { log.Error().Err(err).Msg("An error occurred when deleting post attachment...") @@ -742,15 +769,8 @@ func DeletePostInBatch(items []models.Post) error { } } - conn, err := gap.Nx.GetClientGrpcConn("uc") - if err != nil { - return nil - } - - pc := pproto.NewAttachmentServiceClient(conn) - _, err = pc.DeleteAttachment(context.Background(), &pproto.DeleteAttachmentRequest{ + err := filekit.CountAttachmentUsage(gap.Nx, &pproto.UpdateUsageRequest{ Rid: lo.Uniq(attachments), - // FIXME Some issues here, if the user linked others uploaded attachment, it will be deleted }) if err != nil { log.Error().Err(err).Msg("An error occurred when deleting post attachment...")