From 71c3e11708dad327924bdcb95193d44c2b11a907 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 1 Nov 2017 01:38:19 +0900
Subject: wip

---
 src/api/endpoints/channels/create.ts |  3 ++-
 src/api/endpoints/posts/create.ts    | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/api/endpoints')

diff --git a/src/api/endpoints/channels/create.ts b/src/api/endpoints/channels/create.ts
index 74b089dfc3..e0c0e0192a 100644
--- a/src/api/endpoints/channels/create.ts
+++ b/src/api/endpoints/channels/create.ts
@@ -21,7 +21,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
 	const channel = await Channel.insert({
 		created_at: new Date(),
 		user_id: user._id,
-		title: title
+		title: title,
+		index: 0
 	});
 
 	// Response
diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts
index e0a02fa4a0..183cabf135 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/api/endpoints/posts/create.ts
@@ -153,6 +153,16 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 		if (repost && !isQuote) {
 			return rej('チャンネル内部では引用ではないRepostをすることはできません');
 		}
+	} else {
+		// 返信対象の投稿がチャンネルへの投稿だったらダメ
+		if (inReplyToPost && inReplyToPost.channel_id != null) {
+			return rej('チャンネル外部からチャンネル内部の投稿に返信することはできません');
+		}
+
+		// Repost対象の投稿がチャンネルへの投稿だったらダメ
+		if (repost && repost.channel_id != null) {
+			return rej('チャンネル外部からチャンネル内部の投稿をRepostすることはできません');
+		}
 	}
 
 	// Get 'poll' parameter
@@ -199,6 +209,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 	const post = await Post.insert({
 		created_at: new Date(),
 		channel_id: channel ? channel._id : undefined,
+		index: channel ? channel.index + 1 : undefined,
 		media_ids: files ? files.map(file => file._id) : undefined,
 		reply_to_id: inReplyToPost ? inReplyToPost._id : undefined,
 		repost_id: repost ? repost._id : undefined,
@@ -217,6 +228,12 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
 	// -----------------------------------------------------------
 	// Post processes
 
+	Channel.update({ _id: channel._id }, {
+		$inc: {
+			index: 1
+		}
+	});
+
 	User.update({ _id: user._id }, {
 		$set: {
 			latest_post: post
-- 
cgit v1.2.3-freya