This commit is contained in:
mattyatea 2023-12-30 08:53:47 +09:00
parent e8ad65dc8a
commit 1456d49042
5 changed files with 7 additions and 20 deletions

View file

@ -44,6 +44,7 @@ export const paramDef = {
isSensitive: { type: 'boolean', nullable: true }, isSensitive: { type: 'boolean', nullable: true },
localOnly: { type: 'boolean', nullable: true }, localOnly: { type: 'boolean', nullable: true },
fileId: { type: 'string', format: 'misskey:id' }, fileId: { type: 'string', format: 'misskey:id' },
isNotifyIsHome: { type: 'boolean', nullable: true },
}, },
required: ['name', 'fileId'], required: ['name', 'fileId'],
} as const; } as const;
@ -86,7 +87,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
aliases: ps.aliases ?? [], aliases: ps.aliases ?? [],
license: ps.license ?? null, license: ps.license ?? null,
host: null, host: null,
draft: false,
isSensitive: ps.isSensitive ?? false, isSensitive: ps.isSensitive ?? false,
localOnly: ps.localOnly ?? false, localOnly: ps.localOnly ?? false,
roleIdsThatCanBeUsedThisEmojiAsReaction: [], roleIdsThatCanBeUsedThisEmojiAsReaction: [],

View file

@ -58,7 +58,7 @@ export const paramDef = {
}, },
}, },
}, },
required: ['name', 'fileId', 'draft'], required: ['name', 'fileId'],
} as const; } as const;
// TODO: ロジックをサービスに切り出す // TODO: ロジックをサービスに切り出す
@ -87,7 +87,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
license: ps.license ?? null, license: ps.license ?? null,
isSensitive: ps.isSensitive ?? false, isSensitive: ps.isSensitive ?? false,
localOnly: ps.localOnly ?? false, localOnly: ps.localOnly ?? false,
draft: false,
roleIdsThatCanBeUsedThisEmojiAsReaction: ps.roleIdsThatCanBeUsedThisEmojiAsReaction ?? [], roleIdsThatCanBeUsedThisEmojiAsReaction: ps.roleIdsThatCanBeUsedThisEmojiAsReaction ?? [],
}, me); }, me);

View file

@ -36,7 +36,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkButton v-else danger @click="removePinnedList()"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton> <MkButton v-else danger @click="removePinnedList()"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton>
</MkFolder> </MkFolder>
<MkSwitch v-model="showMediaTimeline">{{ i18n.ts.showMediaTimeline}}<template #caption>{{ i18n.ts.showMediaTimelineInfo }} </template></MkSwitch> <MkSwitch v-model="showMediaTimeline">{{ i18n.ts.showMediaTimeline}}<template #caption>{{ i18n.ts.showMediaTimelineInfo }} </template></MkSwitch>
<MkSwitch v-model="FeaturedOrNote">{{ i18n.ts.FeaturedOrNote}}<template #caption>{{ i18n.ts.FeaturedOrNoteInfo }} </template></MkSwitch>
<MkSwitch v-model="showGlobalTimeline">{{ i18n.ts.showGlobalTimeline }}</MkSwitch> <MkSwitch v-model="showGlobalTimeline">{{ i18n.ts.showGlobalTimeline }}</MkSwitch>
</div> </div>
</FormSection> </FormSection>
@ -325,7 +324,6 @@ const enablehanntenn = computed(defaultStore.makeGetterSetter('enablehanntenn'))
const showMediaTimeline = computed(defaultStore.makeGetterSetter('showMediaTimeline')); const showMediaTimeline = computed(defaultStore.makeGetterSetter('showMediaTimeline'));
const showGlobalTimeline = computed(defaultStore.makeGetterSetter('showGlobalTimeline')); const showGlobalTimeline = computed(defaultStore.makeGetterSetter('showGlobalTimeline'));
const showVisibilityColor = computed(defaultStore.makeGetterSetter('showVisibilityColor')) const showVisibilityColor = computed(defaultStore.makeGetterSetter('showVisibilityColor'))
const FeaturedOrNote = computed(defaultStore.makeGetterSetter('FeaturedOrNote'))
const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disableStreamingTimeline')); const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disableStreamingTimeline'));
const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroupedNotifications')); const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroupedNotifications'));
const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enableSeasonalScreenEffect')); const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enableSeasonalScreenEffect'));
@ -392,7 +390,6 @@ watch([
showMediaTimeline, showMediaTimeline,
showVisibilityColor, showVisibilityColor,
enableonlyAndWithSave, enableonlyAndWithSave,
FeaturedOrNote,
showGlobalTimeline, showGlobalTimeline,
disableStreamingTimeline, disableStreamingTimeline,
enableSeasonalScreenEffect, enableSeasonalScreenEffect,

View file

@ -148,14 +148,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<XActivity :key="user.id" :user="user"/> <XActivity :key="user.id" :user="user"/>
</MkLazy> </MkLazy>
</template> </template>
<div v-if="!defaultStore.state.FeaturedOrNote"> <div>
<div v-if="!disableNotes">
<MkLazy>
<XTimeline :user="user"/>
</MkLazy>
</div>
</div>
<div v-else>
<div style="margin-bottom: 8px;">{{ i18n.ts._sfx.note }}</div> <div style="margin-bottom: 8px;">{{ i18n.ts._sfx.note }}</div>
<MkNotes :class="$style.tl" :noGap="true" :pagination="Notes"/> <MkNotes :class="$style.tl" :noGap="true" :pagination="Notes"/>
</div> </div>
@ -195,6 +188,8 @@ import {isFollowingVisibleForMe, isFollowersVisibleForMe} from '@/scripts/isFfVi
import MkNotifyButton from "@/components/MkNotifyButton.vue"; import MkNotifyButton from "@/components/MkNotifyButton.vue";
import MkRemoteInfoUpdate from "@/components/MkRemoteInfoUpdate.vue"; import MkRemoteInfoUpdate from "@/components/MkRemoteInfoUpdate.vue";
import {defaultStore} from '@/store.js'; import {defaultStore} from '@/store.js';
import MkNotes from "@/components/MkNotes.vue";
import MkLazy from "@/components/global/MkLazy.vue";
function calcAge(birthdate: string): number { function calcAge(birthdate: string): number {
const date = new Date(birthdate); const date = new Date(birthdate);

View file

@ -478,10 +478,6 @@ export const defaultStore = markRaw(new Storage('base', {
where: 'device', where: 'device',
default: false, default: false,
}, },
FeaturedOrNote: {
where: 'device',
default: false
},
tlWithReplies: { tlWithReplies: {
where: 'device', where: 'device',
default: false, default: false,