Compare commits

...

5 Commits

Author SHA1 Message Date
Moon Man a969568ca6 Merge remote-tracking branch 'mkljczk/status-notification-type' into spc 2024-06-06 09:15:31 +00:00
marcin mikołajczak 34285150a0 Add tab to interactions.vue
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-02 09:36:06 +02:00
HJ e33734b474 Merge branch 'tusooa/no-preserve-selection-color' into 'develop'
Ensure selection text color has enough contrast

See merge request pleroma/pleroma-fe!1917
2024-05-31 13:49:06 +00:00
tusooa 3da6f8a2d1
Ensure selection text color has enough contrast 2024-05-31 09:39:31 -04:00
marcin mikołajczak 5c48ea2f1a Support `status` notification type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-25 08:42:32 +02:00
14 changed files with 50 additions and 7 deletions

View File

@ -0,0 +1 @@
Ensure selection text color has enough contrast

View File

@ -0,0 +1 @@
Support `status` notification type

View File

@ -3,6 +3,7 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
const tabModeDict = {
mentions: ['mention'],
statuses: ['status'],
'likes+repeats': ['repeat', 'like'],
follows: ['follow'],
reactions: ['pleroma:emoji_reaction'],

View File

@ -10,9 +10,13 @@
:on-switch="onModeSwitch"
>
<span
key="mentions"
key="statuses"
:label="$t('nav.mentions')"
/>
<span
key="statuses"
:label="$t('interactions.statuses')"
/>
<span
key="likes+repeats"
:label="$t('interactions.favs_repeats')"

View File

@ -1,6 +1,6 @@
<template>
<article
v-if="notification.type === 'mention'"
v-if="notification.type === 'mention' || notification.type === 'status'"
>
<Status
class="Notification"

View File

@ -43,6 +43,15 @@
:class="{ 'menu-checkbox-checked': filters.mentions }"
/>{{ $t('settings.notification_visibility_mentions') }}
</button>
<button
class="menu-item dropdown-item"
@click="toggleNotificationFilter('statuses')"
>
<span
class="input menu-checkbox"
:class="{ 'menu-checkbox-checked': filters.statuses }"
/>{{ $t('settings.notification_visibility_statuses') }}
</button>
<button
class="menu-item dropdown-item"
@click="toggleNotificationFilter('emojiReactions')"

View File

@ -33,7 +33,7 @@ const Notifications = {
// Disables panel styles, unread mark, potentially other notification-related actions
// meant for "Interactions" timeline
minimalMode: Boolean,
// Custom filter mode, an array of strings, possible values 'mention', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline
// Custom filter mode, an array of strings, possible values 'mention', 'status', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline
filterMode: Array,
// Do not show extra notifications
noExtra: {

View File

@ -37,7 +37,7 @@ export default {
// Selection colors
'--selectionBackground': 'color | --accent',
'--selectionText': 'color | $textColor(--accent, --text)'
'--selectionText': 'color | $textColor(--accent, --text, no-preserve)'
}
}
]

View File

@ -60,6 +60,21 @@
</li>
</ul>
</li>
<li>
<h4> {{ $t('settings.notification_visibility_statuses') }}</h4>
<ul class="setting-list">
<li>
<BooleanSetting path="notificationVisibility.statuses">
{{ $t('settings.notification_visibility_in_column') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationNative.statuses">
{{ $t('settings.notification_visibility_native_notifications') }}
</BooleanSetting>
</li>
</ul>
</li>
<li>
<h4> {{ $t('settings.notification_visibility_likes') }}</h4>
<ul class="setting-list">

View File

@ -212,7 +212,8 @@
"unread_follow_requests": "{num} new follow request | {num} new follow requests",
"configuration_tip": "You can customize what to display here in {theSettings}. {dismiss}",
"configuration_tip_settings": "the settings",
"configuration_tip_dismiss": "Do not show again"
"configuration_tip_dismiss": "Do not show again",
"subscribed_status": "posted"
},
"polls": {
"add_poll": "Add poll",
@ -264,7 +265,8 @@
"emoji_reactions": "Emoji Reactions",
"reports": "Reports",
"moves": "User migrates",
"load_older": "Load older interactions"
"load_older": "Load older interactions",
"statuses": "Subscriptions"
},
"post_status": {
"edit_status": "Edit status",
@ -588,6 +590,7 @@
"notification_visibility_moves": "User Migrates",
"notification_visibility_emoji_reactions": "Reactions",
"notification_visibility_polls": "Ends of polls you voted in",
"notification_visibility_statuses": "Subscriptions",
"notification_show_extra": "Show extra notifications in the notifications column",
"notification_extra_chats": "Show unread chats",
"notification_extra_announcements": "Show unread announcements",

View File

@ -60,6 +60,7 @@ export const defaultState = {
notificationVisibility: {
follows: true,
mentions: true,
statuses: true,
likes: true,
repeats: true,
moves: true,
@ -72,6 +73,7 @@ export const defaultState = {
notificationNative: {
follows: true,
mentions: true,
statuses: true,
likes: false,
repeats: false,
moves: false,

View File

@ -18,6 +18,7 @@ export const visibleTypes = store => {
return ([
notificationVisibility.likes && 'like',
notificationVisibility.mentions && 'mention',
notificationVisibility.statuses && 'status',
notificationVisibility.repeats && 'repeat',
notificationVisibility.follows && 'follow',
notificationVisibility.followRequest && 'follow_request',
@ -28,7 +29,7 @@ export const visibleTypes = store => {
].filter(_ => _))
}
const statusNotifications = new Set(['like', 'mention', 'repeat', 'pleroma:emoji_reaction', 'poll'])
const statusNotifications = new Set(['like', 'mention', 'status', 'repeat', 'pleroma:emoji_reaction', 'poll'])
export const isStatusNotification = (type) => statusNotifications.has(type)
@ -118,6 +119,9 @@ export const prepareNotificationObject = (notification, i18n) => {
case 'like':
i18nString = 'favorited_you'
break
case 'status':
i18nString = 'subscribed_status'
break
case 'repeat':
i18nString = 'repeated_you'
break

View File

@ -5,6 +5,7 @@ import { promiseInterval } from '../promise_interval/promise_interval.js'
// Note: chat_mention excluded as pleroma-fe polls them separately
const mastoApiNotificationTypes = [
'mention',
'status',
'favourite',
'reblog',
'follow',

View File

@ -38,6 +38,8 @@ const setSettings = async () => {
switch (k) {
case 'mentions':
return 'mention'
case 'statuses':
return 'status'
case 'likes':
return 'like'
case 'repeats':