Merge branch 'develop'

10 files changed, 73 insertions, 73 deletions

diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 13d612cf80..8c996bdba6 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -1,29 +1,29 @@
 import * as mfm from 'mfm-js';
 import es from '../../db/elasticsearch';
-import { publishMainStream, publishNotesStream } from '../stream';
-import DeliverManager from '../../remote/activitypub/deliver-manager';
-import renderNote from '../../remote/activitypub/renderer/note';
-import renderCreate from '../../remote/activitypub/renderer/create';
-import renderAnnounce from '../../remote/activitypub/renderer/announce';
-import { renderActivity } from '../../remote/activitypub/renderer';
-import { resolveUser } from '../../remote/resolve-user';
-import config from '@/config';
+import { publishMainStream, publishNotesStream } from '@/services/stream';
+import DeliverManager from '@/remote/activitypub/deliver-manager';
+import renderNote from '@/remote/activitypub/renderer/note';
+import renderCreate from '@/remote/activitypub/renderer/create';
+import renderAnnounce from '@/remote/activitypub/renderer/announce';
+import { renderActivity } from '@/remote/activitypub/renderer/index';
+import { resolveUser } from '@/remote/resolve-user';
+import config from '@/config/index';
 import { updateHashtags } from '../update-hashtag';
-import { concat } from '../../prelude/array';
+import { concat } from '@/prelude/array';
 import insertNoteUnread from './unread';
 import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
 import { extractMentions } from '@/misc/extract-mentions';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm';
 import { extractHashtags } from '@/misc/extract-hashtags';
-import { Note, IMentionedRemoteUsers } from '../../models/entities/note';
-import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, Antennas, Followings, MutedNotes, Channels, ChannelFollowings, Blockings } from '../../models';
-import { DriveFile } from '../../models/entities/drive-file';
-import { App } from '../../models/entities/app';
+import { Note, IMentionedRemoteUsers } from '@/models/entities/note';
+import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, Antennas, Followings, MutedNotes, Channels, ChannelFollowings, Blockings } from '@/models/index';
+import { DriveFile } from '@/models/entities/drive-file';
+import { App } from '@/models/entities/app';
 import { Not, getConnection, In } from 'typeorm';
-import { User, ILocalUser, IRemoteUser } from '../../models/entities/user';
+import { User, ILocalUser, IRemoteUser } from '@/models/entities/user';
 import { genId } from '@/misc/gen-id';
-import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '../chart';
-import { Poll, IPoll } from '../../models/entities/poll';
+import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '@/services/chart/index';
+import { Poll, IPoll } from '@/models/entities/poll';
 import { createNotification } from '../create-notification';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error';
 import { checkHitAntenna } from '@/misc/check-hit-antenna';
@@ -31,7 +31,7 @@ import { checkWordMute } from '@/misc/check-word-mute';
 import { addNoteToAntenna } from '../add-note-to-antenna';
 import { countSameRenotes } from '@/misc/count-same-renotes';
 import { deliverToRelays } from '../relay';
-import { Channel } from '../../models/entities/channel';
+import { Channel } from '@/models/entities/channel';
 import { normalizeForSearch } from '@/misc/normalize-for-search';
 import { getAntennas } from '@/misc/antenna-cache';
 
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts
index a7ac86e106..a14d84e7b2 100644
--- a/src/services/note/delete.ts
+++ b/src/services/note/delete.ts
@@ -1,16 +1,16 @@
-import { publishNoteStream } from '../stream';
-import renderDelete from '../../remote/activitypub/renderer/delete';
-import renderAnnounce from '../../remote/activitypub/renderer/announce';
-import renderUndo from '../../remote/activitypub/renderer/undo';
-import { renderActivity } from '../../remote/activitypub/renderer';
-import renderTombstone from '../../remote/activitypub/renderer/tombstone';
-import config from '@/config';
+import { publishNoteStream } from '@/services/stream';
+import renderDelete from '@/remote/activitypub/renderer/delete';
+import renderAnnounce from '@/remote/activitypub/renderer/announce';
+import renderUndo from '@/remote/activitypub/renderer/undo';
+import { renderActivity } from '@/remote/activitypub/renderer/index';
+import renderTombstone from '@/remote/activitypub/renderer/tombstone';
+import config from '@/config/index';
 import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
