Merge pull request #2824 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 97f6baf

Gemfile

@@ -64,7 +64,6 @@ gem 'link_header', '~> 0.0'
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
-gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'

Gemfile.lock

@@ -455,11 +455,6 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nsa (0.3.0)
-      activesupport (>= 4.2, < 7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      sidekiq (>= 3.5)
-      statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.16.5)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
@@ -821,7 +816,6 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.26)
-    statsd-ruby (1.5.0)
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.1)
@@ -980,7 +974,6 @@ DEPENDENCIES
   net-http (~> 0.4.0)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
-  nsa
   oj (~> 3.14)
   omniauth (~> 2.0)
   omniauth-cas (~> 3.0.0.beta.1)

app/javascript/mastodon/locales/an.json

@@ -483,8 +483,6 @@
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrau",
-  "status.hide": "Amagar la publicación",
   "status.history.created": "{name} creyó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar mas",
@@ -509,10 +507,7 @@
   "status.report": "Denunciar €{name}",
   "status.sensitive_warning": "Conteniu sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Amostrar de totz modos",
-  "status.show_less": "Amostrar menos",
   "status.show_less_all": "Amostrar menos pa tot",
-  "status.show_more": "Amostrar mas",
   "status.show_more_all": "Amostrar mas pa tot",
   "status.show_original": "Amostrar orichinal",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",

app/javascript/mastodon/locales/ar.json

@@ -736,8 +736,6 @@
   "status.favourite": "فضّل",
   "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذا المنشور",
-  "status.filtered": "مُصفّى",
-  "status.hide": "إخفاء المنشور",
   "status.history.created": "أنشأه {name} {date}",
   "status.history.edited": "عدله {name} {date}",
   "status.load_more": "حمّل المزيد",
@@ -765,10 +763,7 @@
   "status.report": "ابلِغ عن @{name}",
   "status.sensitive_warning": "محتوى حساس",
   "status.share": "مشاركة",
-  "status.show_filter_reason": "إظهار على أي حال",
-  "status.show_less": "اعرض أقلّ",
   "status.show_less_all": "طي الكل",
-  "status.show_more": "أظهر المزيد",
   "status.show_more_all": "توسيع الكل",
   "status.show_original": "إظهار الأصل",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",

app/javascript/mastodon/locales/ast.json

@@ -422,8 +422,6 @@
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
-  "status.filtered": "Peñeróse",
-  "status.hide": "Anubrir l'artículu",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
@@ -446,9 +444,6 @@
   "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Amosar de toes toes",
-  "status.show_less": "Amosar menos",
-  "status.show_more": "Amosar más",
   "status.show_original": "Amosar l'orixinal",
   "status.translate": "Traducir",
   "status.translated_from_with": "Tradúxose del {lang} con {provider}",

app/javascript/mastodon/locales/be.json

@@ -745,8 +745,6 @@
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
-  "status.filtered": "Адфільтравана",
-  "status.hide": "Схаваць допіс",
   "status.history.created": "Створана {name} {date}",
   "status.history.edited": "Адрэдагавана {name} {date}",
   "status.load_more": "Загрузіць яшчэ",
@@ -774,10 +772,7 @@
   "status.report": "Паскардзіцца на @{name}",
   "status.sensitive_warning": "Уражвальны змест",
   "status.share": "Абагуліць",
-  "status.show_filter_reason": "Усё адно паказаць",
-  "status.show_less": "Паказаць меньш",
   "status.show_less_all": "Згарнуць усё",
-  "status.show_more": "Паказаць болей",
   "status.show_more_all": "Разгарнуць усё",
   "status.show_original": "Паказаць арыгінал",
   "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {далучэнне} few {{attachmentCount} далучэнні} many {{attachmentCount} далучэнняў} other {{attachmentCount} далучэння}}",

app/javascript/mastodon/locales/bg.json

@@ -746,8 +746,6 @@
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
-  "status.filtered": "Филтрирано",
-  "status.hide": "Скриване на публ.",
   "status.history.created": "{name} създаде {date}",
   "status.history.edited": "{name} редактира {date}",
   "status.load_more": "Зареждане на още",
@@ -775,10 +773,7 @@
   "status.report": "Докладване на @{name}",
   "status.sensitive_warning": "Деликатно съдържание",
   "status.share": "Споделяне",
-  "status.show_filter_reason": "Покажи въпреки това",
-  "status.show_less": "Показване на по-малко",
   "status.show_less_all": "Показване на по-малко за всички",
-  "status.show_more": "Показване на повече",
   "status.show_more_all": "Показване на повече за всички",
   "status.show_original": "Показване на първообраза",
   "status.title.with_attachments": "{user} публикува {attachmentCount, plural, one {прикачване} other {{attachmentCount} прикачвания}}",

app/javascript/mastodon/locales/bn.json

