|
@ -337,7 +337,6 @@ class Sessions extends RedisModel {
|
|
ModelUtil.emitOK(self.eventEmitter, []);
|
|
ModelUtil.emitOK(self.eventEmitter, []);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
callback(null, sessionIds);
|
|
callback(null, sessionIds);
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@ -350,7 +349,6 @@ class Sessions extends RedisModel {
|
|
if (!callback) {
|
|
if (!callback) {
|
|
callback = index, index = 0
|
|
callback = index, index = 0
|
|
}
|
|
}
|
|
|
|
|
|
let sessionId = sessionIds[index];
|
|
let sessionId = sessionIds[index];
|
|
let sessionKey = RedisModel.makeRedisKey(REDIS_KEYS.Session, sessionId);
|
|
let sessionKey = RedisModel.makeRedisKey(REDIS_KEYS.Session, sessionId);
|
|
let participantsRoleKey = RedisModel.makeRedisKey(REDIS_KEYS.SessionParticipantsRole, sessionId);
|
|
let participantsRoleKey = RedisModel.makeRedisKey(REDIS_KEYS.SessionParticipantsRole, sessionId);
|
|
@ -759,11 +757,16 @@ class Sessions extends RedisModel {
|
|
handler(null, messages);
|
|
handler(null, messages);
|
|
}).then(function () {
|
|
}).then(function () {
|
|
Sessions.updateParticipantLastFetchTime(sessionId, userId, new Date().getTime());
|
|
Sessions.updateParticipantLastFetchTime(sessionId, userId, new Date().getTime());
|
|
if(session.type != SESSION_TYPES.GROUP){
|
|
|
|
|
|
if(session.type == SESSION_TYPES.P2P){
|
|
for(var j in users){
|
|
for(var j in users){
|
|
if(users[j]==userId)continue;
|
|
if(users[j]==userId)continue;
|
|
WechatClient.sendAllRead(users[j],sessionId);
|
|
WechatClient.sendAllRead(users[j],sessionId);
|
|
}
|
|
}
|
|
|
|
}else if(session.type == SESSION_TYPES.MUC){
|
|
|
|
for(var j in users){
|
|
|
|
if(users[j]==userId)continue;
|
|
|
|
WechatClient.sendMucAllRead(users[j],userId,sessionId);
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
})
|
|
})
|
|
@ -786,11 +789,16 @@ class Sessions extends RedisModel {
|
|
handler(null, messages);
|
|
handler(null, messages);
|
|
}).then(function () {
|
|
}).then(function () {
|
|
Sessions.updateParticipantLastFetchTime(sessionId, userId, new Date().getTime());
|
|
Sessions.updateParticipantLastFetchTime(sessionId, userId, new Date().getTime());
|
|
if(session.type != SESSION_TYPES.GROUP){
|
|
|
|
|
|
if(session.type == SESSION_TYPES.P2P){
|
|
for(var j in users){
|
|
for(var j in users){
|
|
if(users[j]==userId)continue;
|
|
if(users[j]==userId)continue;
|
|
WechatClient.sendAllRead(users[j],sessionId);
|
|
WechatClient.sendAllRead(users[j],sessionId);
|
|
}
|
|
}
|
|
|
|
}else if(session.type == SESSION_TYPES.MUC){
|
|
|
|
for(var j in users){
|
|
|
|
if(users[j]==userId)continue;
|
|
|
|
WechatClient.sendMucAllRead(users[j],userId,sessionId);
|
|
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|
|
})
|
|
})
|