gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20231124

Browse source
This commit is contained in:
KMY 2023-11-24 09:07:40 +09:00
commit c5e4020922
206 changed files with 1987 additions and 965 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/reducers/notifications.js
View file

@ -284,7 +284,7 @@ export default function notifications(state = initialState, action) {
case blockAccountSuccess.type:
return filterNotifications(state, [action.payload.relationship.id]);
case muteAccountSuccess.type:
return action.relationship.muting_notifications ? filterNotifications(state, [action.payload.relationship.id]) : state;
return action.payload.relationship.muting_notifications ? filterNotifications(state, [action.payload.relationship.id]) : state;
case blockDomainSuccess.type:
return filterNotifications(state, action.payload.accounts);
case authorizeFollowRequestSuccess.type: