Add specific message for severed relationship events with purged data

mastodon · Mar 12, 2024 · c5fe57a · c5fe57a
1 parent 0920c1c
commit c5fe57a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 18 deletions.
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -26,11 +26,18 @@ const RelationshipsSeveranceEvent = ({ event, hidden }) => {
         <div>
           <RelativeTimestamp timestamp={event.get('created_at')} short={false} />
           {' · '}
-          <FormattedMessage
-            id='relationship_severance_notification.relationships'
-            defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
-            values={{ count: event.get('relationships_count', 0) }}
-          />
+          { event.get('purged') ? (
+            <FormattedMessage
+              id='relationship_severance_notification.purged_data'
+              defaultMessage='purged by administrators'
+            />
+          ) : (
+            <FormattedMessage
+              id='relationship_severance_notification.relationships'
+              defaultMessage='{count, plural, one {# relationship} other {# relationships}}'
+              values={{ count: event.get('relationships_count', 0) }}
+            />
+          )}
           <br />
           <strong>{intl.formatMessage(messages[event.get('type')])}</strong>
         </div>

diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
@@ -558,6 +558,7 @@
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relationship_severance_notification.purged_data": "purged by administrators",
   "relationship_severance_notification.relationships": "{count, plural, one {# relationship} other {# relationships}}",
   "relationship_severance_notification.types.account_suspension": "Account has been suspended",
   "relationship_severance_notification.types.domain_block": "Domain has been suspended",

diff --git a/app/serializers/rest/relationship_severance_event_serializer.rb b/app/serializers/rest/relationship_severance_event_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::RelationshipSeveranceEventSerializer < ActiveModel::Serializer
-  attributes :id, :type, :target_name, :created_at
+  attributes :id, :type, :purged, :target_name, :created_at
 
   attribute :relationships_count, if: -> { current_user.present? }
 

diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
@@ -17,15 +17,18 @@
           %tr
             %td= l event.created_at
             %td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name)
-            %td
-              - count = event.severed_relationships.active.where(local_account: current_account).count
-              - if count.zero?
-                = t('generic.none')
-              - else
-                = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
-            %td
-              - count = event.severed_relationships.passive.where(local_account: current_account).count
-              - if count.zero?
-                = t('generic.none')
-              - else
-                = table_link_to 'download', t('severed_relationships.download', count: count), followers_severed_relationship_path(event, format: :csv)
+            - if event.purged?
+              %td{ rowspan: 2 }= t('severed_relationships.purged')
+            - else
+              %td
+                - count = event.severed_relationships.active.where(local_account: current_account).count
+                - if count.zero?
+                  = t('generic.none')
+                - else
+                  = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
+              %td
+                - count = event.severed_relationships.passive.where(local_account: current_account).count
+                - if count.zero?
+                  = t('generic.none')
+                - else
+                  = table_link_to 'download', t('severed_relationships.download', count: count), followers_severed_relationship_path(event, format: :csv)
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1671,6 +1671,7 @@ en:
     lost_followers: Lost followers
     lost_follows: Lost follows
     preamble: You may lose follows and followers when you block a domain or when your moderators decide to suspend a remote server. When that happens, you will be able to download lists of severed relationships, to be inspected and possibly imported on another server.
+    purged: Information about this server has been purged by your server's administrators.
     type: Event
   statuses:
     attached: