mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2026-01-04 17:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

move list exclusivity check to AFTER eligibility check. use log.Panic() instead of panic()

Browse source
This commit is contained in:
kim 2024-09-16 17:20:12 +01:00
commit 3814784991
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/processing/workers/surfacetimeline.go
View file

@ -234,8 +234,8 @@ func (s *Surface) listTimelineStatusForFollow(
mutes *usermute.CompiledUserMuteList,
) (timelined bool, exclusive bool, err error) {
// Get all lists that contain this follow.
lists, err := s.State.DB.GetListsWithFollowID(
// Get all lists that contain this given follow.
lists, err := s.State.DB.GetListsContainingFollowID(
// We don't need list sub-models.
gtscontext.SetBarebones(ctx),
@ -246,9 +246,6 @@ func (s *Surface) listTimelineStatusForFollow(
}
for _, list := range lists {
// Update exclusive flag if list is so.
exclusive = exclusive || *list.Exclusive
// Check whether list is eligible for this status.
eligible, err := s.listEligible(ctx, list, status)
if err != nil {
@ -260,6 +257,9 @@ func (s *Surface) listTimelineStatusForFollow(
continue
}
// Update exclusive flag if list is so.
exclusive = exclusive || *list.Exclusive
// At this point we are certain this status
// should be included in the timeline of the
// list that this list entry belongs to.
@ -362,7 +362,8 @@ func (s *Surface) listEligible(
return follows, nil
default:
panic("unknown reply policy: " + list.RepliesPolicy)
log.Panicf(ctx, "unknown reply policy: %s", list.RepliesPolicy)
return false, nil // unreachable code
}
}
@ -717,8 +718,8 @@ func (s *Surface) listTimelineStatusUpdateForFollow(
mutes *usermute.CompiledUserMuteList,
) (bool, bool, error) {
// Get all lists that contain this follow.
lists, err := s.State.DB.GetListsWithFollowID(
// Get all lists that contain this given follow.
lists, err := s.State.DB.GetListsContainingFollowID(
// We don't need list sub-models.
gtscontext.SetBarebones(ctx),
@ -731,9 +732,6 @@ func (s *Surface) listTimelineStatusUpdateForFollow(
var exclusive, timelined bool
for _, list := range lists {
// Update exclusive flag if list is so.
exclusive = exclusive || *list.Exclusive
// Check whether list is eligible for this status.
eligible, err := s.listEligible(ctx, list, status)
if err != nil {
@ -745,6 +743,9 @@ func (s *Surface) listTimelineStatusUpdateForFollow(
continue
}
// Update exclusive flag if list is so.
exclusive = exclusive || *list.Exclusive
// At this point we are certain this status
// should be included in the timeline of the
// list that this list entry belongs to.