diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-02 04:15:27 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-02 04:15:27 +0900 |
| commit | cd2542e0fd8578f6e41114ffebbda1f16f7d04ce (patch) | |
| tree | c339b7808fc2a3d72ae30cb86ddb7b9c21852652 /src/server/activitypub | |
| parent | Refactor (diff) | |
| download | sharkey-cd2542e0fd8578f6e41114ffebbda1f16f7d04ce.tar.gz sharkey-cd2542e0fd8578f6e41114ffebbda1f16f7d04ce.tar.bz2 sharkey-cd2542e0fd8578f6e41114ffebbda1f16f7d04ce.zip | |
Refactor
Diffstat (limited to 'src/server/activitypub')
| -rw-r--r-- | src/server/activitypub/inbox.ts | 2 | ||||
| -rw-r--r-- | src/server/activitypub/outbox.ts | 6 | ||||
| -rw-r--r-- | src/server/activitypub/post.ts | 6 | ||||
| -rw-r--r-- | src/server/activitypub/publickey.ts | 4 | ||||
| -rw-r--r-- | src/server/activitypub/user.ts | 4 | ||||
| -rw-r--r-- | src/server/activitypub/with-user.ts | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/server/activitypub/inbox.ts b/src/server/activitypub/inbox.ts index cb679dbf0e..31a47e2761 100644 --- a/src/server/activitypub/inbox.ts +++ b/src/server/activitypub/inbox.ts @@ -3,7 +3,7 @@ import * as express from 'express'; import { parseRequest, verifySignature } from 'http-signature'; import User, { IRemoteUser } from '../../models/user'; import queue from '../../queue'; -import parseAcct from '../../common/user/parse-acct'; +import parseAcct from '../../misc/user/parse-acct'; const app = express(); app.disable('x-powered-by'); diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts index c26c4df75d..2018d8797b 100644 --- a/src/server/activitypub/outbox.ts +++ b/src/server/activitypub/outbox.ts @@ -1,7 +1,7 @@ import * as express from 'express'; -import context from '../../common/remote/activitypub/renderer/context'; -import renderNote from '../../common/remote/activitypub/renderer/note'; -import renderOrderedCollection from '../../common/remote/activitypub/renderer/ordered-collection'; +import context from '../../remote/activitypub/renderer/context'; +import renderNote from '../../remote/activitypub/renderer/note'; +import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection'; import config from '../../conf'; import Post from '../../models/post'; import withUser from './with-user'; diff --git a/src/server/activitypub/post.ts b/src/server/activitypub/post.ts index 6644563d8c..ecbf9671fa 100644 --- a/src/server/activitypub/post.ts +++ b/src/server/activitypub/post.ts @@ -1,7 +1,7 @@ import * as express from 'express'; -import context from '../../common/remote/activitypub/renderer/context'; -import render from '../../common/remote/activitypub/renderer/note'; -import parseAcct from '../../common/user/parse-acct'; +import context from '../../remote/activitypub/renderer/context'; +import render from '../../remote/activitypub/renderer/note'; +import parseAcct from '../../misc/user/parse-acct'; import Post from '../../models/post'; import User from '../../models/user'; diff --git a/src/server/activitypub/publickey.ts b/src/server/activitypub/publickey.ts index e380309dc4..a23d11c156 100644 --- a/src/server/activitypub/publickey.ts +++ b/src/server/activitypub/publickey.ts @@ -1,6 +1,6 @@ import * as express from 'express'; -import context from '../../common/remote/activitypub/renderer/context'; -import render from '../../common/remote/activitypub/renderer/key'; +import context from '../../remote/activitypub/renderer/context'; +import render from '../../remote/activitypub/renderer/key'; import config from '../../conf'; import withUser from './with-user'; diff --git a/src/server/activitypub/user.ts b/src/server/activitypub/user.ts index cfda409e2c..0d0b84bad4 100644 --- a/src/server/activitypub/user.ts +++ b/src/server/activitypub/user.ts @@ -1,7 +1,7 @@ import * as express from 'express'; import config from '../../conf'; -import context from '../../common/remote/activitypub/renderer/context'; -import render from '../../common/remote/activitypub/renderer/person'; +import context from '../../remote/activitypub/renderer/context'; +import render from '../../remote/activitypub/renderer/person'; import withUser from './with-user'; const respond = withUser(username => `${config.url}/@${username}`, (user, req, res) => { diff --git a/src/server/activitypub/with-user.ts b/src/server/activitypub/with-user.ts index ed289b641b..18f2e50ffd 100644 --- a/src/server/activitypub/with-user.ts +++ b/src/server/activitypub/with-user.ts @@ -1,4 +1,4 @@ -import parseAcct from '../../common/user/parse-acct'; +import parseAcct from '../../misc/user/parse-acct'; import User from '../../models/user'; export default (redirect, respond) => async (req, res, next) => { |