Merge pull request #1650 from nextcloud/artonge/fix/mentions_typing

Fix typing for mention in MessageContent.js
pull/1641/head v0.6.0-beta3
Louis 2023-03-13 16:48:00 +01:00 zatwierdzone przez GitHub
commit ad26bfdb91
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 5 dodań i 5 usunięć

Wyświetl plik

@ -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
}