diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-23 17:43:07 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-23 17:43:07 +0900 |
| commit | c74fe3c6e2aae3df4624b9b3a55b45293223ebf5 (patch) | |
| tree | 53ed8d31143b15b6621e59002006e318789e36a4 /src/remote/activitypub | |
| parent | refactor: Tweak path alias of client (diff) | |
| download | sharkey-c74fe3c6e2aae3df4624b9b3a55b45293223ebf5.tar.gz sharkey-c74fe3c6e2aae3df4624b9b3a55b45293223ebf5.tar.bz2 sharkey-c74fe3c6e2aae3df4624b9b3a55b45293223ebf5.zip | |
refactor: Use path alias
Diffstat (limited to 'src/remote/activitypub')
37 files changed, 54 insertions, 54 deletions
diff --git a/src/remote/activitypub/db-resolver.ts b/src/remote/activitypub/db-resolver.ts index 26162b6b23..dba1f0f0b1 100644 --- a/src/remote/activitypub/db-resolver.ts +++ b/src/remote/activitypub/db-resolver.ts @@ -1,4 +1,4 @@ -import config from '../../config'; +import config from '@/config'; import { Note } from '../../models/entities/note'; import { User, IRemoteUser } from '../../models/entities/user'; import { UserPublickey } from '../../models/entities/user-publickey'; diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts index 765180742a..d5176897bc 100644 --- a/src/remote/activitypub/kernel/announce/note.ts +++ b/src/remote/activitypub/kernel/announce/note.ts @@ -4,9 +4,9 @@ import { IRemoteUser } from '../../../../models/entities/user'; import { IAnnounce, getApId } from '../../type'; import { fetchNote, resolveNote } from '../../models/note'; import { apLogger } from '../../logger'; -import { extractDbHost } from '../../../../misc/convert-host'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { getApLock } from '../../../../misc/app-lock'; +import { extractDbHost } from '@/misc/convert-host'; +import { fetchMeta } from '@/misc/fetch-meta'; +import { getApLock } from '@/misc/app-lock'; import { parseAudience } from '../../audience'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/create/note.ts b/src/remote/activitypub/kernel/create/note.ts index f4fb8e5647..69499d303e 100644 --- a/src/remote/activitypub/kernel/create/note.ts +++ b/src/remote/activitypub/kernel/create/note.ts @@ -2,8 +2,8 @@ import Resolver from '../../resolver'; import { IRemoteUser } from '../../../../models/entities/user'; import { createNote, fetchNote } from '../../models/note'; import { getApId, IObject, ICreate } from '../../type'; -import { getApLock } from '../../../../misc/app-lock'; -import { extractDbHost } from '../../../../misc/convert-host'; +import { getApLock } from '@/misc/app-lock'; +import { extractDbHost } from '@/misc/convert-host'; /** * 投稿作成アクティビティを捌きます diff --git a/src/remote/activitypub/kernel/delete/note.ts b/src/remote/activitypub/kernel/delete/note.ts index 8fa2285dba..1a7844f68b 100644 --- a/src/remote/activitypub/kernel/delete/note.ts +++ b/src/remote/activitypub/kernel/delete/note.ts @@ -2,7 +2,7 @@ import { IRemoteUser } from '../../../../models/entities/user'; import deleteNode from '../../../../services/note/delete'; import { apLogger } from '../../logger'; import DbResolver from '../../db-resolver'; -import { getApLock } from '../../../../misc/app-lock'; +import { getApLock } from '@/misc/app-lock'; import { deleteMessage } from '../../../../services/messages/delete'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/flag/index.ts b/src/remote/activitypub/kernel/flag/index.ts index 46ea789b4b..5f5357a3ed 100644 --- a/src/remote/activitypub/kernel/flag/index.ts +++ b/src/remote/activitypub/kernel/flag/index.ts @@ -1,9 +1,9 @@ import { IRemoteUser } from '../../../../models/entities/user'; -import config from '../../../../config'; +import config from '@/config'; import { IFlag, getApIds } from '../../type'; import { AbuseUserReports, Users } from '../../../../models'; import { In } from 'typeorm'; -import { genId } from '../../../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; export default async (actor: IRemoteUser, activity: IFlag): Promise<string> => { // objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので diff --git a/src/remote/activitypub/kernel/read.ts b/src/remote/activitypub/kernel/read.ts index e4049fa7ef..edbc8e68ed 100644 --- a/src/remote/activitypub/kernel/read.ts +++ b/src/remote/activitypub/kernel/read.ts @@ -1,6 +1,6 @@ import { IRemoteUser } from '../../../models/entities/user'; import { IRead, getApId } from '../type'; -import { isSelfHost, extractDbHost } from '../../../misc/convert-host'; +import { isSelfHost, extractDbHost } from '@/misc/convert-host'; import { MessagingMessages } from '../../../models'; import { readUserMessagingMessage } from '../../../server/api/common/read-messaging-message'; diff --git a/src/remote/activitypub/misc/ld-signature.ts b/src/remote/activitypub/misc/ld-signature.ts index 070e39edfb..dec07ea81b 100644 --- a/src/remote/activitypub/misc/ld-signature.ts +++ b/src/remote/activitypub/misc/ld-signature.ts @@ -2,7 +2,7 @@ import * as crypto from 'crypto'; import * as jsonld from 'jsonld'; import { CONTEXTS } from './contexts'; import fetch from 'node-fetch'; -import { httpAgent, httpsAgent } from '../../../misc/fetch'; +import { httpAgent, httpsAgent } from '@/misc/fetch'; // RsaSignature2017 based from https://github.com/transmute-industries/RsaSignature2017 diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts index dd8086cbeb..79fc2bf4a6 100644 --- a/src/remote/activitypub/models/image.ts +++ b/src/remote/activitypub/models/image.ts @@ -1,7 +1,7 @@ import uploadFromUrl from '../../../services/drive/upload-from-url'; import { IRemoteUser } from '../../../models/entities/user'; import Resolver from '../resolver'; -import { fetchMeta } from '../../../misc/fetch-meta'; +import { fetchMeta } from '@/misc/fetch-meta'; import { apLogger } from '../logger'; import { DriveFile } from '../../../models/entities/drive-file'; import { DriveFiles } from '../../../models'; diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index e3488800ca..09e066708f 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -1,6 +1,6 @@ import * as promiseLimit from 'promise-limit'; -import config from '../../../config'; +import config from '@/config'; import Resolver from '../resolver'; import post from '../../../services/note/create'; import { resolvePerson, updatePerson } from './person'; @@ -14,14 +14,14 @@ import vote from '../../../services/note/polls/vote'; import { apLogger } from '../logger'; import { DriveFile } from '../../../models/entities/drive-file'; import { deliverQuestionUpdate } from '../../../services/note/polls/update'; -import { extractDbHost, toPuny } from '../../../misc/convert-host'; +import { extractDbHost, toPuny } from '@/misc/convert-host'; import { Emojis, Polls, MessagingMessages } from '../../../models'; import { Note } from '../../../models/entities/note'; import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji } from '../type'; import { Emoji } from '../../../models/entities/emoji'; -import { genId } from '../../../misc/gen-id'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { getApLock } from '../../../misc/app-lock'; +import { genId } from '@/misc/gen-id'; +import { fetchMeta } from '@/misc/fetch-meta'; +import { getApLock } from '@/misc/app-lock'; import { createMessage } from '../../../services/messages/create'; import { parseAudience } from '../audience'; import { extractApMentions } from './mention'; diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 93e95df0a4..734275a473 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -1,6 +1,6 @@ import * as promiseLimit from 'promise-limit'; -import config from '../../../config'; +import config from '@/config'; import Resolver from '../resolver'; import { resolveImage } from './image'; import { isCollectionOrOrderedCollection, isCollection, IPerson, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue } from '../type'; @@ -16,17 +16,17 @@ import { Users, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys import { User, IRemoteUser } from '../../../models/entities/user'; import { Emoji } from '../../../models/entities/emoji'; import { UserNotePining } from '../../../models/entities/user-note-pining'; -import { genId } from '../../../misc/gen-id'; +import { genId } from '@/misc/gen-id'; import { instanceChart, usersChart } from '../../../services/chart'; import { UserPublickey } from '../../../models/entities/user-publickey'; -import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error'; -import { toPuny } from '../../../misc/convert-host'; +import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error'; +import { toPuny } from '@/misc/convert-host'; import { UserProfile } from '../../../models/entities/user-profile'; import { validActor } from '../../../remote/activitypub/type'; import { getConnection } from 'typeorm'; import { toArray } from '../../../prelude/array'; import { fetchInstanceMetadata } from '../../../services/fetch-instance-metadata'; -import { normalizeForSearch } from '../../../misc/normalize-for-search'; +import { normalizeForSearch } from '@/misc/normalize-for-search'; const logger = apLogger; diff --git a/src/remote/activitypub/models/question.ts b/src/remote/activitypub/models/question.ts index 6b6749894a..966b15af11 100644 --- a/src/remote/activitypub/models/question.ts +++ b/src/remote/activitypub/models/question.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import Resolver from '../resolver'; import { IObject, IQuestion, isQuestion, } from '../type'; import { apLogger } from '../logger'; diff --git a/src/remote/activitypub/renderer/accept.ts b/src/remote/activitypub/renderer/accept.ts index 21b4629074..03f7b07387 100644 --- a/src/remote/activitypub/renderer/accept.ts +++ b/src/remote/activitypub/renderer/accept.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; export default (object: any, user: ILocalUser) => ({ diff --git a/src/remote/activitypub/renderer/add.ts b/src/remote/activitypub/renderer/add.ts index 46f937f61d..18f9ccacf5 100644 --- a/src/remote/activitypub/renderer/add.ts +++ b/src/remote/activitypub/renderer/add.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; export default (user: ILocalUser, target: any, object: any) => ({ diff --git a/src/remote/activitypub/renderer/announce.ts b/src/remote/activitypub/renderer/announce.ts index d82bf6a693..f577dbbc89 100644 --- a/src/remote/activitypub/renderer/announce.ts +++ b/src/remote/activitypub/renderer/announce.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { Note } from '../../../models/entities/note'; export default (object: any, note: Note) => { diff --git a/src/remote/activitypub/renderer/block.ts b/src/remote/activitypub/renderer/block.ts index c29a9aea82..26b7dd580a 100644 --- a/src/remote/activitypub/renderer/block.ts +++ b/src/remote/activitypub/renderer/block.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser, IRemoteUser } from '../../../models/entities/user'; export default (blocker: ILocalUser, blockee: IRemoteUser) => ({ diff --git a/src/remote/activitypub/renderer/create.ts b/src/remote/activitypub/renderer/create.ts index e1fc0515c8..ff0840b9e6 100644 --- a/src/remote/activitypub/renderer/create.ts +++ b/src/remote/activitypub/renderer/create.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { Note } from '../../../models/entities/note'; export default (object: any, note: Note) => { diff --git a/src/remote/activitypub/renderer/delete.ts b/src/remote/activitypub/renderer/delete.ts index a98c97e6e9..dd49193424 100644 --- a/src/remote/activitypub/renderer/delete.ts +++ b/src/remote/activitypub/renderer/delete.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; export default (object: any, user: ILocalUser) => ({ diff --git a/src/remote/activitypub/renderer/emoji.ts b/src/remote/activitypub/renderer/emoji.ts index 947a96df37..b62259c32e 100644 --- a/src/remote/activitypub/renderer/emoji.ts +++ b/src/remote/activitypub/renderer/emoji.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { Emoji } from '../../../models/entities/emoji'; export default (emoji: Emoji) => ({ diff --git a/src/remote/activitypub/renderer/follow-relay.ts b/src/remote/activitypub/renderer/follow-relay.ts index 58bc0c90c3..d53bd05825 100644 --- a/src/remote/activitypub/renderer/follow-relay.ts +++ b/src/remote/activitypub/renderer/follow-relay.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { Relay } from '../../../models/entities/relay'; import { ILocalUser } from '../../../models/entities/user'; diff --git a/src/remote/activitypub/renderer/follow-user.ts b/src/remote/activitypub/renderer/follow-user.ts index bfc91bb4cb..744361a24f 100644 --- a/src/remote/activitypub/renderer/follow-user.ts +++ b/src/remote/activitypub/renderer/follow-user.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { Users } from '../../../models'; import { User } from '../../../models/entities/user'; diff --git a/src/remote/activitypub/renderer/follow.ts b/src/remote/activitypub/renderer/follow.ts index 400b15ec7b..fb8bca52ac 100644 --- a/src/remote/activitypub/renderer/follow.ts +++ b/src/remote/activitypub/renderer/follow.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { User } from '../../../models/entities/user'; import { Users } from '../../../models'; diff --git a/src/remote/activitypub/renderer/hashtag.ts b/src/remote/activitypub/renderer/hashtag.ts index 36563c2df5..a739a4b0b6 100644 --- a/src/remote/activitypub/renderer/hashtag.ts +++ b/src/remote/activitypub/renderer/hashtag.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; export default (tag: string) => ({ type: 'Hashtag', diff --git a/src/remote/activitypub/renderer/index.ts b/src/remote/activitypub/renderer/index.ts index 4c33fdafb1..d96c277881 100644 --- a/src/remote/activitypub/renderer/index.ts +++ b/src/remote/activitypub/renderer/index.ts @@ -1,9 +1,9 @@ -import config from '../../../config'; +import config from '@/config'; import { v4 as uuid } from 'uuid'; import { IActivity } from '../type'; import { LdSignature } from '../misc/ld-signature'; import { ILocalUser } from '../../../models/entities/user'; -import { getUserKeypair } from '../../../misc/keypair-store'; +import { getUserKeypair } from '@/misc/keypair-store'; export const renderActivity = (x: any): IActivity | null => { if (x == null) return null; diff --git a/src/remote/activitypub/renderer/key.ts b/src/remote/activitypub/renderer/key.ts index e792f487fd..547059dd3c 100644 --- a/src/remote/activitypub/renderer/key.ts +++ b/src/remote/activitypub/renderer/key.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; import { UserKeypair } from '../../../models/entities/user-keypair'; import { createPublicKey } from 'crypto'; diff --git a/src/remote/activitypub/renderer/like.ts b/src/remote/activitypub/renderer/like.ts index d4dd3663d4..5967836846 100644 --- a/src/remote/activitypub/renderer/like.ts +++ b/src/remote/activitypub/renderer/like.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { NoteReaction } from '../../../models/entities/note-reaction'; import { Note } from '../../../models/entities/note'; import { Emojis } from '../../../models'; diff --git a/src/remote/activitypub/renderer/mention.ts b/src/remote/activitypub/renderer/mention.ts index 3b5e8f27af..14c4c40d47 100644 --- a/src/remote/activitypub/renderer/mention.ts +++ b/src/remote/activitypub/renderer/mention.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { User, ILocalUser } from '../../../models/entities/user'; import { Users } from '../../../models'; diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts index 8e3e0e9ba1..54dee07892 100644 --- a/src/remote/activitypub/renderer/note.ts +++ b/src/remote/activitypub/renderer/note.ts @@ -2,7 +2,7 @@ import renderDocument from './document'; import renderHashtag from './hashtag'; import renderMention from './mention'; import renderEmoji from './emoji'; -import config from '../../../config'; +import config from '@/config'; import toHtml from '../misc/get-note-html'; import { Note, IMentionedRemoteUsers } from '../../../models/entities/note'; import { DriveFile } from '../../../models/entities/drive-file'; diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts index 479e6d76bf..894a6edf01 100644 --- a/src/remote/activitypub/renderer/person.ts +++ b/src/remote/activitypub/renderer/person.ts @@ -1,6 +1,6 @@ import renderImage from './image'; import renderKey from './key'; -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; import { toHtml } from '../../../mfm/to-html'; import { parse } from '../../../mfm/parse'; @@ -9,7 +9,7 @@ import renderEmoji from './emoji'; import { IIdentifier } from '../models/identifier'; import renderHashtag from './hashtag'; import { DriveFiles, UserProfiles } from '../../../models'; -import { getUserKeypair } from '../../../misc/keypair-store'; +import { getUserKeypair } from '@/misc/keypair-store'; export async function renderPerson(user: ILocalUser) { const id = `${config.url}/users/${user.id}`; diff --git a/src/remote/activitypub/renderer/question.ts b/src/remote/activitypub/renderer/question.ts index 6ade10d1bf..3b17c7dc9c 100644 --- a/src/remote/activitypub/renderer/question.ts +++ b/src/remote/activitypub/renderer/question.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; import { Note } from '../../../models/entities/note'; import { Poll } from '../../../models/entities/poll'; diff --git a/src/remote/activitypub/renderer/read.ts b/src/remote/activitypub/renderer/read.ts index c53b47859f..1b5fef298d 100644 --- a/src/remote/activitypub/renderer/read.ts +++ b/src/remote/activitypub/renderer/read.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; import { MessagingMessage } from '../../../models/entities/messaging-message'; diff --git a/src/remote/activitypub/renderer/reject.ts b/src/remote/activitypub/renderer/reject.ts index c4e0ba0d0a..e29057ae9e 100644 --- a/src/remote/activitypub/renderer/reject.ts +++ b/src/remote/activitypub/renderer/reject.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; export default (object: any, user: ILocalUser) => ({ diff --git a/src/remote/activitypub/renderer/remove.ts b/src/remote/activitypub/renderer/remove.ts index 1b9a6b8c05..1d5d2ffe70 100644 --- a/src/remote/activitypub/renderer/remove.ts +++ b/src/remote/activitypub/renderer/remove.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; export default (user: ILocalUser, target: any, object: any) => ({ diff --git a/src/remote/activitypub/renderer/undo.ts b/src/remote/activitypub/renderer/undo.ts index 2ff6b61b90..0e9998a41d 100644 --- a/src/remote/activitypub/renderer/undo.ts +++ b/src/remote/activitypub/renderer/undo.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser, User } from '../../../models/entities/user'; export default (object: any, user: ILocalUser | User) => ({ diff --git a/src/remote/activitypub/renderer/update.ts b/src/remote/activitypub/renderer/update.ts index c1d5ba29b2..636dc5c55c 100644 --- a/src/remote/activitypub/renderer/update.ts +++ b/src/remote/activitypub/renderer/update.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { ILocalUser } from '../../../models/entities/user'; export default (object: any, user: ILocalUser) => { diff --git a/src/remote/activitypub/renderer/vote.ts b/src/remote/activitypub/renderer/vote.ts index 8929c03460..1eb3acc3d5 100644 --- a/src/remote/activitypub/renderer/vote.ts +++ b/src/remote/activitypub/renderer/vote.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '@/config'; import { Note } from '../../../models/entities/note'; import { IRemoteUser, ILocalUser } from '../../../models/entities/user'; import { PollVote } from '../../../models/entities/poll-vote'; diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts index 5f15d5480c..fc774bc9a5 100644 --- a/src/remote/activitypub/request.ts +++ b/src/remote/activitypub/request.ts @@ -3,13 +3,13 @@ import * as https from 'https'; import { sign } from 'http-signature'; import * as crypto from 'crypto'; -import config from '../../config'; +import config from '@/config'; import { ILocalUser } from '../../models/entities/user'; -import { getAgentByUrl } from '../../misc/fetch'; +import { getAgentByUrl } from '@/misc/fetch'; import { URL } from 'url'; import got from 'got'; import * as Got from 'got'; -import { getUserKeypair } from '../../misc/keypair-store'; +import { getUserKeypair } from '@/misc/keypair-store'; export default async (user: ILocalUser, url: string, object: any) => { const timeout = 10 * 1000; diff --git a/src/remote/activitypub/resolver.ts b/src/remote/activitypub/resolver.ts index 2871c1cb41..066bde0883 100644 --- a/src/remote/activitypub/resolver.ts +++ b/src/remote/activitypub/resolver.ts @@ -1,5 +1,5 @@ -import config from '../../config'; -import { getJson } from '../../misc/fetch'; +import config from '@/config'; +import { getJson } from '@/misc/fetch'; import { ILocalUser } from '../../models/entities/user'; import { getInstanceActor } from '../../services/instance-actor'; import { signedGet } from './request'; |