From 4061ae6d808e24fab42aa55608070c60395138c5 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 25 Nov 2018 01:39:22 +0900 Subject: [PATCH] Fix: url-preview (#3397) --- src/client/app/common/scripts/note-mixin.ts | 4 ++-- .../app/common/views/components/messaging-room.message.vue | 4 ++-- src/client/app/desktop/views/components/note-detail.vue | 4 ++-- src/client/app/mobile/views/components/note-detail.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts index e0df788b3..205c6dc02 100644 --- a/src/client/app/common/scripts/note-mixin.ts +++ b/src/client/app/common/scripts/note-mixin.ts @@ -79,8 +79,8 @@ export default (opts: Opts = {}) => ({ if (this.appearNote.text) { const ast = parse(this.appearNote.text); return unique(ast - .filter(t => (t.type == 'url' || t.type == 'link') && !t.silent) - .map(t => t.url)); + .filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent)) + .map(t => t.props.url)); } else { return null; } diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue index 966bd5417..758ce2c27 100644 --- a/src/client/app/common/views/components/messaging-room.message.vue +++ b/src/client/app/common/views/components/messaging-room.message.vue @@ -51,8 +51,8 @@ export default Vue.extend({ if (this.message.text) { const ast = parse(this.message.text); return unique(ast - .filter(t => (t.type == 'url' || t.type == 'link') && !t.silent) - .map(t => t.url)); + .filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent)) + .map(t => t.props.url)); } else { return null; } diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index 37c409335..877577edc 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -151,8 +151,8 @@ export default Vue.extend({ if (this.appearNote.text) { const ast = parse(this.appearNote.text); return unique(ast - .filter(t => (t.type == 'url' || t.type == 'link') && !t.silent) - .map(t => t.url)); + .filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent)) + .map(t => t.props.url)); } else { return null; } diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue index 61968a64d..19455aeae 100644 --- a/src/client/app/mobile/views/components/note-detail.vue +++ b/src/client/app/mobile/views/components/note-detail.vue @@ -143,8 +143,8 @@ export default Vue.extend({ if (this.appearNote.text) { const ast = parse(this.appearNote.text); return unique(ast - .filter(t => (t.type == 'url' || t.type == 'link') && !t.silent) - .map(t => t.url)); + .filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent)) + .map(t => t.props.url)); } else { return null; }