Skip to content

Commit

Permalink
failure notification. bugfix: LocalID
Browse files Browse the repository at this point in the history
  • Loading branch information
MaskRay committed Mar 13, 2016
1 parent 3e049d3 commit 7eca7be
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions webwxapp.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ ws.onmessage = data => {
} catch (ex) {
consoleerror(ex.stack)
} finally {
wechatircd_LocalID = null
chatFactory.setCurrentUserName(old)
}
break
Expand Down Expand Up @@ -2301,7 +2302,7 @@ angular.module("Services", []),
msg.MMStatus = confFactory.MSG_SEND_STATUS_FAIL

//@ PATCH
if (wechatircd_LocalID.has(e.LocalID) && token)
if (seenLocalID.has(msg.LocalID) && token)
try {
ws.send({token: token,
command: 'send_text_message_fail',
Expand Down Expand Up @@ -2547,14 +2548,14 @@ angular.module("Services", []),
try {
// 服务端通过WebSocket控制网页版发送消息,无需投递到服务端
if (seenLocalID.has(e.LocalID))
seenLocalID.delete(e.LocalID)
;
// 非服务端生成
else {
var sender = contactFactory.getContact(e.MMActualSender)
sender = Object.assign({}, sender, {DisplayName: sender.RemarkName || sender.getDisplayName()})
var receiver = contactFactory.getContact(e.MMPeerUserName)
receiver = Object.assign({}, receiver, {DisplayName: receiver.RemarkName || receiver.getDisplayName()})
if (sender && receiver) {
sender = Object.assign({}, sender, {DisplayName: sender.RemarkName || sender.getDisplayName()})
receiver = Object.assign({}, receiver, {DisplayName: receiver.RemarkName || receiver.getDisplayName()})
delete sender.MemberList
delete receiver.MemberList
if (e.MsgType == confFactory.MSGTYPE_IMAGE) // 3 图片
Expand Down

0 comments on commit 7eca7be

Please sign in to comment.