natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '[PR]: [mastodon-client] improve mentions parser' (#10516) from e2net/calckey:masto-client-improvements into develop 

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10516
This commit is contained in:
Kainoa Kanter 2023-07-18 16:04:25 +00:00
parent 2b59d03d6f ed5c5a7156
commit 31f1e86b49
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
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(
`@${m.acct}@${this.baseUrlToHost(this.baseUrl)}`,
regexLocalUser,
`@${m.acct}`,
);
}
else if (!status.content.match(regexFull)) {
status.content = status.content.replace(
regexRemoteUser,
`@${m.acct}`,
);
}
status.content = status.content.replace(
`@${m.acct}`,
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[] = [];
@ -1542,7 +1559,7 @@ export default class Misskey implements MegalodonInterface {
if (text == undefined) return mentions;
const mentionMatch = text.matchAll(
/(?<=^|\s)@(?<user>.*?)(?:@(?<host>.*?)|)(?=\s|$)/g,
/(?<=^|\s)@(?<user>[a-zA-Z0-9_]+)(?:@(?<host>[a-zA-Z0-9-.]+\.[a-zA-Z0-9-]+)|)(?=[^a-zA-Z0-9]|$)/g,
);
for (const m of mentionMatch) {
@ -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,
);
@ -2963,7 +2980,7 @@ export default class Misskey implements MegalodonInterface {
}
try {
const match = q.match(/^@(?<user>.*?)(?:@(?<host>.*?)|)$/);
const match = q.match(/^@(?<user>[a-zA-Z0-9_]+)(?:@(?<host>[a-zA-Z0-9-.]+\.[a-zA-Z0-9-]+)|)$/);
if (match) {
const lookupQuery = {
username: match.groups?.user,