Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
This commit is contained in:
Claire
2024-11-03 20:51:58 +01:00
201 changed files with 1941 additions and 736 deletions

View File

@@ -95,6 +95,14 @@ class ActivityPub::Parser::StatusParser
lang.presence && NORMALIZED_LOCALE_NAMES.fetch(lang.downcase.to_sym, lang)
end
def favourites_count
@object.dig(:likes, :totalItems)
end
def reblogs_count
@object.dig(:shares, :totalItems)
end
private
def raw_language_code