Merge pull request 'Fixes #9350' (#9495) from yawhn/elreqkey:develop into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9495
This commit is contained in:
commit
8e79ab69b0
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<MkPagination ref="pagingComponent" :pagination="pagination">
|
<MkPagination ref="pagingComponent" :pagination="pagination" disableReload="true">
|
||||||
<template #empty>
|
<template #empty>
|
||||||
<div class="_fullinfo">
|
<div class="_fullinfo">
|
||||||
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
|
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
|
||||||
|
|
|
@ -1,34 +1,37 @@
|
||||||
<template>
|
<template>
|
||||||
<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
|
<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
|
||||||
<MkLoading v-if="fetching"/>
|
<MkLoading v-if="fetching" />
|
||||||
|
|
||||||
<MkError v-else-if="error" @retry="init()"/>
|
<MkError v-else-if="error" @retry="init()" />
|
||||||
|
|
||||||
<div v-else-if="empty" key="_empty_" class="empty">
|
<div v-else-if="empty" key="_empty_" class="empty">
|
||||||
<slot name="empty">
|
<slot name="empty">
|
||||||
<div class="_fullinfo">
|
<div class="_fullinfo">
|
||||||
<img src="/static-assets/badges/info.png" class="_ghost" alt="Error"/>
|
<img src="/static-assets/badges/info.png" class="_ghost" alt="Error" />
|
||||||
<div>{{ i18n.ts.nothing }}</div>
|
<div>{{ i18n.ts.nothing }}</div>
|
||||||
|
</div>
|
||||||
|
</slot>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else ref="rootEl">
|
||||||
|
<div v-show="pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
|
||||||
|
<MkButton v-if="!moreFetching" class="button" :disabled="moreFetching"
|
||||||
|
:style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
|
||||||
|
{{ i18n.ts.loadMore }}
|
||||||
|
</MkButton>
|
||||||
|
<MkLoading v-else class="loading" />
|
||||||
|
</div>
|
||||||
|
<slot :items="items"></slot>
|
||||||
|
<div v-show="!pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
|
||||||
|
<MkButton v-if="!moreFetching"
|
||||||
|
v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" class="button"
|
||||||
|
:disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
|
||||||
|
{{ i18n.ts.loadMore }}
|
||||||
|
</MkButton>
|
||||||
|
<MkLoading v-else class="loading" />
|
||||||
</div>
|
</div>
|
||||||
</slot>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-else ref="rootEl">
|
|
||||||
<div v-show="pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
|
|
||||||
<MkButton v-if="!moreFetching" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMoreAhead">
|
|
||||||
{{ i18n.ts.loadMore }}
|
|
||||||
</MkButton>
|
|
||||||
<MkLoading v-else class="loading"/>
|
|
||||||
</div>
|
</div>
|
||||||
<slot :items="items"></slot>
|
</transition>
|
||||||
<div v-show="!pagination.reversed && more" key="_more_" class="cxiknjgy _gap">
|
|
||||||
<MkButton v-if="!moreFetching" v-appear="($store.state.enableInfiniteScroll && !disableAutoLoad) ? fetchMore : null" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" primary @click="fetchMore">
|
|
||||||
{{ i18n.ts.loadMore }}
|
|
||||||
</MkButton>
|
|
||||||
<MkLoading v-else class="loading"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
@ -66,6 +69,7 @@ const props = withDefaults(defineProps<{
|
||||||
disableAutoLoad?: boolean;
|
disableAutoLoad?: boolean;
|
||||||
displayLimit?: number;
|
displayLimit?: number;
|
||||||
externalItemArray?: Ref<Array<any>>;
|
externalItemArray?: Ref<Array<any>>;
|
||||||
|
disableReload?: boolean;
|
||||||
}>(), {
|
}>(), {
|
||||||
displayLimit: 30,
|
displayLimit: 30,
|
||||||
});
|
});
|
||||||
|
@ -74,7 +78,7 @@ const emit = defineEmits<{
|
||||||
(ev: 'queue', count: number): void;
|
(ev: 'queue', count: number): void;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
type Item = { id: string; [another: string]: unknown; };
|
type Item = { id: string;[another: string]: unknown; };
|
||||||
|
|
||||||
const rootEl = ref<HTMLElement>();
|
const rootEl = ref<HTMLElement>();
|
||||||
const items = ref<Item[]>([]);
|
const items = ref<Item[]>([]);
|
||||||
|
@ -87,6 +91,7 @@ const backed = ref(false); // 遡り中か否か
|
||||||
const isBackTop = ref(false);
|
const isBackTop = ref(false);
|
||||||
const empty = computed(() => items.value.length === 0);
|
const empty = computed(() => items.value.length === 0);
|
||||||
const error = ref(false);
|
const error = ref(false);
|
||||||
|
const alreadyInitedOnce = ref(false);
|
||||||
|
|
||||||
const init = async (): Promise<void> => {
|
const init = async (): Promise<void> => {
|
||||||
queue.value = [];
|
queue.value = [];
|
||||||
|
@ -107,14 +112,17 @@ const init = async (): Promise<void> => {
|
||||||
if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) {
|
if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) {
|
||||||
res.pop();
|
res.pop();
|
||||||
items.value = props.pagination.reversed ? [...res].reverse() : res;
|
items.value = props.pagination.reversed ? [...res].reverse() : res;
|
||||||
|
if (props.externalItemArray) {
|
||||||
|
props.externalItemArray.value = items.value;
|
||||||
|
}
|
||||||
more.value = true;
|
more.value = true;
|
||||||
} else {
|
} else {
|
||||||
items.value = props.pagination.reversed ? [...res].reverse() : res;
|
items.value = props.pagination.reversed ? [...res].reverse() : res;
|
||||||
|
if (props.externalItemArray) {
|
||||||
|
props.externalItemArray.value = items.value;
|
||||||
|
}
|
||||||
more.value = false;
|
more.value = false;
|
||||||
}
|
}
|
||||||
if(props.externalItemArray) {
|
|
||||||
props.externalItemArray.value = items.value;
|
|
||||||
}
|
|
||||||
offset.value = res.length;
|
offset.value = res.length;
|
||||||
error.value = false;
|
error.value = false;
|
||||||
fetching.value = false;
|
fetching.value = false;
|
||||||
|
@ -126,7 +134,7 @@ const init = async (): Promise<void> => {
|
||||||
|
|
||||||
const reload = (): void => {
|
const reload = (): void => {
|
||||||
items.value = [];
|
items.value = [];
|
||||||
if(props.externalItemArray) {
|
if (props.externalItemArray) {
|
||||||
props.externalItemArray.value = [];
|
props.externalItemArray.value = [];
|
||||||
}
|
}
|
||||||
init();
|
init();
|
||||||
|
@ -188,14 +196,17 @@ const fetchMore = async (): Promise<void> => {
|
||||||
if (res.length > SECOND_FETCH_LIMIT) {
|
if (res.length > SECOND_FETCH_LIMIT) {
|
||||||
res.pop();
|
res.pop();
|
||||||
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
||||||
|
if (props.externalItemArray) {
|
||||||
|
props.externalItemArray.value = items.value;
|
||||||
|
}
|
||||||
more.value = true;
|
more.value = true;
|
||||||
} else {
|
} else {
|
||||||
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
||||||
|
if (props.externalItemArray) {
|
||||||
|
props.externalItemArray.value = items.value;
|
||||||
|
}
|
||||||
more.value = false;
|
more.value = false;
|
||||||
}
|
}
|
||||||
if(props.externalItemArray) {
|
|
||||||
props.externalItemArray.value = items.value;
|
|
||||||
}
|
|
||||||
offset.value += res.length;
|
offset.value += res.length;
|
||||||
moreFetching.value = false;
|
moreFetching.value = false;
|
||||||
}, err => {
|
}, err => {
|
||||||
|
@ -221,14 +232,17 @@ const fetchMoreAhead = async (): Promise<void> => {
|
||||||
if (res.length > SECOND_FETCH_LIMIT) {
|
if (res.length > SECOND_FETCH_LIMIT) {
|
||||||
res.pop();
|
res.pop();
|
||||||
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
||||||
|
if (props.externalItemArray) {
|
||||||
|
props.externalItemArray.value = items.value;
|
||||||
|
}
|
||||||
more.value = true;
|
more.value = true;
|
||||||
} else {
|
} else {
|
||||||
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res);
|
||||||
|
if (props.externalItemArray) {
|
||||||
|
props.externalItemArray.value = items.value;
|
||||||
|
}
|
||||||
more.value = false;
|
more.value = false;
|
||||||
}
|
}
|
||||||
if(props.externalItemArray) {
|
|
||||||
props.externalItemArray.value = items.value;
|
|
||||||
}
|
|
||||||
offset.value += res.length;
|
offset.value += res.length;
|
||||||
moreFetching.value = false;
|
moreFetching.value = false;
|
||||||
}, err => {
|
}, err => {
|
||||||
|
@ -254,7 +268,7 @@ const prepend = (item: Item): void => {
|
||||||
//items.value = items.value.slice(-props.displayLimit);
|
//items.value = items.value.slice(-props.displayLimit);
|
||||||
while (items.value.length >= props.displayLimit) {
|
while (items.value.length >= props.displayLimit) {
|
||||||
items.value.shift();
|
items.value.shift();
|
||||||
if(props.externalItemArray) props.externalItemArray.value.shift();
|
if (props.externalItemArray) props.externalItemArray.value.shift();
|
||||||
}
|
}
|
||||||
more.value = true;
|
more.value = true;
|
||||||
}
|
}
|
||||||
|
@ -262,13 +276,13 @@ const prepend = (item: Item): void => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
items.value.push(item);
|
items.value.push(item);
|
||||||
if(props.externalItemArray) props.externalItemArray.value.push(item);
|
if (props.externalItemArray) props.externalItemArray.value.push(item);
|
||||||
// TODO
|
// TODO
|
||||||
} else {
|
} else {
|
||||||
// 初回表示時はunshiftだけでOK
|
// 初回表示時はunshiftだけでOK
|
||||||
if (!rootEl.value) {
|
if (!rootEl.value) {
|
||||||
items.value.unshift(item);
|
items.value.unshift(item);
|
||||||
if(props.externalItemArray) props.externalItemArray.value.unshift(item);
|
if (props.externalItemArray) props.externalItemArray.value.unshift(item);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -277,18 +291,7 @@ const prepend = (item: Item): void => {
|
||||||
if (isTop) {
|
if (isTop) {
|
||||||
// Prepend the item
|
// Prepend the item
|
||||||
items.value.unshift(item);
|
items.value.unshift(item);
|
||||||
if(props.externalItemArray) props.externalItemArray.value.unshift(item);
|
if (props.externalItemArray) props.externalItemArray.value.unshift(item);
|
||||||
|
|
||||||
// オーバーフローしたら古いアイテムは捨てる
|
|
||||||
if (items.value.length >= props.displayLimit) {
|
|
||||||
// このやり方だとVue 3.2以降アニメーションが動かなくなる
|
|
||||||
//this.items = items.value.slice(0, props.displayLimit);
|
|
||||||
while (items.value.length >= props.displayLimit) {
|
|
||||||
items.value.pop();
|
|
||||||
if(props.externalItemArray) props.externalItemArray.value.pop();
|
|
||||||
}
|
|
||||||
more.value = true;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
queue.value.push(item);
|
queue.value.push(item);
|
||||||
onScrollTop(rootEl.value, () => {
|
onScrollTop(rootEl.value, () => {
|
||||||
|
@ -303,28 +306,30 @@ const prepend = (item: Item): void => {
|
||||||
|
|
||||||
const append = (item: Item): void => {
|
const append = (item: Item): void => {
|
||||||
items.value.push(item);
|
items.value.push(item);
|
||||||
if(props.externalItemArray) props.externalItemArray.value.push(item);
|
if (props.externalItemArray) props.externalItemArray.value.push(item);
|
||||||
};
|
};
|
||||||
|
|
||||||
const removeItem = (finder: (item: Item) => boolean): boolean => {
|
const removeItem = (finder: (item: Item) => boolean): boolean => {
|
||||||
const i = items.value.findIndex(finder);
|
const i = items.value.findIndex(finder);
|
||||||
if (i === -1) {
|
const j = props.externalItemArray?.findIndex(finder);
|
||||||
|
if (i === -1 && j === -1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
items.value.splice(i, 1);
|
items.value.splice(i, 1);
|
||||||
if(props.externalItemArray) props.externalItemArray.value.splice(i, 1);
|
if (props.externalItemArray) props.externalItemArray.value.splice(i, 1);
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => {
|
const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => {
|
||||||
const i = items.value.findIndex(item => item.id === id);
|
const i = items.value.findIndex(item => item.id === id);
|
||||||
if (i === -1) {
|
const j = props.externalItemArray?.findIndex(item => item.id === id);
|
||||||
|
if (i === -1 && j === -1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
items.value[i] = replacer(items.value[i]);
|
items.value[i] = replacer(items.value[i]);
|
||||||
if(props.externalItemArray) props.externalItemArray.value[i] = items.value[i];
|
if (props.externalItemArray) props.externalItemArray.value[i] = items.value[i];
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -341,10 +346,14 @@ init();
|
||||||
|
|
||||||
onActivated(() => {
|
onActivated(() => {
|
||||||
isBackTop.value = false;
|
isBackTop.value = false;
|
||||||
|
if(alreadyInitedOnce.value && (!props.disableReload || !props.disableReload.value)) {
|
||||||
|
reload();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
onDeactivated(() => {
|
onDeactivated(() => {
|
||||||
isBackTop.value = window.scrollY === 0;
|
isBackTop.value = window.scrollY === 0;
|
||||||
|
alreadyInitedOnce.value = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
@ -365,13 +374,14 @@ defineExpose({
|
||||||
.fade-leave-active {
|
.fade-leave-active {
|
||||||
transition: opacity 0.15s ease;
|
transition: opacity 0.15s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fade-enter-from,
|
.fade-enter-from,
|
||||||
.fade-leave-to {
|
.fade-leave-to {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cxiknjgy {
|
.cxiknjgy {
|
||||||
> .button {
|
>.button {
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,43 +1,47 @@
|
||||||
<template>
|
<template>
|
||||||
<MkStickyContainer>
|
<MkStickyContainer>
|
||||||
<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
|
<template #header>
|
||||||
<div>
|
<MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" />
|
||||||
<MkSpacer :content-max="800">
|
</template>
|
||||||
<swiper
|
<div>
|
||||||
:modules="[Virtual]"
|
<MkSpacer :content-max="800">
|
||||||
:space-between="20"
|
<swiper :modules="[Virtual]" :space-between="20" :virtual="true"
|
||||||
:virtual="true"
|
:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)" @swiper="setSwiperRef"
|
||||||
:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
|
@slide-change="onSlideChange">
|
||||||
@swiper="setSwiperRef"
|
<swiper-slide>
|
||||||
@slide-change="onSlideChange"
|
<div class="_content yweeujhr dms">
|
||||||
>
|
<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{
|
||||||
<swiper-slide>
|
i18n.ts.startMessaging
|
||||||
<div class="_content yweeujhr dms">
|
}}</MkButton>
|
||||||
<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
|
<MkPagination v-slot="{ items }" :pagination="dmsPagination">
|
||||||
<MkPagination v-slot="{}" :externalItemArray="messages" :pagination="dmsPagination">
|
<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
|
||||||
<MkChatPreview v-for="message in messages" :key="message.id" class="yweeujhr message _block" :message="message"/>
|
:message="message" />
|
||||||
</MkPagination>
|
</MkPagination>
|
||||||
</div>
|
|
||||||
</swiper-slide>
|
|
||||||
<swiper-slide>
|
|
||||||
<div class="_content yweeujhr groups">
|
|
||||||
<div class="groupsbuttons">
|
|
||||||
<MkButton primary class="start" :link="true" to="/my/groups"><i class="ph-user-circle-gear-bold ph-lg"></i> {{ i18n.ts.manageGroups }}</MkButton>
|
|
||||||
<MkButton primary class="start" @click="startGroup"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
|
|
||||||
</div>
|
</div>
|
||||||
<MkPagination v-slot="{}" :externalItemArray="groupMessages" :pagination="groupsPagination">
|
</swiper-slide>
|
||||||
<MkChatPreview v-for="message in groupMessages" :key="message.id" class="yweeujhr message _block" :message="message"/>
|
<swiper-slide>
|
||||||
</MkPagination>
|
<div class="_content yweeujhr groups">
|
||||||
</div>
|
<div class="groupsbuttons">
|
||||||
</swiper-slide>
|
<MkButton primary class="start" :link="true" to="/my/groups"><i
|
||||||
</swiper>
|
class="ph-user-circle-gear-bold ph-lg"></i> {{ i18n.ts.manageGroups }}</MkButton>
|
||||||
</MkSpacer>
|
<MkButton primary class="start" @click="startGroup"><i class="ph-plus-bold ph-lg"></i> {{
|
||||||
</div>
|
i18n.ts.startMessaging
|
||||||
</MkStickyContainer>
|
}}</MkButton>
|
||||||
|
</div>
|
||||||
|
<MkPagination v-slot="{ items }" :pagination="groupsPagination">
|
||||||
|
<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
|
||||||
|
:message="message" />
|
||||||
|
</MkPagination>
|
||||||
|
</div>
|
||||||
|
</swiper-slide>
|
||||||
|
</swiper>
|
||||||
|
</MkSpacer>
|
||||||
|
</div>
|
||||||
|
</MkStickyContainer>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { markRaw, onMounted, onUnmounted, watch } from 'vue';
|
import { markRaw, onMounted, onUnmounted, watch, computed } from 'vue';
|
||||||
import * as Acct from 'calckey-js/built/acct';
|
import * as Acct from 'calckey-js/built/acct';
|
||||||
import { Virtual } from 'swiper';
|
import { Virtual } from 'swiper';
|
||||||
import { Swiper, SwiperSlide } from 'swiper/vue';
|
import { Swiper, SwiperSlide } from 'swiper/vue';
|
||||||
|
@ -58,8 +62,9 @@ import 'swiper/scss/virtual';
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
let messages = $ref([]);
|
let messages = $ref([]);
|
||||||
let groupMessages = $ref([]);
|
|
||||||
let connection = $ref(null);
|
let connection = $ref(null);
|
||||||
|
let paginationComponentUser = $ref<InstanceType<typeof MkPagination>>();
|
||||||
|
let paginationComponentGroup = $ref<InstanceType<typeof MkPagination>>();
|
||||||
|
|
||||||
const tabs = ['dms', 'groups'];
|
const tabs = ['dms', 'groups'];
|
||||||
let tab = $ref(tabs[0]);
|
let tab = $ref(tabs[0]);
|
||||||
|
@ -89,30 +94,33 @@ definePageMetadata({
|
||||||
|
|
||||||
const dmsPagination = {
|
const dmsPagination = {
|
||||||
endpoint: 'messaging/history' as const,
|
endpoint: 'messaging/history' as const,
|
||||||
limit: 15,
|
limit: 20,
|
||||||
params: {
|
params: computed(() => ({
|
||||||
group: false,
|
group: false,
|
||||||
},
|
})),
|
||||||
|
offsetMode: true,
|
||||||
};
|
};
|
||||||
const groupsPagination = {
|
const groupsPagination = {
|
||||||
endpoint: 'messaging/history' as const,
|
endpoint: 'messaging/history' as const,
|
||||||
limit: 5,
|
limit: 10,
|
||||||
params: {
|
params: computed(() => ({
|
||||||
group: true,
|
group: true,
|
||||||
},
|
})),
|
||||||
|
offsetMode: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
function onMessage(message): void {
|
function onMessage(message): void {
|
||||||
if (message.recipientId) {
|
if (message.recipientId) {
|
||||||
messages = messages.filter(m => !(
|
messages = messages.filter(m => !(
|
||||||
(m.recipientId === message.recipientId && m.userId === message.userId) ||
|
(m.recipientId === message.recipientId && m.userId === message.userId) ||
|
||||||
(m.recipientId === message.userId && m.userId === message.recipientId)));
|
(m.recipientId === message.userId && m.userId === message.recipientId)));
|
||||||
|
|
||||||
messages.unshift(message);
|
messages.unshift(message);
|
||||||
} else if (message.groupId) {
|
} else if (message.groupId) {
|
||||||
groupMessages = groupMessages.filter(m => m.groupId !== message.groupId);
|
messages = messages.filter(m => m.groupId !== message.groupId);
|
||||||
groupMessages.unshift(message);
|
messages.unshift(message);
|
||||||
}
|
}
|
||||||
|
forceRerender();
|
||||||
}
|
}
|
||||||
|
|
||||||
function onRead(ids): void {
|
function onRead(ids): void {
|
||||||
|
@ -206,17 +214,17 @@ onUnmounted(() => {
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.yweeujhr {
|
.yweeujhr {
|
||||||
> .start {
|
>.start {
|
||||||
margin: 0 auto var(--margin) auto;
|
margin: 0 auto var(--margin) auto;
|
||||||
}
|
|
||||||
|
|
||||||
> .groupsbuttons {
|
|
||||||
max-width: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</style>
|
|
||||||
|
>.groupsbuttons {
|
||||||
|
max-width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
|
@ -460,7 +460,7 @@ export const routes = [
|
||||||
{
|
{
|
||||||
path: "/ads",
|
path: "/ads",
|
||||||
name: "ads",
|
name: "ads",
|
||||||
component: page(() => import("./pages/admin/ads.vue")),
|
component: page(() => import("./pages/admin/promotions.vue")),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/database",
|
path: "/database",
|
||||||
|
|
Loading…
Reference in New Issue