diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-23 22:00:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 22:00:13 +0100 |
| commit | f52c988e12e464e7baefc2fdb48ddf4a95584664 (patch) | |
| tree | 1849998c1180280751f829769c10c84986bf0953 /app/lib | |
| parent | 81cc86bb1ffb662843938379eeb522e3a6f11b79 (diff) | |
Add announcements (#12662)
* Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/entity_cache.rb | 2 | ||||
| -rw-r--r-- | app/lib/inline_renderer.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb index 8fff544a0..35a3773d2 100644 --- a/app/lib/entity_cache.rb +++ b/app/lib/entity_cache.rb @@ -8,7 +8,7 @@ class EntityCache MAX_EXPIRATION = 7.days.freeze def mention(username, domain) - Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:username, :domain, :url).find_remote(username, domain) } + Rails.cache.fetch(to_key(:mention, username, domain), expires_in: MAX_EXPIRATION) { Account.select(:id, :username, :domain, :url).find_remote(username, domain) } end def emoji(shortcodes, domain) diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb index 761a8822d..27e334a4d 100644 --- a/app/lib/inline_renderer.rb +++ b/app/lib/inline_renderer.rb @@ -15,6 +15,10 @@ class InlineRenderer serializer = REST::NotificationSerializer when :conversation serializer = REST::ConversationSerializer + when :announcement + serializer = REST::AnnouncementSerializer + when :reaction + serializer = REST::ReactionSerializer else return end |