aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/notification/notification.js3
-rw-r--r--src/components/notification/notification.vue5
-rw-r--r--src/components/notifications/notifications.js3
-rw-r--r--src/components/notifications/notifications.vue3
-rw-r--r--src/components/status/status.js6
-rw-r--r--src/components/status/status.vue3
-rw-r--r--src/i18n/en.json2
-rw-r--r--src/modules/statuses.js36
-rw-r--r--src/services/api/api.service.js25
9 files changed, 4 insertions, 82 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index c86f22bb..fe5b7018 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -21,9 +21,6 @@ const Notification = {
},
userProfileLink (user) {
return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
- },
- dismiss () {
- this.$store.dispatch('dismissNotifications', { id: this.notification.id })
}
},
computed: {
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 6e8e9844..fa931fb6 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -3,8 +3,6 @@
v-if="notification.type === 'mention'"
:compact="true"
:statusoid="notification.status"
- isNotification="true"
- @dismissNotification="dismiss"
>
</status>
<div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else>
@@ -40,9 +38,6 @@
<timeago :since="notification.action.created_at" :auto-update="240"></timeago>
</router-link>
</div>
- <span class="button-icon" @click.prevent="dismiss">
- <i class="button-icon icon-cancel delete-status"></i>
- </span>
</span>
<div class="follow-text" v-if="notification.type === 'follow'">
<router-link :to="userProfileLink(notification.action.user)">
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 68004d54..e1c53c58 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -55,9 +55,6 @@ const Notifications = {
markAsSeen () {
this.$store.dispatch('markNotificationsAsSeen')
},
- clear () {
- this.$store.dispatch('clearNotifications')
- },
fetchOlderNotifications () {
const store = this.$store
const credentials = store.state.users.currentUser.credentials
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 5a5f8ed8..05f51f6c 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -9,8 +9,7 @@
<div @click.prevent class="loadmore-error alert error" v-if="error">
{{$t('timeline.error_fetching')}}
</div>
- <!-- <button v-if="unseenCount" @click.prevent="markAsSeen" class="read-button">{{$t('notifications.read')}}</button> -->
- <button v-if="notifications.length" @click.prevent="clear" class="read-button">{{$t('notifications.clear')}}</button>
+ <button v-if="unseenCount" @click.prevent="markAsSeen" class="read-button">{{$t('notifications.read')}}</button>
</div>
<div class="panel-body">
<div v-for="notification in visibleNotifications" :key="notification.action.id + notification.id" class="notification" :class='{"unseen": !notification.seen}'>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 4cd26be3..9e18fe15 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -25,8 +25,7 @@ const Status = {
'replies',
'isPreview',
'noHeading',
- 'inlineExpanded',
- 'isNotification'
+ 'inlineExpanded'
],
data () {
return {
@@ -366,9 +365,6 @@ const Status = {
setMedia () {
const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
return () => this.$store.dispatch('setMedia', attachments)
- },
- dismissNotification () {
- this.$emit('dismissNotification')
}
},
watch: {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 28a44346..1f6d0325 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,9 +52,6 @@
<a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
<i class="button-icon icon-link-ext-alt"></i>
</a>
- <span class="button-icon" v-if="isNotification" @click.prevent="dismissNotification">
- <i class="button-icon icon-cancel delete-status"></i>
- </span>
<template v-if="expandable && !isPreview">
<a href="#" @click.prevent="toggleExpanded" title="Expand">
<i class="button-icon icon-plus-squared"></i>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 38abfaf5..01fe2fba 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -62,8 +62,6 @@
"load_older": "Load older notifications",
"notifications": "Notifications",
"read": "Read!",
- "clear": "Clear!",
- "dismiss": "Dismiss!",
"repeated_you": "repeated your status",
"no_more_notifications": "No more notifications"
},
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 4cc3907d..1eb1a3e3 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { remove, slice, each, find, findIndex, maxBy, minBy, merge, first, last, isArray } from 'lodash'
+import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray } from 'lodash'
import apiService from '../services/api/api.service.js'
// import parse from '../services/status_parser/status_parser.js'
@@ -390,27 +390,6 @@ export const mutations = {
notification.seen = true
})
},
- clearNotifications (state) {
- state.notifications.data = []
- state.notifications.idStore = {}
- state.notifications.maxId = 0
- state.notifications.minId = 0
- },
- dismissNotifications (state, { id }) {
- const { data } = state.notifications
- const idx = findIndex(data, { id })
-
- if (idx !== -1) {
- const notification = data[idx]
- data.splice(idx, 1)
- delete state.notifications.idStore[id]
- if (state.notifications.maxId === notification.id) {
- state.notifications.maxId = data.length ? maxBy(data, 'id').id : 0
- } else if (state.notifications.minId === notification.id) {
- state.notifications.minId = data.length ? minBy(data, 'id').id : 0
- }
- }
- },
queueFlush (state, { timeline, id }) {
state.timelines[timeline].flushMarker = id
}
@@ -495,19 +474,6 @@ const statuses = {
id: rootState.statuses.notifications.maxId,
credentials: rootState.users.currentUser.credentials
})
- },
- clearNotifications ({ rootState, commit }) {
- commit('clearNotifications')
- apiService.clearNotifications({
- credentials: rootState.users.currentUser.credentials
- })
- },
- dismissNotifications ({ rootState, commit }, { id }) {
- commit('dismissNotifications', { id })
- apiService.dismissNotifications({
- id,
- credentials: rootState.users.currentUser.credentials
- })
}
},
mutations
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 9d3139ce..03553d75 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -43,8 +43,6 @@ const SUGGESTIONS_URL = '/api/v1/suggestions'
const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
const MASTODON_USER_NOTIFICATIONS_URL = '/api/v1/notifications'
-const MASTODON_USER_NOTIFICATIONS_CLEAR_URL = '/api/v1/notifications/clear'
-const MASTODON_USER_NOTIFICATIONS_DISMISS_URL = '/api/v1/notifications/dismiss'
import { each, map } from 'lodash'
import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
@@ -577,25 +575,6 @@ const markNotificationsAsSeen = ({id, credentials}) => {
}).then((data) => data.json())
}
-const clearNotifications = ({ credentials }) => {
- return fetch(MASTODON_USER_NOTIFICATIONS_CLEAR_URL, {
- headers: authHeaders(credentials),
- method: 'POST'
- }).then((data) => data.json())
-}
-
-const dismissNotifications = ({ id, credentials }) => {
- const body = new FormData()
-
- body.append('id', id)
-
- return fetch(MASTODON_USER_NOTIFICATIONS_DISMISS_URL, {
- body,
- headers: authHeaders(credentials),
- method: 'POST'
- }).then((data) => data.json())
-}
-
const apiService = {
verifyCredentials,
fetchTimeline,
@@ -636,9 +615,7 @@ const apiService = {
approveUser,
denyUser,
suggestions,
- markNotificationsAsSeen,
- clearNotifications,
- dismissNotifications
+ markNotificationsAsSeen
}
export default apiService
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-11 13:46:49 +0000