Add view for moves notifications

This commit is contained in:
kPherox 2019-12-11 00:00:10 +09:00
parent 2bc63720a5
commit 6af870cd90
No known key found for this signature in database
GPG Key ID: C04751C2BFA2F62D
9 changed files with 39 additions and 6 deletions

View File

@ -74,9 +74,13 @@
<i class="fa icon-user-plus lit" /> <i class="fa icon-user-plus lit" />
<small>{{ $t('notifications.followed_you') }}</small> <small>{{ $t('notifications.followed_you') }}</small>
</span> </span>
<span v-if="notification.type === 'move'">
<i class="fa icon-arrow-curved lit" />
<small>{{ $t('notifications.moved_to') }}</small>
</span>
</div> </div>
<div <div
v-if="notification.type === 'follow'" v-if="notification.type === 'follow' || notification.type === 'move'"
class="timeago" class="timeago"
> >
<span class="faint"> <span class="faint">
@ -115,6 +119,14 @@
@{{ notification.from_profile.screen_name }} @{{ notification.from_profile.screen_name }}
</router-link> </router-link>
</div> </div>
<div
v-else-if="notification.type === 'move'"
class="move-text"
>
<router-link :to="userProfileLink">
@{{ notification.target.screen_name }}
</router-link>
</div>
<template v-else> <template v-else>
<status <status
class="faint" class="faint"

View File

@ -76,7 +76,7 @@
} }
} }
.follow-text { .follow-text, .move-text {
padding: 0.5em 0; padding: 0.5em 0;
} }
@ -151,6 +151,11 @@
color: var(--cOrange, $fallback--cOrange); color: var(--cOrange, $fallback--cOrange);
} }
.icon-arrow-curved.lit {
color: $fallback--cBlue;
color: var(--cBlue, $fallback--cBlue);
}
.status-content { .status-content {
margin: 0; margin: 0;
max-height: 300px; max-height: 300px;

View File

@ -314,6 +314,11 @@
{{ $t('settings.notification_visibility_mentions') }} {{ $t('settings.notification_visibility_mentions') }}
</Checkbox> </Checkbox>
</li> </li>
<li>
<Checkbox v-model="notificationVisibility.moves">
{{ $t('settings.notification_visibility_moves') }}
</Checkbox>
</li>
</ul> </ul>
</div> </div>
<div> <div>

View File

@ -312,6 +312,7 @@
"notification_visibility_likes": "Likes", "notification_visibility_likes": "Likes",
"notification_visibility_mentions": "Mentions", "notification_visibility_mentions": "Mentions",
"notification_visibility_repeats": "Repeats", "notification_visibility_repeats": "Repeats",
"notification_visibility_moves": "Moves",
"no_rich_text_description": "Strip rich text formatting from all posts", "no_rich_text_description": "Strip rich text formatting from all posts",
"no_blocks": "No blocks", "no_blocks": "No blocks",
"no_mutes": "No mutes", "no_mutes": "No mutes",

View File

@ -28,7 +28,8 @@ export const defaultState = {
follows: true, follows: true,
mentions: true, mentions: true,
likes: true, likes: true,
repeats: true repeats: true,
moves: true
}, },
webPushNotifications: false, webPushNotifications: false,
muteWords: [], muteWords: [],

View File

@ -66,7 +66,8 @@ const visibleNotificationTypes = (rootState) => {
rootState.config.notificationVisibility.likes && 'like', rootState.config.notificationVisibility.likes && 'like',
rootState.config.notificationVisibility.mentions && 'mention', rootState.config.notificationVisibility.mentions && 'mention',
rootState.config.notificationVisibility.repeats && 'repeat', rootState.config.notificationVisibility.repeats && 'repeat',
rootState.config.notificationVisibility.follows && 'follow' rootState.config.notificationVisibility.follows && 'follow',
rootState.config.notificationVisibility.moves && 'move'
].filter(_ => _) ].filter(_ => _)
} }

View File

@ -6,7 +6,8 @@ export const visibleTypes = store => ([
store.state.config.notificationVisibility.likes && 'like', store.state.config.notificationVisibility.likes && 'like',
store.state.config.notificationVisibility.mentions && 'mention', store.state.config.notificationVisibility.mentions && 'mention',
store.state.config.notificationVisibility.repeats && 'repeat', 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(_ => _)) ].filter(_ => _))
const sortById = (a, b) => { const sortById = (a, b) => {

View File

@ -65,7 +65,8 @@ function sendSubscriptionToBackEnd (subscription, token, notificationVisibility)
follow: notificationVisibility.follows, follow: notificationVisibility.follows,
favourite: notificationVisibility.likes, favourite: notificationVisibility.likes,
mention: notificationVisibility.mentions, mention: notificationVisibility.mentions,
reblog: notificationVisibility.repeats reblog: notificationVisibility.repeats,
move: notificationVisibility.moves
} }
} }
}) })

View File

@ -303,6 +303,12 @@
"css": "gauge", "css": "gauge",
"code": 61668, "code": 61668,
"src": "fontawesome" "src": "fontawesome"
},
{
"uid": "f3ebd6751c15a280af5cc5f4a764187d",
"css": "arrow-curved",
"code": 59421,
"src": "iconic"
} }
] ]
} }