1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-23 14:46:44 +09:00
This commit is contained in:
NoriDev 2024-05-13 15:36:51 +09:00
parent 3241db64ab
commit e54dd80c30
56 changed files with 78 additions and 79 deletions

View File

@ -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.

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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 {

View File

@ -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
*/

View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: cherrypick-contributors
* SPDX-FileCopyrightText: noridev and cherrypick-project
* SPDX-License-Identifier: AGPL-3.0-only
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -120,12 +120,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
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(),

View File

@ -103,12 +103,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
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;

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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<typeof meta, typeof paramDef> { // eslint-
});
}
}

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -106,7 +106,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
) {
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);

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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',

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: syuilo and misskey-project
SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project
SPDX-License-Identifier: AGPL-3.0-only
-->

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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;

View File

@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: syuilo and misskey-project
SPDX-FileCopyrightText: syuilo and misskey-project & noridev and cherrypick-project
SPDX-License-Identifier: AGPL-3.0-only
-->