summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-17 16:05:50 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-17 16:05:50 +0900
commitaaa167fd5765360631af3b2c3af416e3f2db30e9 (patch)
tree384e0120778bfbab5ff8c2bbcde4bd956b9d6848 /src
parentv4970 (diff)
downloadsharkey-aaa167fd5765360631af3b2c3af416e3f2db30e9.tar.gz
sharkey-aaa167fd5765360631af3b2c3af416e3f2db30e9.tar.bz2
sharkey-aaa167fd5765360631af3b2c3af416e3f2db30e9.zip
Refactor
Diffstat (limited to 'src')
-rw-r--r--src/queue/processors/http/process-inbox.ts2
-rw-r--r--src/remote/activitypub/kernel/announce/note.ts2
-rw-r--r--src/remote/activitypub/kernel/create/image.ts2
-rw-r--r--src/remote/activitypub/kernel/create/note.ts2
-rw-r--r--src/remote/activitypub/models/image.ts (renamed from src/remote/activitypub/objects/image.ts)0
-rw-r--r--src/remote/activitypub/models/note.ts (renamed from src/remote/activitypub/objects/note.ts)0
-rw-r--r--src/remote/activitypub/models/person.ts (renamed from src/remote/activitypub/objects/person.ts)0
-rw-r--r--src/remote/resolve-user.ts2
8 files changed, 5 insertions, 5 deletions
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 2c49a67b66..75ff5918f6 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -5,7 +5,7 @@ const httpSignature = require('http-signature');
import parseAcct from '../../../acct/parse';
import User, { IRemoteUser } from '../../../models/user';
import perform from '../../../remote/activitypub/perform';
-import { resolvePerson } from '../../../remote/activitypub/objects/person';
+import { resolvePerson } from '../../../remote/activitypub/models/person';
const log = debug('misskey:queue:inbox');
diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts
index 68fb23c97f..a288dd499a 100644
--- a/src/remote/activitypub/kernel/announce/note.ts
+++ b/src/remote/activitypub/kernel/announce/note.ts
@@ -4,7 +4,7 @@ import Resolver from '../../resolver';
import post from '../../../../services/note/create';
import { IRemoteUser } from '../../../../models/user';
import { IAnnounce, INote } from '../../type';
-import { fetchNote, resolveNote } from '../../objects/note';
+import { fetchNote, resolveNote } from '../../models/note';
const log = debug('misskey:activitypub');
diff --git a/src/remote/activitypub/kernel/create/image.ts b/src/remote/activitypub/kernel/create/image.ts
index ea36545f0c..2a55522220 100644
--- a/src/remote/activitypub/kernel/create/image.ts
+++ b/src/remote/activitypub/kernel/create/image.ts
@@ -1,5 +1,5 @@
import { IRemoteUser } from '../../../../models/user';
-import { createImage } from '../../objects/image';
+import { createImage } from '../../models/image';
export default async function(actor: IRemoteUser, image): Promise<void> {
await createImage(image.url, actor);
diff --git a/src/remote/activitypub/kernel/create/note.ts b/src/remote/activitypub/kernel/create/note.ts
index 530cf6483f..ed9fb6e54c 100644
--- a/src/remote/activitypub/kernel/create/note.ts
+++ b/src/remote/activitypub/kernel/create/note.ts
@@ -1,6 +1,6 @@
import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
-import { createNote, fetchNote } from '../../objects/note';
+import { createNote, fetchNote } from '../../models/note';
/**
* 投稿作成アクティビティを捌きます
diff --git a/src/remote/activitypub/objects/image.ts b/src/remote/activitypub/models/image.ts
index d7bc5aff2f..d7bc5aff2f 100644
--- a/src/remote/activitypub/objects/image.ts
+++ b/src/remote/activitypub/models/image.ts
diff --git a/src/remote/activitypub/objects/note.ts b/src/remote/activitypub/models/note.ts
index 221d502f06..221d502f06 100644
--- a/src/remote/activitypub/objects/note.ts
+++ b/src/remote/activitypub/models/note.ts
diff --git a/src/remote/activitypub/objects/person.ts b/src/remote/activitypub/models/person.ts
index b755b2603a..b755b2603a 100644
--- a/src/remote/activitypub/objects/person.ts
+++ b/src/remote/activitypub/models/person.ts
diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts
index 5cb35cadef..b6048842bf 100644
--- a/src/remote/resolve-user.ts
+++ b/src/remote/resolve-user.ts
@@ -2,7 +2,7 @@ import { toUnicode, toASCII } from 'punycode';
import User from '../models/user';
import webFinger from './webfinger';
import config from '../config';
-import { createPerson } from './activitypub/objects/person';
+import { createPerson } from './activitypub/models/person';
export default async (username, _host, option) => {
const usernameLower = username.toLowerCase();