mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 16:52:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] move status filtering from type converter (#4306)

Browse source 
This finalizes the moving status filtering out of the type converter, and into its own `./internal/filter/` subpkg :)

Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4306
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
kim 2025-07-04 15:30:39 +02:00 • committed by kim
commit 66e1ec14aa
38 changed files with 565 additions and 846 deletions
Download patch file Download diff file Expand all files Collapse all files

34
internal/processing/workers/surfacenotify.go
View file

@ -22,12 +22,12 @@ import (
"errors"
"strings"
apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model"
"code.superseriousbusiness.org/gotosocial/internal/db"
"code.superseriousbusiness.org/gotosocial/internal/gtscontext"
"code.superseriousbusiness.org/gotosocial/internal/gtserror"
"code.superseriousbusiness.org/gotosocial/internal/gtsmodel"
"code.superseriousbusiness.org/gotosocial/internal/id"
"code.superseriousbusiness.org/gotosocial/internal/typeutils"
"code.superseriousbusiness.org/gotosocial/internal/util"
"code.superseriousbusiness.org/gotosocial/internal/util/xslices"
)
@ -727,6 +727,8 @@ func (s *Surface) Notify(
return nil
}
var filtered []apimodel.FilterResult
if status != nil {
// Check whether status is muted by the target account.
muted, err := s.MuteFilter.StatusNotificationsMuted(ctx,
@ -741,17 +743,35 @@ func (s *Surface) Notify(
// Don't notify.
return nil
}
var hide bool
// Check whether notification status is filtered by requester in notifs.
filtered, hide, err = s.StatusFilter.StatusFilterResultsInContext(ctx,
targetAccount,
status,
gtsmodel.FilterContextNotifications,
)
if err != nil {
return gtserror.Newf("error checking status filtering: %w", err)
}
if hide {
// Don't notify.
return nil
}
}
// Convert the notification to frontend API model for streaming / web push.
apiNotif, err := s.Converter.NotificationToAPINotification(ctx, notif, true)
if err != nil && !errors.Is(err, typeutils.ErrHideStatus) {
// Convert notification to frontend API model for streaming / web push.
apiNotif, err := s.Converter.NotificationToAPINotification(ctx, notif)
if err != nil {
return gtserror.Newf("error converting notification to api representation: %w", err)
}
if apiNotif == nil {
// Filtered.
return nil
if apiNotif.Status != nil {
// Set filter results on status,
// in case any were set above.
apiNotif.Status.Filtered = filtered
}
// Stream notification to the user.