Merge pull request #943 from kmycode/upstream-20241206

Upstream 20241206

.github/workflows/test-migrations.yml

@@ -15,6 +15,7 @@ on:
       - '**/*.rb'
       - '.github/workflows/test-migrations.yml'
       - 'lib/tasks/tests.rake'
+      - 'lib/tasks/db.rake'
 
   pull_request:
     paths:
@@ -93,6 +94,11 @@ jobs:
           bin/rails db:drop
           bin/rails db:create
           SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails tests:migrations:prepare_database
+
+          # Migrate up to v4.2.0 breakpoint
+          bin/rails db:migrate VERSION=20230907150100
+
+          # Migrate the rest
           SKIP_POST_DEPLOYMENT_MIGRATIONS=true bin/rails db:migrate
           bin/rails db:migrate
           bin/rails tests:migrations:check_database

Gemfile.lock

@@ -94,7 +94,7 @@ GEM
     ast (2.4.2)
     attr_required (1.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1015.0)
+    aws-partitions (1.1017.0)
     aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -103,7 +103,7 @@ GEM
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.175.0)
+    aws-sdk-s3 (1.176.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -128,7 +128,7 @@ GEM
       msgpack (~> 1.2)
     brakeman (6.2.2)
       racc
-    browser (6.1.0)
+    browser (6.2.0)
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
@@ -466,7 +466,7 @@ GEM
     opentelemetry-api (1.4.0)
     opentelemetry-common (0.21.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.29.0)
+    opentelemetry-exporter-otlp (0.29.1)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -490,8 +490,9 @@ GEM
     opentelemetry-instrumentation-active_job (0.7.8)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_model_serializers (0.20.2)
+    opentelemetry-instrumentation-active_model_serializers (0.20.3)
       opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (>= 0.6.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_record (0.8.1)
       opentelemetry-api (~> 1.0)
@@ -545,7 +546,7 @@ GEM
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-registry (0.3.1)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.5.0)
+    opentelemetry-sdk (1.6.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)

app/controllers/api/v1/trends/tags_controller.rb

@@ -27,7 +27,9 @@ def set_tags
   end
 
   def tags_from_trends
-    Trends.tags.query.allowed
+    scope = Trends.tags.query.allowed.in_locale(content_locale)
+    scope = scope.filtered_for(current_account) if user_signed_in?
+    scope
   end
 
   def next_path

app/javascript/mastodon/locales/bg.json

@@ -101,8 +101,9 @@
   "annual_report.summary.highlighted_post.possessive": "на {name}",
   "annual_report.summary.most_used_app.most_used_app": "най-употребявано приложение",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "най-употребяван хаштаг",
+  "annual_report.summary.most_used_hashtag.none": "Няма",
   "annual_report.summary.new_posts.new_posts": "нови публикации",
-  "annual_report.summary.percentile.text": "<topLabel>Това ви слага най-отгоре</topLabel><percentage></percentage><bottomLabel>сред потребителите на Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.text": "<topLabel>Това ви слага най-отгоре</topLabel><percentage></percentage><bottomLabel>сред потребителите на {domain}.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Няма да кажем на Бърни Сандърс.",
   "annual_report.summary.thanks": "Благодарим, че сте част от Mastodon!",
   "attachments_list.unprocessed": "(необработено)",
@@ -204,6 +205,9 @@
   "confirmations.edit.confirm": "Редактиране",
   "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.edit.title": "Презаписвате ли публикацията?",
+  "confirmations.follow_to_list.confirm": "Последване и добавяне в списък",
+  "confirmations.follow_to_list.message": "Трябва да последвате {name}, за да добавите лицето към списък.",
+  "confirmations.follow_to_list.title": "Последвате ли потребителя?",
   "confirmations.logout.confirm": "Излизане",
   "confirmations.logout.message": "Наистина ли искате да излезете?",
   "confirmations.logout.title": "Излизате ли от системата?",
@@ -394,6 +398,7 @@
   "home.pending_critical_update.title": "Налично критично обновяване на сигурността!",
   "home.show_announcements": "Показване на оповестяванията",
   "ignore_notifications_modal.disclaimer": "Mastodon не може да осведоми потребители, че сте пренебрегнали известията им. Пренебрегването на известията няма да спре самите съобщения да не бъдат изпращани.",
+  "ignore_notifications_modal.filter_instead": "Вместо това филтриране",
   "ignore_notifications_modal.filter_to_act_users": "Вие все още ще може да приемате, отхвърляте или докладвате потребители",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Прецеждането помага за избягване на възможно объркване",
   "ignore_notifications_modal.filter_to_review_separately": "Може да разгледате отделно филтрираните известия",
@@ -491,7 +496,7 @@
   "lists.replies_policy.list": "Членуващите в списъка",
   "lists.replies_policy.none": "Никого",
   "lists.save": "Запазване",
-  "lists.search_placeholder": "Търсене сред, които сте последвали",
+  "lists.search": "Търсене",
   "lists.show_replies_to": "Включва отговори от членуващи в списъка до",
   "load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
   "loading_indicator.label": "Зареждане…",
@@ -634,6 +639,7 @@
   "notifications.policy.drop": "Пренебрегване",
   "notifications.policy.drop_hint": "Изпращане в празнотата, за да не се видим никога пак",
   "notifications.policy.filter": "Филтър",
+  "notifications.policy.filter_hint": "Изпращане до филтрираните входящи за известия",
   "notifications.policy.filter_limited_accounts_hint": "Ограничено от модераторите на сървъра",
   "notifications.policy.filter_limited_accounts_title": "Модерирани акаунти",
   "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",

app/javascript/mastodon/locales/ca.json

@@ -103,7 +103,7 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "l'etiqueta més utilitzada",
   "annual_report.summary.most_used_hashtag.none": "Cap",
   "annual_report.summary.new_posts.new_posts": "publicacions noves",
-  "annual_report.summary.percentile.text": "<topLabel>Que us posa en el</topLabel><percentage></percentage><bottomLabel>més alt dels usuaris de Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.text": "<topLabel>Que us posa al</topLabel><percentage></percentage><bottomLabel>capdamunt dels usuaris de {domain}.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "No li ho direm al Bernie.",
   "annual_report.summary.thanks": "Gràcies per formar part de Mastodon!",
   "attachments_list.unprocessed": "(sense processar)",
@@ -205,6 +205,9 @@
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
   "confirmations.edit.title": "Sobreescriure la publicació?",
+  "confirmations.follow_to_list.confirm": "Seguir i afegir a una llista",
+  "confirmations.follow_to_list.message": "Cal seguir {name} per a afegir-lo a una llista.",
+  "confirmations.follow_to_list.title": "Seguir l'usuari?",
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
   "confirmations.logout.title": "Tancar la sessió?",
@@ -493,7 +496,7 @@
   "lists.replies_policy.list": "Membres de la llista",
   "lists.replies_policy.none": "Ningú",
   "lists.save": "Desa",
-  "lists.search_placeholder": "Cerca persones que seguiu",
+  "lists.search": "Cerca",
   "lists.show_replies_to": "Inclou respostes de membres de la llista a",
   "load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
   "loading_indicator.label": "Es carrega…",

app/javascript/mastodon/locales/cy.json

@@ -103,7 +103,6 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashnod a ddefnyddiwyd fwyaf",
   "annual_report.summary.most_used_hashtag.none": "Dim",
   "annual_report.summary.new_posts.new_posts": "postiadau newydd",
-  "annual_report.summary.percentile.text": "<topLabel>Rydych chi yn y </topLabel><percentage></percentage><bottomLabel>mwyaf o ddefnyddwyr Mastodon.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Ni fyddwn yn dweud wrth Bernie.",
   "annual_report.summary.thanks": "Diolch am fod yn rhan o Mastodon!",
   "attachments_list.unprocessed": "(heb eu prosesu)",
@@ -487,7 +486,6 @@
   "lists.replies_policy.list": "Aelodau'r rhestr",
   "lists.replies_policy.none": "Neb",
   "lists.save": "Cadw",
-  "lists.search_placeholder": "Chwiliwch am bobl rydych chi'n eu dilyn",
   "lists.show_replies_to": "Cynhwyswch atebion gan aelodau'r rhestr i",
   "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
   "loading_indicator.label": "Yn llwytho…",

app/javascript/mastodon/locales/da.json

@@ -103,7 +103,7 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "mest benyttede hashtag",
   "annual_report.summary.most_used_hashtag.none": "Intet",
   "annual_report.summary.new_posts.new_posts": "nye indlæg",
-  "annual_report.summary.percentile.text": "<topLabel>Det betyder, at man er i top</topLabel><percentage></percentage><bottomLabel>af Mastodon-brugere.</bottomLabel>",
+  "annual_report.summary.percentile.text": "<topLabel>Det betyder, at man er i top</topLabel><percentage></percentage><bottomLabel>af {domain}-brugere.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Vi fortæller det ikke til Bernie.",
   "annual_report.summary.thanks": "Tak for at være en del af Mastodon!",
   "attachments_list.unprocessed": "(ubehandlet)",
@@ -205,6 +205,9 @@
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
   "confirmations.edit.title": "Overskriv indlæg?",
+  "confirmations.follow_to_list.confirm": "Følg og føj til liste",
+  "confirmations.follow_to_list.message": "Man skal følge {name} for at føje vedkommende til en liste.",
+  "confirmations.follow_to_list.title": "Følg bruger?",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.logout.title": "Log ud?",
@@ -244,7 +247,7 @@
   "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
   "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
-  "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+  "domain_block_modal.they_wont_know": "De ser ikke den aktive blokering.",
   "domain_block_modal.title": "Blokér domæne?",
   "domain_block_modal.you_will_lose_num_followers": "Man vil miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} person, man følger} other {{followingCountDisplay} personer, man følger}}.",
   "domain_block_modal.you_will_lose_relationships": "Alle følgere og personer som følges på denne server mistes.",
@@ -492,7 +495,7 @@
   "lists.replies_policy.list": "Listemedlemmer",
   "lists.replies_policy.none": "Ingen",
   "lists.save": "Gem",
-  "lists.search_placeholder": "Søg efter folk, man følger",
+  "lists.search": "Søg",
   "lists.show_replies_to": "Medtag svar fra listemedlemmer til",
   "load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}",
   "loading_indicator.label": "Indlæser…",

app/javascript/mastodon/locales/de.json

@@ -103,7 +103,7 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "am häufigsten verwendeter Hashtag",
   "annual_report.summary.most_used_hashtag.none": "Keiner",
   "annual_report.summary.new_posts.new_posts": "neue Beiträge",
-  "annual_report.summary.percentile.text": "<topLabel>Damit gehörst du zu den obersten</topLabel><percentage></percentage><bottomLabel>der Mastodon-Nutzer*innen.</bottomLabel>",
+  "annual_report.summary.percentile.text": "<topLabel>Damit gehörst du zu den obersten</topLabel><percentage></percentage><bottomLabel>der Nutzer*innen auf {domain}.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Wir werden Bernie nichts verraten.",
   "annual_report.summary.thanks": "Danke, dass du Teil von Mastodon bist!",
   "attachments_list.unprocessed": "(ausstehend)",
@@ -205,6 +205,9 @@
   "confirmations.edit.confirm": "Bearbeiten",
   "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
   "confirmations.edit.title": "Beitrag überschreiben?",
+  "confirmations.follow_to_list.confirm": "Folgen und zur Liste hinzufügen",
+  "confirmations.follow_to_list.message": "Du musst {name} folgen, um das Profil zu einer Liste hinzufügen zu können.",
+  "confirmations.follow_to_list.title": "Profil folgen?",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
   "confirmations.logout.title": "Abmelden?",
@@ -220,7 +223,7 @@
   "confirmations.unfollow.title": "Profil entfolgen?",
   "content_warning.hide": "Beitrag ausblenden",
   "content_warning.show": "Trotzdem anzeigen",
-  "content_warning.show_more": "Mehr anzeigen",
+  "content_warning.show_more": "Beitrag anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -493,7 +496,7 @@
   "lists.replies_policy.list": "Mitglieder der Liste",
   "lists.replies_policy.none": "Niemanden",
   "lists.save": "Speichern",
-  "lists.search_placeholder": "Nach Profilen suchen, denen du folgst",
+  "lists.search": "Suchen",
   "lists.show_replies_to": "Antworten von Listenmitgliedern einbeziehen an …",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
   "loading_indicator.label": "Wird geladen …",