From e54dd80c3000180ee4979b6b2e2a5b411579be21 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Mon, 13 May 2024 15:36:51 +0900 Subject: [PATCH] tweak 3241db64 --- COPYING | 2 +- .../1629387925000-disableRightClick.js | 2 +- .../1684231006000-tweak-varchar-length2.js | 2 +- .../1696402675000-add-meta-options.js | 2 +- .../1696417300000-add-meta-options.js | 2 +- .../migration/1696604572677-poll-vote-poll.js | 2 +- .../1697737204579-deleteCreatedAt.js | 2 +- .../1699432324194-remoteAvaterDecoration.js | 2 +- .../1704185628000-note-updated-at2.js | 2 +- packages/backend/src/core/AntennaService.ts | 2 +- packages/backend/src/core/MessagingService.ts | 2 +- .../backend/src/core/deserializeAntenna.ts | 2 +- .../entities/MessagingMessageEntityService.ts | 2 +- .../core/entities/UserGroupEntityService.ts | 2 +- .../UserGroupInvitationEntityService.ts | 2 +- .../backend/src/models/MessagingMessage.ts | 2 +- packages/backend/src/models/UserGroup.ts | 2 +- .../backend/src/models/UserGroupInvitation.ts | 2 +- .../backend/src/models/UserGroupJoining.ts | 2 +- .../models/json-schema/messaging-message.ts | 2 +- .../src/models/json-schema/user-group.ts | 2 +- .../admin/abuse-report-resolver/create.ts | 12 +++++----- .../admin/abuse-report-resolver/update.ts | 12 +++++----- .../server/api/endpoints/admin/emoji/adds.ts | 2 +- .../api/endpoints/admin/invite/revoke.ts | 2 +- .../i/read-all-messaging-messages.ts | 2 +- .../api/endpoints/i/user-group-invites.ts | 2 +- .../server/api/endpoints/messaging/history.ts | 2 +- .../api/endpoints/messaging/messages.ts | 3 +-- .../endpoints/messaging/messages/create.ts | 2 +- .../endpoints/messaging/messages/delete.ts | 2 +- .../api/endpoints/messaging/messages/read.ts | 2 +- .../src/server/api/endpoints/notes/update.ts | 2 +- .../api/endpoints/users/groups/create.ts | 2 +- .../api/endpoints/users/groups/delete.ts | 2 +- .../users/groups/invitations/accept.ts | 2 +- .../users/groups/invitations/reject.ts | 2 +- .../api/endpoints/users/groups/invite.ts | 2 +- .../api/endpoints/users/groups/joined.ts | 2 +- .../api/endpoints/users/groups/leave.ts | 2 +- .../api/endpoints/users/groups/owned.ts | 2 +- .../server/api/endpoints/users/groups/pull.ts | 2 +- .../server/api/endpoints/users/groups/show.ts | 2 +- .../api/endpoints/users/groups/transfer.ts | 2 +- .../api/endpoints/users/groups/update.ts | 2 +- .../server/api/endpoints/users/translate.ts | 24 +++++++++---------- .../api/stream/channels/messaging-index.ts | 2 +- .../server/api/stream/channels/messaging.ts | 4 ++-- .../MkUserSetupDialog.Blur.stories.impl.ts | 2 +- ...MkUserSetupDialog.FontSize.stories.impl.ts | 2 +- ...og.MisskeyFlavoredMarkdown.stories.impl.ts | 2 +- .../global/NotificationPageHeader.vue | 2 +- .../frontend/src/filters/bytes-net-sizes.ts | 2 +- packages/frontend/src/filters/bytes-net-v.ts | 2 +- .../frontend/src/pages/admin/_header_.vue | 2 +- .../src/pages/notifications-friendly.vue | 2 +- 56 files changed, 78 insertions(+), 79 deletions(-) diff --git a/COPYING b/COPYING index 57ad466702..53d498fb43 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ Unless otherwise stated this repository is -Copyright © 2014-2024 syuilo and noridev and other misskey, cherrypick contributors +Copyright © 2014-2024 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. diff --git a/packages/backend/migration/1629387925000-disableRightClick.js b/packages/backend/migration/1629387925000-disableRightClick.js index a4f9da6d52..6c821791fb 100644 --- a/packages/backend/migration/1629387925000-disableRightClick.js +++ b/packages/backend/migration/1629387925000-disableRightClick.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1684231006000-tweak-varchar-length2.js b/packages/backend/migration/1684231006000-tweak-varchar-length2.js index af58cf578a..1935b3293b 100644 --- a/packages/backend/migration/1684231006000-tweak-varchar-length2.js +++ b/packages/backend/migration/1684231006000-tweak-varchar-length2.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1696402675000-add-meta-options.js b/packages/backend/migration/1696402675000-add-meta-options.js index 9941edc6ae..2dc55ef7db 100644 --- a/packages/backend/migration/1696402675000-add-meta-options.js +++ b/packages/backend/migration/1696402675000-add-meta-options.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1696417300000-add-meta-options.js b/packages/backend/migration/1696417300000-add-meta-options.js index d9b13e2179..c2660dd1b0 100644 --- a/packages/backend/migration/1696417300000-add-meta-options.js +++ b/packages/backend/migration/1696417300000-add-meta-options.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1696604572677-poll-vote-poll.js b/packages/backend/migration/1696604572677-poll-vote-poll.js index 4c9c786435..32c2e867fb 100644 --- a/packages/backend/migration/1696604572677-poll-vote-poll.js +++ b/packages/backend/migration/1696604572677-poll-vote-poll.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and misskey-project and cherrypick-contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1697737204579-deleteCreatedAt.js b/packages/backend/migration/1697737204579-deleteCreatedAt.js index 4f29d9e1b4..6ac568c681 100644 --- a/packages/backend/migration/1697737204579-deleteCreatedAt.js +++ b/packages/backend/migration/1697737204579-deleteCreatedAt.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and misskey-project and cherrypick-contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1699432324194-remoteAvaterDecoration.js b/packages/backend/migration/1699432324194-remoteAvaterDecoration.js index 3b6a6f7608..c5e0dd53af 100644 --- a/packages/backend/migration/1699432324194-remoteAvaterDecoration.js +++ b/packages/backend/migration/1699432324194-remoteAvaterDecoration.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and misskey-project and cherrypick-contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/migration/1704185628000-note-updated-at2.js b/packages/backend/migration/1704185628000-note-updated-at2.js index b37746aab4..1eca703214 100644 --- a/packages/backend/migration/1704185628000-note-updated-at2.js +++ b/packages/backend/migration/1704185628000-note-updated-at2.js @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and misskey-project and cherrypick-contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts index 1ff4ca4d86..d9b40c1734 100644 --- a/packages/backend/src/core/AntennaService.ts +++ b/packages/backend/src/core/AntennaService.ts @@ -17,8 +17,8 @@ import { UtilityService } from '@/core/UtilityService.js'; import { bindThis } from '@/decorators.js'; import type { GlobalEvents } from '@/core/GlobalEventService.js'; import { FanoutTimelineService } from '@/core/FanoutTimelineService.js'; -import type { OnApplicationShutdown } from '@nestjs/common'; import { deserializeAntenna } from './deserializeAntenna.js'; +import type { OnApplicationShutdown } from '@nestjs/common'; @Injectable() export class AntennaService implements OnApplicationShutdown { diff --git a/packages/backend/src/core/MessagingService.ts b/packages/backend/src/core/MessagingService.ts index 0a05e3acd9..d316cd611b 100644 --- a/packages/backend/src/core/MessagingService.ts +++ b/packages/backend/src/core/MessagingService.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/core/deserializeAntenna.ts b/packages/backend/src/core/deserializeAntenna.ts index 0afe079bea..1d0fbbdc86 100644 --- a/packages/backend/src/core/deserializeAntenna.ts +++ b/packages/backend/src/core/deserializeAntenna.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: cherrypick-contributors + * SPDX-FileCopyrightText: noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/core/entities/MessagingMessageEntityService.ts b/packages/backend/src/core/entities/MessagingMessageEntityService.ts index 5974e984f8..40d961bacb 100644 --- a/packages/backend/src/core/entities/MessagingMessageEntityService.ts +++ b/packages/backend/src/core/entities/MessagingMessageEntityService.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/core/entities/UserGroupEntityService.ts b/packages/backend/src/core/entities/UserGroupEntityService.ts index 72de937062..402d27923c 100644 --- a/packages/backend/src/core/entities/UserGroupEntityService.ts +++ b/packages/backend/src/core/entities/UserGroupEntityService.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/core/entities/UserGroupInvitationEntityService.ts b/packages/backend/src/core/entities/UserGroupInvitationEntityService.ts index ba1f30ae9d..9500d6c95f 100644 --- a/packages/backend/src/core/entities/UserGroupInvitationEntityService.ts +++ b/packages/backend/src/core/entities/UserGroupInvitationEntityService.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/models/MessagingMessage.ts b/packages/backend/src/models/MessagingMessage.ts index 80b3c2c4c2..1357438679 100644 --- a/packages/backend/src/models/MessagingMessage.ts +++ b/packages/backend/src/models/MessagingMessage.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/models/UserGroup.ts b/packages/backend/src/models/UserGroup.ts index 96005898dd..69567c53c6 100644 --- a/packages/backend/src/models/UserGroup.ts +++ b/packages/backend/src/models/UserGroup.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/models/UserGroupInvitation.ts b/packages/backend/src/models/UserGroupInvitation.ts index 59b1aee163..8d53d63794 100644 --- a/packages/backend/src/models/UserGroupInvitation.ts +++ b/packages/backend/src/models/UserGroupInvitation.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/models/UserGroupJoining.ts b/packages/backend/src/models/UserGroupJoining.ts index 7cfb6dacb1..aa2c26a03d 100644 --- a/packages/backend/src/models/UserGroupJoining.ts +++ b/packages/backend/src/models/UserGroupJoining.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/models/json-schema/messaging-message.ts b/packages/backend/src/models/json-schema/messaging-message.ts index 74caa0ed76..b8cf33e3bd 100644 --- a/packages/backend/src/models/json-schema/messaging-message.ts +++ b/packages/backend/src/models/json-schema/messaging-message.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/models/json-schema/user-group.ts b/packages/backend/src/models/json-schema/user-group.ts index 63eeeb59d3..f0e81928db 100644 --- a/packages/backend/src/models/json-schema/user-group.ts +++ b/packages/backend/src/models/json-schema/user-group.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/create.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/create.ts index 7432b23c40..d0d398838c 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/create.ts @@ -120,12 +120,12 @@ export default class extends Endpoint { const previousMonth = expirationDate.getUTCMonth(); (ps.expiresAt === '1hour' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 hour')); } : ps.expiresAt === '12hours' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('12 hours')); } : - ps.expiresAt === '1day' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 day')); } : - ps.expiresAt === '1week' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 week')); } : - ps.expiresAt === '1month' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 1 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 1 + 1) / 12))); } : - ps.expiresAt === '3months' ? function () {expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 3 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 3 + 1) / 12))); } : - ps.expiresAt === '6months' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 6 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 6 + 1) / 12))); } : - ps.expiresAt === '1year' ? function () { expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + 1); } : function () { expirationDate = null; })(); + ps.expiresAt === '1day' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 day')); } : + ps.expiresAt === '1week' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 week')); } : + ps.expiresAt === '1month' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 1 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 1 + 1) / 12))); } : + ps.expiresAt === '3months' ? function () {expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 3 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 3 + 1) / 12))); } : + ps.expiresAt === '6months' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 6 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 6 + 1) / 12))); } : + ps.expiresAt === '1year' ? function () { expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + 1); } : function () { expirationDate = null; })(); return await this.abuseReportResolverRepository.insert({ id: this.idService.gen(), diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts index beece140a7..d0cd055444 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report-resolver/update.ts @@ -103,12 +103,12 @@ export default class extends Endpoint { const previousMonth = expirationDate.getUTCMonth(); (ps.expiresAt === '1hour' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 hour')); } : ps.expiresAt === '12hours' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('12 hours')); } : - ps.expiresAt === '1day' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 day')); } : - ps.expiresAt === '1week' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 week')); } : - ps.expiresAt === '1month' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 1 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 1 + 1) / 12))); } : - ps.expiresAt === '3months' ? function () {expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 3 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 3 + 1) / 12))); } : - ps.expiresAt === '6months' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 6 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 6 + 1) / 12))); } : - ps.expiresAt === '1year' ? function () { expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + 1); } : function () { expirationDate = null; })(); + ps.expiresAt === '1day' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 day')); } : + ps.expiresAt === '1week' ? function () { expirationDate!.setTime(expirationDate!.getTime() + ms('1 week')); } : + ps.expiresAt === '1month' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 1 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 1 + 1) / 12))); } : + ps.expiresAt === '3months' ? function () {expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 3 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 3 + 1) / 12))); } : + ps.expiresAt === '6months' ? function () { expirationDate!.setUTCMonth((expirationDate!.getUTCMonth() + 6 + 1) % 12 - 1); expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + (Math.floor((previousMonth + 6 + 1) / 12))); } : + ps.expiresAt === '1year' ? function () { expirationDate!.setUTCFullYear(expirationDate!.getUTCFullYear() + 1); } : function () { expirationDate = null; })(); properties.expiresAt = ps.expiresAt; properties.expirationDate = expirationDate; diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts b/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts index de7a8929f1..4ca78e16d9 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/admin/invite/revoke.ts b/packages/backend/src/server/api/endpoints/admin/invite/revoke.ts index 83ee1d11bf..c7db1eae65 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/revoke.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/revoke.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts index ede0957234..510c14a9b7 100644 --- a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts +++ b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts index 0de6c2327a..414aff59be 100644 --- a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts +++ b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts index c314ba46c7..cf8f037638 100644 --- a/packages/backend/src/server/api/endpoints/messaging/history.ts +++ b/packages/backend/src/server/api/endpoints/messaging/history.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts index 9208cb503e..a97e9c57ee 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ @@ -173,4 +173,3 @@ export default class extends Endpoint { // eslint- }); } } - diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts index 46268f86b2..173497abfc 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts index aeebe1202b..c780684637 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts index 3a8fc15965..e7c1849a52 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/notes/update.ts b/packages/backend/src/server/api/endpoints/notes/update.ts index cf2041e1f7..fecd0baf21 100644 --- a/packages/backend/src/server/api/endpoints/notes/update.ts +++ b/packages/backend/src/server/api/endpoints/notes/update.ts @@ -106,7 +106,7 @@ export default class extends Endpoint { ) { super({ ...meta, - requireRolePolicy: "canEditNote", // 修正された部分 + requireRolePolicy: 'canEditNote', // 修正された部分 }, paramDef, async (ps, me) => { const note = await this.getterService.getNote(ps.noteId).catch(err => { if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); diff --git a/packages/backend/src/server/api/endpoints/users/groups/create.ts b/packages/backend/src/server/api/endpoints/users/groups/create.ts index 0bcc4bf7be..aab9d38081 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/create.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/create.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/delete.ts b/packages/backend/src/server/api/endpoints/users/groups/delete.ts index 3ed21b8e3b..9a8112ffef 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/delete.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/delete.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts index e790d000bc..968691d552 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts index 0740845ecf..fa7d40e28c 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/invite.ts b/packages/backend/src/server/api/endpoints/users/groups/invite.ts index aa5488e271..f4d990c18c 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/invite.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/invite.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/joined.ts b/packages/backend/src/server/api/endpoints/users/groups/joined.ts index 42bd0e4b6e..e34e8d3d38 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/joined.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/joined.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/leave.ts b/packages/backend/src/server/api/endpoints/users/groups/leave.ts index d2f9d79caf..ed105fc4b6 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/leave.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/leave.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/owned.ts b/packages/backend/src/server/api/endpoints/users/groups/owned.ts index 7ae5893840..1c456e8686 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/owned.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/owned.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/pull.ts b/packages/backend/src/server/api/endpoints/users/groups/pull.ts index df429d7f3b..41838540e4 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/pull.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/pull.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/show.ts b/packages/backend/src/server/api/endpoints/users/groups/show.ts index e6dcd53bde..898b967d01 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/show.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/show.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts index 83f3a93d9b..cb9ff1ebcd 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/groups/update.ts b/packages/backend/src/server/api/endpoints/users/groups/update.ts index 08e6bf1c38..ce887c1647 100644 --- a/packages/backend/src/server/api/endpoints/users/groups/update.ts +++ b/packages/backend/src/server/api/endpoints/users/groups/update.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/endpoints/users/translate.ts b/packages/backend/src/server/api/endpoints/users/translate.ts index 01c23c09cc..8a6b7b14fe 100644 --- a/packages/backend/src/server/api/endpoints/users/translate.ts +++ b/packages/backend/src/server/api/endpoints/users/translate.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ @@ -72,31 +72,31 @@ export default class extends Endpoint { // eslint- if (!policies.canUseTranslator) { throw new ApiError(meta.errors.unavailable); } - + const target = await this.getterService.getUserProfiles(ps.userId).catch(err => { if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchDescription); throw err; }); - + if (target.description == null) { return; } - + const instance = await this.metaService.fetch(); - + const translatorServices = [ 'deepl', 'google_no_api', 'ctav3', ]; - + if (instance.translatorType == null || !translatorServices.includes(instance.translatorType)) { return Promise.resolve(204); // Promise.resolveで204をラップする } - + let targetLang = ps.targetLang; if (targetLang.includes('-')) targetLang = targetLang.split('-')[0]; - + let translationResult; if (instance.translatorType === 'deepl') { if (instance.deeplAuthKey == null) { @@ -106,9 +106,9 @@ export default class extends Endpoint { // eslint- } else if (instance.translatorType === 'google_no_api') { let targetLang = ps.targetLang; if (targetLang.includes('-')) targetLang = targetLang.split('-')[0]; - + const { text, raw } = await translate(target.description, { to: targetLang }); - + return { sourceLang: raw.src, text: text, @@ -124,13 +124,13 @@ export default class extends Endpoint { // eslint- } else { throw new Error('Unsupported translator type'); } - + return Promise.resolve({ sourceLang: translationResult.sourceLang || '', text: translationResult.text || '', translator: translationResult.translator || [], }); - }); + }); } private async translateDeepL(text: string, targetLang: string, authKey: string, isPro: boolean, provider: string) { diff --git a/packages/backend/src/server/api/stream/channels/messaging-index.ts b/packages/backend/src/server/api/stream/channels/messaging-index.ts index 22d5e52d51..970c67c9f9 100644 --- a/packages/backend/src/server/api/stream/channels/messaging-index.ts +++ b/packages/backend/src/server/api/stream/channels/messaging-index.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts index 2d082c7fa2..7c7cb3b253 100644 --- a/packages/backend/src/server/api/stream/channels/messaging.ts +++ b/packages/backend/src/server/api/stream/channels/messaging.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ @@ -113,7 +113,7 @@ class MessagingChannel extends Channel { if (now.getTime() - date.getTime() > 5000) delete this.typers[userId]; } - const users = await this.userEntityService.packMany(Object.keys(this.typers), null, { schema: "UserLite" }); + const users = await this.userEntityService.packMany(Object.keys(this.typers), null, { schema: 'UserLite' }); this.send({ type: 'typers', diff --git a/packages/frontend/src/components/MkUserSetupDialog.Blur.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.Blur.stories.impl.ts index 4965cbc2d7..a0ca9e9f9e 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.Blur.stories.impl.ts +++ b/packages/frontend/src/components/MkUserSetupDialog.Blur.stories.impl.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/frontend/src/components/MkUserSetupDialog.FontSize.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.FontSize.stories.impl.ts index fc3e1c8f03..589a864efa 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.FontSize.stories.impl.ts +++ b/packages/frontend/src/components/MkUserSetupDialog.FontSize.stories.impl.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/frontend/src/components/MkUserSetupDialog.MisskeyFlavoredMarkdown.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.MisskeyFlavoredMarkdown.stories.impl.ts index c240671769..dcb63b044d 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.MisskeyFlavoredMarkdown.stories.impl.ts +++ b/packages/frontend/src/components/MkUserSetupDialog.MisskeyFlavoredMarkdown.stories.impl.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/frontend/src/components/global/NotificationPageHeader.vue b/packages/frontend/src/components/global/NotificationPageHeader.vue index 3ce62dad27..0281b45fe1 100644 --- a/packages/frontend/src/components/global/NotificationPageHeader.vue +++ b/packages/frontend/src/components/global/NotificationPageHeader.vue @@ -1,5 +1,5 @@ diff --git a/packages/frontend/src/filters/bytes-net-sizes.ts b/packages/frontend/src/filters/bytes-net-sizes.ts index 007a48fc95..c9c87ad31d 100644 --- a/packages/frontend/src/filters/bytes-net-sizes.ts +++ b/packages/frontend/src/filters/bytes-net-sizes.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/frontend/src/filters/bytes-net-v.ts b/packages/frontend/src/filters/bytes-net-v.ts index dc774221c4..83758e50cc 100644 --- a/packages/frontend/src/filters/bytes-net-v.ts +++ b/packages/frontend/src/filters/bytes-net-v.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and noridev and other misskey, cherrypick contributors + * SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project * SPDX-License-Identifier: AGPL-3.0-only */ diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue index ace154bb84..9b0d5cf64b 100644 --- a/packages/frontend/src/pages/admin/_header_.vue +++ b/packages/frontend/src/pages/admin/_header_.vue @@ -45,7 +45,7 @@ import { globalEvents } from '@/events.js'; import { injectReactiveMetadata } from '@/scripts/page-metadata.js'; import { deviceKind } from '@/scripts/device-kind.js'; import { defaultStore } from '@/store.js'; -import { mainRouter } from "@/router/main.js"; +import { mainRouter } from '@/router/main.js'; const MOBILE_THRESHOLD = 500; diff --git a/packages/frontend/src/pages/notifications-friendly.vue b/packages/frontend/src/pages/notifications-friendly.vue index 66e7ba92d2..c7ca952f50 100644 --- a/packages/frontend/src/pages/notifications-friendly.vue +++ b/packages/frontend/src/pages/notifications-friendly.vue @@ -1,5 +1,5 @@