mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-02 05:52:25 -06: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

53
internal/processing/conversations/update.go
View file

@ -27,7 +27,6 @@ import (
"code.superseriousbusiness.org/gotosocial/internal/gtsmodel"
"code.superseriousbusiness.org/gotosocial/internal/id"
"code.superseriousbusiness.org/gotosocial/internal/log"
"code.superseriousbusiness.org/gotosocial/internal/typeutils"
"code.superseriousbusiness.org/gotosocial/internal/util"
)
@ -158,26 +157,6 @@ func (p *Processor) UpdateConversationsForStatus(ctx context.Context, status *gt
continue
}
// Convert the conversation to API representation.
apiConversation, err := p.converter.ConversationToAPIConversation(ctx,
conversation,
localAccount,
nil,
)
if err != nil {
// If the conversation's last status matched a hide filter, skip it.
// If there was another kind of error, log that and skip it anyway.
if !errors.Is(err, typeutils.ErrHideStatus) {
log.Errorf(ctx,
"error converting conversation %s to API representation for account %s: %v",
status.ID,
localAccount.ID,
err,
)
}
continue
}
// If status was authored by this participant,
// don't bother notifying, they already know!
if status.AccountID == localAccount.ID {
@ -198,6 +177,38 @@ func (p *Processor) UpdateConversationsForStatus(ctx context.Context, status *gt
continue
}
// Check whether status if filtered by local participant in context.
filtered, hide, err := p.statusFilter.StatusFilterResultsInContext(ctx,
localAccount,
status,
gtsmodel.FilterContextNotifications,
)
if err != nil {
log.Errorf(ctx, "error filtering status: %v", err)
continue
}
if hide {
continue
}
// Convert the conversation to API representation.
apiConversation, err := p.converter.ConversationToAPIConversation(ctx,
conversation,
localAccount,
)
if err != nil {
log.Errorf(ctx, "error converting conversation %s to API representation for account %s: %v",
status.ID,
localAccount.ID,
err,
)
continue
}
// Set filter results on attached status model.
apiConversation.LastStatus.Filtered = filtered
// Generate a notification,
notifications = append(notifications, ConversationNotification{
AccountID: localAccount.ID,