Skip to content

Commit 2ec5f01

Browse files
committed
Merge tag '2024.5.0-io.7' into bun
2 parents fbbcbaa + 86209cf commit 2ec5f01

File tree

94 files changed

+4342
-2639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+4342
-2639
lines changed

locales/en-US.yml

+13
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,12 @@ emailAddressLogin: "Login with email address"
13191319
usernameLogin: "Login with username"
13201320
autoloadDrafts: "Automatically load drafts when opening the posting form"
13211321
drafts: "Drafts"
1322+
unsent: "Unsent"
1323+
schedule: "Schedule"
1324+
scheduled: "Scheduled"
1325+
unschedule: "Unschedule"
1326+
setScheduledTime: "Set scheduled time"
1327+
willBePostedAt: "Note will be posted at {x}"
13221328

13231329
_bubbleGame:
13241330
howToPlay: "How to play"
@@ -1787,6 +1793,7 @@ _role:
17871793
gtlAvailable: "Can view the global timeline"
17881794
ltlAvailable: "Can view the local timeline"
17891795
canPublicNote: "Can send public notes"
1796+
canScheduleNote: "Can schedule notes"
17901797
canInitiateConversation: "Can mention, reply or quote"
17911798
canCreateContent: "Can create contents"
17921799
canUpdateContent: "Can edit contents"
@@ -2474,6 +2481,9 @@ _notification:
24742481
roleAssigned: "Role given"
24752482
emptyPushNotificationMessage: "Push notifications have been updated"
24762483
achievementEarned: "Achievement unlocked"
2484+
noteScheduled: "Note has been scheduled"
2485+
scheduledNotePosted: "Scheduled note has been posted"
2486+
scheduledNoteError: "Scheduled note has problem with posting"
24772487
testNotification: "Test notification"
24782488
checkNotificationBehavior: "Check notification appearance"
24792489
sendTestNotification: "Send test notification"
@@ -2497,6 +2507,9 @@ _notification:
24972507
followRequestAccepted: "Accepted follow requests"
24982508
roleAssigned: "Role given"
24992509
achievementEarned: "Achievement unlocked"
2510+
noteScheduled: "Note scheduled"
2511+
scheduledNotePosted: "Scheduled note posted"
2512+
scheduledNoteError: "Problem with scheduled note"
25002513
app: "Notifications from linked apps"
25012514
_actions:
25022515
followBack: "followed you back"

locales/index.d.ts

