summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/models
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-19 21:55:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-08-19 21:55:45 +0900
commit42cc93dd0f189995f29fc87d2734fc809105a7cf (patch)
tree7a74658a76d71d4c07bf89a7028fa1786af0e13e /src/remote/activitypub/models
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-42cc93dd0f189995f29fc87d2734fc809105a7cf.tar.gz
sharkey-42cc93dd0f189995f29fc87d2734fc809105a7cf.tar.bz2
sharkey-42cc93dd0f189995f29fc87d2734fc809105a7cf.zip
fix: mochaが動かないため拡張子なしに戻した
Diffstat (limited to 'src/remote/activitypub/models')
-rw-r--r--src/remote/activitypub/models/image.ts14
-rw-r--r--src/remote/activitypub/models/mention.ts10
-rw-r--r--src/remote/activitypub/models/note.ts52
-rw-r--r--src/remote/activitypub/models/person.ts50
-rw-r--r--src/remote/activitypub/models/question.ts12
-rw-r--r--src/remote/activitypub/models/tag.ts4
6 files changed, 71 insertions, 71 deletions
diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts
index ea2584407a..cd28d59a16 100644
--- a/src/remote/activitypub/models/image.ts
+++ b/src/remote/activitypub/models/image.ts
@@ -1,10 +1,10 @@
-import uploadFromUrl from '@/services/drive/upload-from-url.js';
-import { IRemoteUser } 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 } from '@/models/index.js';
+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 { apLogger } from '../logger';
+import { DriveFile } from '@/models/entities/drive-file';
+import { DriveFiles } from '@/models/index';
const logger = apLogger;
diff --git a/src/remote/activitypub/models/mention.ts b/src/remote/activitypub/models/mention.ts
index e84429815d..0db0324aba 100644
--- a/src/remote/activitypub/models/mention.ts
+++ b/src/remote/activitypub/models/mention.ts
@@ -1,9 +1,9 @@
-import { toArray, unique } from '../../../prelude/array.js';
-import { IObject, isMention, IApMention } from '../type.js';
-import { resolvePerson } from './person.js';
+import { toArray, unique } from '../../../prelude/array';
+import { IObject, isMention, IApMention } from '../type';
+import { resolvePerson } from './person';
import * as promiseLimit from 'promise-limit';
-import Resolver from '../resolver.js';
-import { User } from '@/models/entities/user.js';
+import Resolver from '../resolver';
+import { User } from '@/models/entities/user';
export async function extractApMentions(tags: IObject | IObject[] | null | undefined) {
const hrefs = unique(extractApMentionObjects(tags).map(x => x.href as string));
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index 2a4f51bb3b..d28d642a0a 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -1,31 +1,31 @@
import * as promiseLimit from 'promise-limit';
-import config from '@/config/index.js';
-import Resolver from '../resolver.js';
-import post from '@/services/note/create.js';
-import { resolvePerson, updatePerson } from './person.js';
-import { resolveImage } from './image.js';
-import { IRemoteUser } from '@/models/entities/user.js';
-import { htmlToMfm } from '../misc/html-to-mfm.js';
-import { extractApHashtags } from './tag.js';
-import { unique, toArray, toSingle } from '../../../prelude/array.js';
-import { extractPollFromQuestion } from './question.js';
-import vote from '@/services/note/polls/vote.js';
-import { apLogger } from '../logger.js';
-import { DriveFile } from '@/models/entities/drive-file.js';
-import { deliverQuestionUpdate } from '@/services/note/polls/update.js';
-import { extractDbHost, toPuny } from '@/misc/convert-host.js';
-import { Emojis, Polls, MessagingMessages } from '@/models/index.js';
-import { Note } from '@/models/entities/note.js';
-import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji, getApType } from '../type.js';
-import { Emoji } from '@/models/entities/emoji.js';
-import { genId } from '@/misc/gen-id.js';
-import { fetchMeta } from '@/misc/fetch-meta.js';
-import { getApLock } from '@/misc/app-lock.js';
-import { createMessage } from '@/services/messages/create.js';
-import { parseAudience } from '../audience.js';
-import { extractApMentions } from './mention.js';
-import DbResolver from '../db-resolver.js';
+import config from '@/config/index';
+import Resolver from '../resolver';
+import post from '@/services/note/create';
+import { resolvePerson, updatePerson } from './person';
+import { resolveImage } from './image';
+import { IRemoteUser } from '@/models/entities/user';
+import { htmlToMfm } from '../misc/html-to-mfm';
+import { extractApHashtags } from './tag';
+import { unique, toArray, toSingle } from '../../../prelude/array';
+import { extractPollFromQuestion } from './question';
+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 { Emojis, Polls, MessagingMessages } from '@/models/index';
+import { Note } from '@/models/entities/note';
+import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji, getApType } 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 { createMessage } from '@/services/messages/create';
+import { parseAudience } from '../audience';
+import { extractApMentions } from './mention';
+import DbResolver from '../db-resolver';
const logger = apLogger;
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 2b7d707ac8..3ae13135e3 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -2,32 +2,32 @@ import { URL } from 'url';
import * as promiseLimit from 'promise-limit';
import $, { Context } from 'cafy';
-import config from '@/config/index.js';
-import Resolver from '../resolver.js';
-import { resolveImage } from './image.js';
-import { isCollectionOrOrderedCollection, isCollection, IActor, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue, getApType, isActor } from '../type.js';
-import { fromHtml } from '../../../mfm/from-html.js';
-import { htmlToMfm } from '../misc/html-to-mfm.js';
-import { resolveNote, extractEmojis } from './note.js';
-import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instance-doc.js';
-import { extractApHashtags } from './tag.js';
-import { apLogger } from '../logger.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 { User, IRemoteUser } from '@/models/entities/user.js';
-import { Emoji } from '@/models/entities/emoji.js';
-import { UserNotePining } from '@/models/entities/user-note-pining.js';
-import { genId } from '@/misc/gen-id.js';
-import { instanceChart, usersChart } from '@/services/chart/index.js';
-import { UserPublickey } from '@/models/entities/user-publickey.js';
-import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
-import { toPuny } from '@/misc/convert-host.js';
-import { UserProfile } from '@/models/entities/user-profile.js';
+import config from '@/config/index';
+import Resolver from '../resolver';
+import { resolveImage } from './image';
+import { isCollectionOrOrderedCollection, isCollection, IActor, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue, getApType, isActor } from '../type';
+import { fromHtml } from '../../../mfm/from-html';
+import { htmlToMfm } from '../misc/html-to-mfm';
+import { resolveNote, extractEmojis } from './note';
+import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instance-doc';
+import { extractApHashtags } from './tag';
+import { apLogger } from '../logger';
+import { Note } from '@/models/entities/note';
+import { updateUsertags } from '@/services/update-hashtag';
+import { Users, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '@/models/index';
+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 { instanceChart, usersChart } from '@/services/chart/index';
+import { UserPublickey } from '@/models/entities/user-publickey';
+import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error';
+import { toPuny } from '@/misc/convert-host';
+import { UserProfile } from '@/models/entities/user-profile';
import { getConnection } from 'typeorm';
-import { toArray } from '../../../prelude/array.js';
-import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata.js';
-import { normalizeForSearch } from '@/misc/normalize-for-search.js';
+import { toArray } from '../../../prelude/array';
+import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata';
+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 f954a38e8b..79f93c3a30 100644
--- a/src/remote/activitypub/models/question.ts
+++ b/src/remote/activitypub/models/question.ts
@@ -1,9 +1,9 @@
-import config from '@/config/index.js';
-import Resolver from '../resolver.js';
-import { IObject, IQuestion, isQuestion, } from '../type.js';
-import { apLogger } from '../logger.js';
-import { Notes, Polls } from '@/models/index.js';
-import { IPoll } from '@/models/entities/poll.js';
+import config from '@/config/index';
+import Resolver from '../resolver';
+import { IObject, IQuestion, isQuestion, } from '../type';
+import { apLogger } from '../logger';
+import { Notes, Polls } from '@/models/index';
+import { IPoll } from '@/models/entities/poll';
export async function extractPollFromQuestion(source: string | IObject, resolver?: Resolver): Promise<IPoll> {
if (resolver == null) resolver = new Resolver();
diff --git a/src/remote/activitypub/models/tag.ts b/src/remote/activitypub/models/tag.ts
index cb8c753365..d25cb463fe 100644
--- a/src/remote/activitypub/models/tag.ts
+++ b/src/remote/activitypub/models/tag.ts
@@ -1,5 +1,5 @@
-import { toArray } from '../../../prelude/array.js';
-import { IObject, isHashtag, IApHashtag } from '../type.js';
+import { toArray } from '../../../prelude/array';
+import { IObject, isHashtag, IApHashtag } from '../type';
export function extractApHashtags(tags: IObject | IObject[] | null | undefined) {
if (tags == null) return [];