refactor: Use path alias
This commit is contained in:
@@ -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';
|
||||
|
@@ -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;
|
||||
|
@@ -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';
|
||||
|
||||
/**
|
||||
* 投稿作成アクティビティを捌きます
|
||||
|
@@ -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;
|
||||
|
@@ -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スキーマと対応させられないので
|
||||
|
@@ -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';
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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';
|
||||
|
@@ -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';
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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';
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { ILocalUser } from '../../../models/entities/user';
|
||||
|
||||
export default (object: any, user: ILocalUser) => ({
|
||||
|
@@ -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) => ({
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
|
||||
export default (object: any, note: Note) => {
|
||||
|
@@ -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) => ({
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { Note } from '../../../models/entities/note';
|
||||
|
||||
export default (object: any, note: Note) => {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { ILocalUser } from '../../../models/entities/user';
|
||||
|
||||
export default (object: any, user: ILocalUser) => ({
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { Emoji } from '../../../models/entities/emoji';
|
||||
|
||||
export default (emoji: Emoji) => ({
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { Relay } from '../../../models/entities/relay';
|
||||
import { ILocalUser } from '../../../models/entities/user';
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { Users } from '../../../models';
|
||||
import { User } from '../../../models/entities/user';
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { User } from '../../../models/entities/user';
|
||||
import { Users } from '../../../models';
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
|
||||
export default (tag: string) => ({
|
||||
type: 'Hashtag',
|
||||
|
@@ -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;
|
||||
|
@@ -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';
|
||||
|
@@ -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';
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { User, ILocalUser } from '../../../models/entities/user';
|
||||
import { Users } from '../../../models';
|
||||
|
||||
|
@@ -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';
|
||||
|
@@ -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}`;
|
||||
|
@@ -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';
|
||||
|
@@ -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';
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { ILocalUser } from '../../../models/entities/user';
|
||||
|
||||
export default (object: any, user: ILocalUser) => ({
|
||||
|
@@ -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) => ({
|
||||
|
@@ -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) => ({
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import config from '../../../config';
|
||||
import config from '@/config';
|
||||
import { ILocalUser } from '../../../models/entities/user';
|
||||
|
||||
export default (object: any, user: ILocalUser) => {
|
||||
|
@@ -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';
|
||||
|
@@ -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;
|
||||
|
@@ -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';
|
||||
|
Reference in New Issue
Block a user