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

Merge branch 'develop' into client-monorepo

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-10-18 20:26:12 +02:00
parent 94b34f1f80 17b1365853
commit 3e12774e40
17 changed files with 292 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/server/controllers/api-v3/members.js
View File

@@ -21,6 +21,7 @@ import {
import { sendNotification as sendPushNotification } from '../../libs/pushNotifications';
import common from '../../../common';
import { sentMessage } from '../../libs/inbox';
import { highlightMentions } from '../../libs/highlightMentions';
const { achievements } = common;
@@ -676,7 +677,7 @@ api.sendPrivateMessage = {
if (validationErrors) throw validationErrors;
const sender = res.locals.user;
const { message } = req.body;
const message = (await highlightMentions(req.body.message))[0];
const receiver = await User.findById(req.body.toUserId).exec();
if (!receiver) throw new NotFound(res.t('userNotFound'));