ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 02:08:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing DMList errors

Browse Source
This commit is contained in:
Clayton Wilson 2019-11-08 18:48:00 -05:00
parent 02197ee940
commit 19f8f70bf2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions/handlers/users.js
View File

@ -462,7 +462,7 @@ exports.getDirectMessages = (req, res) => {
const dms = req.userData.dms; const dms = req.userData.dms;
// Return null if this user has no DMs // Return null if this user has no DMs
if (dms === null || dms.length === 0) return res.status(200).json({data: null}); if (dms === undefined || dms === null || dms.length === 0) return res.status(200).json({data: null});
let dmsData = []; let dmsData = [];
let dmPromises = []; let dmPromises = [];
@ -697,6 +697,10 @@ exports.sendDirectMessage = (req, res) => {
db.doc(`/users/${creator}`).get() db.doc(`/users/${creator}`).get()
.then((userDoc) => { .then((userDoc) => {
let dmList = userDoc.data().dms; let dmList = userDoc.data().dms;
// Return if the creator doesn't have any DMs.
// This means they have not created a DM's channel yet
if (dmList === null || dmList === undefined) return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`})
let dmRefPromises = []; let dmRefPromises = [];
dmList.forEach((dmRef) => { dmList.forEach((dmRef) => {
dmRefPromises.push( dmRefPromises.push(
@ -731,8 +735,8 @@ exports.sendDirectMessage = (req, res) => {
}) })
if (correctDMRef === null) { if (correctDMRef === null) {
console.log(`There is no DM channel between ${creator} and ${recipient}.`); console.log(`There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`);
return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}.`}); return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`});
} }
return db.collection(`/dm/${correctDMRef.id}/messages`).add(newMessage); return db.collection(`/dm/${correctDMRef.id}/messages`).add(newMessage);