diff options
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 4 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 0b04ad7ff..86f41cfe9 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -23,8 +23,8 @@ class FeedManager 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) + def broadcast(timeline_id, options = {}) + ActionCable.server.broadcast("timeline:#{timeline_id}", options) end def trim(type, account_id) diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index d8d5424fd..1ec77e56d 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -2,6 +2,7 @@ require 'singleton' class Formatter include Singleton + include RoutingHelper include ActionView::Helpers::TextHelper include ActionView::Helpers::SanitizeHelper @@ -52,7 +53,7 @@ class Formatter def hashtag_html(match) prefix, affix = match.split('#') - "#{prefix}<a href=\"#\" class=\"mention hashtag\">#<span>#{affix}</span></a>" + "#{prefix}<a href=\"#{tag_url(affix.downcase)}\" class=\"mention hashtag\">#<span>#{affix}</span></a>" end def mention_html(match, account) |