@@ -411,8 +411,6 @@
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দ",
-  "status.filtered": "ছাঁকনিদিত",
-  "status.hide": "পোস্ট লুকাও",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "মিডিয়া লুকানো আছে",
   "status.mention": "@{name}কে উল্লেখ করতে",
@@ -434,9 +432,7 @@
   "status.report": "@{name} কে রিপোর্ট করতে",
   "status.sensitive_warning": "সংবেদনশীল কিছু",
   "status.share": "অন্যদের জানান",
-  "status.show_less": "কম দেখতে",
   "status.show_less_all": "সবগুলোতে কম দেখতে",
-  "status.show_more": "আরো দেখাতে",
   "status.show_more_all": "সবগুলোতে আরো দেখতে",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "অনুবাদ",

app/javascript/mastodon/locales/br.json

@@ -579,8 +579,6 @@
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
   "status.filter": "Silañ ar c'hannad-mañ",
-  "status.filtered": "Silet",
-  "status.hide": "Kuzhat an embannadur",
   "status.history.created": "Krouet gant {name} {date}",
   "status.history.edited": "Kemmet gant {name} {date}",
   "status.load_more": "Kargañ muioc'h",
@@ -607,10 +605,7 @@
   "status.report": "Disklêriañ @{name}",
   "status.sensitive_warning": "Dalc'had kizidik",
   "status.share": "Rannañ",
-  "status.show_filter_reason": "Diskwel memes tra",
-  "status.show_less": "Diskouez nebeutoc'h",
   "status.show_less_all": "Diskouez nebeutoc'h evit an holl",
-  "status.show_more": "Diskouez muioc'h",
   "status.show_more_all": "Diskouez miuoc'h evit an holl",
   "status.show_original": "Diskouez hini orin",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",

app/javascript/mastodon/locales/ca.json

@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Deixa de seguir",
   "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
   "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
+  "content_warning.hide": "Amaga la publicació",
+  "content_warning.show": "Mostra-la igualment",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
-  "status.filtered": "Filtrada",
-  "status.hide": "Amaga el tut",
   "status.history.created": "creat per {name} {date}",
   "status.history.edited": "editat per {name} {date}",
   "status.load_more": "Carrega'n més",
@@ -814,10 +815,7 @@
   "status.report": "Denuncia @{name}",
   "status.sensitive_warning": "Contingut sensible",
   "status.share": "Comparteix",
-  "status.show_filter_reason": "Mostra igualment",
-  "status.show_less": "Mostra'n menys",
   "status.show_less_all": "Mostra'n menys per a tot",
-  "status.show_more": "Mostra'n més",
   "status.show_more_all": "Mostra'n més per a tot",
   "status.show_original": "Mostra l'original",
   "status.title.with_attachments": "{user} ha publicat {attachmentCount, plural, one {un adjunt} other {{attachmentCount} adjunts}}",

app/javascript/mastodon/locales/ckb.json

@@ -542,8 +542,6 @@
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
   "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
-  "status.filtered": "پاڵاوتن",
-  "status.hide": "شاردنەوەی پۆست",
   "status.history.created": "{name} دروستکراوە لە{date}",
   "status.history.edited": "{name} دروستکاریکراوە لە{date}",
   "status.load_more": "زیاتر بار بکە",
@@ -568,10 +566,7 @@
   "status.report": "گوزارشت @{name}",
   "status.sensitive_warning": "ناوەڕۆکی هەستیار",
   "status.share": "هاوبەشی بکە",
-  "status.show_filter_reason": "بە هەر حاڵ نیشان بدە",
-  "status.show_less": "کەمتر نیشان بدە",
   "status.show_less_all": "هەمووی بچووک بکەوە",
-  "status.show_more": "زیاتر نیشان بدە",
   "status.show_more_all": "زیاتر نیشان بدە بۆ هەمووی",
   "status.show_original": "پیشاندانی شێوه‌ی ڕاسته‌قینه‌",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",

app/javascript/mastodon/locales/co.json

@@ -321,7 +321,6 @@
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Integrà",
-  "status.filtered": "Filtratu",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",
@@ -343,9 +342,7 @@
   "status.report": "Palisà @{name}",
   "status.sensitive_warning": "Cuntinutu sensibile",
   "status.share": "Sparte",
-  "status.show_less": "Ripiegà",
   "status.show_less_all": "Ripiegà tuttu",
-  "status.show_more": "Slibrà",
   "status.show_more_all": "Slibrà tuttu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Ùn piattà più a cunversazione",

app/javascript/mastodon/locales/cs.json

@@ -731,8 +731,6 @@
   "status.favourite": "Oblíbit",
   "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
-  "status.filtered": "Filtrováno",
-  "status.hide": "Skrýt příspěvek",
   "status.history.created": "Uživatel {name} vytvořil {date}",
   "status.history.edited": "Uživatel {name} upravil {date}",
   "status.load_more": "Načíst více",
