diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /app/models/status.rb | |
parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 745a1401c..044816be7 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -497,6 +497,12 @@ class Status < ApplicationRecord im end + def discard_with_reblogs + discard_time = Time.current + Status.unscoped.where(reblog_of_id: id, deleted_at: [nil, deleted_at]).in_batches.update_all(deleted_at: discard_time) unless reblog? + update_attribute(:deleted_at, discard_time) + end + private def update_status_stat!(attrs) |