diff options
| author | Joël Quenneville <joelq@thoughtbot.com> | 2017-04-07 14:18:30 -0400 |
|---|---|---|
| committer | Joël Quenneville <joelq@thoughtbot.com> | 2017-04-07 14:18:30 -0400 |
| commit | d4c94fa004117fdb7226b1b846a12d12dc0542d9 (patch) | |
| tree | 93d2a3a70ad6bb6f23a63c9f6fc086c9f197384f /app/lib | |
| parent | 4e41cd9ab8f51120d558b70528b163c98993be53 (diff) | |
DRY up reblog vs original status check
Checking reblog vs original status was happening in multiple places across the app. For views, this logic was encapsulated in a helper method named `proper_status` but in the other layers of the app, the logic was duplicated. Because the logic is used at all layers of the app, we extracted it into a `Status#proper` method on the model and changed all uses of the logic to use this method. There is now a single source of truth for this condition. We added test coverage to untested methods that got refactored.
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/atom_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb index be1cced8b..b9dcee6b3 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/atom_serializer.rb @@ -328,7 +328,7 @@ class AtomSerializer def serialize_status_attributes(entry, status) append_element(entry, 'summary', status.spoiler_text) unless status.spoiler_text.blank? - append_element(entry, 'content', Formatter.instance.format(status.reblog? ? status.reblog : status).to_str, type: 'html') + append_element(entry, 'content', Formatter.instance.format(status.proper).to_str, type: 'html') status.mentions.each do |mentioned| append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': TagManager::TYPES[:person], href: TagManager.instance.uri_for(mentioned.account)) |