From aa4ef6745ad798bd7d4f05cb397ef1dd85279814 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 7 Jul 2018 19:19:00 +0900 Subject: Refactorng --- src/renderers/get-note-summary.ts | 50 ------------------------------- src/renderers/get-notification-summary.ts | 28 ----------------- src/renderers/get-reaction-emoji.ts | 14 --------- src/renderers/get-user-name.ts | 5 ---- src/renderers/get-user-summary.ts | 18 ----------- 5 files changed, 115 deletions(-) delete mode 100644 src/renderers/get-note-summary.ts delete mode 100644 src/renderers/get-notification-summary.ts delete mode 100644 src/renderers/get-reaction-emoji.ts delete mode 100644 src/renderers/get-user-name.ts delete mode 100644 src/renderers/get-user-summary.ts (limited to 'src/renderers') diff --git a/src/renderers/get-note-summary.ts b/src/renderers/get-note-summary.ts deleted file mode 100644 index ec7c74cf9f..0000000000 --- a/src/renderers/get-note-summary.ts +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 投稿を表す文字列を取得します。 - * @param {*} note (packされた)投稿 - */ -const summarize = (note: any): string => { - if (note.deletedAt) { - return '(削除された投稿)'; - } - - if (note.isHidden) { - return '(非公開の投稿)'; - } - - let summary = ''; - - // 本文 - summary += note.text ? note.text : ''; - - // メディアが添付されているとき - if (note.media.length != 0) { - summary += ` (${note.media.length}つのメディア)`; - } - - // 投票が添付されているとき - if (note.poll) { - summary += ' (投票)'; - } - - // 返信のとき - if (note.replyId) { - if (note.reply) { - summary += ` RE: ${summarize(note.reply)}`; - } else { - summary += ' RE: ...'; - } - } - - // Renoteのとき - if (note.renoteId) { - if (note.renote) { - summary += ` RP: ${summarize(note.renote)}`; - } else { - summary += ' RP: ...'; - } - } - - return summary.trim(); -}; - -export default summarize; diff --git a/src/renderers/get-notification-summary.ts b/src/renderers/get-notification-summary.ts deleted file mode 100644 index 67c9654769..0000000000 --- a/src/renderers/get-notification-summary.ts +++ /dev/null @@ -1,28 +0,0 @@ -import getUserName from './get-user-name -import getNoteSummary from './get-note-summary'; -import getReactionEmoji from './get-reaction-emoji'; - -/** - * 通知を表す文字列を取得します。 - * @param notification 通知 - */ -export default function(notification: any): string { - switch (notification.type) { - case 'follow': - return `${getUserName(notification.user)}にフォローされました`; - case 'mention': - return `言及されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; - case 'reply': - return `返信されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; - case 'renote': - return `Renoteされました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; - case 'quote': - return `引用されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; - case 'reaction': - return `リアクションされました:\n${getUserName(notification.user)} <${getReactionEmoji(notification.reaction)}>「${getNoteSummary(notification.note)}」`; - case 'poll_vote': - return `投票されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; - default: - return `<不明な通知タイプ: ${notification.type}>`; - } -} diff --git a/src/renderers/get-reaction-emoji.ts b/src/renderers/get-reaction-emoji.ts deleted file mode 100644 index c661205379..0000000000 --- a/src/renderers/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-user-name.ts b/src/renderers/get-user-name.ts deleted file mode 100644 index acd5e6626d..0000000000 --- a/src/renderers/get-user-name.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { IUser } from '../models/user'; - -export default function(user: IUser): string { - return user.name || '名無し'; -} diff --git a/src/renderers/get-user-summary.ts b/src/renderers/get-user-summary.ts deleted file mode 100644 index 1bd9a7fb47..0000000000 --- a/src/renderers/get-user-summary.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { IUser, isLocalUser } from '../models/user'; -import getAcct from '../acct/render'; -import getUserName from './get-user-name'; - -/** - * ユーザーを表す文字列を取得します。 - * @param user ユーザー - */ -export default function(user: IUser): string { - let string = `${getUserName(user)} (@${getAcct(user)})\n` + - `${user.notesCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`; - - if (isLocalUser(user)) { - string += `場所: ${user.profile.location}、誕生日: ${user.profile.birthday}\n`; - } - - return string + `「${user.description}」`; -} -- cgit v1.2.3-freya