summaryrefslogtreecommitdiff
path: root/src/server/api/bot/interfaces/line.ts
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-06 01:36:34 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-06 01:36:34 +0900
commitf0e8e6392b5ef99488ea0bbecbf9029e30ef0cfa (patch)
tree736d3fe581b6b9169d8e676453019e1d2afec876 /src/server/api/bot/interfaces/line.ts
parentMerge pull request #1403 from akihikodaki/duplicate (diff)
downloadsharkey-f0e8e6392b5ef99488ea0bbecbf9029e30ef0cfa.tar.gz
sharkey-f0e8e6392b5ef99488ea0bbecbf9029e30ef0cfa.tar.bz2
sharkey-f0e8e6392b5ef99488ea0bbecbf9029e30ef0cfa.zip
Allow name property of user to be null
Diffstat (limited to 'src/server/api/bot/interfaces/line.ts')
-rw-r--r--src/server/api/bot/interfaces/line.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts
index 7847cbdeaa..1191aaf391 100644
--- a/src/server/api/bot/interfaces/line.ts
+++ b/src/server/api/bot/interfaces/line.ts
@@ -10,6 +10,7 @@ import prominence = require('prominence');
import getAcct from '../../../../acct/render';
import parseAcct from '../../../../acct/parse';
import getPostSummary from '../../../../renderers/get-post-summary';
+import getUserName from '../../../../renderers/get-user-name';
const redis = prominence(_redis);
@@ -131,7 +132,7 @@ class LineBot extends BotCore {
template: {
type: 'buttons',
thumbnailImageUrl: `${user.avatarUrl}?thumbnail&size=1024`,
- title: `${user.name} (@${acct})`,
+ title: `${getUserName(user)} (@${acct})`,
text: user.description || '(no description)',
actions: actions
}
@@ -146,7 +147,7 @@ class LineBot extends BotCore {
limit: 5
}, this.user);
- const text = `${tl[0].user.name}さんのタイムラインはこちらです:\n\n` + tl
+ const text = `${getUserName(tl[0].user)}さんのタイムラインはこちらです:\n\n` + tl
.map(post => getPostSummary(post))
.join('\n-----\n');