Fixed mail fetch
This commit is contained in:
parent
3ad54caf8d
commit
4716b98cd5
2 changed files with 6 additions and 10 deletions
|
|
@ -4,17 +4,18 @@ const User = require('server/db/models/User');
|
|||
const { getAllMail } = require('server/utils/getData');
|
||||
|
||||
async function Get(req, res) {
|
||||
const { user: lastMailFetch, username } = req;
|
||||
const { lastMailFetch, username } = req.user;
|
||||
|
||||
// Fetch mail if expired
|
||||
if (Number(lastMailFetch) + config.mailExpires < Date.now()) {
|
||||
const messages = await getAllMail({ username });
|
||||
return res.send({ messages });
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
const messages = await Mail.find({ receiver: username }).sort({
|
||||
createdAt: 'desc',
|
||||
});
|
||||
|
||||
console.log(username);
|
||||
return res.send({ messages });
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,13 +52,8 @@ async function getAllComments({ answer_id, question_id }) {
|
|||
);
|
||||
}
|
||||
|
||||
async function getAllMail({ question_id }) {
|
||||
return getAllData(
|
||||
Mail,
|
||||
`/questions/${question_id}/comments`,
|
||||
'mail_id',
|
||||
'mail'
|
||||
);
|
||||
async function getAllMail({ username }) {
|
||||
return getAllData(Mail, `/mail/${username}`, 'mail_id', 'messages');
|
||||
}
|
||||
|
||||
async function getAllQuestions(username) {
|
||||
|
|
|
|||
Reference in a new issue