ppfun/pixelplanet
13
Fork 18
Code Issues 24 Pull Requests Releases 2 Activity

country ban for actual country not displayed country

Browse Source
This commit is contained in:
HF 2020-04-29 23:36:32 +02:00
parent d952050f42
commit d1e8236ea1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/ChatProvider.js
View File

@ -27,6 +27,10 @@ class ChatProvider {
regexp: /ADMIN/gi,
matches: 3,
},
{
regexp: /ICE CREAM/gi,
matches: 1,
},
{
regexp: /JEBAĆ/gi,
matches: 2,
@ -59,11 +63,12 @@ class ChatProvider {
async sendMessage(user, message, channelId: number = 0) {
const name = (user.regUser) ? user.regUser.name : null;
const country = (name.endsWith('berg') || name.endsWith('stein'))
const country = user.country || 'xx';
const displayCountry = (name.endsWith('berg') || name.endsWith('stein'))
? 'il'
: (user.country || 'xx');
: country;
if (name.startsWith('popi')) return null;
if (name.startsWith('popi') || name.startsWith('popl')) return null;
if (!name) {
// eslint-disable-next-line max-len
return 'Couldn\'t send your message, pls log out and back in again.';
@ -158,8 +163,8 @@ class ChatProvider {
}
return `You are muted for another ${muted} seconds`;
}
this.addMessage(name, message, country, channelId);
webSockets.broadcastChatMessage(name, message, country, channelId);
this.addMessage(name, message, displayCountry, channelId);
webSockets.broadcastChatMessage(name, message, displayCountry, channelId);
return null;
}