Merge e95899fa83 into a50c8e951f

app/controllers/concerns/accountable_concern.rb

@@ -4,6 +4,8 @@ module AccountableConcern
   extend ActiveSupport::Concern
 
   def log_action(action, target)
+    return unless target.previous_changes.any? || target.destroyed?
+
     Admin::ActionLog.create(
       account: current_account,
       action: action,

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)}
-          {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 }}
-        />
       </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": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
-  "filtered_notifications_banner.pending_requests": "Notifications 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;
+    background: $ui-button-background-color;
-    align-items: center;
+    color: $white;
-    border-radius: 999px;
+    border-radius: 100px;
-    background: var(--background-border-color);
+    padding: 2px 8px;
-    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;
-    }
   }
 }
 

app/models/admin/account_action.rb

@@ -124,26 +124,26 @@ class Admin::AccountAction
 
   def handle_disable!
     authorize(target_account.user, :disable?)
-    log_action(:disable, target_account.user)
     target_account.user&.disable!
+    log_action(:disable, target_account.user)
   end
 
   def handle_sensitive!
     authorize(target_account, :sensitive?)
-    log_action(:sensitive, target_account)
     target_account.sensitize!
+    log_action(:sensitive, target_account)
   end
 
   def handle_silence!
     authorize(target_account, :silence?)
-    log_action(:silence, target_account)
     target_account.silence!
+    log_action(:silence, target_account)
   end
 
   def handle_suspend!
     authorize(target_account, :suspend?)
-    log_action(:suspend, target_account)
     target_account.suspend!(origin: :local)
+    log_action(:suspend, target_account)
   end
 
   def text_for_warning

spec/controllers/concerns/accountable_concern_spec.rb

@@ -19,10 +19,24 @@ RSpec.describe AccountableConcern do
   let(:hoge)   { hoge_class.new(user) }
 
   describe '#log_action' do
-    it 'creates Admin::ActionLog' do
+    subject { hoge.log_action(:create, target) }
-      expect do
+
-        hoge.log_action(:create, target)
+    before { target.reload } # Ensure changes from creation cleared
-      end.to change(Admin::ActionLog, :count).by(1)
+
+    context 'when target has changed' do
+      before { target.update!(username: 'new_value') }
+
+      it 'creates Admin::ActionLog' do
+        expect { subject }
+          .to change(Admin::ActionLog, :count).by(1)
+      end
+    end
+
+    context 'when target has not changed' do
+      it 'does not create Admin::ActionLog' do
+        expect { subject }
+          .to_not change(Admin::ActionLog, :count)
+      end
     end
   end
 end