Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
This commit is contained in:
Claire
2022-03-15 20:45:27 +01:00
146 changed files with 1357 additions and 820 deletions

View File

@ -300,6 +300,10 @@ class Status < ApplicationRecord
end
end
def requires_review?
attributes['trendable'].nil? && account.requires_review?
end
def requires_review_notification?
attributes['trendable'].nil? && account.requires_review_notification?
end