diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-05-09 15:17:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-05-09 16:17:43 +0200 |
| commit | 8275d70e38579128f0680ee4001a944907a3772a (patch) | |
| tree | ce97c3f6609bcbc6d24c7423ef7c0247011e2122 /internal/db/bundb/relationship_follow_req.go | |
| parent | [chore] tidy + update StatusToAPIStatus (#1754) (diff) | |
| download | gotosocial-8275d70e38579128f0680ee4001a944907a3772a.tar.xz | |
[bugfix] update go-cache version to support multi-keying (#1756)
* update go-cache version to support multi-keying
Signed-off-by: kim <grufwub@gmail.com>
* improved cache invalidation
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/relationship_follow_req.go')
| -rw-r--r-- | internal/db/bundb/relationship_follow_req.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/internal/db/bundb/relationship_follow_req.go b/internal/db/bundb/relationship_follow_req.go index 4a6ec1ab8..c0f4bce3b 100644 --- a/internal/db/bundb/relationship_follow_req.go +++ b/internal/db/bundb/relationship_follow_req.go @@ -208,14 +208,17 @@ func (r *relationshipDB) AcceptFollowRequest(ctx context.Context, sourceAccountI Notify: followReq.Notify, } - // If the follow already exists, just - // replace the URI with the new one. - if _, err := r.conn. - NewInsert(). - Model(follow). - On("CONFLICT (?,?) DO UPDATE set ? = ?", bun.Ident("account_id"), bun.Ident("target_account_id"), bun.Ident("uri"), follow.URI). - Exec(ctx); err != nil { - return nil, r.conn.ProcessError(err) + if err := r.state.Caches.GTS.Follow().Store(follow, func() error { + // If the follow already exists, just + // replace the URI with the new one. + _, err := r.conn. + NewInsert(). + Model(follow). + On("CONFLICT (?,?) DO UPDATE set ? = ?", bun.Ident("account_id"), bun.Ident("target_account_id"), bun.Ident("uri"), follow.URI). + Exec(ctx) + return r.conn.ProcessError(err) + }); err != nil { + return nil, err } // Delete original follow request. @@ -227,8 +230,7 @@ func (r *relationshipDB) AcceptFollowRequest(ctx context.Context, sourceAccountI return nil, r.conn.ProcessError(err) } - // Invalidate follow request from cache lookups; this will - // invalidate the follow as well via the invalidate hook. + // Invalidate follow request from cache lookups r.state.Caches.GTS.FollowRequest().Invalidate("ID", followReq.ID) // Delete original follow request notification |