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' into sabrecat/unsociable

Browse Source
This commit is contained in:
SabreCat
2023-07-25 15:17:13 -05:00
parent d49736dd69 5c4aa664b5
commit cbaa3180cc
110 changed files with 2137 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/server/controllers/api-v3/groups.js
View File

@@ -580,9 +580,10 @@ api.joinGroup = {
if (userPreviousParty) await userPreviousParty.leave(user);
}
}
// Clear all invitations of new user
// Clear all invitations of new user and reset looking for party state
user.invitations.parties = [];
user.invitations.party = {};
user.party.seeking = null;
// invite new user to pending quest
if (group.quest.key && !group.quest.active) {
@@ -1383,6 +1384,7 @@ api.getLookingForParty = {
const seekers = await User
.find({
'party.seeking': { $exists: true },
'invitations.party.id': { $exists: false },
'auth.timestamps.loggedin': {
$gt: moment().subtract(7, 'days').toDate(),
},
@@ -1398,7 +1400,6 @@ api.getLookingForParty = {
const filteredSeekers = seekers.filter(seeker => {
if (seeker.party._id) return false;
if (seeker.invitations.party.id) return false;
if (seeker.flags.chatRevoked) return false;
if (seeker.auth.blocked) return false;
if (seeker.inbox.blocks.indexOf(user._id) !== -1) return false;