Skip to content

Commit

Permalink
tweak 3241db6
Browse files Browse the repository at this point in the history
  • Loading branch information
noridev committed May 13, 2024
1 parent 3241db6 commit e54dd80
Show file tree
Hide file tree
Showing 56 changed files with 78 additions and 79 deletions.
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-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.

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/migration/1696604572677-poll-vote-poll.js
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/core/AntennaService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/core/MessagingService.ts
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/core/deserializeAntenna.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: cherrypick-contributors
* SPDX-FileCopyrightText: noridev and cherrypick-project
* SPDX-License-Identifier: AGPL-3.0-only
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/models/MessagingMessage.ts
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/models/UserGroup.ts
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/models/UserGroupInvitation.ts
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/models/UserGroupJoining.ts
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/models/json-schema/user-group.ts
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down Expand Up @@ -173,4 +173,3 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
});
}
}

Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/server/api/endpoints/notes/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
Loading

0 comments on commit e54dd80

Please sign in to comment.