about summary refs log tree commit diff
path: root/app/views/stream_entries
diff options
context:
space:
mode:
authorJoël Quenneville <joelq@thoughtbot.com>2017-04-07 14:18:30 -0400
committerJoël Quenneville <joelq@thoughtbot.com>2017-04-07 14:18:30 -0400
commitd4c94fa004117fdb7226b1b846a12d12dc0542d9 (patch)
tree93d2a3a70ad6bb6f23a63c9f6fc086c9f197384f /app/views/stream_entries
parent4e41cd9ab8f51120d558b70528b163c98993be53 (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/views/stream_entries')
-rw-r--r--app/views/stream_entries/_status.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index cdd0dde3b..434c5c8da 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -16,7 +16,7 @@
           %strong= display_name(status.account)
         = t('stream_entries.reblogged')
 
-  = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) }
+  = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: status.proper }
 
 - if include_threads
   = render partial: 'stream_entries/status', collection: @descendants, as: :status, locals: { is_successor: true }