Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
pleroma-fe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
absturztaube
pleroma-fe
Commits
9d09e409
Commit
9d09e409
authored
May 26, 2020
by
HJ
🐼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
multiple fixes
parent
83e5ee54
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
src/components/notification/notification.js
src/components/notification/notification.js
+4
-2
src/components/notification/notification.vue
src/components/notification/notification.vue
+2
-4
src/components/status/status.js
src/components/status/status.js
+1
-3
src/modules/statuses.js
src/modules/statuses.js
+1
-1
No files found.
src/components/notification/notification.js
View file @
9d09e409
import
StatusContent
from
'
../status_content/status_content.vue
'
import
Status
from
'
../status/status.vue
'
import
UserAvatar
from
'
../user_avatar/user_avatar.vue
'
import
UserCard
from
'
../user_card/user_card.vue
'
...
...
@@ -16,10 +17,11 @@ const Notification = {
},
props
:
[
'
notification
'
],
components
:
{
Status
,
Status
Content
,
UserAvatar
,
UserCard
,
Timeago
Timeago
,
Status
,
},
methods
:
{
toggleUserExpanded
()
{
...
...
src/components/notification/notification.vue
View file @
9d09e409
...
...
@@ -157,11 +157,9 @@
</router-link>
</div>
<template
v-else
>
<status
<status
-content
class=
"faint"
:compact=
"true"
:statusoid=
"notification.action"
:no-heading=
"true"
:status=
"notification.action"
/>
</
template
>
</div>
...
...
src/components/status/status.js
View file @
9d09e409
...
...
@@ -122,8 +122,6 @@ const Status = {
this
.
muteWordHits
.
length
>
0
)
const
excusesNotToMute
=
(
// Currently showing status
this
.
unmuted
||
(
this
.
inProfile
&&
(
// Don't mute user's posts on user timeline (except reblogs)
...
...
@@ -137,7 +135,7 @@ const Status = {
// No excuses if post has muted words
)
&&
!
this
.
muteWordHits
.
length
>
0
return
!
excusesNotToMute
&&
reasonsToMute
return
!
this
.
unmuted
&&
!
excusesNotToMute
&&
reasonsToMute
},
hideFilteredStatuses
()
{
return
this
.
mergedConfig
.
hideFilteredStatuses
...
...
src/modules/statuses.js
View file @
9d09e409
...
...
@@ -386,7 +386,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
state
.
notifications
.
desktopNotificationSilence
||
!
visibleNotificationTypes
.
includes
(
notification
.
type
)
||
(
status
&&
(
notification
.
type
===
'
mention
'
&&
status
&&
(
status
.
muted
||
muteWordHits
(
status
,
rootGetters
.
mergedConfig
.
muteWords
).
length
===
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment