summaryrefslogtreecommitdiff
path: root/src/models
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-06-28 18:54:10 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-06-28 18:54:09 +0900
commit0141affe056e2b7103f67088f6f5bdb276c8d5d3 (patch)
treec66cb7597f43a749d24b48ee0b552133ec000b38 /src/models
parentUse as const (diff)
downloadsharkey-0141affe056e2b7103f67088f6f5bdb276c8d5d3.tar.gz
sharkey-0141affe056e2b7103f67088f6f5bdb276c8d5d3.tar.bz2
sharkey-0141affe056e2b7103f67088f6f5bdb276c8d5d3.zip
Fix: AP object / actor type (#5086)
* attributedToがArrayの場合などに対応 * attachment以外で来るDocument系のObjectに対応 * Renote, Reply 対応 * 表示をいい感じに * fix type * revert as const * Fix Note / Question type * attributedToのtypeで複合配列を想定する
Diffstat (limited to 'src/models')
-rw-r--r--src/models/repositories/note.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/models/repositories/note.ts b/src/models/repositories/note.ts
index 3ac490b001..03a50fecec 100644
--- a/src/models/repositories/note.ts
+++ b/src/models/repositories/note.ts
@@ -144,8 +144,8 @@ export class NoteRepository extends Repository<Note> {
let text = note.text;
- if (note.name) {
- text = `【${note.name}】\n${note.text}`;
+ if (note.name && note.uri) {
+ text = `【${note.name}】\n${(note.text || '').trim()}\n${note.uri}`;
}
const reactionEmojis = unique(concat([note.emojis, Object.keys(note.reactions)]));