Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/01_bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ body:
* Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
* Browser: Chrome 113.0.5672.126
* Server URL: cherrypick.example.com
* CherryPick: 4.x.x (Misskey: 2025.x.x)
* CherryPick: 4.x.x (Misskey: 2026.x.x)
value: |
* Model and OS of the device(s):
* Browser:
Expand All @@ -74,7 +74,7 @@ body:

Examples:
* Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "CherryPick install shell script", development environment
* CherryPick: 4.x.x (Misskey: 2025.x.x)
* CherryPick: 4.x.x (Misskey: 2026.x.x)
* Node: 20.x.x
* PostgreSQL: 18.x.x
* Redis: 7.x.x
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Unless otherwise stated this repository is
Copyright © 2014-2025 syuilo & noridev and contributors
Copyright © 2014-2026 syuilo & noridev and contributors

And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.

Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/kokonect-link/cherrypick.git"
},
"packageManager": "pnpm@10.25.0",
"packageManager": "pnpm@10.30.3",
"workspaces": [
"packages/cherrypick-js",
"packages/i18n",
Expand Down Expand Up @@ -61,30 +61,30 @@
},
"dependencies": {
"cssnano": "7.1.2",
"esbuild": "0.27.1",
"esbuild": "0.27.3",
"execa": "9.6.1",
"ignore-walk": "8.0.0",
"js-yaml": "4.1.1",
"postcss": "8.5.6",
"tar": "7.5.2",
"terser": "5.44.1",
"tar": "7.5.10",
"terser": "5.46.0",
"typescript": "5.9.3"
},
"devDependencies": {
"@biomejs/biome": "2.3.11",
"@eslint/js": "9.39.1",
"@eslint/js": "9.39.3",
"@misskey-dev/eslint-plugin": "2.2.0",
"@types/js-yaml": "4.0.9",
"@types/node": "24.10.2",
"@typescript-eslint/eslint-plugin": "8.49.0",
"@typescript-eslint/parser": "8.49.0",
"@types/node": "24.11.0",
"@typescript-eslint/eslint-plugin": "8.56.1",
"@typescript-eslint/parser": "8.56.1",
"cross-env": "10.1.0",
"cypress": "15.7.1",
"eslint": "9.39.1",
"globals": "16.5.0",
"cypress": "15.11.0",
"eslint": "9.39.3",
"globals": "17.4.0",
"ncp": "2.0.0",
"pnpm": "10.25.0",
"start-server-and-test": "2.1.3"
"pnpm": "10.30.3",
"start-server-and-test": "2.1.5"
},
"optionalDependencies": {
"@tensorflow/tfjs-core": "4.22.0"
Expand Down
83 changes: 83 additions & 0 deletions packages/backend/migration/1767787474213-Fix.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 56 additions & 0 deletions packages/backend/migration/1767792212399-MigrationCleanup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* SPDX-FileCopyrightText: noridev and cherrypick-project
* SPDX-License-Identifier: AGPL-3.0-only
*/

export class MigrationCleanup1767792212399 {
name = 'MigrationCleanup1767792212399'

async up(queryRunner) {
await queryRunner.query(`COMMENT ON COLUMN "abuse_report_resolver"."updatedAt" IS 'The updated date of the AbuseReportResolver.'`);
await queryRunner.query(`COMMENT ON COLUMN "abuse_report_resolver"."expirationDate" IS 'The expiration date of the AbuseReportResolver'`);
await queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "canChat" DROP DEFAULT`);
await queryRunner.query(`ALTER TABLE "channel" ALTER COLUMN "color" SET DEFAULT '#ffbcdc'`);
await queryRunner.query(`ALTER TABLE "note" ALTER COLUMN "deliveryTargets" SET DEFAULT '{}'`);
await queryRunner.query(`COMMENT ON COLUMN "event"."metadata" IS 'metadata object describing the event. Follows https://schema.org/Event'`);
await queryRunner.query(`ALTER TABLE "event" ALTER COLUMN "metadata" SET DEFAULT '{"@context":"https://schema.org/","@type":"Event"}'`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "remoteObjectStorageUseSSL" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "remoteObjectStorageUseProxy" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "preservedUsernames" SET DEFAULT '{admin,administrator,root,system,maintainer,host,mod,moderator,owner,superuser,staff,auth,i,me,everyone,all,mention,mentions,example,user,users,account,accounts,official,help,helps,support,supports,info,information,informations,announce,announces,announcement,announcements,notice,notification,notifications,dev,developer,developers,tech,misskey,cherrypick}'`);
await queryRunner.query(`COMMENT ON COLUMN "meta"."trustedLinkUrlPatterns" IS 'An array of URL strings or regex that can be used to omit warnings about redirects to external sites. Separate them with spaces to specify AND, and enclose them with slashes to specify regular expressions. Each item is regarded as an OR.'`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "hasEvent" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "disableRightClick" SET NOT NULL`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventStart" IS 'The start time of the event'`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventEnd" IS 'The end of the event'`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventTitle" IS 'short name of event'`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" SET NOT NULL`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventMetadata" IS 'metadata object describing the event. Follows https://schema.org/Event'`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" SET DEFAULT '{"@context":"https://schema.org/","@type":"Event"}'`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "deliveryTargets" SET DEFAULT '{}'`);
await queryRunner.query(`CREATE INDEX "IDX_72689e25ff8131746cb31ef9a1" ON "note_draft" ("eventStart") `);
}

async down(queryRunner) {
await queryRunner.query(`DROP INDEX "public"."IDX_72689e25ff8131746cb31ef9a1"`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "deliveryTargets" DROP DEFAULT`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" SET DEFAULT '{}'`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventMetadata" IS NULL`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" DROP NOT NULL`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventTitle" IS NULL`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventEnd" IS NULL`);
await queryRunner.query(`COMMENT ON COLUMN "note_draft"."eventStart" IS NULL`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "disableRightClick" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "hasEvent" DROP NOT NULL`);
await queryRunner.query(`COMMENT ON COLUMN "meta"."trustedLinkUrlPatterns" IS NULL`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "preservedUsernames" SET DEFAULT '{admin,administrator,root,system,maintainer,host,mod,moderator,owner,superuser,staff,auth,i,me,everyone,all,mention,mentions,example,user,users,account,accounts,official,help,helps,support,supports,info,information,informations,announce,announces,announcement,announcements,notice,notification,notifications,dev,developer,developers,tech,misskey}'`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "remoteObjectStorageUseProxy" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "remoteObjectStorageUseSSL" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "event" ALTER COLUMN "metadata" SET DEFAULT '{}'`);
await queryRunner.query(`COMMENT ON COLUMN "event"."metadata" IS 'metadata mapping for event with more user configurable optional information'`);
await queryRunner.query(`ALTER TABLE "note" ALTER COLUMN "deliveryTargets" DROP DEFAULT`);
await queryRunner.query(`ALTER TABLE "channel" ALTER COLUMN "color" SET DEFAULT '#86b300'`);
await queryRunner.query(`ALTER TABLE "user" ALTER COLUMN "canChat" SET DEFAULT true`);
await queryRunner.query(`COMMENT ON COLUMN "abuse_report_resolver"."expirationDate" IS 'The expiration date of AbuseReportResolver'`);
await queryRunner.query(`COMMENT ON COLUMN "abuse_report_resolver"."updatedAt" IS 'The updated date of AbuseReportResolver'`);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project, noridev and cherryPick-project, yojo-art team
* SPDX-License-Identifier: AGPL-3.0-only
*/
export class NoteDraftEventMetadataNullable1769162192635 {
name = 'NoteDraftEventMetadataNullable1769162192635'

/**
* @param {QueryRunner} queryRunner
*/
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "proxyRemoteFiles" SET DEFAULT true`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" DROP DEFAULT`);
}

/**
* @param {QueryRunner} queryRunner
*/
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" SET DEFAULT '{"@type": "Event", "@context": "https://schema.org/"}'`);
await queryRunner.query(`ALTER TABLE "note_draft" ALTER COLUMN "eventMetadata" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "proxyRemoteFiles" SET DEFAULT false`);
}
}
16 changes: 16 additions & 0 deletions packages/backend/migration/1773490771475-AddUserPendingOriginIp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: noridev and cherrypick-project
* SPDX-License-Identifier: AGPL-3.0-only
*/

export class AddUserPendingOriginIp1773490771475 {
name = 'AddUserPendingOriginIp1773490771475'

async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_pending" ADD "requestOriginIp" character varying(128) NULL`);
}

async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_pending" DROP COLUMN "requestOriginIp"`);
}
}
Loading
Loading