diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
commit | 980c004f0601bbfaf440c0ea56de408ccfd79007 (patch) | |
tree | 8ed051d5e8b9c530b3282cfd84e34e50b3bcfa57 /app/models/status.rb | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index c189d19bf..f4284f771 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -87,6 +87,7 @@ class Status < ApplicationRecord scope :remote, -> { where(local: false).where.not(uri: nil) } scope :local, -> { where(local: true).or(where(uri: nil)) } + scope :with_accounts, ->(ids) { where(id: ids).includes(:account) } scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') } scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') } scope :with_public_visibility, -> { where(visibility: :public) } @@ -200,8 +201,12 @@ class Status < ApplicationRecord def title if destroyed? "#{account.acct} deleted status" + elsif reblog? + preview = sensitive ? '<sensitive>' : text.slice(0, 10).split("\n")[0] + "#{account.acct} shared #{reblog.account.acct}'s: #{preview}" else - reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}" + preview = sensitive ? '<sensitive>' : text.slice(0, 20).split("\n")[0] + "#{account.acct}: #{preview}" end end |