-import { User, ILocalUser, IRemoteUser } from '../../models/entities/user';
-import { Note, IMentionedRemoteUsers } from '../../models/entities/note';
-import { Notes, Users, Instances } from '../../models';
-import { notesChart, perUserNotesChart, instanceChart } from '../chart';
-import { deliverToFollowers, deliverToUser } from '../../remote/activitypub/deliver-manager';
+import { User, ILocalUser, IRemoteUser } from '@/models/entities/user';
+import { Note, IMentionedRemoteUsers } from '@/models/entities/note';
+import { Notes, Users, Instances } from '@/models/index';
+import { notesChart, perUserNotesChart, instanceChart } from '@/services/chart/index';
+import { deliverToFollowers, deliverToUser } from '@/remote/activitypub/deliver-manager';
 import { countSameRenotes } from '@/misc/count-same-renotes';
 import { deliverToRelays } from '../relay';
 import { Brackets, In } from 'typeorm';
diff --git a/src/services/note/polls/update.ts b/src/services/note/polls/update.ts
index a33efab668..a22ce8e373 100644
--- a/src/services/note/polls/update.ts
+++ b/src/services/note/polls/update.ts
@@ -1,9 +1,9 @@
-import renderUpdate from '../../../remote/activitypub/renderer/update';
-import { renderActivity } from '../../../remote/activitypub/renderer';
-import renderNote from '../../../remote/activitypub/renderer/note';
-import { Users, Notes } from '../../../models';
-import { Note } from '../../../models/entities/note';
-import { deliverToFollowers } from '../../../remote/activitypub/deliver-manager';
+import renderUpdate from '@/remote/activitypub/renderer/update';
+import { renderActivity } from '@/remote/activitypub/renderer/index';
+import renderNote from '@/remote/activitypub/renderer/note';
+import { Users, Notes } from '@/models/index';
+import { Note } from '@/models/entities/note';
+import { deliverToFollowers } from '@/remote/activitypub/deliver-manager';
 import { deliverToRelays } from '../../relay';
 
 export async function deliverQuestionUpdate(noteId: Note['id']) {
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index d3cf9f2117..886a09dde9 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -1,7 +1,7 @@
-import { publishNoteStream } from '../../stream';
-import { User } from '../../../models/entities/user';
-import { Note } from '../../../models/entities/note';
-import { PollVotes, NoteWatchings, Polls, Blockings } from '../../../models';
+import { publishNoteStream } from '@/services/stream';
+import { User } from '@/models/entities/user';
+import { Note } from '@/models/entities/note';
+import { PollVotes, NoteWatchings, Polls, Blockings } from '@/models/index';
 import { Not } from 'typeorm';
 import { genId } from '@/misc/gen-id';
 import { createNotification } from '../../create-notification';
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index b8a8d172f1..308bd4dff7 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -1,18 +1,18 @@
-import { publishNoteStream } from '../../stream';
-import { renderLike } from '../../../remote/activitypub/renderer/like';
-import DeliverManager from '../../../remote/activitypub/deliver-manager';
-import { renderActivity } from '../../../remote/activitypub/renderer';
+import { publishNoteStream } from '@/services/stream';
+import { renderLike } from '@/remote/activitypub/renderer/like';
+import DeliverManager from '@/remote/activitypub/deliver-manager';
+import { renderActivity } from '@/remote/activitypub/renderer/index';
 import { toDbReaction, decodeReaction } from '@/misc/reaction-lib';
-import { User, IRemoteUser } from '../../../models/entities/user';
-import { Note } from '../../../models/entities/note';
-import { NoteReactions, Users, NoteWatchings, Notes, Emojis, Blockings } from '../../../models';
+import { User, IRemoteUser } from '@/models/entities/user';
+import { Note } from '@/models/entities/note';
+import { NoteReactions, Users, NoteWatchings, Notes, Emojis, Blockings } from '@/models/index';
 import { Not } from 'typeorm';
-import { perUserReactionsChart } from '../../chart';
+import { perUserReactionsChart } from '@/services/chart/index';
 import { genId } from '@/misc/gen-id';
 import { createNotification } from '../../create-notification';
 import deleteReaction from './delete';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error';
-import { NoteReaction } from '../../../models/entities/note-reaction';
+import { NoteReaction } from '@/models/entities/note-reaction';
 import { IdentifiableError } from '@/misc/identifiable-error';
 
 export default async (user: { id: User['id']; host: User['host']; }, note: Note, reaction?: string) => {
diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts
index 712031fa88..062dbad6f1 100644
--- a/src/services/note/reaction/delete.ts
+++ b/src/services/note/reaction/delete.ts
@@ -1,12 +1,12 @@
-import { publishNoteStream } from '../../stream';
-import { renderLike } from '../../../remote/activitypub/renderer/like';
-import renderUndo from '../../../remote/activitypub/renderer/undo';
-import { renderActivity } from '../../../remote/activitypub/renderer';
-import DeliverManager from '../../../remote/activitypub/deliver-manager';
+import { publishNoteStream } from '@/services/stream';
+import { renderLike } from '@/remote/activitypub/renderer/like';
+import renderUndo from '@/remote/activitypub/renderer/undo';
+import { renderActivity } from '@/remote/activitypub/renderer/index';
+import DeliverManager from '@/remote/activitypub/deliver-manager';
 import { IdentifiableError } from '@/misc/identifiable-error';
-import { User, IRemoteUser } from '../../../models/entities/user';
-import { Note } from '../../../models/entities/note';
-import { NoteReactions, Users, Notes } from '../../../models';
+import { User, IRemoteUser } from '@/models/entities/user';
+import { Note } from '@/models/entities/note';
+import { NoteReactions, Users, Notes } from '@/models/index';
 import { decodeReaction } from '@/misc/reaction-lib';
 
 export default async (user: { id: User['id']; host: User['host']; }, note: Note) => {
diff --git a/src/services/note/read.ts b/src/services/note/read.ts
index a661c0a9d0..2e221d553a 100644
--- a/src/services/note/read.ts
+++ b/src/services/note/read.ts
@@ -1,12 +1,12 @@
-import { publishMainStream } from '../stream';
-import { Note } from '../../models/entities/note';
-import { User } from '../../models/entities/user';
-import { NoteUnreads, AntennaNotes, Users, Followings, ChannelFollowings } from '../../models';
+import { publishMainStream } from '@/services/stream';
+import { Note } from '@/models/entities/note';
+import { User } from '@/models/entities/user';
+import { NoteUnreads, AntennaNotes, Users, Followings, ChannelFollowings } from '@/models/index';
 import { Not, IsNull, In } from 'typeorm';
-import { Channel } from '../../models/entities/channel';
+import { Channel } from '@/models/entities/channel';
 import { checkHitAntenna } from '@/misc/check-hit-antenna';
 import { getAntennas } from '@/misc/antenna-cache';
-import { PackedNote } from '../../models/repositories/note';
+import { PackedNote } from '@/models/repositories/note';
 import { readNotificationByQuery } from '@/server/api/common/read-notification';
 
 /**
diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts
index 5cfba0f342..4a9df6083c 100644
--- a/src/services/note/unread.ts
+++ b/src/services/note/unread.ts
@@ -1,7 +1,7 @@
-import { Note } from '../../models/entities/note';
-import { publishMainStream } from '../stream';
-import { User } from '../../models/entities/user';
-import { Mutings, NoteUnreads } from '../../models';
+import { Note } from '@/models/entities/note';
+import { publishMainStream } from '@/services/stream';
+import { User } from '@/models/entities/user';
+import { Mutings, NoteUnreads } from '@/models/index';
 import { genId } from '@/misc/gen-id';
 
 export default async function(userId: User['id'], note: Note, params: {
diff --git a/src/services/note/unwatch.ts b/src/services/note/unwatch.ts
index 047ac343be..8ea02fe33c 100644
--- a/src/services/note/unwatch.ts
+++ b/src/services/note/unwatch.ts
@@ -1,6 +1,6 @@
-import { User } from '../../models/entities/user';
-import { NoteWatchings } from '../../models';
-import { Note } from '../../models/entities/note';
+import { User } from '@/models/entities/user';
+import { NoteWatchings } from '@/models/index';
+import { Note } from '@/models/entities/note';
 
 export default async (me: User['id'], note: Note) => {
 	await NoteWatchings.delete({
diff --git a/src/services/note/watch.ts b/src/services/note/watch.ts
index e333f04286..e457191d99 100644
--- a/src/services/note/watch.ts
+++ b/src/services/note/watch.ts
@@ -1,8 +1,8 @@
-import { User } from '../../models/entities/user';
-import { Note } from '../../models/entities/note';
-import { NoteWatchings } from '../../models';
+import { User } from '@/models/entities/user';
+import { Note } from '@/models/entities/note';
+import { NoteWatchings } from '@/models/index';
 import { genId } from '@/misc/gen-id';
-import { NoteWatching } from '../../models/entities/note-watching';
+import { NoteWatching } from '@/models/entities/note-watching';
 
 export default async (me: User['id'], note: Note) => {
 	// 自分の投稿はwatchできない