diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-12-28 23:05:30 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-12-28 23:05:30 +0900 |
| commit | 5c490e75213f0f876c35ab4fb6cf71eefa3afab7 (patch) | |
| tree | 0c6a4ec4b7e7aae785cbcf013cf8f4c37f97dfe9 /src/misc | |
| parent | 12.64.0 (diff) | |
| download | sharkey-5c490e75213f0f876c35ab4fb6cf71eefa3afab7.tar.gz sharkey-5c490e75213f0f876c35ab4fb6cf71eefa3afab7.tar.bz2 sharkey-5c490e75213f0f876c35ab4fb6cf71eefa3afab7.zip | |
Bug fix and refactoring
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/get-note-summary.ts | 4 | ||||
| -rw-r--r-- | src/misc/get-notification-summary.ts | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/misc/get-note-summary.ts b/src/misc/get-note-summary.ts index 7db8bca3ec..b80da16caf 100644 --- a/src/misc/get-note-summary.ts +++ b/src/misc/get-note-summary.ts @@ -2,7 +2,7 @@ * 投稿を表す文字列を取得します。 * @param {*} note (packされた)投稿 */ -const summarize = (note: any, locale: any): string => { +export const getNoteSummary = (note: any, locale: any): string => { if (note.deletedAt) { return `(${locale['deletedNote']})`; } @@ -50,5 +50,3 @@ const summarize = (note: any, locale: any): string => { return summary.trim(); }; - -export default summarize; diff --git a/src/misc/get-notification-summary.ts b/src/misc/get-notification-summary.ts index b20711c605..aade3f75be 100644 --- a/src/misc/get-notification-summary.ts +++ b/src/misc/get-notification-summary.ts @@ -1,6 +1,7 @@ import getUserName from './get-user-name'; -import getNoteSummary from './get-note-summary'; +import { getNoteSummary } from './get-note-summary'; import getReactionEmoji from './get-reaction-emoji'; +import locales = require('../../locales'); /** * 通知を表す文字列を取得します。 @@ -11,17 +12,17 @@ export default function(notification: any): string { case 'follow': return `${getUserName(notification.user)}にフォローされました`; case 'mention': - return `言及されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; + return `言及されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note, locales['ja-JP'])}」`; case 'reply': - return `返信されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; + return `返信されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note, locales['ja-JP'])}」`; case 'renote': - return `Renoteされました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; + return `Renoteされました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note, locales['ja-JP'])}」`; case 'quote': - return `引用されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; + return `引用されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note, locales['ja-JP'])}」`; case 'reaction': - return `リアクションされました:\n${getUserName(notification.user)} <${getReactionEmoji(notification.reaction)}>「${getNoteSummary(notification.note)}」`; + return `リアクションされました:\n${getUserName(notification.user)} <${getReactionEmoji(notification.reaction)}>「${getNoteSummary(notification.note, locales['ja-JP'])}」`; case 'pollVote': - return `投票されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note)}」`; + return `投票されました:\n${getUserName(notification.user)}「${getNoteSummary(notification.note, locales['ja-JP'])}」`; default: return `<不明な通知タイプ: ${notification.type}>`; } |