好友:移除黑名单时添加好友时,若也在对方黑名单时,不发推送
This commit is contained in:
@@ -420,11 +420,18 @@ export class FriendHandler {
|
|||||||
if (!friend) {
|
if (!friend) {
|
||||||
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX);
|
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX);
|
||||||
} else {
|
} else {
|
||||||
let apply = await FriendApplyModel.createApply(hisRoleId, role);
|
let hisRelation = await FriendRelationModel.findFriendByRole(hisRoleId, POPULATE_TYPE.NOT);
|
||||||
let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId);
|
let hisType = getRecommendType(hisRelation, hisRoleId, roleId);
|
||||||
if(hisOnlineInfo) {
|
if(hisType == FRIEND_RELATION_TYPE.NORMAL) {
|
||||||
let myApply = await getMyApplyParam(apply.applyCode, role);
|
let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
|
||||||
sendMessageToUserWithSuc(friend.roleId, PUSH_ROUTE.FRIEND_APPLY, { apply: myApply }, hisOnlineInfo.sid);
|
if (incResult) {
|
||||||
|
let apply = await FriendApplyModel.createApply(hisRoleId, role);
|
||||||
|
let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId);
|
||||||
|
if(hisOnlineInfo) {
|
||||||
|
let myApply = await getMyApplyParam(apply.applyCode, role);
|
||||||
|
sendMessageToUserWithSuc(friend.roleId, PUSH_ROUTE.FRIEND_APPLY, { apply: myApply }, hisOnlineInfo.sid);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user