diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 19:48:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 19:48:05 +0100 |
| commit | d602c92b310545eb733a58caed49717341abe27c (patch) | |
| tree | 59b020274695be37d47d0a4c98962c2677e621e6 /app/lib | |
| parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
| parent | d90da7d080d25355290e5d5e86c2c918d685add7 (diff) | |
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/admin/metrics/dimension/languages_dimension.rb | 2 | ||||
| -rw-r--r-- | app/lib/admin/metrics/dimension/tag_languages_dimension.rb | 2 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/lib/admin/metrics/dimension/languages_dimension.rb b/app/lib/admin/metrics/dimension/languages_dimension.rb index a6aaf5d21..1cc5f4120 100644 --- a/app/lib/admin/metrics/dimension/languages_dimension.rb +++ b/app/lib/admin/metrics/dimension/languages_dimension.rb @@ -20,6 +20,6 @@ class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension: rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, @limit]]) - rows.map { |row| { key: row['locale'], human_key: human_locale(row['locale']), value: row['value'].to_s } } + rows.map { |row| { key: row['locale'], human_key: standard_locale_name(row['locale']), value: row['value'].to_s } } end end diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb index 1cfa07478..afbc8cde8 100644 --- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb +++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb @@ -25,7 +25,7 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]]) - rows.map { |row| { key: row['language'], human_key: human_locale(row['language']), value: row['value'].to_s } } + rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } } end private diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index f2c4beed5..94d149da3 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -32,7 +32,7 @@ class Formatter include ActionView::Helpers::TextHelper def format(status, **options) - if status.reblog? + if status.respond_to?(:reblog?) && status.reblog? prepend_reblog = status.reblog.account.acct status = status.proper else @@ -53,7 +53,7 @@ class Formatter return html.html_safe # rubocop:disable Rails/OutputSafety end - linkable_accounts = status.active_mentions.map(&:account) + linkable_accounts = status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : [] linkable_accounts << status.account html = raw_content |