summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorwoxtu <woxtup@gmail.com>2023-07-19 11:27:50 +0900
committerGitHub <noreply@github.com>2023-07-19 11:27:50 +0900
commit8c77153c04dce5b904ff4edf7edceade68118192 (patch)
treed2a75ded5cf0dad48cdfac76bfc88b5cca2f8194 /packages/backend/src/core
parentupdate aiscript to 0.14.0 (diff)
downloadsharkey-8c77153c04dce5b904ff4edf7edceade68118192.tar.gz
sharkey-8c77153c04dce5b904ff4edf7edceade68118192.tar.bz2
sharkey-8c77153c04dce5b904ff4edf7edceade68118192.zip
Fix auto-fixable issues (#11314)
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/AccountMoveService.ts3
-rw-r--r--packages/backend/src/core/FetchInstanceMetadataService.ts2
-rw-r--r--packages/backend/src/core/NoteCreateService.ts2
-rw-r--r--packages/backend/src/core/UserFollowingService.ts16
-rw-r--r--packages/backend/src/core/VideoProcessingService.ts2
-rw-r--r--packages/backend/src/core/entities/AbuseUserReportEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/AuthSessionEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/ChannelEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/FollowRequestEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/GalleryLikeEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/ModerationLogEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/NoteFavoriteEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/PageLikeEntityService.ts2
-rw-r--r--packages/backend/src/core/entities/SigninEntityService.ts2
14 files changed, 21 insertions, 22 deletions
diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index 69d83b13b0..111fcfd734 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -4,10 +4,9 @@ import { IsNull, In, MoreThan, Not } from 'typeorm';
import { bindThis } from '@/decorators.js';
import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
-import type { LocalUser, RemoteUser } from '@/models/entities/User.js';
+import type { LocalUser, RemoteUser, User } from '@/models/entities/User.js';
import type { BlockingsRepository, FollowingsRepository, InstancesRepository, Muting, MutingsRepository, UserListJoiningsRepository, UsersRepository } from '@/models/index.js';
import type { RelationshipJobData, ThinUser } from '@/queue/types.js';
-import type { User } from '@/models/entities/User.js';
import { IdService } from '@/core/IdService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 9e8d17442f..88706f1a48 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -2,6 +2,7 @@ import { URL } from 'node:url';
import { Inject, Injectable } from '@nestjs/common';
import { JSDOM } from 'jsdom';
import tinycolor from 'tinycolor2';
+import * as Redis from 'ioredis';
import type { Instance } from '@/models/entities/Instance.js';
import type Logger from '@/logger.js';
import { DI } from '@/di-symbols.js';
@@ -10,7 +11,6 @@ import { HttpRequestService } from '@/core/HttpRequestService.js';
import { bindThis } from '@/decorators.js';
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
import type { DOMWindow } from 'jsdom';
-import * as Redis from 'ioredis';
type NodeInfo = {
openRegistrations?: unknown;
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 4f3d66dd58..648ff76483 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -574,7 +574,7 @@ export class NoteCreateService implements OnApplicationShutdown {
where: {
userId: data.reply.userId,
threadId: data.reply.threadId ?? data.reply.id,
- }
+ },
});
if (!isThreadMuted) {
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 4d7bfeaf23..44269d3b8a 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -1,5 +1,6 @@
import { Inject, Injectable, OnModuleInit, forwardRef } from '@nestjs/common';
import { ModuleRef } from '@nestjs/core';
+import { IsNull } from 'typeorm';
import type { LocalUser, PartialLocalUser, PartialRemoteUser, RemoteUser, User } from '@/models/entities/User.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { QueueService } from '@/core/QueueService.js';
@@ -21,9 +22,8 @@ import { UserBlockingService } from '@/core/UserBlockingService.js';
import { MetaService } from '@/core/MetaService.js';
import { CacheService } from '@/core/CacheService.js';
import type { Config } from '@/config.js';
-import Logger from '../logger.js';
-import { IsNull } from 'typeorm';
import { AccountMoveService } from '@/core/AccountMoveService.js';
+import Logger from '../logger.js';
const logger = new Logger('following/create');
@@ -322,7 +322,7 @@ export class UserFollowingService implements OnModuleInit {
where: {
followerId: follower.id,
followeeId: followee.id,
- }
+ },
});
if (following === null || !following.follower || !following.followee) {
@@ -412,8 +412,8 @@ export class UserFollowingService implements OnModuleInit {
followerId: user.id,
followee: {
movedToUri: IsNull(),
- }
- }
+ },
+ },
});
const nonMovedFollowers = await this.followingsRepository.count({
relations: {
@@ -423,8 +423,8 @@ export class UserFollowingService implements OnModuleInit {
followeeId: user.id,
follower: {
movedToUri: IsNull(),
- }
- }
+ },
+ },
});
await this.usersRepository.update(
{ id: user.id },
@@ -646,7 +646,7 @@ export class UserFollowingService implements OnModuleInit {
where: {
followeeId: followee.id,
followerId: follower.id,
- }
+ },
});
if (!following || !following.followee || !following.follower) return;
diff --git a/packages/backend/src/core/VideoProcessingService.ts b/packages/backend/src/core/VideoProcessingService.ts
index 89681f3372..06f832ab09 100644
--- a/packages/backend/src/core/VideoProcessingService.ts
+++ b/packages/backend/src/core/VideoProcessingService.ts
@@ -52,7 +52,7 @@ export class VideoProcessingService {
query({
thumbnail: '1',
url,
- })
+ }),
);
}
}
diff --git a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
index 7f8240b8b2..94ae1856b9 100644
--- a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
+++ b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
@@ -3,8 +3,8 @@ import { DI } from '@/di-symbols.js';
import type { AbuseUserReportsRepository } from '@/models/index.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { AbuseUserReport } from '@/models/entities/AbuseUserReport.js';
-import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
+import { UserEntityService } from './UserEntityService.js';
@Injectable()
export class AbuseUserReportEntityService {
diff --git a/packages/backend/src/core/entities/AuthSessionEntityService.ts b/packages/backend/src/core/entities/AuthSessionEntityService.ts
index b7edc8494e..a1874c63ab 100644
--- a/packages/backend/src/core/entities/AuthSessionEntityService.ts
+++ b/packages/backend/src/core/entities/AuthSessionEntityService.ts
@@ -4,8 +4,8 @@ import type { AuthSessionsRepository } from '@/models/index.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { AuthSession } from '@/models/entities/AuthSession.js';
import type { User } from '@/models/entities/User.js';
-import { AppEntityService } from './AppEntityService.js';
import { bindThis } from '@/decorators.js';
+import { AppEntityService } from './AppEntityService.js';
@Injectable()
export class AuthSessionEntityService {
diff --git a/packages/backend/src/core/entities/ChannelEntityService.ts b/packages/backend/src/core/entities/ChannelEntityService.ts
index d24657260f..de99ce72c4 100644
--- a/packages/backend/src/core/entities/ChannelEntityService.ts
+++ b/packages/backend/src/core/entities/ChannelEntityService.ts
@@ -50,7 +50,7 @@ export class ChannelEntityService {
const hasUnreadNote = meId ? await this.noteUnreadsRepository.exist({
where: {
noteChannelId: channel.id,
- userId: meId
+ userId: meId,
},
}) : undefined;
diff --git a/packages/backend/src/core/entities/FollowRequestEntityService.ts b/packages/backend/src/core/entities/FollowRequestEntityService.ts
index c2edc6a13a..6f6f4be412 100644
--- a/packages/backend/src/core/entities/FollowRequestEntityService.ts
+++ b/packages/backend/src/core/entities/FollowRequestEntityService.ts
@@ -4,8 +4,8 @@ import type { FollowRequestsRepository } from '@/models/index.js';
import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { FollowRequest } from '@/models/entities/FollowRequest.js';
-import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
+import { UserEntityService } from './UserEntityService.js';
@Injectable()
export class FollowRequestEntityService {
diff --git a/packages/backend/src/core/entities/GalleryLikeEntityService.ts b/packages/backend/src/core/entities/GalleryLikeEntityService.ts
index db46045db3..73c264da94 100644
--- a/packages/backend/src/core/entities/GalleryLikeEntityService.ts
+++ b/packages/backend/src/core/entities/GalleryLikeEntityService.ts
@@ -3,8 +3,8 @@ import { DI } from '@/di-symbols.js';
import type { GalleryLikesRepository } from '@/models/index.js';
import type { } from '@/models/entities/Blocking.js';
import type { GalleryLike } from '@/models/entities/GalleryLike.js';
-import { GalleryPostEntityService } from './GalleryPostEntityService.js';
import { bindThis } from '@/decorators.js';
+import { GalleryPostEntityService } from './GalleryPostEntityService.js';
@Injectable()
export class GalleryLikeEntityService {
diff --git a/packages/backend/src/core/entities/ModerationLogEntityService.ts b/packages/backend/src/core/entities/ModerationLogEntityService.ts
index 7058e38af9..59815d2639 100644
--- a/packages/backend/src/core/entities/ModerationLogEntityService.ts
+++ b/packages/backend/src/core/entities/ModerationLogEntityService.ts
@@ -4,8 +4,8 @@ import type { ModerationLogsRepository } from '@/models/index.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { } from '@/models/entities/Blocking.js';
import type { ModerationLog } from '@/models/entities/ModerationLog.js';
-import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
+import { UserEntityService } from './UserEntityService.js';
@Injectable()
export class ModerationLogEntityService {
diff --git a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
index 8a7727b4cd..badb8fb816 100644
--- a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
@@ -4,8 +4,8 @@ import type { NoteFavoritesRepository } from '@/models/index.js';
import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { NoteFavorite } from '@/models/entities/NoteFavorite.js';
-import { NoteEntityService } from './NoteEntityService.js';
import { bindThis } from '@/decorators.js';
+import { NoteEntityService } from './NoteEntityService.js';
@Injectable()
export class NoteFavoriteEntityService {
diff --git a/packages/backend/src/core/entities/PageLikeEntityService.ts b/packages/backend/src/core/entities/PageLikeEntityService.ts
index 3460c1e422..99465d0ea3 100644
--- a/packages/backend/src/core/entities/PageLikeEntityService.ts
+++ b/packages/backend/src/core/entities/PageLikeEntityService.ts
@@ -4,8 +4,8 @@ import type { PageLikesRepository } from '@/models/index.js';
import type { } from '@/models/entities/Blocking.js';
import type { User } from '@/models/entities/User.js';
import type { PageLike } from '@/models/entities/PageLike.js';
-import { PageEntityService } from './PageEntityService.js';
import { bindThis } from '@/decorators.js';
+import { PageEntityService } from './PageEntityService.js';
@Injectable()
export class PageLikeEntityService {
diff --git a/packages/backend/src/core/entities/SigninEntityService.ts b/packages/backend/src/core/entities/SigninEntityService.ts
index 51fa7543d9..a6c4407ce8 100644
--- a/packages/backend/src/core/entities/SigninEntityService.ts
+++ b/packages/backend/src/core/entities/SigninEntityService.ts
@@ -3,8 +3,8 @@ import { DI } from '@/di-symbols.js';
import type { SigninsRepository } from '@/models/index.js';
import type { } from '@/models/entities/Blocking.js';
import type { Signin } from '@/models/entities/Signin.js';
-import { UserEntityService } from './UserEntityService.js';
import { bindThis } from '@/decorators.js';
+import { UserEntityService } from './UserEntityService.js';
@Injectable()
export class SigninEntityService {