Added basic ignore/unignore functionality
This commit is contained in:
parent
999fae91b7
commit
b80f82b9f2
6 changed files with 139 additions and 1 deletions
|
|
@ -132,6 +132,40 @@ class commandProcessor{
|
||||||
//ignore user
|
//ignore user
|
||||||
await userDB.ignoreByUser(commandObj.argumentArray[1]);
|
await userDB.ignoreByUser(commandObj.argumentArray[1]);
|
||||||
|
|
||||||
|
//Update all users sockets on every channel
|
||||||
|
this.server.crawlConnections(commandObj.socket.user.user, (user)=>{
|
||||||
|
//syncrhonously fire and forget ignored user list
|
||||||
|
user.sendIgnoredList(userDB);
|
||||||
|
});
|
||||||
|
|
||||||
|
//disable send flag
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async unignore(commandObj){
|
||||||
|
//If we wherent given a user to ignore
|
||||||
|
if(commandObj.argumentArray[1] == null){
|
||||||
|
//Silently return
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Attempt to find user DB doc object
|
||||||
|
const userDB = await userModel.findOne({user: commandObj.socket.user.user});
|
||||||
|
|
||||||
|
//Prevent missing users
|
||||||
|
if(userDB == null){
|
||||||
|
throw loggerUtils.exceptionSmith("Called from invalid user", "validation");
|
||||||
|
}
|
||||||
|
|
||||||
|
//ignore user
|
||||||
|
await userDB.unignoreByUser(commandObj.argumentArray[1]);
|
||||||
|
|
||||||
|
//Update all users sockets on every channel
|
||||||
|
this.server.crawlConnections(commandObj.socket.user.user, (user)=>{
|
||||||
|
//syncrhonously fire and forget ignored user list
|
||||||
|
user.sendIgnoredList(userDB);
|
||||||
|
});
|
||||||
|
|
||||||
//disable send flag
|
//disable send flag
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -216,6 +216,7 @@ class connectedUser{
|
||||||
chan: Array.from(this.permMap.chan),
|
chan: Array.from(this.permMap.chan),
|
||||||
},
|
},
|
||||||
flair: this.flair,
|
flair: this.flair,
|
||||||
|
ignored: (await userDB.getIgnoredUsers()).user
|
||||||
}
|
}
|
||||||
|
|
||||||
//For each flair listed in the Database
|
//For each flair listed in the Database
|
||||||
|
|
@ -332,6 +333,21 @@ class connectedUser{
|
||||||
this.channel.broadcastUserList();
|
this.channel.broadcastUserList();
|
||||||
this.sendClientMetadata();
|
this.sendClientMetadata();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sends updated ignored list to a client
|
||||||
|
* @param {Mongoose.Document} userDB - Users DB Document
|
||||||
|
*/
|
||||||
|
async sendIgnoredList(userDB){
|
||||||
|
//if we wherent handed a user document
|
||||||
|
if(userDB == null){
|
||||||
|
//Pull it based on user name
|
||||||
|
userDB = await userModel.findOne({user: this.user});
|
||||||
|
}
|
||||||
|
|
||||||
|
//Retrieve and send updated ignored users list to clients socket
|
||||||
|
this.emit("ignore", (await userDB.getIgnoredUsers()).user);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = connectedUser;
|
module.exports = connectedUser;
|
||||||
|
|
@ -687,6 +687,12 @@ userSchema.methods.ignoreByUserDoc = async function(userDB){
|
||||||
throw loggerUtils.exceptionSmith("User not found", "validation");
|
throw loggerUtils.exceptionSmith("User not found", "validation");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//if someone is trying to self-ignore
|
||||||
|
if(userDB._id.equals(this._id)){
|
||||||
|
//Remind them of the brutal truth that is reality
|
||||||
|
throw loggerUtils.exceptionSmith("YOU CANNOT ESCAPE THE PRISON THAT IS YOUR MIND!!!", "validation");
|
||||||
|
}
|
||||||
|
|
||||||
if(this.ignored.includes(userDB._id)){
|
if(this.ignored.includes(userDB._id)){
|
||||||
throw loggerUtils.exceptionSmith("User already ignored", "validation");
|
throw loggerUtils.exceptionSmith("User already ignored", "validation");
|
||||||
}
|
}
|
||||||
|
|
@ -700,6 +706,41 @@ userSchema.methods.ignoreByUserDoc = async function(userDB){
|
||||||
console.log(await this.getIgnoredUsers());
|
console.log(await this.getIgnoredUsers());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* un-ignores a given user by their username
|
||||||
|
* @param {Mongoose.Document} userDB - DB Document of user to ignore
|
||||||
|
*/
|
||||||
|
userSchema.methods.unignoreByUser = async function(user){
|
||||||
|
//Pull user doc from DB
|
||||||
|
const userDB = await this.constructor.findOne({user});
|
||||||
|
//Do an unignorem user by username
|
||||||
|
await this.unignoreByUserDoc(userDB);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* un-ignores a given user by their DB Document
|
||||||
|
* @param {Mongoose.Document} userDB - DB Document of user to ignore
|
||||||
|
*/
|
||||||
|
userSchema.methods.unignoreByUserDoc = async function(userDB){
|
||||||
|
//Prevent missing users
|
||||||
|
if(userDB == null){
|
||||||
|
throw loggerUtils.exceptionSmith("User not found", "validation");
|
||||||
|
}
|
||||||
|
|
||||||
|
//prevent double un-ignoring
|
||||||
|
if(!this.ignored.includes(userDB._id)){
|
||||||
|
throw loggerUtils.exceptionSmith("User not ignored", "validation");
|
||||||
|
}
|
||||||
|
|
||||||
|
//Filter user out of ignored array
|
||||||
|
this.ignored = this.ignored.filter((id)=>{return !id.equals(userDB._id)});
|
||||||
|
|
||||||
|
//Save the DB document
|
||||||
|
await this.save();
|
||||||
|
|
||||||
|
console.log(await this.getIgnoredUsers());
|
||||||
|
}
|
||||||
|
|
||||||
userSchema.methods.getIgnoredUsers = async function(fetchAlts = true){
|
userSchema.methods.getIgnoredUsers = async function(fetchAlts = true){
|
||||||
//Not me commiting ancient fucking sin
|
//Not me commiting ancient fucking sin
|
||||||
const _this = this;
|
const _this = this;
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,9 @@ class channel{
|
||||||
|
|
||||||
this.socket.on("archive", (data) =>{
|
this.socket.on("archive", (data) =>{
|
||||||
this.sortQueue(data.archive);
|
this.sortQueue(data.archive);
|
||||||
})
|
});
|
||||||
|
|
||||||
|
this.socket.on("ignore", this.handleIgnoredList.bind(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -169,6 +171,21 @@ class channel{
|
||||||
this.streamType = data.streamType;
|
this.streamType = data.streamType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updated ignore list
|
||||||
|
* @param {Array} data - Ignore list received from server
|
||||||
|
*/
|
||||||
|
handleIgnoredList(data){
|
||||||
|
//Update ignored users list
|
||||||
|
this.user.ignored = data;
|
||||||
|
|
||||||
|
//If we have the chatbox loaded in
|
||||||
|
if(this.chatBox != null){
|
||||||
|
//Re-render buffer
|
||||||
|
this.chatBox.rerenderBuffer();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sorts queue, optionally adding new items along the way
|
* Sorts queue, optionally adding new items along the way
|
||||||
* @param {object} queueData - Contains list of entries to add to the queue
|
* @param {object} queueData - Contains list of entries to add to the queue
|
||||||
|
|
|
||||||
|
|
@ -229,6 +229,16 @@ class chatBox{
|
||||||
* @param {Object} data De-hydrated chat object from server
|
* @param {Object} data De-hydrated chat object from server
|
||||||
*/
|
*/
|
||||||
displayChat(data){
|
displayChat(data){
|
||||||
|
|
||||||
|
//For every douchebag in the ignored users list
|
||||||
|
for(const douchebag of this.client.user.ignored){
|
||||||
|
//If this message is from the douchebag in question
|
||||||
|
if(data.user == douchebag.user){
|
||||||
|
//tell it to fuck off and die
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Append the post-processed chat-body to the chat buffer
|
//Append the post-processed chat-body to the chat buffer
|
||||||
this.chatBuffer.appendChild(this.chatPostprocessor.postprocess(data));
|
this.chatBuffer.appendChild(this.chatPostprocessor.postprocess(data));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -196,6 +196,26 @@ class userList{
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if(user.user != "Tokebot" && user.user != this.client.user.user){
|
if(user.user != "Tokebot" && user.user != this.client.user.user){
|
||||||
|
let ignored = false;
|
||||||
|
|
||||||
|
//For each douchebag in the ignored users list
|
||||||
|
for(const douchebag of this.client.user.ignored){
|
||||||
|
if(douchebag.user == user.user){
|
||||||
|
/* Normally I abhor making if statements to set booleans, but this only need to happen when its true
|
||||||
|
Plus I also needed to put the break statement somewhere
|
||||||
|
The fucked thing is the break statement isnt necissary with the if statement, but without it it becomes necissary
|
||||||
|
But it cant be used without the if statement, making the task of reducing linecount for this definition a fucking sisyphean nightmare */
|
||||||
|
ignored = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(ignored){
|
||||||
|
menuMap.set("Unignore", ()=>{this.client.chatBox.transmit(`!unignore ${user.user}`);});
|
||||||
|
}else{
|
||||||
|
menuMap.set("Ignore", ()=>{this.client.chatBox.transmit(`!ignore ${user.user}`);});
|
||||||
|
}
|
||||||
|
|
||||||
if(this.client.user.permMap.chan.get("kickUser")){
|
if(this.client.user.permMap.chan.get("kickUser")){
|
||||||
menuMap.set("Kick", ()=>{this.client.chatBox.transmit(`!kick ${user.user}`);});
|
menuMap.set("Kick", ()=>{this.client.chatBox.transmit(`!kick ${user.user}`);});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue