graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-25 06:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge: Fixed sharkey randomly clearing notifications (!473)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/473
This commit is contained in:
Leah 2024-04-12 04:34:35 +00:00
commit 46ec184374
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/components/MkNotifications.vue
View file

@ -29,6 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup> <script lang="ts" setup>
import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue'; import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue';
import * as Misskey from 'misskey-js';
import MkPagination from '@/components/MkPagination.vue'; import MkPagination from '@/components/MkPagination.vue';
import XNotification from '@/components/MkNotification.vue'; import XNotification from '@/components/MkNotification.vue';
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
@ -40,7 +41,6 @@ import { notificationTypes } from '@/const.js';
import { infoImageUrl } from '@/instance.js'; import { infoImageUrl } from '@/instance.js';
import { defaultStore } from '@/store.js'; import { defaultStore } from '@/store.js';
import MkPullToRefresh from '@/components/MkPullToRefresh.vue'; import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
import * as Misskey from 'misskey-js';
const props = defineProps<{ const props = defineProps<{
excludeTypes?: typeof notificationTypes[number][]; excludeTypes?: typeof notificationTypes[number][];
@ -52,12 +52,14 @@ const pagination = computed(() => defaultStore.reactiveState.useGroupedNotificat
endpoint: 'i/notifications-grouped' as const, endpoint: 'i/notifications-grouped' as const,
limit: 20, limit: 20,
params: computed(() => ({ params: computed(() => ({
markAsRead: false,
excludeTypes: props.excludeTypes ?? undefined, excludeTypes: props.excludeTypes ?? undefined,
})), })),
} : { } : {
endpoint: 'i/notifications' as const, endpoint: 'i/notifications' as const,
limit: 20, limit: 20,
params: computed(() => ({ params: computed(() => ({
markAsRead: false,
excludeTypes: props.excludeTypes ?? undefined, excludeTypes: props.excludeTypes ?? undefined,
})), })),
}); });