misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/2024.10

Browse source
This commit is contained in:
dakkar 2024-12-12 17:38:29 +00:00
commit b266a5f9f6
20 changed files with 93 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/frontend/src/components/MkFlashPreview.vue
View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</p>
<footer>
<img class="icon" :src="flash.user.avatarUrl"/>
<p>{{ userName(flash.user) }}</p>
<MkUserName :key="flash.user.id" :user="flash.user"/>
</footer>
</article>
</MkA>
@ -23,7 +23,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { } from 'vue';
import * as Misskey from 'misskey-js';
import { userName } from '@/filters/user.js';
const props = defineProps<{
flash: Misskey.entities.Flash;

3
packages/frontend/src/components/MkPagePreview.vue
View file

@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<p v-if="page.summary" :title="page.summary">{{ page.summary.length > 85 ? page.summary.slice(0, 85) + '…' : page.summary }}</p>
<footer>
<img v-if="page.user.avatarUrl" class="icon" :src="page.user.avatarUrl"/>
<p>{{ userName(page.user) }}</p>
<MkUserName :key="page.user.id" :user="page.user"/>
</footer>
</article>
</MkA>
@ -30,7 +30,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { } from 'vue';
import * as Misskey from 'misskey-js';
import { userName } from '@/filters/user.js';
import MediaImage from '@/components/MkMediaImage.vue';
const props = defineProps<{

2
packages/frontend/src/components/MkUserSetupDialog.Privacy.vue
View file

@ -44,7 +44,7 @@ import MkFolder from '@/components/MkFolder.vue';
import { misskeyApi } from '@/scripts/misskey-api.js';
const isLocked = ref(false);
const hideOnlineStatus = ref(false);
const hideOnlineStatus = ref(true);
const noCrawle = ref(false);
watch([isLocked, hideOnlineStatus, noCrawle], () => {

6
packages/frontend/src/pages/settings/privacy.vue
View file

@ -43,6 +43,10 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.makeExplorable }}
<template #caption>{{ i18n.ts.makeExplorableDescription }}</template>
</MkSwitch>
<MkSwitch v-model="enableRss" @update:modelValue="save()">
{{ i18n.ts.enableRss }}
<template #caption>{{ i18n.ts.enableRssDescription }}</template>
</MkSwitch>
<FormSection>
<template #label>{{ i18n.ts.lockdown }}<span class="_beta">{{ i18n.ts.beta }}</span></template>
@ -180,6 +184,7 @@ const isLocked = ref($i.isLocked);
const autoAcceptFollowed = ref($i.autoAcceptFollowed);
const noCrawle = ref($i.noCrawle);
const noindex = ref($i.noindex);
const enableRss = ref($i.enableRss);
const isExplorable = ref($i.isExplorable);
const requireSigninToViewContents = ref($i.requireSigninToViewContents ?? false);
const makeNotesFollowersOnlyBefore = ref($i.makeNotesFollowersOnlyBefore ?? null);
@ -237,6 +242,7 @@ function save() {
autoAcceptFollowed: !!autoAcceptFollowed.value,
noCrawle: !!noCrawle.value,
noindex: !!noindex.value,
enableRss: !!enableRss.value,
isExplorable: !!isExplorable.value,
requireSigninToViewContents: !!requireSigninToViewContents.value,
makeNotesFollowersOnlyBefore: makeNotesFollowersOnlyBefore.value,