chore: remove unused imports

packages/backend/src/boot/master.ts

@@ -10,7 +10,6 @@ import semver from 'semver';
 import Logger from '@/services/logger.js';
 import loadConfig from '@/config/load.js';
 import { Config } from '@/config/types.js';
-import { lessThan } from '@/prelude/array.js';
 import { envOption } from '../env.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
 import { db, initDb } from '../db/postgre.js';

packages/backend/src/db/postgre.ts

@@ -71,7 +71,6 @@ import { UserPending } from '@/models/entities/user-pending.js';
 
 import { entities as charts } from '@/services/chart/entities.js';
 import { Webhook } from '@/models/entities/webhook.js';
-import { envOption } from '../env.js';
 import { dbLogger } from './logger.js';
 import { redisClient } from './redis.js';
 

packages/backend/src/models/index.ts

@@ -3,7 +3,6 @@ import { db } from '@/db/postgre.js';
 
 import { Announcement } from './entities/announcement.js';
 import { AnnouncementRead } from './entities/announcement-read.js';
-import { Instance } from './entities/instance.js';
 import { Poll } from './entities/poll.js';
 import { PollVote } from './entities/poll-vote.js';
 import { Meta } from './entities/meta.js';

packages/backend/src/queue/processors/db/import-blocking.ts

@@ -5,7 +5,7 @@ import * as Acct from '@/misc/acct.js';
 import { resolveUser } from '@/remote/resolve-user.js';
 import { downloadTextFile } from '@/misc/download-text-file.js';
 import { isSelfHost, toPuny } from '@/misc/convert-host.js';
-import { Users, DriveFiles, Blockings } from '@/models/index.js';
+import { Users, DriveFiles } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
 import block from '@/services/blocking/create.js';
 import { IsNull } from 'typeorm';

packages/backend/src/queue/processors/ended-poll-notification.ts

@@ -1,6 +1,5 @@
 import Bull from 'bull';
-import { In } from 'typeorm';
-import { Notes, Polls, PollVotes } from '@/models/index.js';
+import { Notes, PollVotes } from '@/models/index.js';
 import { queueLogger } from '../logger.js';
 import { EndedPollNotificationJobData } from '@/queue/types.js';
 import { createNotification } from '@/services/create-notification.js';

packages/backend/src/queue/processors/webhook-deliver.ts

@@ -1,4 +1,3 @@
-import { URL } from 'node:url';
 import Bull from 'bull';
 import Logger from '@/services/logger.js';
 import { WebhookDeliverJobData } from '../types.js';

packages/backend/src/remote/activitypub/audience.ts

@@ -3,7 +3,7 @@ import Resolver from './resolver.js';
 import { resolvePerson } from './models/person.js';
 import { unique, concat } from '@/prelude/array.js';
 import promiseLimit from 'promise-limit';
-import { User, CacheableRemoteUser, CacheableUser } from '@/models/entities/user.js';
+import { CacheableRemoteUser, CacheableUser } from '@/models/entities/user.js';
 
 type Visibility = 'public' | 'home' | 'followers' | 'specified';
 

packages/backend/src/remote/activitypub/db-resolver.ts

@@ -1,7 +1,7 @@
 import escapeRegexp from 'escape-regexp';
 import config from '@/config/index.js';
 import { Note } from '@/models/entities/note.js';
-import { User, IRemoteUser, CacheableRemoteUser, CacheableUser } from '@/models/entities/user.js';
+import { CacheableRemoteUser, CacheableUser } from '@/models/entities/user.js';
 import { UserPublickey } from '@/models/entities/user-publickey.js';
 import { MessagingMessage } from '@/models/entities/messaging-message.js';
 import { Notes, Users, UserPublickeys, MessagingMessages } from '@/models/index.js';

packages/backend/src/remote/activitypub/kernel/index.ts

@@ -17,7 +17,6 @@ import flag from './flag/index.js';
 import { apLogger } from '../logger.js';
 import Resolver from '../resolver.js';
 import { toArray } from '@/prelude/array.js';
