summaryrefslogtreecommitdiff
path: root/src/server/api/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 20:32:18 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 20:32:18 +0900
commitcf33e483f7e6f40e8cbbbc0118a7df70bdaf651f (patch)
tree318279530d3392ee40d91968477fc0e78d5cf0f7 /src/server/api/common
parentUpdate .travis.yml (diff)
downloadmisskey-cf33e483f7e6f40e8cbbbc0118a7df70bdaf651f.tar.gz
misskey-cf33e483f7e6f40e8cbbbc0118a7df70bdaf651f.tar.bz2
misskey-cf33e483f7e6f40e8cbbbc0118a7df70bdaf651f.zip
整理した
Diffstat (limited to '')
-rw-r--r--src/common/text/core/syntax-highlighter.ts (renamed from src/server/api/common/text/core/syntax-highlighter.ts)0
-rw-r--r--src/common/text/elements/bold.ts (renamed from src/server/api/common/text/elements/bold.ts)0
-rw-r--r--src/common/text/elements/code.ts (renamed from src/server/api/common/text/elements/code.ts)0
-rw-r--r--src/common/text/elements/emoji.ts (renamed from src/server/api/common/text/elements/emoji.ts)0
-rw-r--r--src/common/text/elements/hashtag.ts (renamed from src/server/api/common/text/elements/hashtag.ts)0
-rw-r--r--src/common/text/elements/inline-code.ts (renamed from src/server/api/common/text/elements/inline-code.ts)0
-rw-r--r--src/common/text/elements/link.ts (renamed from src/server/api/common/text/elements/link.ts)0
-rw-r--r--src/common/text/elements/mention.ts (renamed from src/server/api/common/text/elements/mention.ts)2
-rw-r--r--src/common/text/elements/quote.ts (renamed from src/server/api/common/text/elements/quote.ts)0
-rw-r--r--src/common/text/elements/url.ts (renamed from src/server/api/common/text/elements/url.ts)0
-rw-r--r--src/common/text/index.ts (renamed from src/server/api/common/text/index.ts)0
-rw-r--r--src/server/api/common/drive/add-file.ts8
-rw-r--r--src/server/api/common/drive/upload_from_url.ts2
-rw-r--r--src/server/api/common/get-friends.ts2
-rw-r--r--src/server/api/common/notify.ts6
-rw-r--r--src/server/api/common/push-sw.ts2
-rw-r--r--src/server/api/common/read-messaging-message.ts4
-rw-r--r--src/server/api/common/read-notification.ts2
-rw-r--r--src/server/api/common/watch-post.ts2
19 files changed, 15 insertions, 15 deletions
diff --git a/src/server/api/common/text/core/syntax-highlighter.ts b/src/common/text/core/syntax-highlighter.ts
index c0396b1fc6..c0396b1fc6 100644
--- a/src/server/api/common/text/core/syntax-highlighter.ts
+++ b/src/common/text/core/syntax-highlighter.ts
diff --git a/src/server/api/common/text/elements/bold.ts b/src/common/text/elements/bold.ts
index ce25764457..ce25764457 100644
--- a/src/server/api/common/text/elements/bold.ts
+++ b/src/common/text/elements/bold.ts
diff --git a/src/server/api/common/text/elements/code.ts b/src/common/text/elements/code.ts
index 4821e95fe2..4821e95fe2 100644
--- a/src/server/api/common/text/elements/code.ts
+++ b/src/common/text/elements/code.ts
diff --git a/src/server/api/common/text/elements/emoji.ts b/src/common/text/elements/emoji.ts
index e24231a223..e24231a223 100644
--- a/src/server/api/common/text/elements/emoji.ts
+++ b/src/common/text/elements/emoji.ts
diff --git a/src/server/api/common/text/elements/hashtag.ts b/src/common/text/elements/hashtag.ts
index ee57b140b8..ee57b140b8 100644
--- a/src/server/api/common/text/elements/hashtag.ts
+++ b/src/common/text/elements/hashtag.ts
diff --git a/src/server/api/common/text/elements/inline-code.ts b/src/common/text/elements/inline-code.ts
index 9f9ef51a2b..9f9ef51a2b 100644
--- a/src/server/api/common/text/elements/inline-code.ts
+++ b/src/common/text/elements/inline-code.ts
diff --git a/src/server/api/common/text/elements/link.ts b/src/common/text/elements/link.ts
index 35563ddc3d..35563ddc3d 100644
--- a/src/server/api/common/text/elements/link.ts
+++ b/src/common/text/elements/link.ts
diff --git a/src/server/api/common/text/elements/mention.ts b/src/common/text/elements/mention.ts
index 2025dfdaad..d05a76649d 100644
--- a/src/server/api/common/text/elements/mention.ts
+++ b/src/common/text/elements/mention.ts
@@ -1,7 +1,7 @@
/**
* Mention
*/
-import parseAcct from '../../../../common/user/parse-acct';
+import parseAcct from '../../../common/user/parse-acct';
module.exports = text => {
const match = text.match(/^(?:@[a-zA-Z0-9\-]+){1,2}/);
diff --git a/src/server/api/common/text/elements/quote.ts b/src/common/text/elements/quote.ts
index cc8cfffdc4..cc8cfffdc4 100644
--- a/src/server/api/common/text/elements/quote.ts
+++ b/src/common/text/elements/quote.ts
diff --git a/src/server/api/common/text/elements/url.ts b/src/common/text/elements/url.ts
index 1003aff9c3..1003aff9c3 100644
--- a/src/server/api/common/text/elements/url.ts
+++ b/src/common/text/elements/url.ts
diff --git a/src/server/api/common/text/index.ts b/src/common/text/index.ts
index 1e2398dc38..1e2398dc38 100644
--- a/src/server/api/common/text/index.ts
+++ b/src/common/text/index.ts
diff --git a/src/server/api/common/drive/add-file.ts b/src/server/api/common/drive/add-file.ts
index 21ddd1aae3..4551f55748 100644
--- a/src/server/api/common/drive/add-file.ts
+++ b/src/server/api/common/drive/add-file.ts
@@ -10,11 +10,11 @@ import * as debug from 'debug';
import fileType = require('file-type');
import prominence = require('prominence');
-import DriveFile, { getGridFSBucket } from '../../models/drive-file';
-import DriveFolder from '../../models/drive-folder';
-import { pack } from '../../models/drive-file';
+import DriveFile, { getGridFSBucket } from '../../../../models/drive-file';
+import DriveFolder from '../../../../models/drive-folder';
+import { pack } from '../../../../models/drive-file';
import event, { publishDriveStream } from '../../event';
-import getAcct from '../../../common/user/get-acct';
+import getAcct from '../../../../common/user/get-acct';
import config from '../../../../conf';
const gm = _gm.subClass({
diff --git a/src/server/api/common/drive/upload_from_url.ts b/src/server/api/common/drive/upload_from_url.ts
index 5dd9695936..b825e4c531 100644
--- a/src/server/api/common/drive/upload_from_url.ts
+++ b/src/server/api/common/drive/upload_from_url.ts
@@ -1,5 +1,5 @@
import * as URL from 'url';
-import { IDriveFile, validateFileName } from '../../models/drive-file';
+import { IDriveFile, validateFileName } from '../../../../models/drive-file';
import create from './add-file';
import * as debug from 'debug';
import * as tmp from 'tmp';
diff --git a/src/server/api/common/get-friends.ts b/src/server/api/common/get-friends.ts
index 7f548b3bbf..e0942e0292 100644
--- a/src/server/api/common/get-friends.ts
+++ b/src/server/api/common/get-friends.ts
@@ -1,5 +1,5 @@
import * as mongodb from 'mongodb';
-import Following from '../models/following';
+import Following from '../../../models/following';
export default async (me: mongodb.ObjectID, includeMe: boolean = true) => {
// Fetch relation to other users who the I follows
diff --git a/src/server/api/common/notify.ts b/src/server/api/common/notify.ts
index c4df17f880..f90506cf3c 100644
--- a/src/server/api/common/notify.ts
+++ b/src/server/api/common/notify.ts
@@ -1,8 +1,8 @@
import * as mongo from 'mongodb';
-import Notification from '../models/notification';
-import Mute from '../models/mute';
+import Notification from '../../../models/notification';
+import Mute from '../../../models/mute';
import event from '../event';
-import { pack } from '../models/notification';
+import { pack } from '../../../models/notification';
export default (
notifiee: mongo.ObjectID,
diff --git a/src/server/api/common/push-sw.ts b/src/server/api/common/push-sw.ts
index e5fbec10ec..13227af8d5 100644
--- a/src/server/api/common/push-sw.ts
+++ b/src/server/api/common/push-sw.ts
@@ -1,6 +1,6 @@
const push = require('web-push');
import * as mongo from 'mongodb';
-import Subscription from '../models/sw-subscription';
+import Subscription from '../../../models/sw-subscription';
import config from '../../../conf';
if (config.sw) {
diff --git a/src/server/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts
index 9047edec8c..f728130bb3 100644
--- a/src/server/api/common/read-messaging-message.ts
+++ b/src/server/api/common/read-messaging-message.ts
@@ -1,6 +1,6 @@
import * as mongo from 'mongodb';
-import Message from '../models/messaging-message';
-import { IMessagingMessage as IMessage } from '../models/messaging-message';
+import Message from '../../../models/messaging-message';
+import { IMessagingMessage as IMessage } from '../../../models/messaging-message';
import publishUserStream from '../event';
import { publishMessagingStream } from '../event';
import { publishMessagingIndexStream } from '../event';
diff --git a/src/server/api/common/read-notification.ts b/src/server/api/common/read-notification.ts
index 5bbf136323..27632c7ecd 100644
--- a/src/server/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
@@ -1,5 +1,5 @@
import * as mongo from 'mongodb';
-import { default as Notification, INotification } from '../models/notification';
+import { default as Notification, INotification } from '../../../models/notification';
import publishUserStream from '../event';
/**
diff --git a/src/server/api/common/watch-post.ts b/src/server/api/common/watch-post.ts
index 61ea444430..83c9b94f3e 100644
--- a/src/server/api/common/watch-post.ts
+++ b/src/server/api/common/watch-post.ts
@@ -1,5 +1,5 @@
import * as mongodb from 'mongodb';
-import Watching from '../models/post-watching';
+import Watching from '../../../models/post-watching';
export default async (me: mongodb.ObjectID, post: object) => {
// 自分の投稿はwatchできない