tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Fix crash in MergeWorker (#14129)

Browse Source 
Similarly to #12324, the code is passing an Account object where an id
is expected.
This commit is contained in:
ThibG 2020-06-23 16:40:01 +02:00 committed by GitHub
parent 791402af7c
commit 01a99f7ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/feed_manager.rb
View File

@ -106,7 +106,7 @@ class FeedManager
crutches = build_crutches(into_account.id, statuses) crutches = build_crutches(into_account.id, statuses)
statuses.each do |status| statuses.each do |status|
next if filter_from_home?(status, into_account, crutches) next if filter_from_home?(status, into_account.id, crutches)
add_to_feed(:home, into_account.id, status, aggregate) add_to_feed(:home, into_account.id, status, aggregate)
end end