Merge branch 'develop'

5 files changed, 12 insertions, 12 deletions

diff --git a/src/remote/activitypub/kernel/undo/announce.ts b/src/remote/activitypub/kernel/undo/announce.ts
index e08fea188d..7bb9d7fcad 100644
--- a/src/remote/activitypub/kernel/undo/announce.ts
+++ b/src/remote/activitypub/kernel/undo/announce.ts
@@ -1,7 +1,7 @@
-import { Notes } from '../../../../models';
-import { IRemoteUser } from '../../../../models/entities/user';
+import { Notes } from '@/models/index';
+import { IRemoteUser } from '@/models/entities/user';
 import { IAnnounce, getApId } from '../../type';
-import deleteNote from '../../../../services/note/delete';
+import deleteNote from '@/services/note/delete';
 
 export const undoAnnounce = async (actor: IRemoteUser, activity: IAnnounce): Promise<string> => {
 	const uri = getApId(activity);
diff --git a/src/remote/activitypub/kernel/undo/block.ts b/src/remote/activitypub/kernel/undo/block.ts
index 73000fc3f1..61940486be 100644
--- a/src/remote/activitypub/kernel/undo/block.ts
+++ b/src/remote/activitypub/kernel/undo/block.ts
@@ -1,6 +1,6 @@
 import { IBlock } from '../../type';
-import unblock from '../../../../services/blocking/delete';
-import { IRemoteUser } from '../../../../models/entities/user';
+import unblock from '@/services/blocking/delete';
+import { IRemoteUser } from '@/models/entities/user';
 import DbResolver from '../../db-resolver';
 
 export default async (actor: IRemoteUser, activity: IBlock): Promise<string> => {
diff --git a/src/remote/activitypub/kernel/undo/follow.ts b/src/remote/activitypub/kernel/undo/follow.ts
index 73a164030b..d85c7e4a71 100644
--- a/src/remote/activitypub/kernel/undo/follow.ts
+++ b/src/remote/activitypub/kernel/undo/follow.ts
@@ -1,8 +1,8 @@
-import unfollow from '../../../../services/following/delete';
-import cancelRequest from '../../../../services/following/requests/cancel';
+import unfollow from '@/services/following/delete';
+import cancelRequest from '@/services/following/requests/cancel';
 import { IFollow } from '../../type';
-import { IRemoteUser } from '../../../../models/entities/user';
-import { FollowRequests, Followings } from '../../../../models';
+import { IRemoteUser } from '@/models/entities/user';
+import { FollowRequests, Followings } from '@/models/index';
 import DbResolver from '../../db-resolver';
 
 export default async (actor: IRemoteUser, activity: IFollow): Promise<string> => {
diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts
index 0bab3c9666..14b1add152 100644
--- a/src/remote/activitypub/kernel/undo/index.ts
+++ b/src/remote/activitypub/kernel/undo/index.ts
@@ -1,4 +1,4 @@
-import { IRemoteUser } from '../../../../models/entities/user';
+import { IRemoteUser } from '@/models/entities/user';
 import { IUndo, isFollow, isBlock, isLike, isAnnounce, getApType } from '../../type';
 import unfollow from './follow';
 import unblock from './block';
diff --git a/src/remote/activitypub/kernel/undo/like.ts b/src/remote/activitypub/kernel/undo/like.ts
index bd6930c66b..7f821cada0 100644
--- a/src/remote/activitypub/kernel/undo/like.ts
+++ b/src/remote/activitypub/kernel/undo/like.ts
@@ -1,6 +1,6 @@
-import { IRemoteUser } from '../../../../models/entities/user';
+import { IRemoteUser } from '@/models/entities/user';
 import { ILike, getApId } from '../../type';
-import deleteReaction from '../../../../services/note/reaction/delete';
+import deleteReaction from '@/services/note/reaction/delete';
 import { fetchNote } from '../../models/note';
 
 /**