Merge 4e4bdaf335 into a50c8e951f

.env.production.sample

@@ -75,3 +75,11 @@ S3_ALIAS_HOST=files.example.com
 # -----------------------
 IP_RETENTION_PERIOD=31556952
 SESSION_RETENTION_PERIOD=31556952
+
+# Antispam: IP Block/Limit lists  (Limited IP require manual approval).
+# -----------------------
+# URLS in this list are refreshed every 24 hours. Blocked/limited IP Addresses expire after 24 hours.
+# Comma delimited to add more URLs. The format should contain only IP addresses (subnet optional)
+# -----------------------
+# SCHEDULED_IPLIMIT_URLS="https://check.torproject.org/torbulkexitlist"
+# SCHEDULED_IPBLOCK_URLS=""

app/javascript/mastodon/api_types/notifications.ts

@@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {

app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx

@@ -49,21 +49,14 @@ export const FilteredNotificationsBanner: React.FC = () => {
         <span>
           <FormattedMessage
             id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
             values={{ count: policy.summary.pending_requests_count }}
           />
         </span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
-          {toCappedNumber(policy.summary.pending_notifications_count)}
-        </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
+        {toCappedNumber(policy.summary.pending_notifications_count)}
       </div>
     </Link>
   );

app/javascript/mastodon/locales/en.json

@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",

app/javascript/mastodon/models/notification_group.ts

@@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'poll':
     case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId: status.id,
+        statusId,
         sampleAccountIds,
         ...groupWithoutStatus,
       };

app/javascript/styles/mastodon/components.scss

@@ -10171,25 +10171,10 @@ noscript {
   }
 
   &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
-    &__badge {
-      background: $ui-button-background-color;
-      color: $white;
-      border-radius: 100px;
-      padding: 2px 8px;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
   }
 }
 

app/workers/scheduler/ip_spamlist_urls_scheduler.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+class Scheduler::IpSpamlistUrlsScheduler
+  include Sidekiq::Worker
+
+  sidekiq_options retry: 0
+
+  def perform
+    grab_ip_blocks_addresses! if ENV['SCHEDULED_IPBLOCK_URLS'].present?
+    add_ip_blocks_addresses! if ENV['SCHEDULED_IPBLOCK_URLS'].present?
+    grab_ip_limit_addresses! if ENV['SCHEDULED_IPLIMIT_URLS'].present?
+    add_ip_limit_addresses! if ENV['SCHEDULED_IPLIMIT_URLS'].present?
+  end
+
+  def grab_ip_blocks_addresses!
+    @blockips = []
+    ENV['SCHEDULED_IPBLOCK_URLS'].split(',').each do |url|
+      Request.new(:get, url).perform do |res|
+        @blockips.insert = res.body
+      end
+    end
+  end
+
+  def grab_ip_limit_addresses!
+    @limitips = []
+    ENV['SCHEDULED_IPBLIMIT_URLS'].split(',').each do |url|
+      Request.new(:get, url).perform do |res|
+        @limitips.insert = res.body
+      end
+    end
+  end
+
+  def add_ip_blocks_addresses!
+    @blockips.each do |ip|
+      ip_block = IpBlock.find_by(ip: ip)
+
+      if ip_block.present?
+        ip_block.update(expires_in: 24.hours.to_i)
+        next
+      end
+
+      IpBlock.create(
+        ip: ip,
+        severity: :sign_up_block,
+        comment: 'Scheduled IPBlock',
+        expires_in: 24.hours.to_i
+      )
+    end
+  end
+
+  def add_ip_limit_addresses!
+    @limitips.each do |ip|
+      ip_limit = IpBlock.find_by(ip: ip)
+
+      if ip_limit.present?
+        ip_limit.update(expires_in: 24.hours.to_i)
+        next
+      end
+
+      IpBlock.create(
+        ip: ip,
+        severity: :sign_up_requires_approval,
+        comment: 'Scheduled IPLimit',
+        expires_in: 24.hours.to_i
+      )
+    end
+  end
+end

config/sidekiq.yml

@@ -67,3 +67,7 @@
       interval: 1 hour
       class: Scheduler::AutoCloseRegistrationsScheduler
       queue: scheduler
+    ip_spamlist_url_scheduler:
+      every: '24h'
+      class: Scheduler::IpSpamlistUrlsScheduler
+      queue: scheduler