Fix commas breaking contributor mentions
This commit is contained in:
@@ -1,12 +1,13 @@
|
|||||||
import { Database } from '../shared/Database';
|
import { Database } from '../shared/Database';
|
||||||
|
|
||||||
const mentionRegex = new RegExp('@([\\S]+)', 'gi');
|
const mentionRegex = new RegExp('@([\\S]+),|@([\\S]+)', 'gi');
|
||||||
|
|
||||||
export async function fixPings(body: string): Promise<string> {
|
export async function fixPings(body: string): Promise<string> {
|
||||||
const mappings = await Database.getAllGithubUserMappings();
|
const mappings = await Database.getAllGithubUserMappings();
|
||||||
|
|
||||||
return body.replaceAll(mentionRegex, (match, username) => {
|
return body.replaceAll(mentionRegex, (match, m1, m2) => {
|
||||||
const mapping = mappings.find(m => m.github_username == username);
|
const name = m1 ?? m2;
|
||||||
|
const mapping = mappings.find(m => m.github_username == name);
|
||||||
|
|
||||||
return mapping ? `<@${mapping.discord_id}>` : match;
|
return mapping ? `<@${mapping.discord_id}>` : match;
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user