krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to shadow muting (#15543)

Browse Source 
* fix test wording

* make shadow mute work for dms

* shadow mute chat messages

* shadow mute invites

* oops

* refactor mute handling into middleware

* correctly throw error

* fix

* test(chat): expect errors when muted
Also fixes the Linux version in the mongo commands. Again. wtf

---------

Co-authored-by: Kalista Payne <kalista@habitica.com>
This commit is contained in:
Phillip Thelen
2025-11-04 22:35:56 +01:00
committed by GitHub
parent 215e5e1c40
commit 5ff3cc35a6
9 changed files with 225 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/server/models/user/methods.js
View File

@@ -123,6 +123,7 @@ schema.methods.getObjectionsToInteraction = function getObjectionsToInteraction
schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, options) {
const sender = this;
const senderMsg = options.senderMsg || options.receiverMsg;
const { fakeSending } = options;
// whether to save users after sending the message, defaults to true
const saveUsers = options.save !== false;
@@ -165,7 +166,7 @@ schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, o
// Do not add the message twice when sending it to yourself
let newSenderMessage;
if (!sendingToYourself) {
if (!sendingToYourself || fakeSending) {
newSenderMessage = new Inbox({
sent: true,
ownerId: sender._id,
@@ -175,12 +176,13 @@ schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, o
setUserStyles(newSenderMessage, sender);
}
const promises = [newReceiverMessage.save()];
if (!sendingToYourself) promises.push(newSenderMessage.save());
const promises = [];
if (!fakeSending) promises.push(newReceiverMessage.save());
if (!sendingToYourself || fakeSending) promises.push(newSenderMessage.save());
if (saveUsers) {
promises.push(sender.save());
if (!sendingToYourself) promises.push(userToReceiveMessage.save());
if (!sendingToYourself && !fakeSending) promises.push(userToReceiveMessage.save());
}
await Promise.all(promises);