xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

好友：拉黑bug，添加申请等推送

Browse Source
This commit is contained in:
luying
2021-02-05 18:22:15 +08:00
parent e1e36275c0
commit 97d2bea767
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
shared/db/FriendRelation.ts
View File

@@ -62,22 +62,30 @@ export default class FriendRelation extends BaseModel {
return result;
}
public static async moveFromFriend(roleId: string, friend: RoleType, friendShip: FriendShipType, toBlack: boolean ) {
let update = {
$pull: { friends: { roleId: friend.roleId } }
public static async moveFromFriend(roleId: string, friend: RoleType, friendShip: FriendShipType, toBlack: boolean, hasFriend: boolean ) {
let update = {}
let setOnInsert = {};
if(hasFriend) {
update['$pull'] = { friends: { roleId: friend.roleId } };
} else {
setOnInsert['friends'] = [];
}
if(toBlack) {
update['$push'] = { blacklist: { roleId: friend.roleId, role: friend._id, friendShip: friendShip? friendShip._id: null } };
} else {
setOnInsert['blacklist'] = [];
}
update['$setOnInsert'] = setOnInsert;
let result: FriendRelationType = await FriendRelationModel.findOneAndUpdate({ roleId }, update, { new: true });
let result: FriendRelationType = await FriendRelationModel.findOneAndUpdate({ roleId }, update, { upsert: true, new: true });
return result
}
public static async removeFromBlack(roleId: string, frdRoleId: string ) {
let result: FriendRelationType = await FriendRelationModel.findOneAndUpdate({ roleId }, {
$pull: { blacklist: { roleId: frdRoleId } }
}, { new: true });
$pull: { blacklist: { roleId: frdRoleId } },
$setOnInsert: { friends: [] }
}, { upsert: true, new: true });
return result
}