-import { Users } from '@/models/index.js';
 
 export async function performActivity(actor: CacheableRemoteUser, activity: IObject) {
 	if (isCollectionOrOrderedCollection(activity)) {

packages/backend/src/remote/activitypub/kernel/undo/accept.ts

@@ -1,5 +1,4 @@
 import unfollow from '@/services/following/delete.js';
-import cancelRequest from '@/services/following/requests/cancel.js';
 import { IAccept } from '../../type.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Followings } from '@/models/index.js';

packages/backend/src/remote/activitypub/models/image.ts

@@ -1,10 +1,10 @@
 import { uploadFromUrl } from '@/services/drive/upload-from-url.js';
-import { CacheableRemoteUser, IRemoteUser } from '@/models/entities/user.js';
+import { CacheableRemoteUser } from '@/models/entities/user.js';
 import Resolver from '../resolver.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { apLogger } from '../logger.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
-import { DriveFiles, Users } from '@/models/index.js';
+import { DriveFiles } from '@/models/index.js';
 import { truncate } from '@/misc/truncate.js';
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js';
 

packages/backend/src/remote/activitypub/models/mention.ts

@@ -1,6 +1,6 @@
 import promiseLimit from 'promise-limit';
 import { toArray, unique } from '@/prelude/array.js';
-import { CacheableUser, User } from '@/models/entities/user.js';
+import { CacheableUser } from '@/models/entities/user.js';
 import { IObject, isMention, IApMention } from '../type.js';
 import Resolver from '../resolver.js';
 import { resolvePerson } from './person.js';

packages/backend/src/remote/activitypub/models/person.ts

@@ -5,7 +5,7 @@ import config from '@/config/index.js';
 import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instance-doc.js';
 import { Note } from '@/models/entities/note.js';
 import { updateUsertags } from '@/services/update-hashtag.js';
-import { Users, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '@/models/index.js';
+import { Users, Instances, Followings, UserProfiles, UserPublickeys } from '@/models/index.js';
 import { User, IRemoteUser, CacheableUser } from '@/models/entities/user.js';
 import { Emoji } from '@/models/entities/emoji.js';
 import { UserNotePining } from '@/models/entities/user-note-pining.js';

packages/backend/src/remote/activitypub/renderer/flag.ts

@@ -1,7 +1,5 @@
 import config from '@/config/index.js';
-import { IObject, IActivity } from '@/remote/activitypub/type.js';
-import { ILocalUser, IRemoteUser } from '@/models/entities/user.js';
-import { getInstanceActor } from '@/services/instance-actor.js';
+import { ILocalUser } from '@/models/entities/user.js';
 
 // to anonymise reporters, the reporting actor must be a system user
 // object has to be a uri or array of uris

packages/backend/src/remote/activitypub/renderer/undo.ts

@@ -1,5 +1,5 @@
 import config from '@/config/index.js';
-import { ILocalUser, User } from '@/models/entities/user.js';
+import { User } from '@/models/entities/user.js';
 
 export default (object: any, user: { id: User['id'] }) => {
 	if (object == null) return null;

packages/backend/src/remote/activitypub/resolver.ts

@@ -6,7 +6,7 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
 import { extractDbHost, isSelfHost } from '@/misc/convert-host.js';
 import { signedGet } from './request.js';
 import { IObject, isCollectionOrOrderedCollection, ICollection, IOrderedCollection } from './type.js';
-import { FollowRequests, Notes, NoteReactions, Polls, Users } from '@/models/index.js';
+import { Notes, NoteReactions, Polls, Users } from '@/models/index.js';
 import { parseUri } from './db-resolver.js';
 import renderNote from '@/remote/activitypub/renderer/note.js';
 import { renderLike } from '@/remote/activitypub/renderer/like.js';

packages/backend/src/server/api/call.ts

@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import Koa from 'koa';
-import { CacheableLocalUser, User } from '@/models/entities/user.js';
+import { CacheableLocalUser } from '@/models/entities/user.js';
 import { AccessToken } from '@/models/entities/access-token.js';
 import { getIpHash } from '@/misc/get-ip-hash.js';
 import { limiter } from './limiter.js';

packages/backend/src/server/api/common/generate-muted-instance-query.ts

@@ -1,5 +1,4 @@
 import { User } from '@/models/entities/user.js';
-import { id } from '@/models/id.js';
 import { UserProfiles } from '@/models/index.js';
 import { SelectQueryBuilder, Brackets } from 'typeorm';
 

packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts

@@ -1,7 +1,6 @@
 import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts

@@ -2,7 +2,6 @@ import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts

@@ -1,6 +1,5 @@
 import define from '../../../define.js';
 import { createImportCustomEmojisJob } from '@/queue/index.js';
-import ms from 'ms';
 
 export const meta = {
 	secure: true,

packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts

@@ -1,7 +1,6 @@
 import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts

@@ -1,7 +1,6 @@
 import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts

@@ -1,7 +1,6 @@
 import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -1,7 +1,6 @@
 import define from '../../define.js';
 import { Meta } from '@/models/entities/meta.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
-import { DB_MAX_NOTE_TEXT_LENGTH } from '@/misc/hard-limits.js';
 import { db } from '@/db/postgre.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/ap/get.ts

@@ -1,6 +1,5 @@
 import define from '../../define.js';
 import Resolver from '@/remote/activitypub/resolver.js';
-import { ApiError } from '../../error.js';
 import ms from 'ms';
 
 export const meta = {

packages/backend/src/server/api/endpoints/drive/files/delete.ts

@@ -2,7 +2,7 @@ import { deleteFile } from '@/services/drive/delete-file.js';
 import { publishDriveStream } from '@/services/stream.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles, Users } from '@/models/index.js';
+import { DriveFiles } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],

packages/backend/src/server/api/endpoints/drive/files/show.ts

@@ -1,5 +1,5 @@
 import { DriveFile } from '@/models/entities/drive-file.js';
-import { DriveFiles, Users } from '@/models/index.js';
+import { DriveFiles } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 

packages/backend/src/server/api/endpoints/drive/files/update.ts

@@ -1,8 +1,7 @@
 import { publishDriveStream } from '@/services/stream.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles, DriveFolders, Users } from '@/models/index.js';
-import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js';
+import { DriveFiles, DriveFolders } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],

packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts

@@ -3,7 +3,6 @@ import { uploadFromUrl } from '@/services/drive/upload-from-url.js';
 import define from '../../../define.js';
 import { DriveFiles } from '@/models/index.js';
 import { publishMainStream } from '@/services/stream.js';
-import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js';
 
 export const meta = {
 	tags: ['drive'],

packages/backend/src/server/api/endpoints/federation/instances.ts

@@ -1,4 +1,3 @@
-import config from '@/config/index.js';
 import define from '../../define.js';
 import { Instances } from '@/models/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';

packages/backend/src/server/api/endpoints/gallery/posts/create.ts

@@ -3,7 +3,6 @@ import define from '../../../define.js';
 import { DriveFiles, GalleryPosts } from '@/models/index.js';
 import { genId } from '../../../../../misc/gen-id.js';
 import { GalleryPost } from '@/models/entities/gallery-post.js';
-import { ApiError } from '../../../error.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/gallery/posts/update.ts

@@ -1,8 +1,6 @@
 import ms from 'ms';
 import define from '../../../define.js';
 import { DriveFiles, GalleryPosts } from '@/models/index.js';
-import { GalleryPost } from '@/models/entities/gallery-post.js';
-import { ApiError } from '../../../error.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/messaging/messages/create.ts

@@ -1,7 +1,7 @@
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
-import { MessagingMessages, DriveFiles, UserGroups, UserGroupJoinings, Blockings } from '@/models/index.js';
+import { DriveFiles, UserGroups, UserGroupJoinings, Blockings } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { createMessage } from '@/services/messages/create.js';

packages/backend/src/server/api/endpoints/meta.ts

@@ -2,7 +2,6 @@ import { IsNull, MoreThan } from 'typeorm';
 import config from '@/config/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Ads, Emojis, Users } from '@/models/index.js';
-import { DB_MAX_NOTE_TEXT_LENGTH } from '@/misc/hard-limits.js';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
 import define from '../define.js';
 

packages/backend/src/server/api/endpoints/notes/global-timeline.ts

@@ -1,5 +1,5 @@
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { Notes, Users } from '@/models/index.js';
+import { Notes } from '@/models/index.js';
 import { activeUsersChart } from '@/services/chart/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -1,6 +1,6 @@
 import { Brackets } from 'typeorm';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { Followings, Notes, Users } from '@/models/index.js';
+import { Followings, Notes } from '@/models/index.js';
 import { activeUsersChart } from '@/services/chart/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';

packages/backend/src/server/api/endpoints/notes/local-timeline.ts

@@ -1,6 +1,6 @@
 import { Brackets } from 'typeorm';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { Notes, Users } from '@/models/index.js';
+import { Notes } from '@/models/index.js';
 import { activeUsersChart } from '@/services/chart/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';

packages/backend/src/server/api/endpoints/notes/reactions.ts

@@ -1,8 +1,7 @@
-import { DeepPartial, FindOptionsWhere } from 'typeorm';
+import { FindOptionsWhere } from 'typeorm';
 import { NoteReactions } from '@/models/index.js';
 import { NoteReaction } from '@/models/entities/note-reaction.js';
 import define from '../../define.js';
-import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['notes', 'reactions'],

packages/backend/src/server/api/endpoints/request-reset-password.ts

@@ -1,12 +1,10 @@
 import rndstr from 'rndstr';
 import ms from 'ms';
 import { IsNull } from 'typeorm';
-import { publishMainStream } from '@/services/stream.js';
 import config from '@/config/index.js';
 import { Users, UserProfiles, PasswordResetRequests } from '@/models/index.js';
 import { sendEmail } from '@/services/send-email.js';
 import { genId } from '@/misc/gen-id.js';
-import { ApiError } from '../error.js';
 import define from '../define.js';
 
 export const meta = {

packages/backend/src/server/api/endpoints/reset-db.ts

@@ -1,6 +1,5 @@
 import { resetDb } from '@/db/postgre.js';
 import define from '../define.js';
-import { ApiError } from '../error.js';
 
 export const meta = {
 	tags: ['non-productive'],

packages/backend/src/server/api/endpoints/reset-password.ts

@@ -1,8 +1,6 @@
 import bcrypt from 'bcryptjs';
-import { publishMainStream } from '@/services/stream.js';
-import { Users, UserProfiles, PasswordResetRequests } from '@/models/index.js';
+import { UserProfiles, PasswordResetRequests } from '@/models/index.js';
 import define from '../define.js';
-import { ApiError } from '../error.js';
 
 export const meta = {
 	tags: ['reset password'],

packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts

@@ -1,6 +1,5 @@
 import { Brackets } from 'typeorm';
 import { Followings, Users } from '@/models/index.js';
-import { USER_ACTIVE_THRESHOLD } from '@/const.js';
 import { User } from '@/models/entities/user.js';
 import define from '../../define.js';
 

packages/backend/src/server/api/limiter.ts

@@ -1,5 +1,4 @@
 import Limiter from 'ratelimiter';
-import { CacheableLocalUser, User } from '@/models/entities/user.js';
 import Logger from '@/services/logger.js';
 import { redisClient } from '../../db/redis.js';
 import { IEndpointMeta } from './endpoints.js';

packages/backend/src/server/api/private/signup-pending.ts

@@ -1,5 +1,5 @@
 import Koa from 'koa';
-import { Users, UserPendings, UserProfiles } from '@/models/index.js';
+import { UserPendings, UserProfiles } from '@/models/index.js';
 import { signup } from '../common/signup.js';
 import signin from '../common/signin.js';
 

packages/backend/src/server/api/stream/index.ts

@@ -3,7 +3,7 @@ import * as websocket from 'websocket';
 import readNote from '@/services/note/read.js';
 import { User } from '@/models/entities/user.js';
 import { Channel as ChannelModel } from '@/models/entities/channel.js';
-import { Users, Followings, Mutings, UserProfiles, ChannelFollowings, Blockings } from '@/models/index.js';
+import { Followings, Mutings, UserProfiles, ChannelFollowings, Blockings } from '@/models/index.js';
 import { AccessToken } from '@/models/entities/access-token.js';
 import { UserProfile } from '@/models/entities/user-profile.js';
 import { publishChannelStream, publishGroupMessagingStream, publishMessagingStream } from '@/services/stream.js';

packages/backend/src/server/api/stream/types.ts

@@ -7,7 +7,6 @@ import { Note } from '@/models/entities/note.js';
 import { Antenna } from '@/models/entities/antenna.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { DriveFolder } from '@/models/entities/drive-folder.js';
-import { Emoji } from '@/models/entities/emoji.js';
 import { UserList } from '@/models/entities/user-list.js';
 import { MessagingMessage } from '@/models/entities/messaging-message.js';
 import { UserGroup } from '@/models/entities/user-group.js';

packages/backend/src/server/file/send-drive-file.ts

@@ -11,7 +11,7 @@ import { InternalStorage } from '@/services/drive/internal-storage.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
 import { detectType } from '@/misc/get-file-info.js';
-import { convertToWebp, convertToJpeg, convertToPng } from '@/services/drive/image-processor.js';
+import { convertToWebp, convertToPng } from '@/services/drive/image-processor.js';
 import { GenerateVideoThumbnail } from '@/services/drive/generate-video-thumbnail.js';
 import { StatusError } from '@/misc/fetch.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';

packages/backend/src/server/web/index.ts

@@ -4,7 +4,7 @@
 
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { PathOrFileDescriptor, readFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import ms from 'ms';
 import Koa from 'koa';
 import Router from '@koa/router';

packages/backend/src/services/blocking/create.ts

@@ -10,7 +10,6 @@ import { User } from '@/models/entities/user.js';
 import { Blockings, Users, FollowRequests, Followings, UserListJoinings, UserLists } from '@/models/index.js';
 import { perUserFollowingChart } from '@/services/chart/index.js';
 import { genId } from '@/misc/gen-id.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';
 import { webhookDeliver } from '@/queue/index.js';
 

packages/backend/src/services/blocking/delete.ts

@@ -3,7 +3,7 @@ import { renderBlock } from '@/remote/activitypub/renderer/block.js';
 import renderUndo from '@/remote/activitypub/renderer/undo.js';
 import { deliver } from '@/queue/index.js';
 import Logger from '../logger.js';
-import { CacheableUser, User } from '@/models/entities/user.js';
+import { CacheableUser } from '@/models/entities/user.js';
 import { Blockings, Users } from '@/models/index.js';
 
 const logger = new Logger('blocking/delete');

packages/backend/src/services/chart/charts/active-users.ts

@@ -1,6 +1,5 @@
 import Chart, { KVs } from '../core.js';
 import { User } from '@/models/entities/user.js';
-import { Users } from '@/models/index.js';
 import { name, schema } from './entities/active-users.js';
 
 const week = 1000 * 60 * 60 * 24 * 7;

packages/backend/src/services/chart/charts/drive.ts

@@ -1,6 +1,4 @@
 import Chart, { KVs } from '../core.js';
-import { DriveFiles } from '@/models/index.js';
-import { Not, IsNull } from 'typeorm';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { name, schema } from './entities/drive.js';
 

packages/backend/src/services/drive/add-file.ts

@@ -10,7 +10,7 @@ import { driveLogger } from './logger.js';
 import { IImage, convertSharpToJpeg, convertSharpToWebp, convertSharpToPng } from './image-processor.js';
 import { contentDisposition } from '@/misc/content-disposition.js';
 import { getFileInfo } from '@/misc/get-file-info.js';
-import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '@/models/index.js';
+import { DriveFiles, DriveFolders, Users, UserProfiles } from '@/models/index.js';
 import { InternalStorage } from './internal-storage.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { IRemoteUser, User } from '@/models/entities/user.js';

packages/backend/src/services/drive/delete-file.ts

@@ -1,6 +1,6 @@
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { InternalStorage } from './internal-storage.js';
-import { DriveFiles, Instances } from '@/models/index.js';
+import { DriveFiles } from '@/models/index.js';
 import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index.js';
 import { createDeleteObjectStorageFileJob } from '@/queue/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';

packages/backend/src/services/drive/generate-video-thumbnail.ts

@@ -1,4 +1,3 @@
-import * as fs from 'node:fs';
 import { createTempDir } from '@/misc/create-temp.js';
 import { IImage, convertToJpeg } from './image-processor.js';
 import FFmpeg from 'fluent-ffmpeg';

packages/backend/src/services/following/reject.ts

@@ -3,7 +3,7 @@ import renderFollow from '@/remote/activitypub/renderer/follow.js';
 import renderReject from '@/remote/activitypub/renderer/reject.js';
 import { deliver, webhookDeliver } from '@/queue/index.js';
 import { publishMainStream, publishUserEvent } from '@/services/stream.js';
-import { User, ILocalUser, IRemoteUser } from '@/models/entities/user.js';
+import { ILocalUser, IRemoteUser } from '@/models/entities/user.js';
 import { Users, FollowRequests, Followings } from '@/models/index.js';
 import { decrementFollowing } from './delete.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';

packages/backend/src/services/following/requests/accept.ts

@@ -4,7 +4,7 @@ import renderAccept from '@/remote/activitypub/renderer/accept.js';
 import { deliver } from '@/queue/index.js';
 import { publishMainStream } from '@/services/stream.js';
 import { insertFollowingDoc } from '../create.js';
-import { User, ILocalUser, CacheableUser } from '@/models/entities/user.js';
+import { User, CacheableUser } from '@/models/entities/user.js';
 import { FollowRequests, Users } from '@/models/index.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 

packages/backend/src/services/following/requests/cancel.ts

@@ -4,7 +4,7 @@ import renderUndo from '@/remote/activitypub/renderer/undo.js';
 import { deliver } from '@/queue/index.js';
 import { publishMainStream } from '@/services/stream.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { User, ILocalUser } from '@/models/entities/user.js';
+import { User } from '@/models/entities/user.js';
 import { Users, FollowRequests } from '@/models/index.js';
 
 export default async function(followee: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox'] }, follower: { id: User['id']; host: User['host']; uri: User['host'] }) {

packages/backend/src/services/note/create.ts

@@ -16,7 +16,7 @@ import { extractMentions } from '@/misc/extract-mentions.js';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
 import { extractHashtags } from '@/misc/extract-hashtags.js';
 import { Note, IMentionedRemoteUsers } from '@/models/entities/note.js';
-import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, Antennas, Followings, MutedNotes, Channels, ChannelFollowings, Blockings, NoteThreadMutings } from '@/models/index.js';
+import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, MutedNotes, Channels, ChannelFollowings, NoteThreadMutings } from '@/models/index.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { App } from '@/models/entities/app.js';
 import { Not, In } from 'typeorm';

packages/backend/src/services/note/polls/vote.ts

@@ -1,5 +1,5 @@
 import { publishNoteStream } from '@/services/stream.js';
-import { CacheableUser, User } from '@/models/entities/user.js';
+import { CacheableUser } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { PollVotes, NoteWatchings, Polls, Blockings } from '@/models/index.js';
 import { Not } from 'typeorm';

packages/backend/src/services/user-cache.ts

@@ -1,4 +1,4 @@
-import { CacheableLocalUser, CacheableUser, ILocalUser, User } from '@/models/entities/user.js';
+import { CacheableLocalUser, CacheableUser, ILocalUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
 import { Cache } from '@/misc/cache.js';
 import { subsdcriber } from '@/db/redis.js';