diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-06-02 00:15:17 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-06-02 00:15:17 +0900 |
| commit | 484d17f53f26ff3e8961d86f03ef94f62f8f62ed (patch) | |
| tree | 5d010a52387c3bedf69bdee4ab872c39c25e5bd0 /src/services | |
| parent | Merge branch 'master' into locked-account (diff) | |
| download | misskey-484d17f53f26ff3e8961d86f03ef94f62f8f62ed.tar.gz misskey-484d17f53f26ff3e8961d86f03ef94f62f8f62ed.tar.bz2 misskey-484d17f53f26ff3e8961d86f03ef94f62f8f62ed.zip | |
wip
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/following/requests/accept-all.ts (renamed from src/services/user/accept-all-follow-requests.ts) | 6 | ||||
| -rw-r--r-- | src/services/following/requests/accept.ts (renamed from src/services/user/accept-follow-request.ts) | 18 | ||||
| -rw-r--r-- | src/services/following/requests/reject.ts (renamed from src/services/user/reject-follow-request.ts) | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/services/user/accept-all-follow-requests.ts b/src/services/following/requests/accept-all.ts index 397a0d7ec2..9708d9e658 100644 --- a/src/services/user/accept-all-follow-requests.ts +++ b/src/services/following/requests/accept-all.ts @@ -1,6 +1,6 @@ -import User, { IUser } from "../../models/user"; -import FollowRequest from "../../models/follow-request"; -import accept from './accept-follow-request'; +import User, { IUser } from "../../../models/user"; +import FollowRequest from "../../../models/follow-request"; +import accept from './accept'; /** * 指定したユーザー宛てのフォローリクエストをすべて承認 diff --git a/src/services/user/accept-follow-request.ts b/src/services/following/requests/accept.ts index 8b5c82c84e..2dff9b01fe 100644 --- a/src/services/user/accept-follow-request.ts +++ b/src/services/following/requests/accept.ts @@ -1,12 +1,12 @@ -import User, { IUser, isRemoteUser, ILocalUser } from "../../models/user"; -import FollowRequest from "../../models/follow-request"; -import pack from '../../remote/activitypub/renderer'; -import renderFollow from '../../remote/activitypub/renderer/follow'; -import renderAccept from '../../remote/activitypub/renderer/accept'; -import { deliver } from '../../queue'; -import Following from "../../models/following"; -import FollowingLog from "../../models/following-log"; -import FollowedLog from "../../models/followed-log"; +import User, { IUser, isRemoteUser, ILocalUser } from "../../../models/user"; +import FollowRequest from "../../../models/follow-request"; +import pack from '../../../remote/activitypub/renderer'; +import renderFollow from '../../../remote/activitypub/renderer/follow'; +import renderAccept from '../../../remote/activitypub/renderer/accept'; +import { deliver } from '../../../queue'; +import Following from "../../../models/following"; +import FollowingLog from "../../../models/following-log"; +import FollowedLog from "../../../models/followed-log"; export default async function(followee: IUser, follower: IUser) { const following = await Following.insert({ diff --git a/src/services/user/reject-follow-request.ts b/src/services/following/requests/reject.ts index c6388f53e1..acd419d0ee 100644 --- a/src/services/user/reject-follow-request.ts +++ b/src/services/following/requests/reject.ts @@ -1,9 +1,9 @@ -import User, { IUser, isRemoteUser, ILocalUser } from "../../models/user"; -import FollowRequest from "../../models/follow-request"; -import pack from '../../remote/activitypub/renderer'; -import renderFollow from '../../remote/activitypub/renderer/follow'; -import renderReject from '../../remote/activitypub/renderer/reject'; -import { deliver } from '../../queue'; +import User, { IUser, isRemoteUser, ILocalUser } from "../../../models/user"; +import FollowRequest from "../../../models/follow-request"; +import pack from '../../../remote/activitypub/renderer'; +import renderFollow from '../../../remote/activitypub/renderer/follow'; +import renderReject from '../../../remote/activitypub/renderer/reject'; +import { deliver } from '../../../queue'; export default async function(followee: IUser, follower: IUser) { if (isRemoteUser(follower)) { |