Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
0f699a42
Commit
0f699a42
authored
7 years ago
by
Eugen Rochko
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
When muting, clear web UI like for blocks (#5172)
* When muting, clear web UI like for blocks * Fix style issue
parent
5e5f36c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/javascript/mastodon/reducers/notifications.js
+5
-1
5 additions, 1 deletion
app/javascript/mastodon/reducers/notifications.js
app/javascript/mastodon/reducers/statuses.js
+2
-0
2 additions, 0 deletions
app/javascript/mastodon/reducers/statuses.js
with
7 additions
and
1 deletion
app/javascript/mastodon/reducers/notifications.js
+
5
−
1
View file @
0f699a42
...
...
@@ -9,7 +9,10 @@ import {
NOTIFICATIONS_CLEAR
,
NOTIFICATIONS_SCROLL_TOP
,
}
from
'
../actions/notifications
'
;
import
{
ACCOUNT_BLOCK_SUCCESS
}
from
'
../actions/accounts
'
;
import
{
ACCOUNT_BLOCK_SUCCESS
,
ACCOUNT_MUTE_SUCCESS
,
}
from
'
../actions/accounts
'
;
import
{
TIMELINE_DELETE
}
from
'
../actions/timelines
'
;
import
{
Map
as
ImmutableMap
,
List
as
ImmutableList
}
from
'
immutable
'
;
...
...
@@ -108,6 +111,7 @@ export default function notifications(state = initialState, action) {
case
NOTIFICATIONS_EXPAND_SUCCESS
:
return
appendNormalizedNotifications
(
state
,
action
.
notifications
,
action
.
next
);
case
ACCOUNT_BLOCK_SUCCESS
:
case
ACCOUNT_MUTE_SUCCESS
:
return
filterNotifications
(
state
,
action
.
relationship
);
case
NOTIFICATIONS_CLEAR
:
return
state
.
set
(
'
items
'
,
ImmutableList
()).
set
(
'
next
'
,
null
);
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/reducers/statuses.js
+
2
−
0
View file @
0f699a42
...
...
@@ -24,6 +24,7 @@ import {
}
from
'
../actions/timelines
'
;
import
{
ACCOUNT_BLOCK_SUCCESS
,
ACCOUNT_MUTE_SUCCESS
,
}
from
'
../actions/accounts
'
;
import
{
NOTIFICATIONS_UPDATE
,
...
...
@@ -138,6 +139,7 @@ export default function statuses(state = initialState, action) {
case
TIMELINE_DELETE
:
return
deleteStatus
(
state
,
action
.
id
,
action
.
references
);
case
ACCOUNT_BLOCK_SUCCESS
:
case
ACCOUNT_MUTE_SUCCESS
:
return
filterStatuses
(
state
,
action
.
relationship
);
default
:
return
state
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment