Skip to content

Commit

Permalink
Merge pull request #894 from update-host
Browse files Browse the repository at this point in the history
  • Loading branch information
u1-liquid authored Jan 16, 2025
2 parents e0b5199 + 3e20ef5 commit b5f27be
Show file tree
Hide file tree
Showing 94 changed files with 4,350 additions and 2,647 deletions.
13 changes: 13 additions & 0 deletions locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,12 @@ emailAddressLogin: "Login with email address"
usernameLogin: "Login with username"
autoloadDrafts: "Automatically load drafts when opening the posting form"
drafts: "Drafts"
unsent: "Unsent"
schedule: "Schedule"
scheduled: "Scheduled"
unschedule: "Unschedule"
setScheduledTime: "Set scheduled time"
willBePostedAt: "Note will be posted at {x}"

_bubbleGame:
howToPlay: "How to play"
Expand Down Expand Up @@ -1787,6 +1793,7 @@ _role:
gtlAvailable: "Can view the global timeline"
ltlAvailable: "Can view the local timeline"
canPublicNote: "Can send public notes"
canScheduleNote: "Can schedule notes"
canInitiateConversation: "Can mention, reply or quote"
canCreateContent: "Can create contents"
canUpdateContent: "Can edit contents"
Expand Down Expand Up @@ -2474,6 +2481,9 @@ _notification:
roleAssigned: "Role given"
emptyPushNotificationMessage: "Push notifications have been updated"
achievementEarned: "Achievement unlocked"
noteScheduled: "Note has been scheduled"
scheduledNotePosted: "Scheduled note has been posted"
scheduledNoteError: "Scheduled note has problem with posting"
testNotification: "Test notification"
checkNotificationBehavior: "Check notification appearance"
sendTestNotification: "Send test notification"
Expand All @@ -2497,6 +2507,9 @@ _notification:
followRequestAccepted: "Accepted follow requests"
roleAssigned: "Role given"
achievementEarned: "Achievement unlocked"
noteScheduled: "Note scheduled"
scheduledNotePosted: "Scheduled note posted"
scheduledNoteError: "Problem with scheduled note"
app: "Notifications from linked apps"
_actions:
followBack: "followed you back"
Expand Down
52 changes: 52 additions & 0 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5338,6 +5338,30 @@ export interface Locale extends ILocale {
* 下書き
*/
"drafts": string;
/**
* 未送信
*/
"unsent": string;
/**
* 予約
*/
"schedule": string;
/**
* 予約済み
*/
"scheduled": string;
/**
* 予約を解除
*/
"unschedule": string;
/**
* 予約日時を設定
*/
"setScheduledTime": string;
/**
* {x}に投稿されます
*/
"willBePostedAt": ParameterizedString<"x">;
"_bubbleGame": {
/**
* 遊び方
Expand Down Expand Up @@ -6991,6 +7015,10 @@ export interface Locale extends ILocale {
* パブリック投稿の許可
*/
"canPublicNote": string;
/**
* 予約投稿の許可
*/
"canScheduleNote": string;
/**
* メンション、リプライ、引用の許可
*/
Expand Down Expand Up @@ -9649,6 +9677,18 @@ export interface Locale extends ILocale {
* 実績を獲得
*/
"achievementEarned": string;
/**
* ノートが予約されました
*/
"noteScheduled": string;
/**
* 予約済みのノートが投稿されました
*/
"scheduledNotePosted": string;
/**
* 予約済みのノートを投稿できませんでした
*/
"scheduledNoteError": string;
/**
* 通知テスト
*/
Expand Down Expand Up @@ -9738,6 +9778,18 @@ export interface Locale extends ILocale {
* 実績の獲得
*/
"achievementEarned": string;
/**
* ノートが予約された
*/
"noteScheduled": string;
/**
* 予約済みのノートが投稿された
*/
"scheduledNotePosted": string;
/**
* 予約済みのノートが投稿できなかった
*/
"scheduledNoteError": string;
/**
* 連携アプリからの通知
*/
Expand Down
13 changes: 13 additions & 0 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,12 @@ emailAddressLogin: "メールアドレスでログイン"
usernameLogin: "ユーザー名でログイン"
autoloadDrafts: "投稿フォームを開いたときに下書きを自動で読み込む"
drafts: "下書き"
unsent: "未送信"
schedule: "予約"
scheduled: "予約済み"
unschedule: "予約を解除"
setScheduledTime: "予約日時を設定"
willBePostedAt: "{x}に投稿されます"

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

_actions:
Expand Down
15 changes: 14 additions & 1 deletion locales/ko-KR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,12 @@ emailAddressLogin: "이메일 주소로 로그인"
usernameLogin: "사용자명으로 로그인"
autoloadDrafts: "글 작성 시 자동으로 임시 저장된 글 불러오기"
drafts: "임시 저장"
unsent: "미전송"
schedule: "예약"
scheduled: "예약됨"
unschedule: "예약 취소"
setScheduledTime: "예약 시간 설정"
willBePostedAt: "{x}에 게시됩니다"

_bubbleGame:
howToPlay: "설명"
Expand Down Expand Up @@ -1784,6 +1790,7 @@ _role:
gtlAvailable: "글로벌 타임라인 보이기"
ltlAvailable: "로컬 타임라인 보이기"
canPublicNote: "공개 노트 허용"
canScheduleNote: "노트 예약 허용"
mentionMax: "노트에 넣을 수 있는 멘션 수"
canCreateContent: "컨텐츠 생성 허용"
canUpdateContent: "컨텐츠 수정 허용"
Expand Down Expand Up @@ -2456,9 +2463,12 @@ _notification:
pollEnded: "투표 결과가 발표되었습니다"
newNote: "새 게시물"
unreadAntennaNote: "안테나 {name}"
roleAssigned: "역할이 부여 되었습니다."
roleAssigned: "역할이 부여 되었습니다"
emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
achievementEarned: "도전 과제를 달성했습니다"
noteScheduled: "노트가 예약되었습니다"
scheduledNotePosted: "예약된 노트가 게시되었습니다"
scheduledNoteError: "예약된 노트를 게시하지 못했습니다"
testNotification: "알림 테스트"
checkNotificationBehavior: "알림 표시를 체크하기"
sendTestNotification: "테스트 알림 보내기"
Expand All @@ -2482,6 +2492,9 @@ _notification:
followRequestAccepted: "팔로우 요청이 승인되었을 때"
roleAssigned: "역할이 부여 됨"
achievementEarned: "도전 과제 획득"
noteScheduled: "노트가 예약됨"
scheduledNotePosted: "예약된 노트가 게시됨"
scheduledNoteError: "예약된 노트를 게시하지 못함"
app: "연동된 앱을 통한 알림"
_actions:
followBack: "팔로우"
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "misskey",
"version": "2024.5.0-host.6",
"version": "2024.5.0-host.7",
"codename": "nasubi",
"repository": {
"type": "git",
"url": "https://github.com/MisskeyIO/misskey.git"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].4",
"workspaces": [
"packages/frontend",
"packages/backend",
Expand Down Expand Up @@ -56,26 +56,26 @@
"jpeg-js": "0.4.4",
"lodash": "4.17.21",
"sharp": "0.33.5",
"tough-cookie": "5.0.0",
"web-streams-polyfill": "4.0.0"
"tough-cookie": "5.1.0",
"web-streams-polyfill": "4.1.0"
},
"dependencies": {
"cssnano": "7.0.6",
"execa": "9.5.2",
"js-yaml": "4.1.0",
"postcss": "8.4.49",
"postcss": "8.5.1",
"terser": "5.37.0",
"typescript": "5.7.2"
"typescript": "5.7.3"
},
"devDependencies": {
"@types/node": "22.10.2",
"@types/node": "22.10.7",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"cross-env": "7.0.3",
"cypress": "13.17.0",
"eslint": "8.57.1",
"ncp": "2.0.0",
"start-server-and-test": "2.0.9"
"start-server-and-test": "2.0.10"
},
"optionalDependencies": {
"@tensorflow/tfjs-core": "4.22.0"
Expand Down
Binary file added packages/backend/assets/tabler-badges/badges.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions packages/backend/migration/1736923279563-ScheduledNote.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
export class ScheduledNote1736923279563 {
name = 'ScheduledNote1736923279563'

async up(queryRunner) {
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.'`);
await queryRunner.query(`CREATE INDEX "IDX_7ddf8710a9faee81081592ec35" ON "note_scheduled" ("createdAt") `);
await queryRunner.query(`CREATE INDEX "IDX_bbe52891059217fc31e73e84e2" ON "note_scheduled" ("scheduledAt") `);
await queryRunner.query(`CREATE INDEX "IDX_b148b24837cc7a2707ae1f0975" ON "note_scheduled" ("userId") `);
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dfeab22d6bbc4799193997553a" ON "note_scheduled" ("userId", "scheduledAt") `);
await queryRunner.query(`ALTER TABLE "note_scheduled" ADD CONSTRAINT "FK_b148b24837cc7a2707ae1f0975a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "note_scheduled" DROP CONSTRAINT "FK_b148b24837cc7a2707ae1f0975a"`);
await queryRunner.query(`DROP INDEX "public"."IDX_dfeab22d6bbc4799193997553a"`);
await queryRunner.query(`DROP INDEX "public"."IDX_b148b24837cc7a2707ae1f0975"`);
await queryRunner.query(`DROP INDEX "public"."IDX_bbe52891059217fc31e73e84e2"`);
await queryRunner.query(`DROP INDEX "public"."IDX_7ddf8710a9faee81081592ec35"`);
await queryRunner.query(`DROP TABLE "note_scheduled"`);
}
}
Loading

0 comments on commit b5f27be

Please sign in to comment.