natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into note-improvements

This commit is contained in:
Kainoa Kanter 2023-01-20 00:19:53 +00:00
parent 976a2b74fd 8e79ab69b0
commit 81bd92efa9
24 changed files with 169 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -6,12 +6,12 @@
**🌎 **[Calckey](https://i.calckey.cloud/)** is an open source, decentralized social media platform that's free forever! 🚀**
[![no github badge](https://nogithub.codeberg.page/badge.svg)](https://nogithub.codeberg.page/)
[![status badge](https://ci.lavaforge.org/api/badges/calckey/calckey/status.svg)](https://ci.lavaforge.org/calckey/calckey)
[![status badge](https://ci.codeberg.org/api/badges/calckey/calckey/status.svg)](https://ci.codeberg.org/calckey/calckey)
[![liberapay badge](https://img.shields.io/liberapay/receives/ThatOneCalculator?logo=liberapay)](https://liberapay.com/ThatOneCalculator)
[![translate-badge](https://hosted.weblate.org/widgets/calckey/-/svg-badge.svg)](https://hosted.weblate.org/engage/calckey/)
[![docker badge](https://img.shields.io/docker/pulls/thatonecalculator/calckey?logo=docker)](https://hub.docker.com/r/thatonecalculator/calckey)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](./CODE_OF_CONDUCT.md)
[![lavaforge badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-lavaforge-FF8066.svg?logo=lavaforge&logoColor=white)](https://lavaforge.org/calckey/calckey/)
[![lavaforge badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-lavaforge-FF8066.svg?logo=lavaforge&logoColor=white)](https://codeberg.org/calckey/calckey/)
</div>
@ -92,7 +92,7 @@ If you have access to a server that supports one of the sources below, I recomme
## 👀 Get folder ready
```sh
git clone https://lavaforge.org/calckey/calckey.git
git clone https://codeberg.org/calckey/calckey.git
cd calckey/
# git checkout main # if you want only stable versions
```

2
issue_template/bug.yaml
View File

@ -64,7 +64,7 @@ body:
id: terms
attributes:
label: Contribution Guidelines
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://lavaforge.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
options:
- label: I agree to follow this project's Contribution Guidelines
required: true

2
issue_template/feature.yaml
View File

@ -64,7 +64,7 @@ body:
id: terms
attributes:
label: Contribution Guidelines
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://lavaforge.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
options:
- label: I agree to follow this project's Contribution Guidelines
required: true

2
package.json
View File

@ -4,7 +4,7 @@
"codename": "aqua",
"repository": {
"type": "git",
"url": "https://lavaforge.org/calckey/calckey.git"
"url": "https://codeberg.org/calckey/calckey.git"
},
"packageManager": "pnpm@7.25.0",
"private": true,

2
packages/backend/src/boot/master.ts
View File

@ -48,7 +48,7 @@ function greet() {
136,
0,
)(
" If you like Calckey, please consider starring or contributing to the repo. https://lavaforge.org/calckey/calckey",
" If you like Calckey, please consider starring or contributing to the repo. https://codeberg.org/calckey/calckey",
),
);

6
packages/backend/src/misc/reaction-lib.ts
View File

@ -64,11 +64,11 @@ export async function toDbReaction(
// 文字列タイプのリアクションを絵文字に変換
if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
// Unicode emoji
// Unicode絵文字
const match = emojiRegex.exec(reaction);
if (match) {
//return only first emoji
return match[0];
const unicode = match[0];
return unicode.match('\u200d') ? unicode : unicode.replace(/\ufe0f/g, '');
}
const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);

4
packages/backend/src/models/entities/meta.ts
View File

@ -394,14 +394,14 @@ export class Meta {
@Column('varchar', {
length: 512,
default: 'https://lavaforge.org/calckey/calckey',
default: 'https://codeberg.org/calckey/calckey',
nullable: false,
})
public repositoryUrl: string;
@Column('varchar', {
length: 512,
default: 'https://lavaforge.org/calckey/calckey/issues/new',
default: 'https://codeberg.org/calckey/calckey/issues/new',
nullable: true,
})
public feedbackUrl: string | null;

2
packages/backend/src/server/api/endpoints/latest-version.ts
View File

@ -16,7 +16,7 @@ export const paramDef = {
export default define(meta, paramDef, async () => {
let tag_name;
await fetch(
"https://lavaforge.org/api/v1/repos/calckey/calckey/releases?draft=false&pre-release=false&page=1&limit=1",
"https://codeberg.org/api/v1/repos/calckey/calckey/releases?draft=false&pre-release=false&page=1&limit=1",
)
.then((response) => response.json())
.then((data) => {

4
packages/backend/src/server/api/endpoints/meta.ts
View File

@ -68,13 +68,13 @@ export const meta = {
type: "string",
optional: false,
nullable: false,
default: "https://lavaforge.org/calckey/calckey",
default: "https://codeberg.org/calckey/calckey",
},
feedbackUrl: {
type: "string",
optional: false,
nullable: false,
default: "https://lavaforge.org/calckey/calckey/issues",
default: "https://codeberg.org/calckey/calckey/issues",
},
defaultDarkTheme: {
type: "string",

2
packages/backend/src/server/api/endpoints/patrons.ts
View File

@ -17,7 +17,7 @@ export const paramDef = {
export default define(meta, paramDef, async () => {
let patrons;
await fetch(
"https://lavaforge.org/calckey/calckey/raw/branch/develop/patrons.json",
"https://codeberg.org/calckey/calckey/raw/branch/develop/patrons.json",
)
.then((response) => response.json())
.then((data) => {

2
packages/backend/src/server/api/endpoints/release.ts
View File

@ -18,7 +18,7 @@ export default define(meta, paramDef, async () => {
let release;
await fetch(
"https://lavaforge.org/calckey/calckey/raw/branch/develop/release.json",
"https://codeberg.org/calckey/calckey/raw/branch/develop/release.json",
)
.then((response) => response.json())
.then((data) => {

4
packages/backend/src/server/api/openapi/gen-spec.ts
View File

@ -15,7 +15,7 @@ export function genOpenapiSpec() {
externalDocs: {
description: "Repository",
url: "https://lavaforge.org/calckey/calckey",
url: "https://codeberg.org/calckey/calckey",
},
servers: [
@ -106,7 +106,7 @@ export function genOpenapiSpec() {
description: desc,
externalDocs: {
description: "Source code",
url: `https://lavaforge.org/calckey/calckey/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
url: `https://codeberg.org/calckey/calckey/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
},
tags: endpoint.meta.tags || undefined,
security,

2
packages/backend/src/server/web/views/base.pug
View File

@ -16,7 +16,7 @@ doctype html
Thank you for using Calckey!
If you are reading this message... how about joining the development?
https://lavaforge.org/calckey/calckey
https://codeberg.org/calckey/calckey
html

2
packages/client/src/components/MkNotes.vue
View File

@ -1,5 +1,5 @@
<template>
<MkPagination ref="pagingComponent" :pagination="pagination">
<MkPagination ref="pagingComponent" :pagination="pagination" disableReload="true">
<template #empty>
<div class="_fullinfo">
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>

126
packages/client/src/components/MkPagination.vue
View File

@ -1,34 +1,37 @@
<template>
<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
<MkLoading v-if="fetching"/>
<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
<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">
<slot name="empty">
<div class="_fullinfo">
<img src="/static-assets/badges/info.png" class="_ghost" alt="Error"/>
<div>{{ i18n.ts.nothing }}</div>
<div v-else-if="empty" key="_empty_" class="empty">
<slot name="empty">
<div class="_fullinfo">
<img src="/static-assets/badges/info.png" class="_ghost" alt="Error" />
<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>
</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>
</transition>
</transition>
</template>
<script lang="ts" setup>
@ -66,6 +69,7 @@ const props = withDefaults(defineProps<{
disableAutoLoad?: boolean;
displayLimit?: number;
externalItemArray?: Ref<Array<any>>;
disableReload?: boolean;
}>(), {
displayLimit: 30,
});
@ -74,7 +78,7 @@ const emit = defineEmits<{
(ev: 'queue', count: number): void;
}>();
type Item = { id: string; [another: string]: unknown; };
type Item = { id: string;[another: string]: unknown; };
const rootEl = ref<HTMLElement>();
const items = ref<Item[]>([]);
@ -87,6 +91,7 @@ const backed = ref(false); // 遡り中か否か
const isBackTop = ref(false);
const empty = computed(() => items.value.length === 0);
const error = ref(false);
const alreadyInitedOnce = ref(false);
const init = async (): Promise<void> => {
queue.value = [];
@ -107,14 +112,17 @@ const init = async (): Promise<void> => {
if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) {
res.pop();
items.value = props.pagination.reversed ? [...res].reverse() : res;
if (props.externalItemArray) {
props.externalItemArray.value = items.value;
}
more.value = true;
} else {
items.value = props.pagination.reversed ? [...res].reverse() : res;
if (props.externalItemArray) {
props.externalItemArray.value = items.value;
}
more.value = false;
}
if(props.externalItemArray) {
props.externalItemArray.value = items.value;
}
offset.value = res.length;
error.value = false;
fetching.value = false;
@ -126,7 +134,7 @@ const init = async (): Promise<void> => {
const reload = (): void => {
items.value = [];
if(props.externalItemArray) {
if (props.externalItemArray) {
props.externalItemArray.value = [];
}
init();
@ -188,14 +196,17 @@ const fetchMore = async (): Promise<void> => {
if (res.length > SECOND_FETCH_LIMIT) {
res.pop();
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;
} else {
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;
}
if(props.externalItemArray) {
props.externalItemArray.value = items.value;
}
offset.value += res.length;
moreFetching.value = false;
}, err => {
@ -221,14 +232,17 @@ const fetchMoreAhead = async (): Promise<void> => {
if (res.length > SECOND_FETCH_LIMIT) {
res.pop();
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;
} else {
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;
}
if(props.externalItemArray) {
props.externalItemArray.value = items.value;
}
offset.value += res.length;
moreFetching.value = false;
}, err => {
@ -254,7 +268,7 @@ const prepend = (item: Item): void => {
//items.value = items.value.slice(-props.displayLimit);
while (items.value.length >= props.displayLimit) {
items.value.shift();
if(props.externalItemArray) props.externalItemArray.value.shift();
if (props.externalItemArray) props.externalItemArray.value.shift();
}
more.value = true;
}
@ -262,13 +276,13 @@ const prepend = (item: Item): void => {
}
}
items.value.push(item);
if(props.externalItemArray) props.externalItemArray.value.push(item);
if (props.externalItemArray) props.externalItemArray.value.push(item);
// TODO
} else {
// 初回表示時はunshiftだけでOK
if (!rootEl.value) {
items.value.unshift(item);
if(props.externalItemArray) props.externalItemArray.value.unshift(item);
if (props.externalItemArray) props.externalItemArray.value.unshift(item);
return;
}
@ -277,18 +291,7 @@ const prepend = (item: Item): void => {
if (isTop) {
// Prepend the item
items.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;
}
if (props.externalItemArray) props.externalItemArray.value.unshift(item);
} else {
queue.value.push(item);
onScrollTop(rootEl.value, () => {
@ -303,28 +306,30 @@ const prepend = (item: Item): void => {
const append = (item: Item): void => {
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 i = items.value.findIndex(finder);
if (i === -1) {
const j = props.externalItemArray?.findIndex(finder);
if (i === -1 && j === -1) {
return false;
}
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;
};
const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => {
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;
}
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;
};
@ -341,10 +346,14 @@ init();
onActivated(() => {
isBackTop.value = false;
if(alreadyInitedOnce.value && (!props.disableReload || !props.disableReload.value)) {
reload();
}
});
onDeactivated(() => {
isBackTop.value = window.scrollY === 0;
alreadyInitedOnce.value = true;
});
defineExpose({
@ -365,13 +374,14 @@ defineExpose({
.fade-leave-active {
transition: opacity 0.15s ease;
}
.fade-enter-from,
.fade-leave-to {
opacity: 0;
}
.cxiknjgy {
> .button {
>.button {
margin-left: auto;
margin-right: auto;
}

12
packages/client/src/components/MkTokenGenerateWindow.vue
View File

@ -2,28 +2,28 @@
<XModalWindow
ref="dialog"
:width="400"
:height="450"
:height="600"
:with-ok-button="true"
:ok-button-disabled="false"
:can-close="false"
@close="dialog.close()"
@closed="$emit('closed')"
@ok="ok()"
style="padding: 12px"
>
<template #header>{{ title || i18n.ts.generateAccessToken }}</template>
<div v-if="information" class="_section">
<MkInfo warn>{{ information }}</MkInfo>
</div>
<div class="_section">
<MkInput v-model="name">
<template #label>{{ i18n.ts.name }}</template>
</MkInput>
<div style="margin-bottom: 16px;"><b>{{ i18n.ts.name }}</b></div>
<MkInput style="margin-bottom: 16px;" v-model="name"/>
</div>
<div class="_section">
<div style="margin-bottom: 16px;"><b>{{ i18n.ts.permission }}</b></div>
<MkButton inline @click="disableAll">{{ i18n.ts.disableAll }}</MkButton>
<MkButton inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
<MkSwitch v-for="kind in (initialPermissions || kinds)" :key="kind" v-model="permissions[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
<MkButton style="margin-bottom: 12px;" inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
<MkSwitch style="margin-bottom: 6px;" v-for="kind in (initialPermissions || kinds)" :key="kind" v-model="permissions[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
</div>
</XModalWindow>
</template>

6
packages/client/src/pages/about-calckey.vue
View File

@ -12,14 +12,14 @@
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$instance.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span>
</div>
<div class="_formBlock" style="text-align: center;">
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://lavaforge.org/calckey/calckey" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://codeberg.org/calckey/calckey" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
</div>
<div class="_formBlock" style="text-align: center;">
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Calckey</MkButton>
</div>
<FormSection>
<div class="_formLinks">
<FormLink to="https://lavaforge.org/calckey/calckey" external>
<FormLink to="https://codeberg.org/calckey/calckey" external>
<template #icon><i class="ph-code-bold ph-lg"></i></template>
{{ i18n.ts._aboutMisskey.source }}
<template #suffix>Codeberg</template>
@ -44,7 +44,7 @@
<FormLink to="/@syuilo@misskey.io"><Mfm :text="'@syuilo@misskey.io (Original Misskey developer)'"/></FormLink>
<FormLink to="https://www.youtube.com/c/Henkiwashere" external>Henki (error images artist)</FormLink>
</div>
<template #caption><MkLink url="https://lavaforge.org/calckey/calckey/activity">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
<template #caption><MkLink url="https://codeberg.org/calckey/calckey/activity">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
</FormSection>
<FormSection>
<template #label><Mfm text="$[jelly ❤]"/> {{ i18n.ts._aboutMisskey.patrons }}</template>

2
packages/client/src/pages/admin/index.vue
View File

@ -11,7 +11,7 @@
<MkInfo v-if="noMaintainerInformation" warn class="info">{{ i18n.ts.noMaintainerInformationWarning }} <MkA to="/admin/settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
<MkInfo v-if="noBotProtection" warn class="info">{{ i18n.ts.noBotProtectionWarning }} <MkA to="/admin/security" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
<MkInfo v-if="noEmailServer" warn class="info">{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo>
<MkInfo v-if="updateAvailable" warn class="info">{{ i18n.ts.updateAvailable }} <a href="https://lavaforge.org/calckey/calckey/releases" target="_bank" class="_link">{{ i18n.ts.check }}</a></MkInfo>
<MkInfo v-if="updateAvailable" warn class="info">{{ i18n.ts.updateAvailable }} <a href="https://codeberg.org/calckey/calckey/releases" target="_bank" class="_link">{{ i18n.ts.check }}</a></MkInfo>
<MkSuperMenu :def="menuDef" :grid="currentPage?.route.name == null"></MkSuperMenu>
</div>

0
packages/client/src/pages/admin/ads.vue → packages/client/src/pages/admin/promotions.vue
View File

124
packages/client/src/pages/messaging/index.vue
View File

@ -1,43 +1,47 @@
<template>
<MkStickyContainer>
<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
<div>
<MkSpacer :content-max="800">
<swiper
:modules="[Virtual]"
:space-between="20"
:virtual="true"
:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
@swiper="setSwiperRef"
@slide-change="onSlideChange"
>
<swiper-slide>
<div class="_content yweeujhr dms">
<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{ i18n.ts.startMessaging }}</MkButton>
<MkPagination v-slot="{}" :externalItemArray="messages" :pagination="dmsPagination">
<MkChatPreview v-for="message in messages" :key="message.id" class="yweeujhr message _block" :message="message"/>
</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>
<MkStickyContainer>
<template #header>
<MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" />
</template>
<div>
<MkSpacer :content-max="800">
<swiper :modules="[Virtual]" :space-between="20" :virtual="true"
:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)" @swiper="setSwiperRef"
@slide-change="onSlideChange">
<swiper-slide>
<div class="_content yweeujhr dms">
<MkButton primary class="start" @click="startUser"><i class="ph-plus-bold ph-lg"></i> {{
i18n.ts.startMessaging
}}</MkButton>
<MkPagination v-slot="{ items }" :pagination="dmsPagination">
<MkChatPreview v-for="message in items" :key="message.id" class="yweeujhr message _block"
:message="message" />
</MkPagination>
</div>
<MkPagination v-slot="{}" :externalItemArray="groupMessages" :pagination="groupsPagination">
<MkChatPreview v-for="message in groupMessages" :key="message.id" class="yweeujhr message _block" :message="message"/>
</MkPagination>
</div>
</swiper-slide>
</swiper>
</MkSpacer>
</div>
</MkStickyContainer>
</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>
<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>
<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 { Virtual } from 'swiper';
import { Swiper, SwiperSlide } from 'swiper/vue';
@ -58,8 +62,9 @@ import 'swiper/scss/virtual';
const router = useRouter();
let messages = $ref([]);
let groupMessages = $ref([]);
let connection = $ref(null);
let paginationComponentUser = $ref<InstanceType<typeof MkPagination>>();
let paginationComponentGroup = $ref<InstanceType<typeof MkPagination>>();
const tabs = ['dms', 'groups'];
let tab = $ref(tabs[0]);
@ -89,30 +94,33 @@ definePageMetadata({
const dmsPagination = {
endpoint: 'messaging/history' as const,
limit: 15,
params: {
limit: 20,
params: computed(() => ({
group: false,
},
})),
offsetMode: true,
};
const groupsPagination = {
endpoint: 'messaging/history' as const,
limit: 5,
params: {
limit: 10,
params: computed(() => ({
group: true,
},
})),
offsetMode: true,
};
function onMessage(message): void {
if (message.recipientId) {
messages = messages.filter(m => !(
(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);
} else if (message.groupId) {
groupMessages = groupMessages.filter(m => m.groupId !== message.groupId);
groupMessages.unshift(message);
messages = messages.filter(m => m.groupId !== message.groupId);
messages.unshift(message);
}
forceRerender();
}
function onRead(ids): void {
@ -206,17 +214,17 @@ onUnmounted(() => {
});
</script>
<style lang="scss" scoped>
.yweeujhr {
> .start {
margin: 0 auto var(--margin) auto;
}
> .groupsbuttons {
max-width: 100%;
display: flex;
justify-content: center;
margin-bottom: 1rem;
}
<style lang="scss" scoped>
.yweeujhr {
>.start {
margin: 0 auto var(--margin) auto;
}
</style>
>.groupsbuttons {
max-width: 100%;
display: flex;
justify-content: center;
margin-bottom: 1rem;
}
}
</style>

2
packages/client/src/router.ts
View File

@ -460,7 +460,7 @@ export const routes = [
{
path: "/ads",
name: "ads",
component: page(() => import("./pages/admin/ads.vue")),
component: page(() => import("./pages/admin/promotions.vue")),
},
{
path: "/database",

2
packages/client/src/ui/visitor/a.vue
View File

@ -28,7 +28,7 @@
</main>
<div class="powered-by">
<b><MkA to="/">{{ host }}</MkA></b>
<small>Powered by <a href="https://lavaforge.org/calckey/calckey" target="_blank">Calckey</a></small>
<small>Powered by <a href="https://codeberg.org/calckey/calckey" target="_blank">Calckey</a></small>
</div>
</div>
</div>

2
packages/client/src/ui/visitor/b.vue
View File

@ -14,7 +14,7 @@
</main>
<div v-if="!root" class="powered-by">
<b><MkA to="/">{{ host }}</MkA></b>
<small>Powered by <a href="https://lavaforge.org/calckey/calckey" target="_blank">Calckey</a></small>
<small>Powered by <a href="https://codeberg.org/calckey/calckey" target="_blank">Calckey</a></small>
</div>
</div>
</div>

2
packages/client/src/ui/visitor/kanban.vue
View File

@ -28,7 +28,7 @@
</div>
<div v-if="poweredBy" class="powered-by">
<b><MkA to="/">{{ host }}</MkA></b>
<small>Powered by <a href="https://lavaforge.org/calckey/calckey" target="_blank">Calckey</a></small>
<small>Powered by <a href="https://codeberg.org/calckey/calckey" target="_blank">Calckey</a></small>
</div>
</template>
</div>