diff --git a/package.json b/package.json index bb5def9..eeb5699 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "satyr", - "version": "0.7.0", + "version": "0.7.1", "description": "A livestreaming server.", "license": "AGPL-3.0", "author": "knotteye", diff --git a/src/chat.ts b/src/chat.ts index 11993d1..af9d5f5 100644 --- a/src/chat.ts +++ b/src/chat.ts @@ -18,11 +18,11 @@ async function init() { if(config['chat']['discord']['enabled']){ discordClient = new discord.Client(); discordClient.once('ready', ()=>{ console.log('Discord bot ready')}); - discordClient.on('message', (msg) => { + discordClient.on('message', async (msg) => { if(msg['author']['bot']) return; var lu = getUsr(msg['channel']['name'], 'discord') for(var i=0;i{ + var nmsg: string=msg['content']; + + //normalize user mentions + var uarray = await msg['mentions']['users'].array(); + var karray = await msg['mentions']['users'].keyArray(); + for(var i=0;i', 'g'), '@'+usr['username']); + } + + //normalize emoji + var e = nmsg.match(new RegExp('<:\\w+:[0-9]+>', 'g')); + //<:.+:.+> + if(e !== null) + for (var i=0;i', 'g'), '@'+role['name']); + } + + //normalize channel mentions + var c = nmsg.match(new RegExp('<#[0-9]+>', 'g')); + if(c !== null) + for(var i=0;i