Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-mattyatea/schedule-note' into develop

Browse source 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/RoleService.ts
#	packages/frontend/src/components/MkNoteHeader.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/navbar.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
This commit is contained in:
mattyatea 2023-12-02 00:50:04 +09:00
commit b7f9ad1944
39 changed files with 900 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/frontend/src/components/MkNoteHeader.vue
View file

@ -18,7 +18,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="mock">
<MkTime :time="note.createdAt" colored/>
</div>
<MkA v-else :to="notePage(note)">
<MkTime v-else-if="note.isSchedule" mode="absolute" :time="note.createdAt" colored/>
<MkA v-else :to="notePage(note)">
<MkTime :time="note.createdAt" colored/>
</MkA>
<span v-if="note.visibility !== 'public'" style="margin-left: 0.5em;" :title="i18n.ts._visibility[note.visibility]">
@ -40,7 +41,8 @@ import { notePage } from '@/filters/note.js';
import { userPage } from '@/filters/user.js';
const mock = inject<boolean>('mock', false);
defineProps<{
note: Misskey.entities.Note;
note: Misskey.entities.Note & {isSchedule? : boolean};
scheduled?: boolean;
}>();
</script>