HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

[mastodon-client] fix mentions of remote local users without host

Browse source
This commit is contained in:
Laura Hausmann 2023-07-18 17:08:13 +02:00
parent 0ff1f7ca65
commit ed5c5a7156
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/megalodon/src/misskey.ts
View file

@ -1514,19 +1514,35 @@ export default class Misskey implements MegalodonInterface {
if (status.quote != null)
status.quote = await this.addMentionsToStatus(status.quote, cache);
const idx = status.account.acct.indexOf('@');
const origin = idx < 0 ? null : status.account.acct.substring(idx + 1);
status.mentions = (
await this.getMentions(status.plain_content!, cache)
await this.getMentions(status.plain_content!, origin, cache)
).filter((p) => p != null);
for (const m of status.mentions.filter(
(value, index, array) => array.indexOf(value) === index,
)) {
if (m.acct == m.username)
const regexFull = new RegExp(`(?<=^|\\s|>)@${m.acct}(?=[^a-zA-Z0-9]|$)`, 'gi');
const regexLocalUser = new RegExp(`(?<=^|\\s|>)@${m.acct}@${this.baseUrlToHost(this.baseUrl)}(?=[^a-zA-Z0-9]|$)`, 'gi');
const regexRemoteUser = new RegExp(`(?<=^|\\s|>)@${m.username}(?=[^a-zA-Z0-9@]|$)`, 'gi');
if (m.acct == m.username) {
status.content = status.content.replace(
new RegExp(`(?<=^|\\s|>)@${m.acct}@${this.baseUrlToHost(this.baseUrl)}(?=[^a-zA-Z0-9]|$)`, 'g'),
regexLocalUser,
`@${m.acct}`,
);
}
else if (!status.content.match(regexFull)) {
status.content = status.content.replace(
new RegExp(`(?<=^|\\s|>)@${m.acct}(?=[^a-zA-Z0-9]|$)`, 'g'),
regexRemoteUser,
`@${m.acct}`,
);
}
status.content = status.content.replace(
regexFull,
`<a href="${m.url}" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@${m.acct}</a>`,
);
}
@ -1535,6 +1551,7 @@ export default class Misskey implements MegalodonInterface {
public async getMentions(
text: string,
origin: string | null,
cache: AccountCache,
): Promise<Entity.Mention[]> {
const mentions: Entity.Mention[] = [];
@ -1551,7 +1568,7 @@ export default class Misskey implements MegalodonInterface {
const account = await this.getAccountByNameCached(
m.groups.user,
m.groups.host,
m.groups.host ?? origin,
cache,
);