diff --git a/src/app/channel/channelManager.js b/src/app/channel/channelManager.js index 289c227..b36d7b5 100644 --- a/src/app/channel/channelManager.js +++ b/src/app/channel/channelManager.js @@ -20,8 +20,11 @@ const config = require('../../../config.json'); //Local Imports const channelModel = require('../../schemas/channel/channelSchema'); const emoteModel = require('../../schemas/emoteSchema'); +const {userModel} = require('../../schemas/user/userSchema'); +const userBanModel = require('../../schemas/user/userBanSchema'); const socketUtils = require('../../utils/socketUtils'); const loggerUtils = require('../../utils/loggerUtils'); +const csrfUtils = require('../../utils/csrfUtils'); const presenceUtils = require('../../utils/presenceUtils'); const activeChannel = require('./activeChannel'); const chatHandler = require('./chatHandler'); diff --git a/www/css/theme/movie-night.css b/www/css/theme/movie-night.css index fa3d836..00e2f24 100644 --- a/www/css/theme/movie-night.css +++ b/www/css/theme/movie-night.css @@ -214,7 +214,7 @@ textarea{ text-shadow: var(--danger-glow0-alt1); } -.positive-button:not([disabled]){ +.positive-button{ background-color: var(--focus0); color: white; } diff --git a/www/js/channel/panels/pmPanel.js b/www/js/channel/panels/pmPanel.js index 261c694..85e191e 100644 --- a/www/js/channel/panels/pmPanel.js +++ b/www/js/channel/panels/pmPanel.js @@ -108,20 +108,14 @@ class pmPanel extends panelObj{ //Pull current sesh from sesh list const sesh = this.client.pmHandler.seshList.get(this.activeSesh); - //Preprocess message from prompt - const preprocessedMessage = this.client.chatBox.commandPreprocessor.preprocess(this.seshPrompt.value); + //Send message out to server + this.client.pmSocket.emit("pm", { + recipients: sesh.recipients, + msg: this.seshPrompt.value + }); - //If preprocessedMessage had it's send flag thrown as false - if(preprocessedMessage != false){ - //Stick recipients into the pre-processed message - preprocessedMessage.recipients = sesh.recipients; - - //Send message out to server - this.client.pmSocket.emit("pm", preprocessedMessage); - } - - //Clear our prompt - this.seshPrompt.value = ""; + //Clear our prompt + this.seshPrompt.value = ""; } }