From 5b9f3701f58ca00c151498d16b6a839a91ba8643 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 2 Apr 2018 12:58:53 +0900 Subject: Abolish common and misc directories --- src/server/api/endpoints/posts/create.ts | 12 ++++++------ src/server/api/endpoints/posts/polls/vote.ts | 4 ++-- src/server/api/endpoints/posts/reactions/create.ts | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/server/api/endpoints/posts') diff --git a/src/server/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts index c2e790a241..e74ac7582e 100644 --- a/src/server/api/endpoints/posts/create.ts +++ b/src/server/api/endpoints/posts/create.ts @@ -3,8 +3,8 @@ */ import $ from 'cafy'; import deepEqual = require('deep-equal'); -import html from '../../../../common/text/html'; -import parse from '../../../../common/text/parse'; +import html from '../../../../text/html'; +import parse from '../../../../text/parse'; import Post, { IPost, isValidText, isValidCw } from '../../../../models/post'; import User, { ILocalUser } from '../../../../models/user'; import Channel, { IChannel } from '../../../../models/channel'; @@ -15,10 +15,10 @@ import Watching from '../../../../models/post-watching'; import ChannelWatching from '../../../../models/channel-watching'; import { pack } from '../../../../models/post'; import watch from '../../common/watch-post'; -import event, { pushSw, publishChannelStream } from '../../../../common/event'; -import notify from '../../../../common/notify'; -import getAcct from '../../../../misc/user/get-acct'; -import parseAcct from '../../../../misc/user/parse-acct'; +import event, { pushSw, publishChannelStream } from '../../../../event'; +import notify from '../../../../notify'; +import getAcct from '../../../../user/get-acct'; +import parseAcct from '../../../../user/parse-acct'; import config from '../../../../conf'; /** diff --git a/src/server/api/endpoints/posts/polls/vote.ts b/src/server/api/endpoints/posts/polls/vote.ts index 59b1f099fb..be1fd7b5d0 100644 --- a/src/server/api/endpoints/posts/polls/vote.ts +++ b/src/server/api/endpoints/posts/polls/vote.ts @@ -6,8 +6,8 @@ import Vote from '../../../../../models/poll-vote'; import Post from '../../../../../models/post'; import Watching from '../../../../../models/post-watching'; import watch from '../../../common/watch-post'; -import { publishPostStream } from '../../../../../common/event'; -import notify from '../../../../../common/notify'; +import { publishPostStream } from '../../../../../event'; +import notify from '../../../../../notify'; /** * Vote poll of a post diff --git a/src/server/api/endpoints/posts/reactions/create.ts b/src/server/api/endpoints/posts/reactions/create.ts index 441d563835..408b2483af 100644 --- a/src/server/api/endpoints/posts/reactions/create.ts +++ b/src/server/api/endpoints/posts/reactions/create.ts @@ -7,8 +7,8 @@ import Post, { pack as packPost } from '../../../../../models/post'; import { pack as packUser } from '../../../../../models/user'; import Watching from '../../../../../models/post-watching'; import watch from '../../../common/watch-post'; -import { publishPostStream, pushSw } from '../../../../../common/event'; -import notify from '../../../../../common/notify'; +import { publishPostStream, pushSw } from '../../../../../event'; +import notify from '../../../../../notify'; /** * React to a post -- cgit v1.2.3-freya