From 4ef3d3a6d2865e8bb486d74c8fb3b6fdfde699ff Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Mon, 2 Apr 2018 13:41:25 +0900
Subject: Introduce renderers directory

---
 .../app/common/scripts/compose-notification.ts     |  4 +-
 .../app/desktop/views/components/notifications.vue |  2 +-
 src/client/app/desktop/views/pages/home.vue        |  2 +-
 src/client/app/mobile/api/post.ts                  |  2 +-
 .../views/components/notification-preview.vue      |  2 +-
 .../app/mobile/views/components/notification.vue   |  2 +-
 .../app/mobile/views/components/post-card.vue      |  2 +-
 src/client/app/mobile/views/pages/home.vue         |  2 +-
 src/get-notification-summary.ts                    | 27 -------------
 src/get-post-summary.ts                            | 45 ----------------------
 src/get-reaction-emoji.ts                          | 14 -------
 src/renderers/get-notification-summary.ts          | 27 +++++++++++++
 src/renderers/get-post-summary.ts                  | 45 ++++++++++++++++++++++
 src/renderers/get-reaction-emoji.ts                | 14 +++++++
 src/renderers/get-user-summary.ts                  | 18 +++++++++
 src/server/api/bot/core.ts                         |  6 +--
 src/server/api/bot/interfaces/line.ts              |  2 +-
 src/user/get-summary.ts                            | 18 ---------
 18 files changed, 117 insertions(+), 117 deletions(-)
 delete mode 100644 src/get-notification-summary.ts
 delete mode 100644 src/get-post-summary.ts
 delete mode 100644 src/get-reaction-emoji.ts
 create mode 100644 src/renderers/get-notification-summary.ts
 create mode 100644 src/renderers/get-post-summary.ts
 create mode 100644 src/renderers/get-reaction-emoji.ts
 create mode 100644 src/renderers/get-user-summary.ts
 delete mode 100644 src/user/get-summary.ts

diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts
index 4030d61ac7..ebc15952f6 100644
--- a/src/client/app/common/scripts/compose-notification.ts
+++ b/src/client/app/common/scripts/compose-notification.ts
@@ -1,5 +1,5 @@
-import getPostSummary from '../../../../get-post-summary';
-import getReactionEmoji from '../../../../get-reaction-emoji';
+import getPostSummary from '../../../../renderers/get-post-summary';
+import getReactionEmoji from '../../../../renderers/get-reaction-emoji';
 
 type Notification = {
 	title: string;
diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue
index 8c4102494f..9bfe1560ba 100644
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -103,7 +103,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import getAcct from '../../../../../user/get-acct';
-import getPostSummary from '../../../../../get-post-summary';
+import getPostSummary from '../../../../../renderers/get-post-summary';
 
 export default Vue.extend({
 	data() {
diff --git a/src/client/app/desktop/views/pages/home.vue b/src/client/app/desktop/views/pages/home.vue
index ad9e2bc9d1..c209af4e43 100644
--- a/src/client/app/desktop/views/pages/home.vue
+++ b/src/client/app/desktop/views/pages/home.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import Progress from '../../../common/scripts/loading';
-import getPostSummary from '../../../../../get-post-summary';
+import getPostSummary from '../../../../../renderers/get-post-summary';
 
 export default Vue.extend({
 	props: {
diff --git a/src/client/app/mobile/api/post.ts b/src/client/app/mobile/api/post.ts
index 6580cbf4b1..98309ba8de 100644
--- a/src/client/app/mobile/api/post.ts
+++ b/src/client/app/mobile/api/post.ts
@@ -1,6 +1,6 @@
 import PostForm from '../views/components/post-form.vue';
 //import RepostForm from '../views/components/repost-form.vue';
-import getPostSummary from '../../../../get-post-summary';
+import getPostSummary from '../../../../renderers/get-post-summary';
 
 export default (os) => (opts) => {
 	const o = opts || {};
diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue
index e7e1f75a87..77abd3c0ea 100644
--- a/src/client/app/mobile/views/components/notification-preview.vue
+++ b/src/client/app/mobile/views/components/notification-preview.vue
@@ -59,7 +59,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getPostSummary from '../../../../../get-post-summary';
+import getPostSummary from '../../../../../renderers/get-post-summary';
 
 export default Vue.extend({
 	props: ['notification'],
diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue
index d92b019447..d3e313756f 100644
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -78,7 +78,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import getPostSummary from '../../../../../get-post-summary';
+import getPostSummary from '../../../../../renderers/get-post-summary';
 import getAcct from '../../../../../user/get-acct';
 
 export default Vue.extend({
diff --git a/src/client/app/mobile/views/components/post-card.vue b/src/client/app/mobile/views/components/post-card.vue
index 893e4c3071..de42a01f78 100644
--- a/src/client/app/mobile/views/components/post-card.vue
+++ b/src/client/app/mobile/views/components/post-card.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import summary from '../../../../../get-post-summary';
+import summary from '../../../../../renderers/get-post-summary';
 import getAcct from '../../../../../user/get-acct';
 
 export default Vue.extend({
diff --git a/src/client/app/mobile/views/pages/home.vue b/src/client/app/mobile/views/pages/home.vue
index b2edf59561..6fb1c6d4fa 100644
--- a/src/client/app/mobile/views/pages/home.vue
+++ b/src/client/app/mobile/views/pages/home.vue
@@ -64,7 +64,7 @@ import Vue from 'vue';
 import * as XDraggable from 'vuedraggable';
 import * as uuid from 'uuid';
 import Progress from '../../../common/scripts/loading';
-import getPostSummary from '../../../../../get-post-summary';
+import getPostSummary from '../../../../../renderers/get-post-summary';
 
 export default Vue.extend({
 	components: {
diff --git a/src/get-notification-summary.ts b/src/get-notification-summary.ts
deleted file mode 100644
index 03db722c84..0000000000
--- a/src/get-notification-summary.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import getPostSummary from './get-post-summary';
-import getReactionEmoji from './get-reaction-emoji';
-
-/**
- * 通知を表す文字列を取得します。
- * @param notification 通知
- */
-export default function(notification: any): string {
-	switch (notification.type) {
-		case 'follow':
-			return `${notification.user.name}にフォローされました`;
-		case 'mention':
-			return `言及されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
-		case 'reply':
-			return `返信されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
-		case 'repost':
-			return `Repostされました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
-		case 'quote':
-			return `引用されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
-		case 'reaction':
-			return `リアクションされました:\n${notification.user.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
-		case 'poll_vote':
-			return `投票されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
-		default:
-			return `<不明な通知タイプ: ${notification.type}>`;
-	}
-}
diff --git a/src/get-post-summary.ts b/src/get-post-summary.ts
deleted file mode 100644
index 8d0033064f..0000000000
--- a/src/get-post-summary.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 投稿を表す文字列を取得します。
- * @param {*} post 投稿
- */
-const summarize = (post: any): string => {
-	let summary = '';
-
-	// チャンネル
-	summary += post.channel ? `${post.channel.title}:` : '';
-
-	// 本文
-	summary += post.text ? post.text : '';
-
-	// メディアが添付されているとき
-	if (post.media) {
-		summary += ` (${post.media.length}つのメディア)`;
-	}
-
-	// 投票が添付されているとき
-	if (post.poll) {
-		summary += ' (投票)';
-	}
-
-	// 返信のとき
-	if (post.replyId) {
-		if (post.reply) {
-			summary += ` RE: ${summarize(post.reply)}`;
-		} else {
-			summary += ' RE: ...';
-		}
-	}
-
-	// Repostのとき
-	if (post.repostId) {
-		if (post.repost) {
-			summary += ` RP: ${summarize(post.repost)}`;
-		} else {
-			summary += ' RP: ...';
-		}
-	}
-
-	return summary.trim();
-};
-
-export default summarize;
diff --git a/src/get-reaction-emoji.ts b/src/get-reaction-emoji.ts
deleted file mode 100644
index c661205379..0000000000
--- a/src/get-reaction-emoji.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export default function(reaction: string): string {
-	switch (reaction) {
-		case 'like': return '👍';
-		case 'love': return '❤️';
-		case 'laugh': return '😆';
-		case 'hmm': return '🤔';
-		case 'surprise': return '😮';
-		case 'congrats': return '🎉';
-		case 'angry': return '💢';
-		case 'confused': return '😥';
-		case 'pudding': return '🍮';
-		default: return '';
-	}
-}
diff --git a/src/renderers/get-notification-summary.ts b/src/renderers/get-notification-summary.ts
new file mode 100644
index 0000000000..03db722c84
--- /dev/null
+++ b/src/renderers/get-notification-summary.ts
@@ -0,0 +1,27 @@
+import getPostSummary from './get-post-summary';
+import getReactionEmoji from './get-reaction-emoji';
+
+/**
+ * 通知を表す文字列を取得します。
+ * @param notification 通知
+ */
+export default function(notification: any): string {
+	switch (notification.type) {
+		case 'follow':
+			return `${notification.user.name}にフォローされました`;
+		case 'mention':
+			return `言及されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
+		case 'reply':
+			return `返信されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
+		case 'repost':
+			return `Repostされました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
+		case 'quote':
+			return `引用されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
+		case 'reaction':
+			return `リアクションされました:\n${notification.user.name} <${getReactionEmoji(notification.reaction)}>「${getPostSummary(notification.post)}」`;
+		case 'poll_vote':
+			return `投票されました:\n${notification.user.name}「${getPostSummary(notification.post)}」`;
+		default:
+			return `<不明な通知タイプ: ${notification.type}>`;
+	}
+}
diff --git a/src/renderers/get-post-summary.ts b/src/renderers/get-post-summary.ts
new file mode 100644
index 0000000000..8d0033064f
--- /dev/null
+++ b/src/renderers/get-post-summary.ts
@@ -0,0 +1,45 @@
+/**
+ * 投稿を表す文字列を取得します。
+ * @param {*} post 投稿
+ */
+const summarize = (post: any): string => {
+	let summary = '';
+
+	// チャンネル
+	summary += post.channel ? `${post.channel.title}:` : '';
+
+	// 本文
+	summary += post.text ? post.text : '';
+
+	// メディアが添付されているとき
+	if (post.media) {
+		summary += ` (${post.media.length}つのメディア)`;
+	}
+
+	// 投票が添付されているとき
+	if (post.poll) {
+		summary += ' (投票)';
+	}
+
+	// 返信のとき
+	if (post.replyId) {
+		if (post.reply) {
+			summary += ` RE: ${summarize(post.reply)}`;
+		} else {
+			summary += ' RE: ...';
+		}
+	}
+
+	// Repostのとき
+	if (post.repostId) {
+		if (post.repost) {
+			summary += ` RP: ${summarize(post.repost)}`;
+		} else {
+			summary += ' RP: ...';
+		}
+	}
+
+	return summary.trim();
+};
+
+export default summarize;
diff --git a/src/renderers/get-reaction-emoji.ts b/src/renderers/get-reaction-emoji.ts
new file mode 100644
index 0000000000..c661205379
--- /dev/null
+++ b/src/renderers/get-reaction-emoji.ts
@@ -0,0 +1,14 @@
+export default function(reaction: string): string {
+	switch (reaction) {
+		case 'like': return '👍';
+		case 'love': return '❤️';
+		case 'laugh': return '😆';
+		case 'hmm': return '🤔';
+		case 'surprise': return '😮';
+		case 'congrats': return '🎉';
+		case 'angry': return '💢';
+		case 'confused': return '😥';
+		case 'pudding': return '🍮';
+		default: return '';
+	}
+}
diff --git a/src/renderers/get-user-summary.ts b/src/renderers/get-user-summary.ts
new file mode 100644
index 0000000000..2a9e8a5d04
--- /dev/null
+++ b/src/renderers/get-user-summary.ts
@@ -0,0 +1,18 @@
+import { IUser, isLocalUser } from '../models/user';
+import getAcct from '../user/get-acct';
+
+/**
+ * ユーザーを表す文字列を取得します。
+ * @param user ユーザー
+ */
+export default function(user: IUser): string {
+	let string = `${user.name} (@${getAcct(user)})\n` +
+		`${user.postsCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
+
+	if (isLocalUser(user)) {
+		const account = user.account;
+		string += `場所: ${account.profile.location}、誕生日: ${account.profile.birthday}\n`;
+	}
+
+	return string + `「${user.description}」`;
+}
diff --git a/src/server/api/bot/core.ts b/src/server/api/bot/core.ts
index 3beec33d11..7f9409660a 100644
--- a/src/server/api/bot/core.ts
+++ b/src/server/api/bot/core.ts
@@ -3,10 +3,10 @@ import * as bcrypt from 'bcryptjs';
 
 import User, { IUser, init as initUser, ILocalUser } from '../../../models/user';
 
-import getPostSummary from '../../../get-post-summary';
-import getUserSummary from '../../../user/get-summary';
+import getPostSummary from '../../../renderers/get-post-summary';
+import getUserSummary from '../../../renderers/get-user-summary';
 import parseAcct from '../../../user/parse-acct';
-import getNotificationSummary from '../../../get-notification-summary';
+import getNotificationSummary from '../../../renderers/get-notification-summary';
 
 const hmm = [
 	'？',
diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts
index 27248c9b9d..17841a9f09 100644
--- a/src/server/api/bot/interfaces/line.ts
+++ b/src/server/api/bot/interfaces/line.ts
@@ -9,7 +9,7 @@ import _redis from '../../../../db/redis';
 import prominence = require('prominence');
 import getAcct from '../../../../user/get-acct';
 import parseAcct from '../../../../user/parse-acct';
-import getPostSummary from '../../../../get-post-summary';
+import getPostSummary from '../../../../renderers/get-post-summary';
 
 const redis = prominence(_redis);
 
diff --git a/src/user/get-summary.ts b/src/user/get-summary.ts
deleted file mode 100644
index 8220817025..0000000000
--- a/src/user/get-summary.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { IUser, isLocalUser } from '../models/user';
-import getAcct from './get-acct';
-
-/**
- * ユーザーを表す文字列を取得します。
- * @param user ユーザー
- */
-export default function(user: IUser): string {
-	let string = `${user.name} (@${getAcct(user)})\n` +
-		`${user.postsCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
-
-	if (isLocalUser(user)) {
-		const account = user.account;
-		string += `場所: ${account.profile.location}、誕生日: ${account.profile.birthday}\n`;
-	}
-
-	return string + `「${user.description}」`;
-}
-- 
cgit v1.2.3-freya