@@ -760,10 +758,7 @@
   "status.report": "Nahlásit @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Sdílet",
-  "status.show_filter_reason": "Přesto zobrazit",
-  "status.show_less": "Zobrazit méně",
   "status.show_less_all": "Zobrazit méně pro všechny",
-  "status.show_more": "Zobrazit více",
   "status.show_more_all": "Zobrazit více pro všechny",
   "status.show_original": "Zobrazit originál",
   "status.title.with_attachments": "{user} zveřejnil {attachmentCount, plural, one {přílohu} few {{attachmentCount} přílohy} many {{attachmentCount} příloh} other {{attachmentCount} příloh}}",

app/javascript/mastodon/locales/cy.json

@@ -762,8 +762,6 @@
   "status.favourite": "Hoffi",
   "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
-  "status.filtered": "Wedi'i hidlo",
-  "status.hide": "Cuddio'r postiad",
   "status.history.created": "Crëwyd gan {name} {date}",
   "status.history.edited": "Golygwyd gan {name} {date}",
   "status.load_more": "Llwythwch ragor",
@@ -791,10 +789,7 @@
   "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
-  "status.show_filter_reason": "Dangos beth bynnag",
-  "status.show_less": "Dangos llai",
   "status.show_less_all": "Dangos llai i bawb",
-  "status.show_more": "Dangos mwy",
   "status.show_more_all": "Dangos mwy i bawb",
   "status.show_original": "Dangos y gwreiddiol",
   "status.title.with_attachments": "Postiodd {user} {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",

app/javascript/mastodon/locales/da.json

@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Følg ikke længere",
   "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
   "confirmations.unfollow.title": "Følg ikke længere bruger?",
+  "content_warning.hide": "Skjul indlæg",
+  "content_warning.show": "Vis alligevel",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filter_warning.matches_filter": "Matcher filteret “{title}”",
   "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
-  "status.filtered": "Filtreret",
-  "status.hide": "Skjul indlæg",
   "status.history.created": "{name} oprettet {date}",
   "status.history.edited": "{name} redigeret {date}",
   "status.load_more": "Indlæs mere",
@@ -814,10 +815,7 @@
   "status.report": "Anmeld @{name}",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis alligevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis mere",
   "status.show_more_all": "Vis mere for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} postede {attachmentCount, plural, one {en vedhæftning} other {{attachmentCount} vedhæftninger}}",

app/javascript/mastodon/locales/de.json

@@ -192,6 +192,8 @@
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Möchtest du {name} wirklich entfolgen?",
   "confirmations.unfollow.title": "Profil entfolgen?",
+  "content_warning.hide": "Beitrag ausblenden",
+  "content_warning.show": "Trotzdem anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -299,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
@@ -785,8 +788,6 @@
   "status.favourite": "Favorisieren",
   "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",
-  "status.filtered": "Gefiltert",
-  "status.hide": "Beitrag ausblenden",
   "status.history.created": "{name} erstellte {date}",
   "status.history.edited": "{name} bearbeitete {date}",
   "status.load_more": "Mehr laden",
@@ -814,10 +815,7 @@
   "status.report": "@{name} melden",
   "status.sensitive_warning": "Inhaltswarnung",
   "status.share": "Teilen",
-  "status.show_filter_reason": "Trotzdem anzeigen",
-  "status.show_less": "Weniger anzeigen",
   "status.show_less_all": "Alles einklappen",
-  "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Alles ausklappen",
   "status.show_original": "Ursprünglichen Beitrag anzeigen",
   "status.title.with_attachments": "{user} veröffentlichte {attachmentCount, plural, one {ein Medium} other {{attachmentCount} Medien}}",

app/javascript/mastodon/locales/el.json

@@ -785,8 +785,6 @@
   "status.favourite": "Αγαπημένα",
   "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
-  "status.filtered": "Φιλτραρισμένα",
-  "status.hide": "Απόκρυψη ανάρτησης",
   "status.history.created": "{name} δημιούργησε στις {date}",
   "status.history.edited": "{name} επεξεργάστηκε στις {date}",
   "status.load_more": "Φόρτωσε περισσότερα",
@@ -814,10 +812,7 @@
   "status.report": "Αναφορά @{name}",
   "status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
   "status.share": "Κοινοποίηση",
-  "status.show_filter_reason": "Εμφάνιση παρ' όλα αυτά",
-  "status.show_less": "Δείξε λιγότερα",
   "status.show_less_all": "Δείξε λιγότερα για όλα",
-  "status.show_more": "Δείξε περισσότερα",
   "status.show_more_all": "Δείξε περισσότερα για όλα",
   "status.show_original": "Εμφάνιση αρχικού",
   "status.title.with_attachments": "{user} δημοσίευσε {attachmentCount, plural, one {ένα συνημμένο} other {{attachmentCount} συνημμένα}}",