mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[feature] User muting (#2960)
* User muting * Address review feedback * Rename uniqueness constraint on user_mutes to match convention * Remove unused account_id from where clause * Add UserMute to NewTestDB * Update test/envparsing.sh with new and fixed cache stuff * Address tobi's review comments * Make compiledUserMuteListEntry.expired consistent with UserMute.Expired * Make sure mute_expires_at is serialized as an explicit null for indefinite mutes --------- Co-authored-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
@@ -20,6 +20,7 @@ package bundb
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
|
||||
@@ -108,6 +109,16 @@ func (r *relationshipDB) GetRelationship(ctx context.Context, requestingAccount
|
||||
rel.Note = note.Comment
|
||||
}
|
||||
|
||||
// check if the requesting account is muting the target account
|
||||
mute, err := r.GetMute(ctx, requestingAccount, targetAccount)
|
||||
if err != nil && !errors.Is(err, db.ErrNoEntries) {
|
||||
return nil, gtserror.Newf("error checking muting: %w", err)
|
||||
}
|
||||
if mute != nil && !mute.Expired(time.Now()) {
|
||||
rel.Muting = true
|
||||
rel.MutingNotifications = *mute.Notifications
|
||||
}
|
||||
|
||||
return &rel, nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user