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

Fixing image upload limits, allowing webm, merge/unmerge events trigger

Browse Source 
timeline reload in UI, other small fixes
This commit is contained in:
Eugen Rochko
2016-09-12 18:22:43 +02:00
parent 3d566279cb
commit ce29624c6d
15 changed files with 144 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/feed_manager.rb
View File

@@ -17,7 +17,11 @@ class FeedManager
def push(timeline_type, account, status)
redis.zadd(key(timeline_type, account.id), status.id, status.id)
trim(timeline_type, account.id)
ActionCable.server.broadcast("timeline:#{account.id}", type: 'update', timeline: timeline_type, message: inline_render(account, status))
broadcast(account.id, type: 'update', timeline: timeline_type, message: inline_render(account, status))
end
def broadcast(account_id, options = {})
ActionCable.server.broadcast("timeline:#{account_id}", options)
end
def trim(type, account_id)