mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-25 11:27:31 -07:00
chore: code reformat
This commit is contained in:
parent
5a2ca61f26
commit
b462e9d1fc
8 changed files with 141 additions and 78 deletions
|
@ -295,8 +295,7 @@ export const NoteRepository = db.getRepository(Note).extend({
|
|||
): Promise<Packed<"Note"> | undefined> {
|
||||
try {
|
||||
return await this.pack(src, me, options);
|
||||
}
|
||||
catch {
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
},
|
||||
|
|
|
@ -8,7 +8,11 @@ import { apiTimelineMastodon } from "./endpoints/timeline.js";
|
|||
import { apiNotificationsMastodon } from "./endpoints/notifications.js";
|
||||
import { apiSearchMastodon } from "./endpoints/search.js";
|
||||
import { getInstance } from "./endpoints/meta.js";
|
||||
import {convertAccount, convertAnnouncement, convertFilter} from "./converters.js";
|
||||
import {
|
||||
convertAccount,
|
||||
convertAnnouncement,
|
||||
convertFilter,
|
||||
} from "./converters.js";
|
||||
import { convertId, IdType } from "../index.js";
|
||||
import { Users } from "@/models/index.js";
|
||||
import { IsNull } from "typeorm";
|
||||
|
@ -63,7 +67,10 @@ export function apiMastodonCompatible(router: Router): void {
|
|||
},
|
||||
order: { id: "ASC" },
|
||||
});
|
||||
const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id)).data);
|
||||
const contact =
|
||||
admin == null
|
||||
? null
|
||||
: convertAccount((await client.getAccount(admin.id)).data);
|
||||
ctx.body = await getInstance(data.data, contact);
|
||||
} catch (e: any) {
|
||||
console.error(e);
|
||||
|
|
|
@ -6,9 +6,11 @@ import { IsNull } from "typeorm";
|
|||
import { MAX_NOTE_TEXT_LENGTH, FILE_TYPE_BROWSERSAFE } from "@/const.js";
|
||||
|
||||
// TODO: add iceshrimp features
|
||||
export async function getInstance(response: Entity.Instance, contact: Entity.Account) {
|
||||
const [meta, totalUsers, totalStatuses] =
|
||||
await Promise.all([
|
||||
export async function getInstance(
|
||||
response: Entity.Instance,
|
||||
contact: Entity.Account,
|
||||
) {
|
||||
const [meta, totalUsers, totalStatuses] = await Promise.all([
|
||||
fetchMeta(true),
|
||||
Users.count({ where: { host: IsNull() } }),
|
||||
Notes.count({ where: { userHost: IsNull() } }),
|
||||
|
|
|
@ -26,7 +26,7 @@ export default defineComponent({
|
|||
type: Boolean,
|
||||
required: false,
|
||||
default: false,
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
setup(props, { slots, expose }) {
|
||||
|
|
|
@ -79,7 +79,7 @@ const buttonsLeft = $computed(() => {
|
|||
const buttonsRight = $computed(() => {
|
||||
const buttons = [
|
||||
{
|
||||
icon: 'ph-arrow-clockwise ph-bold ph-lg',
|
||||
icon: "ph-arrow-clockwise ph-bold ph-lg",
|
||||
title: i18n.ts.reload,
|
||||
onClick: reload,
|
||||
},
|
||||
|
|
|
@ -64,7 +64,9 @@
|
|||
><i class="ph-code ph-bold ph-lg"></i
|
||||
></template>
|
||||
{{ i18n.ts._aboutIceshrimp.source }}
|
||||
<template #suffix>Iceshrimp development</template>
|
||||
<template #suffix
|
||||
>Iceshrimp development</template
|
||||
>
|
||||
</FormLink>
|
||||
</div>
|
||||
</FormSection>
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
<template #caption>
|
||||
<I18n :src="i18n.ts.i18nInfo" tag="span">
|
||||
<template #link>
|
||||
<MkLink url="https://hosted.weblate.org/engage/firefish/"
|
||||
<MkLink
|
||||
url="https://hosted.weblate.org/engage/firefish/"
|
||||
>Weblate</MkLink
|
||||
>
|
||||
</template>
|
||||
|
|
|
@ -8,64 +8,103 @@
|
|||
itemKey="id"
|
||||
:animation="150"
|
||||
:handle="'.' + $style.itemHandle"
|
||||
@start="e => e.item.classList.add('active')"
|
||||
@end="e => e.item.classList.remove('active')"
|
||||
@start="(e) => e.item.classList.add('active')"
|
||||
@end="(e) => e.item.classList.remove('active')"
|
||||
>
|
||||
<template #item="{ element, index }">
|
||||
<div
|
||||
v-if="element.type === '-' || navbarItemDef[element.type]"
|
||||
v-if="
|
||||
element.type === '-' ||
|
||||
navbarItemDef[element.type]
|
||||
"
|
||||
:class="$style.item"
|
||||
>
|
||||
<button class="_button" :class="$style.itemHandle"><i class="ph-list ph-bold ph-lg"></i></button>
|
||||
<i class="ti-fw" :class="[$style.itemIcon, navbarItemDef[element.type]?.icon]"></i><span :class="$style.itemText">{{ i18n.ts[navbarItemDef[element.type]?.title] ?? i18n.ts.divider }}</span>
|
||||
<button class="_button" :class="$style.itemRemove" @click="removeItem(index)"><i class="ph-x ph-bold ph-lg"></i></button>
|
||||
<button class="_button" :class="$style.itemHandle">
|
||||
<i class="ph-list ph-bold ph-lg"></i>
|
||||
</button>
|
||||
<i
|
||||
class="ti-fw"
|
||||
:class="[
|
||||
$style.itemIcon,
|
||||
navbarItemDef[element.type]?.icon,
|
||||
]"
|
||||
></i
|
||||
><span :class="$style.itemText">{{
|
||||
i18n.ts[navbarItemDef[element.type]?.title] ??
|
||||
i18n.ts.divider
|
||||
}}</span>
|
||||
<button
|
||||
class="_button"
|
||||
:class="$style.itemRemove"
|
||||
@click="removeItem(index)"
|
||||
>
|
||||
<i class="ph-x ph-bold ph-lg"></i>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</Sortable>
|
||||
</MkContainer>
|
||||
</FormSlot>
|
||||
<div class="buttons">
|
||||
<MkButton inline @click="addItem"><i class="ph-plus ph-bold ph-lg"></i> {{ i18n.ts.addItem }}</MkButton>
|
||||
<MkButton inline danger @click="reset"><i class="ph-arrow-clockwise ph-bold ph-lg"></i> {{ i18n.ts.default }}</MkButton>
|
||||
<MkButton inline primary class="save" @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
|
||||
<MkButton inline @click="addItem"
|
||||
><i class="ph-plus ph-bold ph-lg"></i>
|
||||
{{ i18n.ts.addItem }}</MkButton
|
||||
>
|
||||
<MkButton inline danger @click="reset"
|
||||
><i class="ph-arrow-clockwise ph-bold ph-lg"></i>
|
||||
{{ i18n.ts.default }}</MkButton
|
||||
>
|
||||
<MkButton inline primary class="save" @click="save"
|
||||
><i class="ph-floppy-disk ph-bold ph-lg"></i>
|
||||
{{ i18n.ts.save }}</MkButton
|
||||
>
|
||||
</div>
|
||||
|
||||
<FormRadios v-model="menuDisplay">
|
||||
<template #label>{{ i18n.ts.display }}</template>
|
||||
<option value="sideFull">{{ i18n.ts._menuDisplay.sideFull }}</option>
|
||||
<option value="sideIcon">{{ i18n.ts._menuDisplay.sideIcon }}</option>
|
||||
<option value="sideFull">
|
||||
{{ i18n.ts._menuDisplay.sideFull }}
|
||||
</option>
|
||||
<option value="sideIcon">
|
||||
{{ i18n.ts._menuDisplay.sideIcon }}
|
||||
</option>
|
||||
<!--<option value="top">{{ i18n.ts._menuDisplay.top }}</option>-->
|
||||
<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
|
||||
<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ i18n.ts._menuDisplay.hide }}</MkRadio>-->
|
||||
<!-- TODO: サイドバーを完全に隠せるようにすると、別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
|
||||
</FormRadios>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, defineAsyncComponent, ref, watch } from 'vue';
|
||||
import { computed, defineAsyncComponent, ref, watch } from "vue";
|
||||
import FormRadios from "@/components/form/radios.vue";
|
||||
import MkButton from '@/components/MkButton.vue';
|
||||
import FormSlot from '@/components/form/slot.vue';
|
||||
import MkContainer from '@/components/MkContainer.vue';
|
||||
import * as os from '@/os';
|
||||
import { navbarItemDef } from '@/navbar';
|
||||
import { defaultStore } from '@/store';
|
||||
import { unisonReload } from '@/scripts/unison-reload';
|
||||
import { i18n } from '@/i18n';
|
||||
import { definePageMetadata } from '@/scripts/page-metadata';
|
||||
import { deepClone } from '@/scripts/clone';
|
||||
import MkButton from "@/components/MkButton.vue";
|
||||
import FormSlot from "@/components/form/slot.vue";
|
||||
import MkContainer from "@/components/MkContainer.vue";
|
||||
import * as os from "@/os";
|
||||
import { navbarItemDef } from "@/navbar";
|
||||
import { defaultStore } from "@/store";
|
||||
import { unisonReload } from "@/scripts/unison-reload";
|
||||
import { i18n } from "@/i18n";
|
||||
import { definePageMetadata } from "@/scripts/page-metadata";
|
||||
import { deepClone } from "@/scripts/clone";
|
||||
|
||||
const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
|
||||
const Sortable = defineAsyncComponent(() =>
|
||||
import("vuedraggable").then((x) => x.default),
|
||||
);
|
||||
|
||||
const items = ref(defaultStore.state.menu.map(x => ({
|
||||
const items = ref(
|
||||
defaultStore.state.menu.map((x) => ({
|
||||
id: Math.random().toString(),
|
||||
type: x,
|
||||
})));
|
||||
})),
|
||||
);
|
||||
|
||||
const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
|
||||
const menuDisplay = computed(defaultStore.makeGetterSetter("menuDisplay"));
|
||||
|
||||
async function reloadAsk() {
|
||||
const { canceled } = await os.confirm({
|
||||
type: 'info',
|
||||
type: "info",
|
||||
text: i18n.ts.reloadToApplySetting,
|
||||
});
|
||||
if (canceled) return;
|
||||
|
@ -74,20 +113,30 @@ async function reloadAsk() {
|
|||
}
|
||||
|
||||
async function addItem() {
|
||||
const menu = Object.keys(navbarItemDef).filter(k => !defaultStore.state.menu.includes(k));
|
||||
const menu = Object.keys(navbarItemDef).filter(
|
||||
(k) => !defaultStore.state.menu.includes(k),
|
||||
);
|
||||
const { canceled, result: item } = await os.select({
|
||||
title: i18n.ts.addItem,
|
||||
items: [...menu.map(k => ({
|
||||
value: k, text: i18n.ts[navbarItemDef[k].title],
|
||||
})), {
|
||||
value: '-', text: i18n.ts.divider,
|
||||
}],
|
||||
items: [
|
||||
...menu.map((k) => ({
|
||||
value: k,
|
||||
text: i18n.ts[navbarItemDef[k].title],
|
||||
})),
|
||||
{
|
||||
value: "-",
|
||||
text: i18n.ts.divider,
|
||||
},
|
||||
],
|
||||
});
|
||||
if (canceled) return;
|
||||
items.value = [...items.value, {
|
||||
items.value = [
|
||||
...items.value,
|
||||
{
|
||||
id: Math.random().toString(),
|
||||
type: item,
|
||||
}];
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
function removeItem(index: number) {
|
||||
|
@ -95,12 +144,15 @@ function removeItem(index: number) {
|
|||
}
|
||||
|
||||
async function save() {
|
||||
defaultStore.set('menu', items.value.map(x => x.type));
|
||||
defaultStore.set(
|
||||
"menu",
|
||||
items.value.map((x) => x.type),
|
||||
);
|
||||
await reloadAsk();
|
||||
}
|
||||
|
||||
function reset() {
|
||||
items.value = defaultStore.def.menu.default.map(x => ({
|
||||
items.value = defaultStore.def.menu.default.map((x) => ({
|
||||
id: Math.random().toString(),
|
||||
type: x,
|
||||
}));
|
||||
|
@ -116,7 +168,7 @@ const headerTabs = $computed(() => []);
|
|||
|
||||
definePageMetadata({
|
||||
title: i18n.ts.navbar,
|
||||
icon: 'ti ti-list',
|
||||
icon: "ti ti-list",
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
Loading…
Reference in a new issue