Compare commits

..

No commits in common. "23ad6794738c928ebcec5cf37e1e23173ee46b92" and "b26dd1094ce342ff3ccf88eec507ac04d667e0a0" have entirely different histories.

3 changed files with 11 additions and 14 deletions

View file

@ -20,8 +20,11 @@ const config = require('../../../config.json');
//Local Imports //Local Imports
const channelModel = require('../../schemas/channel/channelSchema'); const channelModel = require('../../schemas/channel/channelSchema');
const emoteModel = require('../../schemas/emoteSchema'); const emoteModel = require('../../schemas/emoteSchema');
const {userModel} = require('../../schemas/user/userSchema');
const userBanModel = require('../../schemas/user/userBanSchema');
const socketUtils = require('../../utils/socketUtils'); const socketUtils = require('../../utils/socketUtils');
const loggerUtils = require('../../utils/loggerUtils'); const loggerUtils = require('../../utils/loggerUtils');
const csrfUtils = require('../../utils/csrfUtils');
const presenceUtils = require('../../utils/presenceUtils'); const presenceUtils = require('../../utils/presenceUtils');
const activeChannel = require('./activeChannel'); const activeChannel = require('./activeChannel');
const chatHandler = require('./chatHandler'); const chatHandler = require('./chatHandler');

View file

@ -214,7 +214,7 @@ textarea{
text-shadow: var(--danger-glow0-alt1); text-shadow: var(--danger-glow0-alt1);
} }
.positive-button:not([disabled]){ .positive-button{
background-color: var(--focus0); background-color: var(--focus0);
color: white; color: white;
} }

View file

@ -108,20 +108,14 @@ class pmPanel extends panelObj{
//Pull current sesh from sesh list //Pull current sesh from sesh list
const sesh = this.client.pmHandler.seshList.get(this.activeSesh); const sesh = this.client.pmHandler.seshList.get(this.activeSesh);
//Preprocess message from prompt //Send message out to server
const preprocessedMessage = this.client.chatBox.commandPreprocessor.preprocess(this.seshPrompt.value); this.client.pmSocket.emit("pm", {
recipients: sesh.recipients,
msg: this.seshPrompt.value
});
//If preprocessedMessage had it's send flag thrown as false //Clear our prompt
if(preprocessedMessage != false){ this.seshPrompt.value = "";
//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 = "";
} }
} }