+52
Original file line numberDiff line numberDiff line change
@@ -5338,6 +5338,30 @@ export interface Locale extends ILocale {
53385338
* 下書き
53395339
*/
53405340
"drafts": string;
5341+
/**
5342+
* 未送信
5343+
*/
5344+
"unsent": string;
5345+
/**
5346+
* 予約
5347+
*/
5348+
"schedule": string;
5349+
/**
5350+
* 予約済み
5351+
*/
5352+
"scheduled": string;
5353+
/**
5354+
* 予約を解除
5355+
*/
5356+
"unschedule": string;
5357+
/**
5358+
* 予約日時を設定
5359+
*/
5360+
"setScheduledTime": string;
5361+
/**
5362+
* {x}に投稿されます
5363+
*/
5364+
"willBePostedAt": ParameterizedString<"x">;
53415365
"_bubbleGame": {
53425366
/**
53435367
* 遊び方
@@ -6991,6 +7015,10 @@ export interface Locale extends ILocale {
69917015
* パブリック投稿の許可
69927016
*/
69937017
"canPublicNote": string;
7018+
/**
7019+
* 予約投稿の許可
7020+
*/
7021+
"canScheduleNote": string;
69947022
/**
69957023
* メンション、リプライ、引用の許可
69967024
*/
@@ -9649,6 +9677,18 @@ export interface Locale extends ILocale {
96499677
* 実績を獲得
96509678
*/
96519679
"achievementEarned": string;
9680+
/**
9681+
* ノートが予約されました
9682+
*/
9683+
"noteScheduled": string;
9684+
/**
9685+
* 予約済みのノートが投稿されました
9686+
*/
9687+
"scheduledNotePosted": string;
9688+
/**
9689+
* 予約済みのノートを投稿できませんでした
9690+
*/
9691+
"scheduledNoteError": string;
96529692
/**
96539693
* 通知テスト
96549694
*/
@@ -9738,6 +9778,18 @@ export interface Locale extends ILocale {
97389778
* 実績の獲得
97399779
*/
97409780
"achievementEarned": string;
9781+
/**
9782+
* ノートが予約された
9783+
*/
9784+
"noteScheduled": string;
9785+
/**
9786+
* 予約済みのノートが投稿された
9787+
*/
9788+
"scheduledNotePosted": string;
9789+
/**
9790+
* 予約済みのノートが投稿できなかった
9791+
*/
9792+
"scheduledNoteError": string;
97419793
/**
97429794
* 連携アプリからの通知
97439795
*/

locales/ja-JP.yml

+13
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,12 @@ emailAddressLogin: "メールアドレスでログイン"
13281328
usernameLogin: "ユーザー名でログイン"
13291329
autoloadDrafts: "投稿フォームを開いたときに下書きを自動で読み込む"
13301330
drafts: "下書き"
1331+
unsent: "未送信"
1332+
schedule: "予約"
1333+
scheduled: "予約済み"
1334+
unschedule: "予約を解除"
1335+
setScheduledTime: "予約日時を設定"
1336+
willBePostedAt: "{x}に投稿されます"
13311337

13321338
_bubbleGame:
13331339
howToPlay: "遊び方"
@@ -1801,6 +1807,7 @@ _role:
18011807
gtlAvailable: "グローバルタイムラインの閲覧"
18021808
ltlAvailable: "ローカルタイムラインの閲覧"
18031809
canPublicNote: "パブリック投稿の許可"
1810+
canScheduleNote: "予約投稿の許可"
18041811
canInitiateConversation: "メンション、リプライ、引用の許可"
18051812
canCreateContent: "コンテンツの作成"
18061813
canUpdateContent: "コンテンツの編集"
@@ -2538,6 +2545,9 @@ _notification:
25382545
roleAssigned: "ロールが付与されました"
25392546
emptyPushNotificationMessage: "プッシュ通知の更新をしました"
25402547
achievementEarned: "実績を獲得"
2548+
noteScheduled: "ノートが予約されました"
2549+
scheduledNotePosted: "予約済みのノートが投稿されました"
2550+
scheduledNoteError: "予約済みのノートを投稿できませんでした"
25412551
testNotification: "通知テスト"
25422552
checkNotificationBehavior: "通知の表示を確かめる"
25432553
sendTestNotification: "テスト通知を送信する"
@@ -2562,6 +2572,9 @@ _notification:
25622572
followRequestAccepted: "フォローが受理された"
25632573
roleAssigned: "ロールが付与された"
25642574
achievementEarned: "実績の獲得"
2575+
noteScheduled: "ノートが予約された"
2576+
scheduledNotePosted: "予約済みのノートが投稿された"
2577+
scheduledNoteError: "予約済みのノートが投稿できなかった"
25652578
app: "連携アプリからの通知"
25662579

25672580
_actions:

locales/ko-KR.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,12 @@ emailAddressLogin: "이메일 주소로 로그인"
13161316
usernameLogin: "사용자명으로 로그인"
13171317
autoloadDrafts: "글 작성 시 자동으로 임시 저장된 글 불러오기"
13181318
drafts: "임시 저장"
1319+
unsent: "미전송"
1320+
schedule: "예약"
1321+
scheduled: "예약됨"
1322+
unschedule: "예약 취소"
1323+
setScheduledTime: "예약 시간 설정"
1324+
willBePostedAt: "{x}에 게시됩니다"
13191325

13201326
_bubbleGame:
13211327
howToPlay: "설명"
@@ -1784,6 +1790,7 @@ _role:
17841790
gtlAvailable: "글로벌 타임라인 보이기"
17851791
ltlAvailable: "로컬 타임라인 보이기"
17861792
canPublicNote: "공개 노트 허용"
1793+
canScheduleNote: "노트 예약 허용"
17871794
mentionMax: "노트에 넣을 수 있는 멘션 수"
17881795
canCreateContent: "컨텐츠 생성 허용"
17891796
canUpdateContent: "컨텐츠 수정 허용"
@@ -2456,9 +2463,12 @@ _notification:
24562463
pollEnded: "투표 결과가 발표되었습니다"
24572464
newNote: "새 게시물"
24582465
unreadAntennaNote: "안테나 {name}"
2459-
roleAssigned: "역할이 부여 되었습니다."
2466+
roleAssigned: "역할이 부여 되었습니다"
24602467
emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
24612468
achievementEarned: "도전 과제를 달성했습니다"
2469+
noteScheduled: "노트가 예약되었습니다"
2470+
scheduledNotePosted: "예약된 노트가 게시되었습니다"
2471+
scheduledNoteError: "예약된 노트를 게시하지 못했습니다"
24622472
testNotification: "알림 테스트"
24632473
checkNotificationBehavior: "알림 표시를 체크하기"
24642474
sendTestNotification: "테스트 알림 보내기"
@@ -2482,6 +2492,9 @@ _notification:
24822492
followRequestAccepted: "팔로우 요청이 승인되었을 때"
24832493
roleAssigned: "역할이 부여 됨"
24842494
achievementEarned: "도전 과제 획득"
2495+
noteScheduled: "노트가 예약됨"
2496+
scheduledNotePosted: "예약된 노트가 게시됨"
2497+
scheduledNoteError: "예약된 노트를 게시하지 못함"
24852498
app: "연동된 앱을 통한 알림"
24862499
_actions:
24872500
followBack: "팔로우"

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "misskey",
3-
"version": "2024.5.0-io.6",
3+
"version": "2024.5.0-io.7",
44
"codename": "nasubi",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/MisskeyIO/misskey.git"
88
},
9-
"packageManager": "pnpm@9.15.0",
9+
"packageManager": "pnpm@9.15.4",
1010
"workspaces": [
1111
"packages/frontend",
1212
"packages/backend",
@@ -57,26 +57,26 @@
5757
"jpeg-js": "0.4.4",
5858
"lodash": "4.17.21",
5959
"sharp": "0.33.5",
60-
"tough-cookie": "5.0.0",
61-
"web-streams-polyfill": "4.0.0"
60+
"tough-cookie": "5.1.0",
61+
"web-streams-polyfill": "4.1.0"
6262
},
6363
"dependencies": {
6464
"cssnano": "7.0.6",
6565
"execa": "9.5.2",
6666
"js-yaml": "4.1.0",
67-
"postcss": "8.4.49",
67+
"postcss": "8.5.1",
6868
"terser": "5.37.0",
69-
"typescript": "5.7.2"
69+
"typescript": "5.7.3"
7070
},
7171
"devDependencies": {
72-
"@types/node": "22.10.2",
72+
"@types/node": "22.10.7",
7373
"@typescript-eslint/eslint-plugin": "7.10.0",
7474
"@typescript-eslint/parser": "7.10.0",
7575
"cross-env": "7.0.3",
7676
"cypress": "13.17.0",
7777
"eslint": "8.57.1",
7878
"ncp": "2.0.0",
79-
"start-server-and-test": "2.0.9"
79+
"start-server-and-test": "2.0.10"
8080
},
8181
"optionalDependencies": {
8282
"@tensorflow/tfjs-core": "4.22.0"
1.32 KB
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
export class ScheduledNote1736923279563 {
2+
name = 'ScheduledNote1736923279563'
3+
4+
async up(queryRunner) {
5+
await queryRunner.query(`CREATE TABLE "note_scheduled" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "scheduledAt" TIMESTAMP WITH TIME ZONE, "reason" character varying(256), "userId" character varying(32) NOT NULL, "draft" jsonb NOT NULL, CONSTRAINT "PK_14ca8fa67f70dc68ebab8900f4b" PRIMARY KEY ("id")); COMMENT ON COLUMN "note_scheduled"."createdAt" IS 'The created date of the Note.'; COMMENT ON COLUMN "note_scheduled"."scheduledAt" IS 'The scheduled date of the Note.'; COMMENT ON COLUMN "note_scheduled"."userId" IS 'The ID of author.'`);
6+
await queryRunner.query(`CREATE INDEX "IDX_7ddf8710a9faee81081592ec35" ON "note_scheduled" ("createdAt") `);
7+
await queryRunner.query(`CREATE INDEX "IDX_bbe52891059217fc31e73e84e2" ON "note_scheduled" ("scheduledAt") `);
8+
await queryRunner.query(`CREATE INDEX "IDX_b148b24837cc7a2707ae1f0975" ON "note_scheduled" ("userId") `);
9+
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dfeab22d6bbc4799193997553a" ON "note_scheduled" ("userId", "scheduledAt") `);
10+
await queryRunner.query(`ALTER TABLE "note_scheduled" ADD CONSTRAINT "FK_b148b24837cc7a2707ae1f0975a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
11+
}
12+
13+
async down(queryRunner) {
14+
await queryRunner.query(`ALTER TABLE "note_scheduled" DROP CONSTRAINT "FK_b148b24837cc7a2707ae1f0975a"`);
15+
await queryRunner.query(`DROP INDEX "public"."IDX_dfeab22d6bbc4799193997553a"`);
16+
await queryRunner.query(`DROP INDEX "public"."IDX_b148b24837cc7a2707ae1f0975"`);
17+
await queryRunner.query(`DROP INDEX "public"."IDX_bbe52891059217fc31e73e84e2"`);
18+
await queryRunner.query(`DROP INDEX "public"."IDX_7ddf8710a9faee81081592ec35"`);
19+
await queryRunner.query(`DROP TABLE "note_scheduled"`);
20+
}
21+
}

0 commit comments

Comments
 (0)