From 392ac622d68955e15842147b11b40f9bbdfa4604 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 13 Mar 2023 14:54:08 +0100 Subject: Fix typing for mention in MessageContent.js Signed-off-by: Louis Chemineau --- src/components/MessageContent.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/MessageContent.js b/src/components/MessageContent.js index d2c3d72d..0968c2cc 100644 --- a/src/components/MessageContent.js +++ b/src/components/MessageContent.js @@ -193,22 +193,22 @@ function getLinkType(className) { /** * - * @param {Array} tags + * @param {import('../types/Mastodon').StatusMention[]} tags * @param {string} mentionHref * @param {string} mentionText */ -function matchMention(tags, mentionHref, mentionText) { +function matchMention(tags = [], mentionHref, mentionText) { const mentionUrl = new URL(mentionHref) for (const tag of tags) { - if (mentionText === tag.name) { + if (mentionText === tag.acct) { return tag } // since the mention link href is not always equal to the href in the tag // we instead match the server and username separate - const tagUrl = new URL(tag.href) + const tagUrl = new URL(tag.url) if (tagUrl.host === mentionUrl.host) { - const [, name] = tag.name.split('@') + const [, name] = tag.acct.split('@') if (name === mentionText || '@' + name === mentionText) { return tag } -- cgit v1.2.3