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
245
Issues
245
List
Boards
Labels
Service Desk
Milestones
Merge Requests
23
Merge Requests
23
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pleroma
pleroma-fe
Commits
ad97e03b
Commit
ad97e03b
authored
Jan 03, 2020
by
HJ
🐼
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-move-type-notification' into 'develop'
Fix for move type notification See merge request
!1026
parents
1a82a00a
215662af
Pipeline
#21539
passed with stages
in 8 minutes and 16 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
65 additions
and
17 deletions
+65
-17
src/components/interactions/interactions.js
src/components/interactions/interactions.js
+2
-1
src/components/interactions/interactions.vue
src/components/interactions/interactions.vue
+4
-0
src/components/notification/notification.js
src/components/notification/notification.js
+7
-7
src/components/notification/notification.vue
src/components/notification/notification.vue
+13
-1
src/components/notifications/notifications.scss
src/components/notifications/notifications.scss
+6
-1
src/components/settings/settings.vue
src/components/settings/settings.vue
+5
-0
src/i18n/en.json
src/i18n/en.json
+4
-1
src/modules/config.js
src/modules/config.js
+2
-1
src/modules/statuses.js
src/modules/statuses.js
+6
-2
src/modules/users.js
src/modules/users.js
+2
-0
src/services/entity_normalizer/entity_normalizer.service.js
src/services/entity_normalizer/entity_normalizer.service.js
+4
-1
src/services/notification_utils/notification_utils.js
src/services/notification_utils/notification_utils.js
+2
-1
src/services/push/push.js
src/services/push/push.js
+2
-1
static/fontello.json
static/fontello.json
+6
-0
No files found.
src/components/interactions/interactions.js
View file @
ad97e03b
...
...
@@ -3,7 +3,8 @@ import Notifications from '../notifications/notifications.vue'
const
tabModeDict
=
{
mentions
:
[
'
mention
'
],
'
likes+repeats
'
:
[
'
repeat
'
,
'
like
'
],
follows
:
[
'
follow
'
]
follows
:
[
'
follow
'
],
moves
:
[
'
move
'
]
}
const
Interactions
=
{
...
...
src/components/interactions/interactions.vue
View file @
ad97e03b
...
...
@@ -21,6 +21,10 @@
key=
"follows"
:label=
"$t('interactions.follows')"
/>
<span
key=
"moves"
:label=
"$t('interactions.moves')"
/>
</tab-switcher>
<Notifications
ref=
"notifications"
...
...
src/components/notification/notification.js
View file @
ad97e03b
...
...
@@ -43,18 +43,18 @@ const Notification = {
const
user
=
this
.
notification
.
from_profile
return
highlightStyle
(
highlight
[
user
.
screen_name
])
},
userInStore
()
{
return
this
.
$store
.
getters
.
findUser
(
this
.
notification
.
from_profile
.
id
)
},
user
()
{
if
(
this
.
userInStore
)
{
return
this
.
userInStore
}
return
this
.
notification
.
from_profile
return
this
.
$store
.
getters
.
findUser
(
this
.
notification
.
from_profile
.
id
)
},
userProfileLink
()
{
return
this
.
generateUserProfileLink
(
this
.
user
)
},
targetUser
()
{
return
this
.
$store
.
getters
.
findUser
(
this
.
notification
.
target
.
id
)
},
targetUserProfileLink
()
{
return
this
.
generateUserProfileLink
(
this
.
targetUser
)
},
needMute
()
{
return
this
.
user
.
muted
}
...
...
src/components/notification/notification.vue
View file @
ad97e03b
...
...
@@ -74,9 +74,13 @@
<i
class=
"fa icon-user-plus lit"
/>
<small>
{{
$t
(
'
notifications.followed_you
'
)
}}
</small>
</span>
<span
v-if=
"notification.type === 'move'"
>
<i
class=
"fa icon-arrow-curved lit"
/>
<small>
{{
$t
(
'
notifications.migrated_to
'
)
}}
</small>
</span>
</div>
<div
v-if=
"notification.type === 'follow'"
v-if=
"notification.type === 'follow'
|| notification.type === 'move'
"
class=
"timeago"
>
<span
class=
"faint"
>
...
...
@@ -115,6 +119,14 @@
@
{{
notification
.
from_profile
.
screen_name
}}
</router-link>
</div>
<div
v-else-if=
"notification.type === 'move'"
class=
"move-text"
>
<router-link
:to=
"targetUserProfileLink"
>
@
{{
notification
.
target
.
screen_name
}}
</router-link>
</div>
<template
v-else
>
<status
class=
"faint"
...
...
src/components/notifications/notifications.scss
View file @
ad97e03b
...
...
@@ -76,7 +76,7 @@
}
}
.follow-text
{
.follow-text
,
.move-text
{
padding
:
0
.5em
0
;
}
...
...
@@ -151,6 +151,11 @@
color
:
var
(
--
cOrange
,
$fallback--cOrange
);
}
.icon-arrow-curved.lit
{
color
:
$fallback--cBlue
;
color
:
var
(
--
cBlue
,
$fallback--cBlue
);
}
.status-content
{
margin
:
0
;
max-height
:
300px
;
...
...
src/components/settings/settings.vue
View file @
ad97e03b
...
...
@@ -323,6 +323,11 @@
{
{
$t('settings.notification_visibility_mentions')
}
}
</
Checkbox
>
</
li
>
<
li
>
<
Checkbox
v-model
=
"notificationVisibility.moves"
>
{
{
$t('settings.notification_visibility_moves')
}
}
</
Checkbox
>
</
li
>
</
ul
>
</
div
>
<
div
>
...
...
src/i18n/en.json
View file @
ad97e03b
...
...
@@ -110,7 +110,8 @@
"notifications"
:
"Notifications"
,
"read"
:
"Read!"
,
"repeated_you"
:
"repeated your status"
,
"no_more_notifications"
:
"No more notifications"
"no_more_notifications"
:
"No more notifications"
,
"migrated_to"
:
"migrated to"
},
"polls"
:
{
"add_poll"
:
"Add Poll"
,
...
...
@@ -140,6 +141,7 @@
"interactions"
:
{
"favs_repeats"
:
"Repeats and Favorites"
,
"follows"
:
"New follows"
,
"moves"
:
"User migrates"
,
"load_older"
:
"Load older interactions"
},
"post_status"
:
{
...
...
@@ -311,6 +313,7 @@
"notification_visibility_likes"
:
"Likes"
,
"notification_visibility_mentions"
:
"Mentions"
,
"notification_visibility_repeats"
:
"Repeats"
,
"notification_visibility_moves"
:
"User Migrates"
,
"no_rich_text_description"
:
"Strip rich text formatting from all posts"
,
"no_blocks"
:
"No blocks"
,
"no_mutes"
:
"No mutes"
,
...
...
src/modules/config.js
View file @
ad97e03b
...
...
@@ -28,7 +28,8 @@ export const defaultState = {
follows
:
true
,
mentions
:
true
,
likes
:
true
,
repeats
:
true
repeats
:
true
,
moves
:
true
},
webPushNotifications
:
false
,
muteWords
:
[],
...
...
src/modules/statuses.js
View file @
ad97e03b
...
...
@@ -67,7 +67,8 @@ const visibleNotificationTypes = (rootState) => {
rootState
.
config
.
notificationVisibility
.
likes
&&
'
like
'
,
rootState
.
config
.
notificationVisibility
.
mentions
&&
'
mention
'
,
rootState
.
config
.
notificationVisibility
.
repeats
&&
'
repeat
'
,
rootState
.
config
.
notificationVisibility
.
follows
&&
'
follow
'
rootState
.
config
.
notificationVisibility
.
follows
&&
'
follow
'
,
rootState
.
config
.
notificationVisibility
.
moves
&&
'
move
'
].
filter
(
_
=>
_
)
}
...
...
@@ -306,7 +307,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
const
addNewNotifications
=
(
state
,
{
dispatch
,
notifications
,
older
,
visibleNotificationTypes
,
rootGetters
})
=>
{
each
(
notifications
,
(
notification
)
=>
{
if
(
notification
.
type
!==
'
follow
'
)
{
if
(
notification
.
type
!==
'
follow
'
&&
notification
.
type
!==
'
move
'
)
{
notification
.
action
=
addStatusToGlobalStorage
(
state
,
notification
.
action
).
item
notification
.
status
=
notification
.
status
&&
addStatusToGlobalStorage
(
state
,
notification
.
status
).
item
}
...
...
@@ -339,6 +340,9 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
case
'
follow
'
:
i18nString
=
'
followed_you
'
break
case
'
move
'
:
i18nString
=
'
migrated_to
'
break
}
if
(
i18nString
)
{
...
...
src/modules/users.js
View file @
ad97e03b
...
...
@@ -373,8 +373,10 @@ const users = {
},
addNewNotifications
(
store
,
{
notifications
})
{
const
users
=
map
(
notifications
,
'
from_profile
'
)
const
targetUsers
=
map
(
notifications
,
'
target
'
)
const
notificationIds
=
notifications
.
map
(
_
=>
_
.
id
)
store
.
commit
(
'
addNewUsers
'
,
users
)
store
.
commit
(
'
addNewUsers
'
,
targetUsers
)
const
notificationsObject
=
store
.
rootState
.
statuses
.
notifications
.
idStore
const
relevantNotifications
=
Object
.
entries
(
notificationsObject
)
...
...
src/services/entity_normalizer/entity_normalizer.service.js
View file @
ad97e03b
...
...
@@ -341,10 +341,13 @@ export const parseNotification = (data) => {
if
(
masto
)
{
output
.
type
=
mastoDict
[
data
.
type
]
||
data
.
type
output
.
seen
=
data
.
pleroma
.
is_seen
output
.
status
=
output
.
type
===
'
follow
'
output
.
status
=
output
.
type
===
'
follow
'
||
output
.
type
===
'
move
'
?
null
:
parseStatus
(
data
.
status
)
output
.
action
=
output
.
status
// TODO: Refactor, this is unneeded
output
.
target
=
output
.
type
!==
'
move
'
?
null
:
parseUser
(
data
.
target
)
output
.
from_profile
=
parseUser
(
data
.
account
)
}
else
{
const
parsedNotice
=
parseStatus
(
data
.
notice
)
...
...
src/services/notification_utils/notification_utils.js
View file @
ad97e03b
...
...
@@ -6,7 +6,8 @@ export const visibleTypes = store => ([
store
.
state
.
config
.
notificationVisibility
.
likes
&&
'
like
'
,
store
.
state
.
config
.
notificationVisibility
.
mentions
&&
'
mention
'
,
store
.
state
.
config
.
notificationVisibility
.
repeats
&&
'
repeat
'
,
store
.
state
.
config
.
notificationVisibility
.
follows
&&
'
follow
'
store
.
state
.
config
.
notificationVisibility
.
follows
&&
'
follow
'
,
store
.
state
.
config
.
notificationVisibility
.
moves
&&
'
move
'
].
filter
(
_
=>
_
))
const
sortById
=
(
a
,
b
)
=>
{
...
...
src/services/push/push.js
View file @
ad97e03b
...
...
@@ -65,7 +65,8 @@ function sendSubscriptionToBackEnd (subscription, token, notificationVisibility)
follow
:
notificationVisibility
.
follows
,
favourite
:
notificationVisibility
.
likes
,
mention
:
notificationVisibility
.
mentions
,
reblog
:
notificationVisibility
.
repeats
reblog
:
notificationVisibility
.
repeats
,
move
:
notificationVisibility
.
moves
}
}
})
...
...
static/fontello.json
View file @
ad97e03b
...
...
@@ -333,6 +333,12 @@
"css"
:
"login"
,
"code"
:
59424
,
"src"
:
"fontawesome"
},
{
"uid"
:
"f3ebd6751c15a280af5cc5f4a764187d"
,
"css"
:
"arrow-curved"
,
"code"
:
59426
,
"src"
:
"iconic"
}
]
}
\ No newline at end of file
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