diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts index 427b1fdda..353a53ec2 100644 --- a/game-server/app/servers/connector/filter/global.ts +++ b/game-server/app/servers/connector/filter/global.ts @@ -67,8 +67,8 @@ class Filter { session.push('teamCode', () => {}); if(isCheckWord(isDevelopEnv())) { - let hasNoBlockWords = this.checkHasBlockWord(routeRecord.route, msg, roleId, serverId, guildCode); - if(!hasNoBlockWords) return next(new Error('globalFilter'), resResult(STATUS.BLOCK_WORDS, { route: routeRecord.route })); + let hasBlockWords = await this.checkHasBlockWord(routeRecord.route, msg, roleId, serverId, guildCode); + if(hasBlockWords) return next(new Error('globalFilter'), resResult(STATUS.BLOCK_WORDS, { route: routeRecord.route })); } if(routeRecord.route == 'guild.guildHandler.createGuild') { diff --git a/game-server/app/services/sdkService.ts b/game-server/app/services/sdkService.ts index c00f8973f..481c24abe 100644 --- a/game-server/app/services/sdkService.ts +++ b/game-server/app/services/sdkService.ts @@ -28,7 +28,7 @@ export async function checkPrivateChat(roleId: string, targetRoleId: string, mes let body = new Chat37Params(message, getSdkChannelId('private')); let myRole = await RoleModel.findByRoleId(roleId); let myUser = await UserModel.findUserByUid(myRole.userInfo.uid); - if(myUser.channelType == '37') { + if(myUser.channelInfo) { body.setByMyRole(myRole, myUser); let targetRole = await RoleModel.findByRoleId(targetRoleId); let targetUser = await UserModel.findUserByUid(targetRole.userInfo.uid); @@ -42,7 +42,7 @@ export async function checkGuildChat(roleId: string, guildCode: string, message: let body = new Chat37Params(message, getSdkChannelId(CHANNEL_PREFIX.GUILD)); let myRole = await RoleModel.findByRoleId(roleId); let myUser = await UserModel.findUserByUid(myRole.userInfo.uid); - if(myUser.channelType == '37') { + if(myUser.channelInfo) { body.setByMyRole(myRole, myUser); body.setByGuild(guildCode); return await request37CheckChat(SDK_37_ADDR.CHECK_CHAT, body, SDK_37_CONST.CHAT_KEY); @@ -54,7 +54,7 @@ export async function checkOtherChat(roleId: string, channelPrefix: string, mess let body = new Chat37Params(message, getSdkChannelId(channelPrefix)); let myRole = await RoleModel.findByRoleId(roleId); let myUser = await UserModel.findUserByUid(myRole.userInfo.uid); - if(myUser.channelType == '37') { + if(!!myUser.channelInfo) { body.setByMyRole(myRole, myUser); return await request37CheckChat(SDK_37_ADDR.CHECK_CHAT, body, SDK_37_CONST.CHAT_KEY); } @@ -66,7 +66,7 @@ export async function checkRoleName(roleId: string, roleName: string, myRole?: R myRole = await RoleModel.findByRoleId(roleId); } let myUser = await UserModel.findUserByUid(myRole.userInfo.uid); - if(myUser.channelType == '37') { + if(!!myUser.channelInfo) { let body = new CheckName37Params(myRole, roleName, myUser); let result = await request37Post(SDK_37_ADDR.CHECK_NAME, body, SDK_37_CONST.CHAT_KEY); if(result == STATUS.REQUEST_TIME_OUT.code) { // 超时