diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
commit | 34b8346e7f1274d40734f9da3100a4343cf9f81c (patch) | |
tree | 1a851db65a949df937de0a3eb4fce1e9f83e5301 /app/models/status.rb | |
parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
parent | a60364ca7d26c82c9353980d0966d37e9aa66014 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 6f3ba4cc3..5ddce72de 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -211,6 +211,8 @@ class Status < ApplicationRecord public_visibility? || unlisted_visibility? end + alias sign? distributable? + def with_media? media_attachments.any? end @@ -529,7 +531,7 @@ class Status < ApplicationRecord return if direct_visibility? account&.increment_count!(:statuses_count) - reblog&.increment_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?) + reblog&.increment_count!(:reblogs_count) if reblog? thread&.increment_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) end @@ -537,7 +539,7 @@ class Status < ApplicationRecord return if direct_visibility? || marked_for_mass_destruction? account&.decrement_count!(:statuses_count) - reblog&.decrement_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?) + reblog&.decrement_count!(:reblogs_count) if reblog? thread&.decrement_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?) end |