好友:服务器名
This commit is contained in:
@@ -63,11 +63,11 @@ export class FriendHandler {
|
||||
let param = new FriendRecommendParams(role);
|
||||
param.setType(type);
|
||||
|
||||
let { serverId, userInfo: { serverType } } = role;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = role;
|
||||
let serverName = await getServerName(serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
|
||||
if (myServerId == serverId && myServerType == serverType) {
|
||||
if (myServerId == serverId) {
|
||||
myServerList.push(param);
|
||||
} else {
|
||||
otherServerList.push(param);
|
||||
@@ -112,8 +112,8 @@ export class FriendHandler {
|
||||
let param = new FriendRecommendParams(role);
|
||||
param.setType(type);
|
||||
|
||||
let { serverId, userInfo: { serverType } } = role;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = role;
|
||||
let serverName = await getServerName(serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
|
||||
list.push(param);
|
||||
@@ -227,8 +227,8 @@ export class FriendHandler {
|
||||
let hisOnlineInfo = await getRoleOnlineInfo(friend.roleId);
|
||||
param.setOnline(hisOnlineInfo.isOnline);
|
||||
|
||||
let { serverId, userInfo: { serverType } } = friend;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = friend;
|
||||
let serverName = await getServerName( serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
|
||||
param.setType(FRIEND_RELATION_TYPE.HAS_FRIEND);
|
||||
@@ -287,8 +287,8 @@ export class FriendHandler {
|
||||
let isOnline = await isRoleOnline(friendRole.roleId);
|
||||
param.setOnline(isOnline);
|
||||
|
||||
let { serverId, userInfo: { serverType } } = friendRole;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = friendRole;
|
||||
let serverName = await getServerName(serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
|
||||
param.setType(FRIEND_RELATION_TYPE.HAS_BLOCKED);
|
||||
@@ -349,8 +349,8 @@ export class FriendHandler {
|
||||
let isOnline = await isRoleOnline(friend.roleId);
|
||||
param.setOnline(isOnline);
|
||||
|
||||
let { serverId, userInfo: { serverType } } = friend;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = friend;
|
||||
let serverName = await getServerName(serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
|
||||
param.setType(FRIEND_RELATION_TYPE.HAS_BLOCKED);
|
||||
@@ -625,8 +625,8 @@ export class FriendHandler {
|
||||
}
|
||||
}
|
||||
let param = new FriendRecommendParams({...role, ...addObj});
|
||||
let { serverId, userInfo: { serverType } } = role;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = role;
|
||||
let serverName = await getServerName(serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
|
||||
return resResult(STATUS.SUCCESS, {...param, isRobot });
|
||||
@@ -639,8 +639,8 @@ export class FriendHandler {
|
||||
let param = new FriendRecommendParams(role);
|
||||
param.setType(type);
|
||||
|
||||
let { serverId, userInfo: { serverType } } = role;
|
||||
let serverName = await getServerName(serverType, serverId);
|
||||
let { serverId } = role;
|
||||
let serverName = await getServerName(serverId);
|
||||
param.setServerName(serverId, serverName);
|
||||
return resResult(STATUS.SUCCESS, {...param, isRobot });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user