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

Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username

Browse Source 
# Conflicts:
#	website/server/controllers/api-v3/chat.js
#	website/server/libs/pushNotifications.js
#	website/server/models/user/schema.js
This commit is contained in:
Phillip Thelen
2019-10-01 12:55:41 +02:00
parent 0072a3968d e6ca63cc36
commit 77b188833e
2077 changed files with 315402 additions and 19684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/server/controllers/api-v3/chat.js
View File

@@ -11,8 +11,8 @@ import {
import { removeFromArray } from '../../libs/collectionManipulators';
import { getUserInfo, getGroupUrl, sendTxn } from '../../libs/email';
import slack from '../../libs/slack';
import { getAuthorEmailFromMessage } from '../../libs/chat';
import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory';
import { getAuthorEmailFromMessage} from '../../libs/chat';
import nconf from 'nconf';
import bannedWords from '../../libs/bannedWords';
import guildsAllowingBannedWords from '../../libs/guildsAllowingBannedWords';
@@ -224,7 +224,7 @@ api.postChat = {
});
}
const newChatMessage = group.sendChat({message, user, flagCount, metaData: null, client});
const newChatMessage = group.sendChat({message: req.body.message, user, flagCount, metaData: null, client, translate: res.t});
let toSave = [newChatMessage.save()];
if (group.type === 'party') {