diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-03-29 14:51:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 14:51:06 +0900 |
| commit | 0b5597c873d2d9d45be94a18e1b74f44d9925185 (patch) | |
| tree | 8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/api/endpoints/posts | |
| parent | oops (diff) | |
| parent | Resolve conflicts (diff) | |
| download | misskey-0b5597c873d2d9d45be94a18e1b74f44d9925185.tar.gz misskey-0b5597c873d2d9d45be94a18e1b74f44d9925185.tar.bz2 misskey-0b5597c873d2d9d45be94a18e1b74f44d9925185.zip | |
Merge pull request #1332 from syuilo/pr/1327
Pr/1327
Diffstat (limited to '')
| -rw-r--r-- | src/server/api/endpoints/posts.ts (renamed from src/api/endpoints/posts.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/categorize.ts (renamed from src/api/endpoints/posts/categorize.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/context.ts (renamed from src/api/endpoints/posts/context.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/create.ts (renamed from src/api/endpoints/posts/create.ts) | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/favorites/create.ts (renamed from src/api/endpoints/posts/favorites/create.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/favorites/delete.ts (renamed from src/api/endpoints/posts/favorites/delete.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/mentions.ts (renamed from src/api/endpoints/posts/mentions.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/polls/recommendation.ts (renamed from src/api/endpoints/posts/polls/recommendation.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/polls/vote.ts (renamed from src/api/endpoints/posts/polls/vote.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/reactions.ts (renamed from src/api/endpoints/posts/reactions.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/reactions/create.ts (renamed from src/api/endpoints/posts/reactions/create.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/reactions/delete.ts (renamed from src/api/endpoints/posts/reactions/delete.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/replies.ts (renamed from src/api/endpoints/posts/replies.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/reposts.ts (renamed from src/api/endpoints/posts/reposts.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/search.ts (renamed from src/api/endpoints/posts/search.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/show.ts (renamed from src/api/endpoints/posts/show.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/timeline.ts (renamed from src/api/endpoints/posts/timeline.ts) | 0 | ||||
| -rw-r--r-- | src/server/api/endpoints/posts/trend.ts (renamed from src/api/endpoints/posts/trend.ts) | 0 |
18 files changed, 1 insertions, 1 deletions
diff --git a/src/api/endpoints/posts.ts b/src/server/api/endpoints/posts.ts index bee1de02d4..bee1de02d4 100644 --- a/src/api/endpoints/posts.ts +++ b/src/server/api/endpoints/posts.ts diff --git a/src/api/endpoints/posts/categorize.ts b/src/server/api/endpoints/posts/categorize.ts index 0436c8e697..0436c8e697 100644 --- a/src/api/endpoints/posts/categorize.ts +++ b/src/server/api/endpoints/posts/categorize.ts diff --git a/src/api/endpoints/posts/context.ts b/src/server/api/endpoints/posts/context.ts index 44a77d102e..44a77d102e 100644 --- a/src/api/endpoints/posts/context.ts +++ b/src/server/api/endpoints/posts/context.ts diff --git a/src/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts index 34f3eea02f..390370ad42 100644 --- a/src/api/endpoints/posts/create.ts +++ b/src/server/api/endpoints/posts/create.ts @@ -18,7 +18,7 @@ import watch from '../../common/watch-post'; import event, { pushSw, publishChannelStream } from '../../event'; import getAcct from '../../../common/user/get-acct'; import parseAcct from '../../../common/user/parse-acct'; -import config from '../../../conf'; +import config from '../../../../conf'; /** * Create a post diff --git a/src/api/endpoints/posts/favorites/create.ts b/src/server/api/endpoints/posts/favorites/create.ts index 6100e10b23..6100e10b23 100644 --- a/src/api/endpoints/posts/favorites/create.ts +++ b/src/server/api/endpoints/posts/favorites/create.ts diff --git a/src/api/endpoints/posts/favorites/delete.ts b/src/server/api/endpoints/posts/favorites/delete.ts index db52036ec5..db52036ec5 100644 --- a/src/api/endpoints/posts/favorites/delete.ts +++ b/src/server/api/endpoints/posts/favorites/delete.ts diff --git a/src/api/endpoints/posts/mentions.ts b/src/server/api/endpoints/posts/mentions.ts index 1b342e8de9..1b342e8de9 100644 --- a/src/api/endpoints/posts/mentions.ts +++ b/src/server/api/endpoints/posts/mentions.ts diff --git a/src/api/endpoints/posts/polls/recommendation.ts b/src/server/api/endpoints/posts/polls/recommendation.ts index 19ef0975fa..19ef0975fa 100644 --- a/src/api/endpoints/posts/polls/recommendation.ts +++ b/src/server/api/endpoints/posts/polls/recommendation.ts diff --git a/src/api/endpoints/posts/polls/vote.ts b/src/server/api/endpoints/posts/polls/vote.ts index 734a3a3c45..734a3a3c45 100644 --- a/src/api/endpoints/posts/polls/vote.ts +++ b/src/server/api/endpoints/posts/polls/vote.ts diff --git a/src/api/endpoints/posts/reactions.ts b/src/server/api/endpoints/posts/reactions.ts index f753ba7c29..f753ba7c29 100644 --- a/src/api/endpoints/posts/reactions.ts +++ b/src/server/api/endpoints/posts/reactions.ts diff --git a/src/api/endpoints/posts/reactions/create.ts b/src/server/api/endpoints/posts/reactions/create.ts index a1e6779805..a1e6779805 100644 --- a/src/api/endpoints/posts/reactions/create.ts +++ b/src/server/api/endpoints/posts/reactions/create.ts diff --git a/src/api/endpoints/posts/reactions/delete.ts b/src/server/api/endpoints/posts/reactions/delete.ts index b09bcbb4b7..b09bcbb4b7 100644 --- a/src/api/endpoints/posts/reactions/delete.ts +++ b/src/server/api/endpoints/posts/reactions/delete.ts diff --git a/src/api/endpoints/posts/replies.ts b/src/server/api/endpoints/posts/replies.ts index db021505fc..db021505fc 100644 --- a/src/api/endpoints/posts/replies.ts +++ b/src/server/api/endpoints/posts/replies.ts diff --git a/src/api/endpoints/posts/reposts.ts b/src/server/api/endpoints/posts/reposts.ts index 51af41f523..51af41f523 100644 --- a/src/api/endpoints/posts/reposts.ts +++ b/src/server/api/endpoints/posts/reposts.ts diff --git a/src/api/endpoints/posts/search.ts b/src/server/api/endpoints/posts/search.ts index bb5c438926..bb5c438926 100644 --- a/src/api/endpoints/posts/search.ts +++ b/src/server/api/endpoints/posts/search.ts diff --git a/src/api/endpoints/posts/show.ts b/src/server/api/endpoints/posts/show.ts index bb4bcdb790..bb4bcdb790 100644 --- a/src/api/endpoints/posts/show.ts +++ b/src/server/api/endpoints/posts/show.ts diff --git a/src/api/endpoints/posts/timeline.ts b/src/server/api/endpoints/posts/timeline.ts index a3e915f16a..a3e915f16a 100644 --- a/src/api/endpoints/posts/timeline.ts +++ b/src/server/api/endpoints/posts/timeline.ts diff --git a/src/api/endpoints/posts/trend.ts b/src/server/api/endpoints/posts/trend.ts index bc0c47fbc6..bc0c47fbc6 100644 --- a/src/api/endpoints/posts/trend.ts +++ b/src/server/api/endpoints/posts/trend.ts |