+
+
+
+
+
![]()
-
{{ i18n.ts.nothing }}
+
-
+
+
+
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 1450a3022db1..f40dc1b2b5b3 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
![]()
@@ -52,16 +58,19 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts._notification.pollEnded }}
- {{ i18n.ts._notification.newNote }}:
(null);
const autocompleteTextareaInput = ref(null);
const autocompleteCwInput = ref(null);
const autocompleteHashtagsInput = ref(null);
@@ -259,11 +265,15 @@ const placeholder = computed((): string => {
});
const submitText = computed((): string => {
- return renote.value
- ? i18n.ts.quote
- : reply.value
- ? i18n.ts.reply
- : i18n.ts.note;
+ if (scheduledTime.value) {
+ return i18n.ts.schedule;
+ } else if (renote.value) {
+ return i18n.ts.quote;
+ } else if (reply.value) {
+ return i18n.ts.reply;
+ } else {
+ return i18n.ts.note;
+ }
});
const textLength = computed((): number => {
@@ -389,6 +399,7 @@ function watchForDraft() {
watch(files, () => saveDraft(), { deep: true });
watch(visibility, () => saveDraft());
watch(localOnly, () => saveDraft());
+ watch(scheduledTime, () => saveDraft());
}
function checkMissingMention() {
@@ -583,10 +594,25 @@ function removeVisibleUser(user) {
visibleUsers.value = erase(user, visibleUsers.value);
}
+async function setScheduledTime() {
+ const { canceled, result: date } = await os.inputDateTime({
+ title: i18n.ts.setScheduledTime,
+ });
+ if (canceled) return;
+
+ scheduledTime.value = date;
+}
+
function clear() {
text.value = '';
+ useCw.value = false;
+ cw.value = null;
+ visibility.value = defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility;
+ localOnly.value = defaultStore.state.rememberNoteVisibility ? defaultStore.state.localOnly : defaultStore.state.defaultNoteLocalOnly;
files.value = [];
poll.value = null;
+ visibleUsers.value = [];
+ scheduledTime.value = null;
quoteId.value = null;
}
@@ -694,10 +720,16 @@ function onDrop(ev: DragEvent): void {
function saveDraft() {
if (props.instant || props.mock) return;
- const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record;
+ let scheduledAt = scheduledTime.value ?? null;
+ if (scheduledAt && (isNaN(scheduledAt.getTime()) || scheduledAt.getTime() < Date.now())) {
+ scheduledAt = null;
+ }
+
+ const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record;
draftData[draftKey.value] = {
updatedAt: new Date().toISOString(),
+ scheduledAt: scheduledAt?.toISOString() ?? null,
channel: channel.value ? {
id: channel.value.id,
name: channel.value.name,
@@ -737,7 +769,7 @@ function saveDraft() {
}
function deleteDraft() {
- const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record;
+ const draftData = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record;
delete draftData[draftKey.value];
@@ -777,7 +809,7 @@ async function openDrafts() {
}
function loadDraft(exactMatch = false) {
- const drafts = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record;
+ const drafts = JSON.parse(miLocalStorage.getItem('drafts') ?? '{}') as Record;
const scope = exactMatch ? draftKey.value : draftKey.value.replace(`note:${draftId.value}`, 'note:');
const draft = Object.entries(drafts).filter(([k]) => k.startsWith(scope))
.map(r => ({ key: r[0], value: { ...r[1], updatedAt: new Date(r[1].updatedAt).getTime() } }))
@@ -788,7 +820,11 @@ function loadDraft(exactMatch = false) {
draftId.value = draft.key.replace(scope, '');
}
- text.value = draft.value.data.text;
+ scheduledTime.value = draft.value.scheduledAt ? new Date(draft.value.scheduledAt) : null;
+ if (scheduledTime.value && (isNaN(scheduledTime.value.getTime()) || scheduledTime.value.getTime() < Date.now())) {
+ scheduledTime.value = null;
+ }
+ text.value = draft.value.data.text ?? '';
useCw.value = draft.value.data.useCw;
cw.value = draft.value.data.cw;
visibility.value = draft.value.data.visibility;
@@ -872,6 +908,7 @@ async function post(ev?: MouseEvent) {
visibility: visibility.value,
visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(u => u.id) : undefined,
reactionAcceptance: reactionAcceptance.value,
+ scheduledAt: scheduledTime.value?.getTime() ?? undefined,
noCreatedNote: true,
};
@@ -1079,6 +1116,7 @@ onMounted(() => {
visibility.value = init.visibility;
localOnly.value = init.localOnly ?? false;
quoteId.value = init.renote ? init.renote.id : null;
+ scheduledTime.value = null;
}
nextTick(() => watchForDraft());
@@ -1352,6 +1390,13 @@ defineExpose({
}
}
+.scheduledTime {
+ display: flex;
+ padding: 8px 24px;
+ gap: 4px;
+ background: var(--infoBg);
+}
+
.footer {
display: flex;
padding: 0 16px 16px 16px;
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index 32b0bb353bc9..1483b9d0c094 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -67,6 +67,9 @@ export const notificationTypes = [
'followRequestAccepted',
'roleAssigned',
'achievementEarned',
+ 'noteScheduled',
+ 'scheduledNotePosted',
+ 'scheduledNoteError',
'app',
] as const;
export const obsoleteNotificationTypes = ['pollVote', 'groupInvited'] as const;
@@ -75,6 +78,7 @@ export const ROLE_POLICIES = [
'gtlAvailable',
'ltlAvailable',
'canPublicNote',
+ 'canScheduleNote',
'canInitiateConversation',
'canCreateContent',
'canUpdateContent',
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 5560335d838e..9a5243926808 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -427,28 +427,36 @@ export function inputNumber(props: {
});
}
-export function inputDate(props: {
+export function inputDateTime(props: {
title?: string | null;
text?: string | null;
placeholder?: string | null;
- default?: string | null;
+ default?: Date | null;
}): Promise<{
canceled: true; result: undefined;
} | {
canceled: false; result: Date;
}> {
+ const defaultValue = props.default ?? new Date();
+ defaultValue.setMinutes(defaultValue.getMinutes() - defaultValue.getTimezoneOffset());
+
return new Promise(resolve => {
popup(MkDialog, {
title: props.title ?? undefined,
text: props.text ?? undefined,
input: {
- type: 'date',
+ type: 'datetime-local',
placeholder: props.placeholder,
- default: props.default ?? null,
+ default: defaultValue.toISOString().slice(0, -5),
},
}, {
done: result => {
- resolve(result ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
+ const date = result ? new Date(result.result) : undefined;
+ if (date && !isNaN(date.getTime())) {
+ resolve({ result: date, canceled: false });
+ } else {
+ resolve({ result: undefined, canceled: true });
+ }
},
}, 'closed');
});
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 2665bfb906c3..d4d5b50500ca 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -165,6 +165,26 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._role._options.canScheduleNote }}
+
+ {{ i18n.ts._role.useBaseValue }}
+ {{ role.policies.canScheduleNote.value ? i18n.ts.yes : i18n.ts.no }}
+
+
+
+
{{ i18n.ts._role._options.canInitiateConversation }}
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index 62782ef75100..132ecbd31b32 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -48,6 +48,14 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._role._options.canScheduleNote }}
+ {{ policies.canScheduleNote ? i18n.ts.yes : i18n.ts.no }}
+
+ {{ i18n.ts.enable }}
+
+
+
{{ i18n.ts._role._options.canInitiateConversation }}
{{ policies.canInitiateConversation ? i18n.ts.yes : i18n.ts.no }}
diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue
index 273250d1d000..b9e804c3f641 100644
--- a/packages/frontend/src/pages/antenna-timeline.vue
+++ b/packages/frontend/src/pages/antenna-timeline.vue
@@ -57,7 +57,7 @@ function top() {
}
async function timetravel() {
- const { canceled, result: date } = await os.inputDate({
+ const { canceled, result: date } = await os.inputDateTime({
title: i18n.ts.date,
});
if (canceled) return;
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 75419ce06d65..311493aa8440 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -221,7 +221,7 @@ function saveTlFilter(key: keyof typeof defaultStore.state.tl.filter, newValue:
}
async function timetravel(): Promise {
- const { canceled, result: date } = await os.inputDate({
+ const { canceled, result: date } = await os.inputDateTime({
title: i18n.ts.date,
});
if (canceled) return;
diff --git a/packages/frontend/src/types/note-draft-item.ts b/packages/frontend/src/types/note-draft-item.ts
deleted file mode 100644
index a7ec5962e589..000000000000
--- a/packages/frontend/src/types/note-draft-item.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as Misskey from 'misskey-js';
-import type { PollEditorModelValue } from '@/components/MkPollEditor.vue';
-
-export type NoteDraftItem = {
- updatedAt: string;
- channel?: {
- id: string;
- name: string;
- };
- renote?: {
- id: string;
- text: string | null;
- user: {
- id: string;
- username: string;
- host: string | null;
- };
- };
- reply?: {
- id: string;
- text: string | null;
- user: {
- id: string;
- username: string;
- host: string | null;
- };
- };
- data: {
- text: string;
- useCw: boolean;
- cw: string | null;
- visibility: 'public' | 'followers' | 'home' | 'specified';
- localOnly: boolean;
- files: Misskey.entities.DriveFile[];
- poll: PollEditorModelValue | null;
- visibleUserIds?: string[];
- };
-};
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 4c03556e6cd1..27d102bd79d3 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1640,6 +1640,9 @@ declare namespace entities {
NotesCreateRequest,
NotesCreateResponse,
NotesDeleteRequest,
+ NotesScheduledCancelRequest,
+ NotesScheduledListRequest,
+ NotesScheduledListResponse,
NotesFavoritesCreateRequest,
NotesFavoritesDeleteRequest,
NotesFeaturedRequest,
@@ -1825,6 +1828,7 @@ declare namespace entities {
Announcement,
App,
Note,
+ NoteDraft,
NoteReaction,
NoteFavorite,
Notification_2 as Notification,
@@ -2573,6 +2577,9 @@ type MyAppsResponse = operations['my___apps']['responses']['200']['content']['ap
// @public (undocumented)
type Note = components['schemas']['Note'];
+// @public (undocumented)
+type NoteDraft = components['schemas']['NoteDraft'];
+
// @public (undocumented)
type NoteFavorite = components['schemas']['NoteFavorite'];
@@ -2681,6 +2688,15 @@ type NotesRequest = operations['notes']['requestBody']['content']['application/j
// @public (undocumented)
type NotesResponse = operations['notes']['responses']['200']['content']['application/json'];
+// @public (undocumented)
+type NotesScheduledCancelRequest = operations['notes___scheduled___cancel']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type NotesScheduledListRequest = operations['notes___scheduled___list']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type NotesScheduledListResponse = operations['notes___scheduled___list']['responses']['200']['content']['application/json'];
+
// @public (undocumented)
type NotesSearchByTagRequest = operations['notes___search-by-tag']['requestBody']['content']['application/json'];
@@ -2742,7 +2758,7 @@ type Notification_2 = components['schemas']['Notification'];
type NotificationsCreateRequest = operations['notifications___create']['requestBody']['content']['application/json'];
// @public (undocumented)
-export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "achievementEarned"];
+export const notificationTypes: readonly ["note", "follow", "mention", "reply", "renote", "quote", "reaction", "pollVote", "pollEnded", "receiveFollowRequest", "followRequestAccepted", "groupInvited", "app", "roleAssigned", "achievementEarned", "noteScheduled", "scheduledNotePosted", "scheduledNoteError"];
// @public (undocumented)
type Page = components['schemas']['Page'];
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index 0b8ee24732ca..712755926c0c 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -3129,6 +3129,28 @@ declare module '../api.js' {
credential?: string | null,
): Promise>;
+ /**
+ * No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *write:notes*
+ */
+ request(
+ endpoint: E,
+ params: P,
+ credential?: string | null,
+ ): Promise>;
+
+ /**
+ * No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *write:notes*
+ */
+ request(
+ endpoint: E,
+ params: P,
+ credential?: string | null,
+ ): Promise>;
+
/**
* No description provided.
*
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 246d2c99b6c4..ab44ed7d48fb 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -418,6 +418,9 @@ import type {
NotesCreateRequest,
NotesCreateResponse,
NotesDeleteRequest,
+ NotesScheduledCancelRequest,
+ NotesScheduledListRequest,
+ NotesScheduledListResponse,
NotesFavoritesCreateRequest,
NotesFavoritesDeleteRequest,
NotesFeaturedRequest,
@@ -872,6 +875,8 @@ export type Endpoints = {
'notes/conversation': { req: NotesConversationRequest; res: NotesConversationResponse };
'notes/create': { req: NotesCreateRequest; res: NotesCreateResponse };
'notes/delete': { req: NotesDeleteRequest; res: EmptyResponse };
+ 'notes/scheduled/cancel': { req: NotesScheduledCancelRequest; res: EmptyResponse };
+ 'notes/scheduled/list': { req: NotesScheduledListRequest; res: NotesScheduledListResponse };
'notes/favorites/create': { req: NotesFavoritesCreateRequest; res: EmptyResponse };
'notes/favorites/delete': { req: NotesFavoritesDeleteRequest; res: EmptyResponse };
'notes/featured': { req: NotesFeaturedRequest; res: NotesFeaturedResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index b26acb1fa54a..b74926c876d1 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -421,6 +421,9 @@ export type NotesConversationResponse = operations['notes___conversation']['resp
export type NotesCreateRequest = operations['notes___create']['requestBody']['content']['application/json'];
export type NotesCreateResponse = operations['notes___create']['responses']['200']['content']['application/json'];
export type NotesDeleteRequest = operations['notes___delete']['requestBody']['content']['application/json'];
+export type NotesScheduledCancelRequest = operations['notes___scheduled___cancel']['requestBody']['content']['application/json'];
+export type NotesScheduledListRequest = operations['notes___scheduled___list']['requestBody']['content']['application/json'];
+export type NotesScheduledListResponse = operations['notes___scheduled___list']['responses']['200']['content']['application/json'];
export type NotesFavoritesCreateRequest = operations['notes___favorites___create']['requestBody']['content']['application/json'];
export type NotesFavoritesDeleteRequest = operations['notes___favorites___delete']['requestBody']['content']['application/json'];
export type NotesFeaturedRequest = operations['notes___featured']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/models.ts b/packages/misskey-js/src/autogen/models.ts
index e60fe35aaef2..332eb28bfa86 100644
--- a/packages/misskey-js/src/autogen/models.ts
+++ b/packages/misskey-js/src/autogen/models.ts
@@ -14,6 +14,7 @@ export type Ad = components['schemas']['Ad'];
export type Announcement = components['schemas']['Announcement'];
export type App = components['schemas']['App'];
export type Note = components['schemas']['Note'];
+export type NoteDraft = components['schemas']['NoteDraft'];
export type NoteReaction = components['schemas']['NoteReaction'];
export type NoteFavorite = components['schemas']['NoteFavorite'];
export type Notification = components['schemas']['Notification'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 63e97c0f64ea..b0d2d76627ae 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -2709,6 +2709,24 @@ export type paths = {
*/
post: operations['notes___delete'];
};
+ '/notes/scheduled/cancel': {
+ /**
+ * notes/scheduled/cancel
+ * @description No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *write:notes*
+ */
+ post: operations['notes___scheduled___cancel'];
+ };
+ '/notes/scheduled/list': {
+ /**
+ * notes/scheduled/list
+ * @description No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *write:notes*
+ */
+ post: operations['notes___scheduled___list'];
+ };
'/notes/favorites/create': {
/**
* notes/favorites/create
@@ -4272,6 +4290,58 @@ export type components = {
clippedCount?: number;
myReaction?: string | null;
};
+ NoteDraft: {
+ /** Format: misskey:id */
+ id: string;
+ /** Format: date-time */
+ updatedAt: string;
+ /** Format: date-time */
+ scheduledAt: string | null;
+ reason?: string;
+ channel?: {
+ /** Format: misskey:id */
+ id: string;
+ name: string;
+ } | null;
+ renote?: ({
+ /** Format: misskey:id */
+ id: string;
+ text: string | null;
+ user: {
+ /** Format: misskey:id */
+ id: string;
+ username: string;
+ host: string | null;
+ };
+ }) | null;
+ reply?: ({
+ /** Format: misskey:id */
+ id: string;
+ text: string | null;
+ user: {
+ /** Format: misskey:id */
+ id: string;
+ username: string;
+ host: string | null;
+ };
+ }) | null;
+ data: {
+ text: string | null;
+ useCw: boolean;
+ cw: string | null;
+ /** @enum {string} */
+ visibility: 'public' | 'home' | 'followers' | 'specified';
+ localOnly: boolean;
+ files: components['schemas']['DriveFile'][];
+ poll: ({
+ choices: string[];
+ multiple: boolean;
+ expiresAt: number | null;
+ expiredAfter: number | null;
+ }) | null;
+ visibleUserIds?: string[];
+ };
+ };
NoteReaction: {
/**
* Format: id
@@ -4419,6 +4489,30 @@ export type components = {
/** @enum {string} */
type: 'achievementEarned';
achievement: string;
+ } | {
+ /** Format: id */
+ id: string;
+ /** Format: date-time */
+ createdAt: string;
+ /** @enum {string} */
+ type: 'noteScheduled';
+ draft: components['schemas']['NoteDraft'];
+ } | {
+ /** Format: id */
+ id: string;
+ /** Format: date-time */
+ createdAt: string;
+ /** @enum {string} */
+ type: 'scheduledNotePosted';
+ note: components['schemas']['Note'];
+ } | {
+ /** Format: id */
+ id: string;
+ /** Format: date-time */
+ createdAt: string;
+ /** @enum {string} */
+ type: 'scheduledNoteError';
+ draft: components['schemas']['NoteDraft'];
} | {
/** Format: id */
id: string;
@@ -4983,6 +5077,7 @@ export type components = {
gtlAvailable: boolean;
ltlAvailable: boolean;
canPublicNote: boolean;
+ canScheduleNote: boolean;
canInitiateConversation: boolean;
canCreateContent: boolean;
canUpdateContent: boolean;
@@ -20366,8 +20461,8 @@ export type operations = {
untilId?: string;
/** @default true */
markAsRead?: boolean;
- includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
- excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+ includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+ excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
};
};
};
@@ -20434,8 +20529,8 @@ export type operations = {
untilId?: string;
/** @default true */
markAsRead?: boolean;
- includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
- excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
+ includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
+ excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'noteScheduled' | 'scheduledNotePosted' | 'scheduledNoteError' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
};
};
};
@@ -23333,6 +23428,7 @@ export type operations = {
expiresAt?: number | null;
expiredAfter?: number | null;
}) | null;
+ scheduledAt?: number | null;
/** @default false */
noCreatedNote?: boolean;
};
@@ -23447,6 +23543,120 @@ export type operations = {
};
};
};
+ /**
+ * notes/scheduled/cancel
+ * @description No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *write:notes*
+ */
+ notes___scheduled___cancel: {
+ requestBody: {
+ content: {
+ 'application/json': {
+ /** Format: misskey:id */
+ draftId: string;
+ };
+ };
+ };
+ responses: {
+ /** @description OK (without any results) */
+ 204: {
+ content: never;
+ };
+ /** @description Client error */
+ 400: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Authentication error */
+ 401: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Forbidden error */
+ 403: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description I'm Ai */
+ 418: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description To many requests */
+ 429: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Internal server error */
+ 500: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ };
+ };
+ /**
+ * notes/scheduled/list
+ * @description No description provided.
+ *
+ * **Credential required**: *Yes* / **Permission**: *write:notes*
+ */
+ notes___scheduled___list: {
+ requestBody: {
+ content: {
+ 'application/json': {
+ /** @default 10 */
+ limit?: number;
+ /** @default 0 */
+ offset?: number;
+ };
+ };
+ };
+ responses: {
+ /** @description OK (with results) */
+ 200: {
+ content: {
+ 'application/json': components['schemas']['NoteDraft'][];
+ };
+ };
+ /** @description Client error */
+ 400: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Authentication error */
+ 401: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Forbidden error */
+ 403: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description I'm Ai */
+ 418: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ /** @description Internal server error */
+ 500: {
+ content: {
+ 'application/json': components['schemas']['Error'];
+ };
+ };
+ };
+ };
/**
* notes/favorites/create
* @description No description provided.
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index d915224a97e8..5fcad5f46294 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -1,4 +1,4 @@
-export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned'] as const;
+export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned', 'noteScheduled', 'scheduledNotePosted', 'scheduledNoteError'] as const;
export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts
index 7d28d8a694ba..1edd528f28e1 100644
--- a/packages/sw/src/scripts/create-notification.ts
+++ b/packages/sw/src/scripts/create-notification.ts
@@ -39,7 +39,7 @@ export async function createNotification {
+async function composeNotification(data: PushNotificationDataMap[keyof PushNotificationDataMap]): Promise<[string, NotificationOptions & { actions?: Record[], renotify?: boolean }] | null> {
const i18n = await (swLang.i18n ?? swLang.fetchLocale());
const { t } = i18n;
switch (data.type) {
@@ -60,7 +60,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
const userDetail = await cli.request('users/show', { userId: data.body.userId }, account.token);
return [t('_notification.youWereFollowed'), {
body: getUserName(data.body.user),
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('user-plus'),
data,
actions: userDetail.isFollowing ? [] : [
@@ -75,7 +75,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'mention':
return [t('_notification.youGotMention', { name: getUserName(data.body.user) }), {
body: data.body.note.text ?? '',
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('at'),
data,
actions: [
@@ -89,7 +89,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'reply':
return [t('_notification.youGotReply', { name: getUserName(data.body.user) }), {
body: data.body.note.text ?? '',
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('arrow-back-up'),
data,
actions: [
@@ -103,7 +103,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'renote':
return [t('_notification.youRenoted', { name: getUserName(data.body.user) }), {
body: data.body.note.text ?? '',
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('repeat'),
data,
actions: [
@@ -117,7 +117,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'quote':
return [t('_notification.youGotQuote', { name: getUserName(data.body.user) }), {
body: data.body.note.text ?? '',
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('quote'),
data,
actions: [
@@ -137,7 +137,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'note':
return [t('_notification.newNote') + ': ' + getUserName(data.body.user), {
body: data.body.note.text ?? '',
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
data,
}];
@@ -164,7 +164,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
const tag = `reaction:${data.body.note.id}`;
return [`${reaction} ${getUserName(data.body.user)}`, {
body: data.body.note.text ?? '',
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
tag,
badge,
data,
@@ -180,7 +180,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'receiveFollowRequest':
return [t('_notification.youReceivedFollowRequest'), {
body: getUserName(data.body.user),
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('user-plus'),
data,
actions: [
@@ -198,11 +198,18 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'followRequestAccepted':
return [t('_notification.yourFollowRequestAccepted'), {
body: getUserName(data.body.user),
- icon: data.body.user.avatarUrl,
+ icon: data.body.user.avatarUrl ?? undefined,
badge: iconUrl('circle-check'),
data,
}];
+ case 'pollEnded':
+ return [t('_notification.pollEnded'), {
+ body: data.body.note.text ?? '',
+ badge: iconUrl('chart-arrows'),
+ data,
+ }];
+
case 'achievementEarned':
return [t('_notification.achievementEarned'), {
body: t(`_achievements._types._${data.body.achievement}.title`),
@@ -211,10 +218,32 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
tag: `achievement:${data.body.achievement}`,
}];
- case 'pollEnded':
- return [t('_notification.pollEnded'), {
+ case 'noteScheduled':
+ return [t('_notification.noteScheduled'), {
+ body: data.body.draft.data.text ?? '',
+ badge: iconUrl('calendar-clock'),
+ data,
+ }];
+
+ case 'scheduledNotePosted':
+ return [t('_notification.scheduledNotePosted'), {
body: data.body.note.text ?? '',
- badge: iconUrl('chart-arrows'),
+ badge: iconUrl('calendar-check'),
+ data,
+ }];
+
+ case 'scheduledNoteError':
+ return [t('_notification.scheduledNoteError'), {
+ body: data.body.draft.reason ?? '',
+ badge: iconUrl('calendar-exclamation'),
+ data,
+ }];
+
+ case 'roleAssigned':
+ return [t('_notification.roleAssigned'), {
+ body: data.body.role.name,
+ icon: data.body.role.iconUrl ?? undefined,
+ badge: iconUrl('badges'),
data,
}];
@@ -238,7 +267,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'unreadAntennaNote':
return [t('_notification.unreadAntennaNote', { name: data.body.antenna.name }), {
body: `${getUserName(data.body.note.user)}: ${data.body.note.text ?? ''}`,
- icon: data.body.note.user.avatarUrl,
+ icon: data.body.note.user.avatarUrl ?? undefined,
badge: iconUrl('antenna'),
tag: `antenna:${data.body.antenna.id}`,
data,
diff --git a/packages/sw/src/types.ts b/packages/sw/src/types.ts
index fac3e707d811..5b38743f2c88 100644
--- a/packages/sw/src/types.ts
+++ b/packages/sw/src/types.ts
@@ -50,4 +50,9 @@ export type BadgeNames =
| 'quote'
| 'repeat'
| 'user-plus'
- | 'users';
+ | 'users'
+ | 'badges'
+ | 'calendar-clock'
+ | 'calendar-check'
+ | 'calendar-exclamation'
+ ;
From 6993e5b7fd1f522c6f06007f08e7991571a0dfc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
=?UTF-8?q?=E3=81=AB=E3=82=85?=
<17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:05:02 +0900
Subject: [PATCH 09/10] =?UTF-8?q?perf(frontend/css):=20MkNote=20=E5=8F=8A?=
=?UTF-8?q?=E3=81=B3=20MkNotification=20=E3=81=AB=20content-visibility=20?=
=?UTF-8?q?=E3=82=92=E9=81=A9=E7=94=A8=20(MisskeyIO#892)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/MkNote.vue | 9 ++-------
packages/frontend/src/components/MkNotification.vue | 3 +++
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 54e7e161faff..6a67a98a1d0c 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -569,13 +569,8 @@ function emitUpdReaction(emoji: string, delta: number) {
overflow: clip;
contain: content;
- // これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
- // 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
- // ノートがマウントされたときに自身の高さを取得し contain-intrinsic-size を設定しなおせばほぼ解決できそうだが、
- // 今度はその処理自体がパフォーマンス低下の原因にならないか懸念される。また、被リアクションでも高さは変化するため、やはり多少のズレは生じる
- // 一度レンダリングされた要素はブラウザがよしなにサイズを覚えておいてくれるような実装になるまで待った方が良さそう(なるのか？)
- //content-visibility: auto;
- //contain-intrinsic-size: 0 128px;
+ content-visibility: auto;
+ contain-intrinsic-size: auto none auto 128px;
&:focus-visible {
outline: none;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index f40dc1b2b5b3..5bf5188c2778 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -218,6 +218,9 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
overflow-wrap: break-word;
display: flex;
contain: content;
+
+ content-visibility: auto;
+ contain-intrinsic-size: auto none auto 100px;
}
.head {
From 86209cf4b33d6d1efca81377d11a79258be43d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
=?UTF-8?q?=E3=81=AB=E3=82=85?=
<17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:29:14 +0900
Subject: [PATCH 10/10] Bump up version to 2024.5.0-io.7 (MisskeyIO#893)
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index f67ad749fcdf..94796d2e388d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2024.5.0-io.6a",
+ "version": "2024.5.0-io.7",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 12f583477f14..697d0c9ff8a0 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2024.5.0-io.6a",
+ "version": "2024.5.0-io.7",
"description": "Misskey SDK for JavaScript",
"types": "./built/dts/index.d.ts",
"exports": {
@@ -35,7 +39,13 @@
-
+
@@ -56,24 +66,94 @@
+
+
+
+ ![]()
+
+
+
+ {{ i18n.ts.nothing }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ draft.channel.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.error }}: {{ draft.reason }}
+
+
@@ -25,6 +25,9 @@ SPDX-License-Identifier: AGPL-3.0-only
[$style.t_quote]: notification.type === 'quote',
[$style.t_pollEnded]: notification.type === 'pollEnded',
[$style.t_achievementEarned]: notification.type === 'achievementEarned',
+ [$style.t_noteScheduled]: notification.type === 'noteScheduled',
+ [$style.t_scheduledNotePosted]: notification.type === 'scheduledNotePosted',
+ [$style.t_scheduledNoteError]: notification.type === 'scheduledNoteError',
[$style.t_roleAssigned]: notification.type === 'roleAssigned' && notification.role.iconUrl == null,
}]"
>
@@ -37,6 +40,9 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
@@ -98,6 +107,23 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._achievements._types['_' + notification.achievement].title }}
+
+
+
+
+
+
+
+
+
+
{{ i18n.ts.youGotNewFollower }}
+
+ {{ notification.draft.reason }}
+
+ {{ maxTextLength - textLength }}
+
+ {{ i18n.tsx.willBePostedAt({ x: dateTimeFormat.format(scheduledTime) }) }}
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+