tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
This commit is contained in:
Claire
2022-02-23 18:13:12 +01:00
parent 2c8615fbf8 0db101ede2
commit 3d25fe0426
71 changed files with 522 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/feed_manager.rb
View File

@ -549,7 +549,7 @@ class FeedManager
end
else
# A reblog may reach earlier than the original status because of the
# delay of the worker deliverying the original status, the late addition
# delay of the worker delivering the original status, the late addition
# by merging timelines, and other reasons.
# If such a reblog already exists, just do not re-insert it into the feed.
return false unless redis.zscore(reblog_key, status.id).nil?