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

Merge upstream changes up to 9d0bce4

app/helpers/theme_helper.rb

@@ -5,8 +5,10 @@ def theme_style_tags(flavour_and_skin)
     flavour, theme = flavour_and_skin
 
     if theme == 'system'
-      stylesheet_pack_tag("skins/#{flavour}/mastodon-light", media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') +
-        stylesheet_pack_tag("skins/#{flavour}/default", media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      ''.html_safe.tap do |tags|
+        tags << stylesheet_pack_tag("skins/#{flavour}/mastodon-light", media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
+        tags << stylesheet_pack_tag("skins/#{flavour}/default", media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+      end
     else
       stylesheet_pack_tag "skins/#{flavour}/#{theme}", media: 'all', crossorigin: 'anonymous'
     end
@@ -16,8 +18,10 @@ def theme_color_tags(flavour_and_skin)
     _, theme = flavour_and_skin
 
     if theme == 'system'
-      tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') +
-        tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+      ''.html_safe.tap do |tags|
+        tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)')
+        tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+      end
     else
       tag.meta name: 'theme-color', content: theme_color_for(theme)
     end

app/javascript/flavours/glitch/features/notifications/index.jsx

@@ -258,6 +258,13 @@ class Notifications extends PureComponent {
 
     let scrollContainer;
 
+    const prepend = (
+      <>
+        {needsNotificationPermission && <NotificationsPermissionBanner />}
+        <FilteredNotificationsBanner />
+      </>
+    );
+
     if (signedIn) {
       scrollContainer = (
         <ScrollableList
@@ -267,7 +274,7 @@ class Notifications extends PureComponent {
           showLoading={isLoading && notifications.size === 0}
           hasMore={hasMore}
           numPending={numPending}
-          prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
+          prepend={prepend}
           alwaysPrepend
           emptyMessage={emptyMessage}
           onLoadMore={this.handleLoadOlder}
@@ -356,8 +363,6 @@ class Notifications extends PureComponent {
 
         {filterBarContainer}
 
-        <FilteredNotificationsBanner />
-
         {scrollContainer}
 
         <Helmet>

app/javascript/flavours/glitch/styles/components.scss

@@ -10746,8 +10746,7 @@ noscript {
 .filtered-notifications-banner {
   display: flex;
   align-items: center;
-  border: 1px solid var(--background-border-color);
-  border-top: 0;
+  border-bottom: 1px solid var(--background-border-color);
   padding: 24px 32px;
   gap: 16px;
   color: $darker-text-color;

app/javascript/mastodon/features/notifications/index.jsx

@@ -223,6 +223,13 @@ class Notifications extends PureComponent {
 
     let scrollContainer;
 
+    const prepend = (
+      <>
+        {needsNotificationPermission && <NotificationsPermissionBanner />}
+        <FilteredNotificationsBanner />
+      </>
+    );
+
     if (signedIn) {
       scrollContainer = (
         <ScrollableList
@@ -232,7 +239,7 @@ class Notifications extends PureComponent {
           showLoading={isLoading && notifications.size === 0}
           hasMore={hasMore}
           numPending={numPending}
-          prepend={needsNotificationPermission && <NotificationsPermissionBanner />}
+          prepend={prepend}
           alwaysPrepend
           emptyMessage={emptyMessage}
           onLoadMore={this.handleLoadOlder}
@@ -282,8 +289,6 @@ class Notifications extends PureComponent {
 
         {filterBarContainer}
 
-        <FilteredNotificationsBanner />
-
         {scrollContainer}
 
         <Helmet>

app/javascript/mastodon/locales/ar.json

@@ -35,6 +35,7 @@
   "account.follow_back": "تابعهم بالمثل",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
+  "account.followers_counter": "{count, plural, zero {}one {{counter} متابع} two {{counter} متابعين} few {{counter} متابعين} many {{counter} متابعين} other {{counter} متابعين}}",
   "account.following": "الاشتراكات",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
   "account.go_to_profile": "اذهب إلى الملف الشخصي",

app/javascript/mastodon/locales/de.json

@@ -205,10 +205,10 @@
   "disabled_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert.",
   "dismissable_banner.community_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen, deren Konten von {domain} verwaltet werden.",
   "dismissable_banner.dismiss": "Ablehnen",
-  "dismissable_banner.explore_links": "Diese Nachrichten werden heute am häufigsten im sozialen Netzwerk geteilt. Neuere Nachrichten, die von vielen verschiedenen Profilen veröffentlicht wurden, werden höher eingestuft.",
-  "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
-  "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
-  "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+  "dismissable_banner.explore_links": "Diese Nachrichten werden heute am häufigsten im Social Web geteilt. Neuere Nachrichten, die von vielen verschiedenen Profilen geteilt wurden, erscheinen weiter oben.",
+  "dismissable_banner.explore_statuses": "Diese Beiträge sind heute im Social Web sehr beliebt. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, erscheinen weiter oben.",
+  "dismissable_banner.explore_tags": "Diese Hashtags sind heute im Social Web sehr beliebt. Hashtags, die von vielen verschiedenen Profilen verwendet werden, erscheinen weiter oben.",
+  "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im Social Web, denen Leute auf {domain} folgen.",
   "domain_block_modal.block": "Server blockieren",
   "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
   "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",

app/javascript/mastodon/locales/ja.json

@@ -35,7 +35,9 @@
   "account.follow_back": "フォローバック",
   "account.followers": "フォロワー",
   "account.followers.empty": "まだ誰もフォローしていません。",
+  "account.followers_counter": "{count, plural, other {{counter} フォロワー}}",
   "account.following": "フォロー中",
+  "account.following_counter": "{count, plural, other {{counter} フォロー}}",
   "account.follows.empty": "まだ誰もフォローしていません。",
   "account.go_to_profile": "プロフィールページへ",
   "account.hide_reblogs": "@{name}さんからのブーストを非表示",
@@ -61,6 +63,7 @@
   "account.requested_follow": "{name}さんがあなたにフォローリクエストしました",
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのブーストを表示",
+  "account.statuses_counter": "{count, plural, other {{counter} 投稿}}",
   "account.unblock": "@{name}さんのブロックを解除",
   "account.unblock_domain": "{domain}のブロックを解除",
   "account.unblock_short": "ブロック解除",
@@ -412,6 +415,7 @@
   "limited_account_hint.title": "このプロフィールは{domain}のモデレーターによって非表示にされています。",
   "link_preview.author": "{name}",
   "link_preview.more_from_author": "{name}さんの投稿をもっと読む",
+  "link_preview.shares": "{count, plural, other {{counter}件の投稿}}",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
   "lists.delete": "リストを削除",

app/javascript/mastodon/locales/si.json

@@ -33,6 +33,7 @@
   "account.mute": "@{name} නිහඬ කරන්න",
   "account.mute_short": "නිහඬ",
   "account.muted": "නිහඬ කළා",
+  "account.open_original_page": "මුල් පිටුව අරින්න",
   "account.posts": "ලිපි",
   "account.posts_with_replies": "ලිපි සහ පිළිතුරු",
   "account.report": "@{name} වාර්තා කරන්න",
@@ -51,6 +52,10 @@
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
   "audio.hide": "හඬපටය සඟවන්න",
+  "block_modal.show_less": "අඩුවෙන් පෙන්වන්න",
+  "block_modal.show_more": "තව පෙන්වන්න",
+  "block_modal.they_will_know": "අවහිර කළ බව දකිනු ඇත.",
+  "block_modal.title": "අවහිර කරන්නද?",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
   "bundle_column_error.error.title": "අපොයි!",
@@ -100,10 +105,13 @@
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
+  "compose_form.poll.option_placeholder": "විකල්පය {number}",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
+  "compose_form.poll.type": "ශෛලිය",
   "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
+  "compose_form.reply": "පිළිතුරු",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
   "confirmation_modal.cancel": "අවලංගු",
@@ -123,13 +131,17 @@
   "conversation.mark_as_read": "කියවූ බව යොදන්න",
   "conversation.open": "සංවාදය බලන්න",
   "conversation.with": "{names} සමඟ",
+  "copy_icon_button.copied": "පසුරුපුවරුවට පිටපත් විය",
   "copypaste.copied": "පිටපත් විය",
   "copypaste.copy_to_clipboard": "පසුරුපුවරුවට පිටපතක්",
   "directory.federated": "දන්නා ෆෙඩිවර්ස් වෙතින්",
   "directory.local": "{domain} වෙතින් පමණි",
   "directory.new_arrivals": "නව පැමිණීම්",
   "directory.recently_active": "මෑත දී සක්‍රියයි",
   "disabled_account_banner.account_settings": "ගිණුමේ සැකසුම්",
+  "dismissable_banner.dismiss": "ඉවතලන්න",
+  "domain_pill.server": "සේවාදායකය",
+  "domain_pill.username": "පරිශ්‍රීලක නාමය",
   "embed.instructions": "පහත කේතය පිටපත් කිරීමෙන් මෙම ලිපිය ඔබගේ අඩවියට කාවද්දන්න.",
   "embed.preview": "මෙන්න එය පෙනෙන අන්දම:",
   "emoji_button.activity": "ක්‍රියාකාරකම",
@@ -178,9 +190,13 @@
   "filter_modal.select_filter.search": "සොයන්න හෝ සාදන්න",
   "filter_modal.select_filter.title": "මෙම ලිපිය පෙරන්න",
   "filter_modal.title.status": "ලිපියක් පෙරන්න",
+  "filtered_notifications_banner.title": "පෙරූ දැනුම්දීම්",
+  "firehose.all": "සියල්ල",
   "firehose.local": "මෙම සේවාදායකය",
   "firehose.remote": "වෙනත් සේවාදායක",
   "follow_request.reject": "ප්‍රතික්‍ෂේප",
+  "follow_suggestions.dismiss": "නැවත පෙන්වන්න එපා",
+  "follow_suggestions.view_all": "සියල්ල බලන්න",
   "footer.about": "පිළිබඳව",
   "footer.directory": "පැතිකඩ නාමාවලිය",
   "footer.get_app": "යෙදුම ගන්න",
@@ -202,6 +218,7 @@
   "home.pending_critical_update.link": "යාවත්කාල බලන්න",
   "home.show_announcements": "නිවේදන පෙන්වන්න",
   "interaction_modal.login.action": "මුලට ගෙනයන්න",
+  "interaction_modal.on_another_server": "වෙනත් සේවාදායකයක",
   "interaction_modal.on_this_server": "මෙම සේවාදායකයෙහි",
   "interaction_modal.title.favourite": "{name}ගේ ලිපිය ප්‍රිය කරන්න",
   "interaction_modal.title.follow": "{name} අනුගමනය",

app/javascript/mastodon/locales/tok.json

@@ -170,6 +170,8 @@
   "domain_block_modal.block": "o weka e ma",
   "domain_block_modal.you_will_lose_followers": "ma ni la jan alasa ale sina li weka",
   "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
+  "domain_pill.server": "ma",
+  "domain_pill.username": "nimi jan",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
   "emoji_button.flags": "len ma",
@@ -274,6 +276,7 @@
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
   "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
+  "mute_modal.title": "sina wile ala wile kute e jan ni?",
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan weka",
   "navigation_bar.compose": "o pali e toki sin",
@@ -290,34 +293,49 @@
   "notification.follow": " {name} li kute e sina",
   "notification.follow_request": "{name} li wile kute e sina",
   "notification.mention": "jan {name} li toki e sina",
+  "notification.moderation-warning.learn_more": "o kama sona e ijo ante",
   "notification.poll": "sina pana lon pana la pana ni li pini",
   "notification.reblog": "{name} li wawa e toki sina",
   "notification.status": "{name} li toki",
   "notification.update": "{name} li ante e toki",
+  "notification_requests.dismiss": "o weka",
   "notifications.column_settings.favourite": "ijo pona:",
   "notifications.column_settings.follow": "jan kute sin",
   "notifications.column_settings.poll": "pana lon pana ni:",
   "notifications.column_settings.reblog": "wawa:",
+  "notifications.column_settings.status": "toki sin:",
   "notifications.column_settings.update": "ante toki:",
   "notifications.filter.all": "ale",
+  "notifications.filter.boosts": "wawa",
   "notifications.filter.favourites": "ijo pona",
+  "notifications.filter.mentions": "toki pi toki sina",
   "notifications.filter.polls": "pana lon pana ni",
+  "onboarding.action.back": "o tawa monsi",
+  "onboarding.actions.back": "o tawa monsi",
   "onboarding.compose.template": "toki a, #Mastodon o!",
   "onboarding.profile.display_name": "nimi tawa jan ante",
+  "onboarding.profile.note": "sona sina",
   "onboarding.share.lead": "o toki lon nasin Masoton pi alasa sina tawa jan",
   "onboarding.share.message": "ilo #Mastodon la mi jan {username} a! o kute e mi lon ni: {url}",
   "onboarding.start.title": "sina o kama pona a!",
   "onboarding.tips.migration": "<strong>sina sona ala sona e ni?</strong> tenpo kama la sina pilin ike tawa ma {domain} la, sina ken tawa ma ante lon ilo Masoton. jan li kute e sina la jan ni li awen kute e sina. kin la sina ken lawa e ma pi sina taso a!",
+  "poll.closed": "ona li pini",
   "poll.total_people": "{count, plural, other {jan #}}",
   "poll.total_votes": "{count, plural, other {pana #}}",
   "poll.vote": "o pana",
   "poll.voted": "sina pana e ni",
   "poll.votes": "{votes, plural, other {pana #}}",
   "privacy.direct.long": "jan ale lon toki",
   "privacy.public.short": "tawa ale",
+  "regeneration_indicator.label": "ni li kama…",
+  "relative_time.days": "{number}d",
   "relative_time.full.just_now": "tenpo ni",
+  "relative_time.hours": "{number}h",
   "relative_time.just_now": "tenpo ni",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
   "relative_time.today": "tenpo suno ni",
+  "reply_indicator.cancel": "o ala",
   "report.block": "o weka e jan",
   "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
   "report.categories.other": "ante",
@@ -336,13 +354,15 @@
   "report.thanks.title": "sina wile ala lukin e ni anu seme?",
   "report.unfollow": "o pini kute e {name}",
   "report_notification.categories.legal": "ike tawa nasin lawa",
+  "report_notification.categories.other": "ante",
   "search.placeholder": "o alasa",
   "search.quick_action.go_to_account": "o tawa lipu jan {x}",
   "search_popout.language_code": "nimi toki kepeken nasin ISO",
   "search_results.all": "ale",
   "search_results.see_all": "ale",
   "search_results.statuses": "toki",
   "search_results.title": "o alasa e {q}",
+  "server_banner.administered_by": "jan lawa:",
   "status.block": "o weka e @{name}",
   "status.cancel_reblog_private": "o pini e pana",
   "status.delete": "o weka",
@@ -356,12 +376,14 @@
   "status.media.open": "o open",
   "status.media.show": "o lukin",
   "status.media_hidden": "sitelen li len",
+  "status.more": "kin",
   "status.mute": "o len e @{name}",
   "status.mute_conversation": "o kute ala e ijo pi toki ni",
   "status.pin": "o sewi lon lipu sina",
   "status.pinned": "toki sewi",
   "status.reblog": "o wawa",
   "status.share": "o pana tawa ante",
+  "status.show_filter_reason": "o lukin",
   "status.show_less": "o lili e ni",
   "status.show_less_all": "o lili e ale",
   "status.show_more": "o suli e ni",
@@ -378,14 +400,17 @@
   "timeline_hint.resources.follows": "jan lukin",
   "timeline_hint.resources.statuses": "ijo pi tenpo suli",
   "trends.trending_now": "jan mute li toki",
+  "units.short.billion": "{count}B",
   "units.short.million": "{count}AAA",
+  "units.short.thousand": "{count}K",
   "upload_button.label": "o pana e sitelen anu kalama",
   "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",
   "upload_form.audio_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili",
   "upload_form.description": "o toki e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
   "upload_form.edit": "o ante",
   "upload_form.thumbnail": "o ante e sitelen lili",
   "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+  "upload_modal.analyzing_picture": "ilo li lukin e sitelen...",
   "upload_modal.choose_image": "o wile e sitelen",
   "upload_modal.description_placeholder": "mi pu jaki tan soweli",
   "upload_modal.detect_text": "ilo o alasa e nimi tan sitelen",

app/javascript/styles/mastodon/components.scss

@@ -10192,8 +10192,7 @@ noscript {
 .filtered-notifications-banner {
   display: flex;
   align-items: center;
-  border: 1px solid var(--background-border-color);
-  border-top: 0;
+  border-bottom: 1px solid var(--background-border-color);
   padding: 24px 32px;
   gap: 16px;
   color: $darker-text-color;

app/serializers/rest/notification_serializer.rb

@@ -3,6 +3,8 @@
 class REST::NotificationSerializer < ActiveModel::Serializer
   attributes :id, :type, :created_at, :group_key
 
+  attribute :filtered, if: :filtered?
+
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
@@ -32,4 +34,6 @@ def relationship_severance_event?
   def moderation_warning_event?
     object.type == :moderation_warning
   end
+
+  delegate :filtered?, to: :object
 end