[performance] refactoring + add fave / follow / request / visibility caching (#1607)
* refactor visibility checking, add caching for visibility
* invalidate visibility cache items on account / status deletes
* fix requester ID passed to visibility cache nil ptr
* de-interface caches, fix home / public timeline caching + visibility
* finish adding code comments for visibility filter
* fix angry goconst linter warnings
* actually finish adding filter visibility code comments for timeline functions
* move home timeline status author check to after visibility
* remove now-unused code
* add more code comments
* add TODO code comment, update printed cache start names
* update printed cache names on stop
* start adding separate follow(request) delete db functions, add specific visibility cache tests
* add relationship type caching
* fix getting local account follows / followed-bys, other small codebase improvements
* simplify invalidation using cache hooks, add more GetAccountBy___() functions
* fix boosting to return 404 if not boostable but no error (to not leak status ID)
* remove dead code
* improved placement of cache invalidation
* update license headers
* add example follow, follow-request config entries
* add example visibility cache configuration to config file
* use specific PutFollowRequest() instead of just Put()
* add tests for all GetAccountBy()
* add GetBlockBy() tests
* update block to check primitive fields
* update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests
* fix copy-pasted code
* update envparsing test
* whitespace
* fix bun struct tag
* add license header to gtscontext
* fix old license header
* improved error creation to not use fmt.Errorf() when not needed
* fix various rebase conflicts, fix account test
* remove commented-out code, fix-up mention caching
* fix mention select bun statement
* ensure mention target account populated, pass in context to customrenderer logging
* remove more uncommented code, fix typeutil test
* add statusfave database model caching
* add status fave cache configuration
* add status fave cache example config
* woops, catch missed error. nice catch linter!
* add back testrig panic on nil db
* update example configuration to match defaults, slight tweak to cache configuration defaults
* update envparsing test with new defaults
* fetch followingget to use the follow target account
* use accounnt.IsLocal() instead of empty domain check
* use constants for the cache visibility type check
* use bun.In() for notification type restriction in db query
* include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable())
* use bun query building for nested select statements to ensure working with postgres
* update public timeline future status checks to match visibility filter
* same as previous, for home timeline
* update public timeline tests to dynamically check for appropriate statuses
* migrate accounts to allow unique constraint on public_key
* provide minimal account with publicKey
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
2023-03-28 13:03:14 +00:00
|
|
|
// GoToSocial
|
|
|
|
// Copyright (C) GoToSocial Authors admin@gotosocial.org
|
|
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
//
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Affero General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
package bundb
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
2023-04-10 19:56:02 +00:00
|
|
|
"time"
|
[performance] refactoring + add fave / follow / request / visibility caching (#1607)
* refactor visibility checking, add caching for visibility
* invalidate visibility cache items on account / status deletes
* fix requester ID passed to visibility cache nil ptr
* de-interface caches, fix home / public timeline caching + visibility
* finish adding code comments for visibility filter
* fix angry goconst linter warnings
* actually finish adding filter visibility code comments for timeline functions
* move home timeline status author check to after visibility
* remove now-unused code
* add more code comments
* add TODO code comment, update printed cache start names
* update printed cache names on stop
* start adding separate follow(request) delete db functions, add specific visibility cache tests
* add relationship type caching
* fix getting local account follows / followed-bys, other small codebase improvements
* simplify invalidation using cache hooks, add more GetAccountBy___() functions
* fix boosting to return 404 if not boostable but no error (to not leak status ID)
* remove dead code
* improved placement of cache invalidation
* update license headers
* add example follow, follow-request config entries
* add example visibility cache configuration to config file
* use specific PutFollowRequest() instead of just Put()
* add tests for all GetAccountBy()
* add GetBlockBy() tests
* update block to check primitive fields
* update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests
* fix copy-pasted code
* update envparsing test
* whitespace
* fix bun struct tag
* add license header to gtscontext
* fix old license header
* improved error creation to not use fmt.Errorf() when not needed
* fix various rebase conflicts, fix account test
* remove commented-out code, fix-up mention caching
* fix mention select bun statement
* ensure mention target account populated, pass in context to customrenderer logging
* remove more uncommented code, fix typeutil test
* add statusfave database model caching
* add status fave cache configuration
* add status fave cache example config
* woops, catch missed error. nice catch linter!
* add back testrig panic on nil db
* update example configuration to match defaults, slight tweak to cache configuration defaults
* update envparsing test with new defaults
* fetch followingget to use the follow target account
* use accounnt.IsLocal() instead of empty domain check
* use constants for the cache visibility type check
* use bun.In() for notification type restriction in db query
* include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable())
* use bun query building for nested select statements to ensure working with postgres
* update public timeline future status checks to match visibility filter
* same as previous, for home timeline
* update public timeline tests to dynamically check for appropriate statuses
* migrate accounts to allow unique constraint on public_key
* provide minimal account with publicKey
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
2023-03-28 13:03:14 +00:00
|
|
|
|
|
|
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
|
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
|
|
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
|
|
|
"github.com/superseriousbusiness/gotosocial/internal/log"
|
|
|
|
"github.com/uptrace/bun"
|
|
|
|
)
|
|
|
|
|
|
|
|
func (r *relationshipDB) GetFollowRequestByID(ctx context.Context, id string) (*gtsmodel.FollowRequest, error) {
|
|
|
|
return r.getFollowRequest(
|
|
|
|
ctx,
|
|
|
|
"ID",
|
|
|
|
func(followReq *gtsmodel.FollowRequest) error {
|
|
|
|
return r.conn.NewSelect().
|
|
|
|
Model(followReq).
|
|
|
|
Where("? = ?", bun.Ident("id"), id).
|
|
|
|
Scan(ctx)
|
|
|
|
},
|
|
|
|
id,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) GetFollowRequestByURI(ctx context.Context, uri string) (*gtsmodel.FollowRequest, error) {
|
|
|
|
return r.getFollowRequest(
|
|
|
|
ctx,
|
|
|
|
"URI",
|
|
|
|
func(followReq *gtsmodel.FollowRequest) error {
|
|
|
|
return r.conn.NewSelect().
|
|
|
|
Model(followReq).
|
|
|
|
Where("? = ?", bun.Ident("uri"), uri).
|
|
|
|
Scan(ctx)
|
|
|
|
},
|
|
|
|
uri,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) GetFollowRequest(ctx context.Context, sourceAccountID string, targetAccountID string) (*gtsmodel.FollowRequest, error) {
|
|
|
|
return r.getFollowRequest(
|
|
|
|
ctx,
|
|
|
|
"AccountID.TargetAccountID",
|
|
|
|
func(followReq *gtsmodel.FollowRequest) error {
|
|
|
|
return r.conn.NewSelect().
|
|
|
|
Model(followReq).
|
|
|
|
Where("? = ?", bun.Ident("account_id"), sourceAccountID).
|
|
|
|
Where("? = ?", bun.Ident("target_account_id"), targetAccountID).
|
|
|
|
Scan(ctx)
|
|
|
|
},
|
|
|
|
sourceAccountID,
|
|
|
|
targetAccountID,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) GetFollowRequestsByIDs(ctx context.Context, ids []string) ([]*gtsmodel.FollowRequest, error) {
|
|
|
|
// Preallocate slice of expected length.
|
|
|
|
followReqs := make([]*gtsmodel.FollowRequest, 0, len(ids))
|
|
|
|
|
|
|
|
for _, id := range ids {
|
|
|
|
// Fetch follow request model for this ID.
|
|
|
|
followReq, err := r.GetFollowRequestByID(ctx, id)
|
|
|
|
if err != nil {
|
|
|
|
log.Errorf(ctx, "error getting follow request %q: %v", id, err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// Append to return slice.
|
|
|
|
followReqs = append(followReqs, followReq)
|
|
|
|
}
|
|
|
|
|
|
|
|
return followReqs, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) IsFollowRequested(ctx context.Context, sourceAccountID string, targetAccountID string) (bool, db.Error) {
|
|
|
|
followReq, err := r.GetFollowRequest(
|
|
|
|
gtscontext.SetBarebones(ctx),
|
|
|
|
sourceAccountID,
|
|
|
|
targetAccountID,
|
|
|
|
)
|
|
|
|
if err != nil && !errors.Is(err, db.ErrNoEntries) {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
return (followReq != nil), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) getFollowRequest(ctx context.Context, lookup string, dbQuery func(*gtsmodel.FollowRequest) error, keyParts ...any) (*gtsmodel.FollowRequest, error) {
|
|
|
|
// Fetch follow request from database cache with loader callback
|
|
|
|
followReq, err := r.state.Caches.GTS.FollowRequest().Load(lookup, func() (*gtsmodel.FollowRequest, error) {
|
|
|
|
var followReq gtsmodel.FollowRequest
|
|
|
|
|
|
|
|
// Not cached! Perform database query
|
|
|
|
if err := dbQuery(&followReq); err != nil {
|
|
|
|
return nil, r.conn.ProcessError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return &followReq, nil
|
|
|
|
}, keyParts...)
|
|
|
|
if err != nil {
|
|
|
|
// error already processed
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if gtscontext.Barebones(ctx) {
|
|
|
|
// Only a barebones model was requested.
|
|
|
|
return followReq, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the follow request source account
|
|
|
|
followReq.Account, err = r.state.DB.GetAccountByID(
|
|
|
|
gtscontext.SetBarebones(ctx),
|
|
|
|
followReq.AccountID,
|
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("error getting follow request source account: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the follow request target account
|
|
|
|
followReq.TargetAccount, err = r.state.DB.GetAccountByID(
|
|
|
|
gtscontext.SetBarebones(ctx),
|
|
|
|
followReq.TargetAccountID,
|
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("error getting follow request target account: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return followReq, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) PutFollowRequest(ctx context.Context, follow *gtsmodel.FollowRequest) error {
|
|
|
|
err := r.state.Caches.GTS.FollowRequest().Store(follow, func() error {
|
|
|
|
_, err := r.conn.NewInsert().Model(follow).Exec(ctx)
|
|
|
|
return r.conn.ProcessError(err)
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalidate follow request origin account ID cached visibility.
|
|
|
|
r.state.Caches.Visibility.Invalidate("ItemID", follow.AccountID)
|
|
|
|
r.state.Caches.Visibility.Invalidate("RequesterID", follow.AccountID)
|
|
|
|
|
|
|
|
// Invalidate follow request target account ID cached visibility.
|
|
|
|
r.state.Caches.Visibility.Invalidate("ItemID", follow.TargetAccountID)
|
|
|
|
r.state.Caches.Visibility.Invalidate("RequesterID", follow.TargetAccountID)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-04-10 19:56:02 +00:00
|
|
|
func (r *relationshipDB) UpdateFollowRequest(ctx context.Context, followRequest *gtsmodel.FollowRequest, columns ...string) error {
|
|
|
|
followRequest.UpdatedAt = time.Now()
|
|
|
|
if len(columns) > 0 {
|
|
|
|
// If we're updating by column, ensure "updated_at" is included.
|
|
|
|
columns = append(columns, "updated_at")
|
|
|
|
}
|
|
|
|
|
|
|
|
return r.state.Caches.GTS.FollowRequest().Store(followRequest, func() error {
|
|
|
|
if _, err := r.conn.NewUpdate().
|
|
|
|
Model(followRequest).
|
|
|
|
Where("? = ?", bun.Ident("follow_request.id"), followRequest.ID).
|
|
|
|
Column(columns...).
|
|
|
|
Exec(ctx); err != nil {
|
|
|
|
return r.conn.ProcessError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
[performance] refactoring + add fave / follow / request / visibility caching (#1607)
* refactor visibility checking, add caching for visibility
* invalidate visibility cache items on account / status deletes
* fix requester ID passed to visibility cache nil ptr
* de-interface caches, fix home / public timeline caching + visibility
* finish adding code comments for visibility filter
* fix angry goconst linter warnings
* actually finish adding filter visibility code comments for timeline functions
* move home timeline status author check to after visibility
* remove now-unused code
* add more code comments
* add TODO code comment, update printed cache start names
* update printed cache names on stop
* start adding separate follow(request) delete db functions, add specific visibility cache tests
* add relationship type caching
* fix getting local account follows / followed-bys, other small codebase improvements
* simplify invalidation using cache hooks, add more GetAccountBy___() functions
* fix boosting to return 404 if not boostable but no error (to not leak status ID)
* remove dead code
* improved placement of cache invalidation
* update license headers
* add example follow, follow-request config entries
* add example visibility cache configuration to config file
* use specific PutFollowRequest() instead of just Put()
* add tests for all GetAccountBy()
* add GetBlockBy() tests
* update block to check primitive fields
* update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests
* fix copy-pasted code
* update envparsing test
* whitespace
* fix bun struct tag
* add license header to gtscontext
* fix old license header
* improved error creation to not use fmt.Errorf() when not needed
* fix various rebase conflicts, fix account test
* remove commented-out code, fix-up mention caching
* fix mention select bun statement
* ensure mention target account populated, pass in context to customrenderer logging
* remove more uncommented code, fix typeutil test
* add statusfave database model caching
* add status fave cache configuration
* add status fave cache example config
* woops, catch missed error. nice catch linter!
* add back testrig panic on nil db
* update example configuration to match defaults, slight tweak to cache configuration defaults
* update envparsing test with new defaults
* fetch followingget to use the follow target account
* use accounnt.IsLocal() instead of empty domain check
* use constants for the cache visibility type check
* use bun.In() for notification type restriction in db query
* include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable())
* use bun query building for nested select statements to ensure working with postgres
* update public timeline future status checks to match visibility filter
* same as previous, for home timeline
* update public timeline tests to dynamically check for appropriate statuses
* migrate accounts to allow unique constraint on public_key
* provide minimal account with publicKey
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
2023-03-28 13:03:14 +00:00
|
|
|
func (r *relationshipDB) AcceptFollowRequest(ctx context.Context, sourceAccountID string, targetAccountID string) (*gtsmodel.Follow, db.Error) {
|
|
|
|
// Get original follow request.
|
|
|
|
followReq, err := r.GetFollowRequest(ctx, sourceAccountID, targetAccountID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create a new follow to 'replace'
|
|
|
|
// the original follow request with.
|
|
|
|
follow := >smodel.Follow{
|
|
|
|
ID: followReq.ID,
|
|
|
|
AccountID: sourceAccountID,
|
|
|
|
Account: followReq.Account,
|
|
|
|
TargetAccountID: targetAccountID,
|
|
|
|
TargetAccount: followReq.TargetAccount,
|
|
|
|
URI: followReq.URI,
|
2023-04-10 19:56:02 +00:00
|
|
|
ShowReblogs: followReq.ShowReblogs,
|
|
|
|
Notify: followReq.Notify,
|
[performance] refactoring + add fave / follow / request / visibility caching (#1607)
* refactor visibility checking, add caching for visibility
* invalidate visibility cache items on account / status deletes
* fix requester ID passed to visibility cache nil ptr
* de-interface caches, fix home / public timeline caching + visibility
* finish adding code comments for visibility filter
* fix angry goconst linter warnings
* actually finish adding filter visibility code comments for timeline functions
* move home timeline status author check to after visibility
* remove now-unused code
* add more code comments
* add TODO code comment, update printed cache start names
* update printed cache names on stop
* start adding separate follow(request) delete db functions, add specific visibility cache tests
* add relationship type caching
* fix getting local account follows / followed-bys, other small codebase improvements
* simplify invalidation using cache hooks, add more GetAccountBy___() functions
* fix boosting to return 404 if not boostable but no error (to not leak status ID)
* remove dead code
* improved placement of cache invalidation
* update license headers
* add example follow, follow-request config entries
* add example visibility cache configuration to config file
* use specific PutFollowRequest() instead of just Put()
* add tests for all GetAccountBy()
* add GetBlockBy() tests
* update block to check primitive fields
* update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests
* fix copy-pasted code
* update envparsing test
* whitespace
* fix bun struct tag
* add license header to gtscontext
* fix old license header
* improved error creation to not use fmt.Errorf() when not needed
* fix various rebase conflicts, fix account test
* remove commented-out code, fix-up mention caching
* fix mention select bun statement
* ensure mention target account populated, pass in context to customrenderer logging
* remove more uncommented code, fix typeutil test
* add statusfave database model caching
* add status fave cache configuration
* add status fave cache example config
* woops, catch missed error. nice catch linter!
* add back testrig panic on nil db
* update example configuration to match defaults, slight tweak to cache configuration defaults
* update envparsing test with new defaults
* fetch followingget to use the follow target account
* use accounnt.IsLocal() instead of empty domain check
* use constants for the cache visibility type check
* use bun.In() for notification type restriction in db query
* include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable())
* use bun query building for nested select statements to ensure working with postgres
* update public timeline future status checks to match visibility filter
* same as previous, for home timeline
* update public timeline tests to dynamically check for appropriate statuses
* migrate accounts to allow unique constraint on public_key
* provide minimal account with publicKey
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
2023-03-28 13:03:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete original follow request.
|
|
|
|
if _, err := r.conn.
|
|
|
|
NewDelete().
|
|
|
|
Table("follow_requests").
|
|
|
|
Where("? = ?", bun.Ident("id"), followReq.ID).
|
|
|
|
Exec(ctx); err != nil {
|
|
|
|
return nil, r.conn.ProcessError(err)
|
|
|
|
}
|
|
|
|
|
2023-03-31 10:16:25 +00:00
|
|
|
// Invalidate follow request from cache lookups; this will
|
|
|
|
// invalidate the follow as well via the invalidate hook.
|
[performance] refactoring + add fave / follow / request / visibility caching (#1607)
* refactor visibility checking, add caching for visibility
* invalidate visibility cache items on account / status deletes
* fix requester ID passed to visibility cache nil ptr
* de-interface caches, fix home / public timeline caching + visibility
* finish adding code comments for visibility filter
* fix angry goconst linter warnings
* actually finish adding filter visibility code comments for timeline functions
* move home timeline status author check to after visibility
* remove now-unused code
* add more code comments
* add TODO code comment, update printed cache start names
* update printed cache names on stop
* start adding separate follow(request) delete db functions, add specific visibility cache tests
* add relationship type caching
* fix getting local account follows / followed-bys, other small codebase improvements
* simplify invalidation using cache hooks, add more GetAccountBy___() functions
* fix boosting to return 404 if not boostable but no error (to not leak status ID)
* remove dead code
* improved placement of cache invalidation
* update license headers
* add example follow, follow-request config entries
* add example visibility cache configuration to config file
* use specific PutFollowRequest() instead of just Put()
* add tests for all GetAccountBy()
* add GetBlockBy() tests
* update block to check primitive fields
* update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests
* fix copy-pasted code
* update envparsing test
* whitespace
* fix bun struct tag
* add license header to gtscontext
* fix old license header
* improved error creation to not use fmt.Errorf() when not needed
* fix various rebase conflicts, fix account test
* remove commented-out code, fix-up mention caching
* fix mention select bun statement
* ensure mention target account populated, pass in context to customrenderer logging
* remove more uncommented code, fix typeutil test
* add statusfave database model caching
* add status fave cache configuration
* add status fave cache example config
* woops, catch missed error. nice catch linter!
* add back testrig panic on nil db
* update example configuration to match defaults, slight tweak to cache configuration defaults
* update envparsing test with new defaults
* fetch followingget to use the follow target account
* use accounnt.IsLocal() instead of empty domain check
* use constants for the cache visibility type check
* use bun.In() for notification type restriction in db query
* include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable())
* use bun query building for nested select statements to ensure working with postgres
* update public timeline future status checks to match visibility filter
* same as previous, for home timeline
* update public timeline tests to dynamically check for appropriate statuses
* migrate accounts to allow unique constraint on public_key
* provide minimal account with publicKey
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
2023-03-28 13:03:14 +00:00
|
|
|
r.state.Caches.GTS.FollowRequest().Invalidate("ID", followReq.ID)
|
|
|
|
|
|
|
|
// Delete original follow request notification
|
|
|
|
if err := r.state.DB.DeleteNotifications(ctx, []string{
|
|
|
|
string(gtsmodel.NotificationFollowRequest),
|
|
|
|
}, targetAccountID, sourceAccountID); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return follow, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) RejectFollowRequest(ctx context.Context, sourceAccountID string, targetAccountID string) db.Error {
|
|
|
|
// Get original follow request.
|
|
|
|
followReq, err := r.GetFollowRequest(ctx, sourceAccountID, targetAccountID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete original follow request.
|
2023-03-31 10:16:25 +00:00
|
|
|
if err := r.DeleteFollowRequestByID(ctx, followReq.ID); err != nil {
|
|
|
|
return err
|
[performance] refactoring + add fave / follow / request / visibility caching (#1607)
* refactor visibility checking, add caching for visibility
* invalidate visibility cache items on account / status deletes
* fix requester ID passed to visibility cache nil ptr
* de-interface caches, fix home / public timeline caching + visibility
* finish adding code comments for visibility filter
* fix angry goconst linter warnings
* actually finish adding filter visibility code comments for timeline functions
* move home timeline status author check to after visibility
* remove now-unused code
* add more code comments
* add TODO code comment, update printed cache start names
* update printed cache names on stop
* start adding separate follow(request) delete db functions, add specific visibility cache tests
* add relationship type caching
* fix getting local account follows / followed-bys, other small codebase improvements
* simplify invalidation using cache hooks, add more GetAccountBy___() functions
* fix boosting to return 404 if not boostable but no error (to not leak status ID)
* remove dead code
* improved placement of cache invalidation
* update license headers
* add example follow, follow-request config entries
* add example visibility cache configuration to config file
* use specific PutFollowRequest() instead of just Put()
* add tests for all GetAccountBy()
* add GetBlockBy() tests
* update block to check primitive fields
* update and finish adding Get{Account,Block,Follow,FollowRequest}By() tests
* fix copy-pasted code
* update envparsing test
* whitespace
* fix bun struct tag
* add license header to gtscontext
* fix old license header
* improved error creation to not use fmt.Errorf() when not needed
* fix various rebase conflicts, fix account test
* remove commented-out code, fix-up mention caching
* fix mention select bun statement
* ensure mention target account populated, pass in context to customrenderer logging
* remove more uncommented code, fix typeutil test
* add statusfave database model caching
* add status fave cache configuration
* add status fave cache example config
* woops, catch missed error. nice catch linter!
* add back testrig panic on nil db
* update example configuration to match defaults, slight tweak to cache configuration defaults
* update envparsing test with new defaults
* fetch followingget to use the follow target account
* use accounnt.IsLocal() instead of empty domain check
* use constants for the cache visibility type check
* use bun.In() for notification type restriction in db query
* include replies when fetching PublicTimeline() (to account for single-author threads in Visibility{}.StatusPublicTimelineable())
* use bun query building for nested select statements to ensure working with postgres
* update public timeline future status checks to match visibility filter
* same as previous, for home timeline
* update public timeline tests to dynamically check for appropriate statuses
* migrate accounts to allow unique constraint on public_key
* provide minimal account with publicKey
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
2023-03-28 13:03:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Delete original follow request notification
|
|
|
|
return r.state.DB.DeleteNotifications(ctx, []string{
|
|
|
|
string(gtsmodel.NotificationFollowRequest),
|
|
|
|
}, targetAccountID, sourceAccountID)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) DeleteFollowRequestByID(ctx context.Context, id string) error {
|
|
|
|
if _, err := r.conn.NewDelete().
|
|
|
|
Table("follow_requests").
|
|
|
|
Where("? = ?", bun.Ident("id"), id).
|
|
|
|
Exec(ctx); err != nil {
|
|
|
|
return r.conn.ProcessError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalidate follow request from cache lookups.
|
|
|
|
r.state.Caches.GTS.FollowRequest().Invalidate("ID", id)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) DeleteFollowRequestByURI(ctx context.Context, uri string) error {
|
|
|
|
if _, err := r.conn.NewDelete().
|
|
|
|
Table("follow_requests").
|
|
|
|
Where("? = ?", bun.Ident("uri"), uri).
|
|
|
|
Exec(ctx); err != nil {
|
|
|
|
return r.conn.ProcessError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalidate follow request from cache lookups.
|
|
|
|
r.state.Caches.GTS.FollowRequest().Invalidate("URI", uri)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (r *relationshipDB) DeleteAccountFollowRequests(ctx context.Context, accountID string) error {
|
|
|
|
var followIDs []string
|
|
|
|
|
|
|
|
if _, err := r.conn.
|
|
|
|
NewDelete().
|
|
|
|
Table("follow_requests").
|
|
|
|
WhereOr("? = ? OR ? = ?",
|
|
|
|
bun.Ident("account_id"),
|
|
|
|
accountID,
|
|
|
|
bun.Ident("target_account_id"),
|
|
|
|
accountID,
|
|
|
|
).
|
|
|
|
Returning("?", bun.Ident("id")).
|
|
|
|
Exec(ctx, &followIDs); err != nil {
|
|
|
|
return r.conn.ProcessError(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invalidate each returned ID.
|
|
|
|
for _, id := range followIDs {
|
|
|
|
r.state.Caches.GTS.FollowRequest().Invalidate("ID", id)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|