Browse Source

增加会话状态

8 years ago
parent
commit
5ec1d2ead4
2 changed files with 6 additions and 7 deletions
  1. 5 5
      src/server/models/sessions/sessions.js
  2. 1 2
      src/server/models/sessions/topics.js

+ 5 - 5
src/server/models/sessions/sessions.js

@ -911,7 +911,7 @@ class Sessions extends RedisModel {
                    sessionName = res[1];
                    if (!sessionType || !sessionName) {
                        logger.error("Unknown session key " + session_key);
                        if (handler) return handler(new Error("Unknown session key " + session_key));
                        if (handler) {handler(new Error("Unknown session key " + session_key));return;} ;
                    }
                }).then(function (res) {
                    // 消息数据双写,并更新用户最后消息获取时间,会话新状态等
@ -923,12 +923,12 @@ class Sessions extends RedisModel {
                    Messages.updateLastContent(session_key, sessionType, sessionName, message);
                    SessionRepo.updateSessionLastStatus(message.sender_id, message.sender_name, message.timestamp, message.content, message.content_type, sessionId);
                    if (handler) handler(null, messageId);
                    if (handler) {handler(null, messageId);return;}
                }).then(function (res) {
                    // 推送消息
                    ParticipantRepo.findIds(sessionId, function (err, res) {
                        if (err) {
                            if (handler) handler(err, messageId)
                            logger.error(err);
                        } else {
                            message.session_id = sessionId;
                            res.forEach(function (participant) {
@ -940,10 +940,10 @@ class Sessions extends RedisModel {
                        }
                    })
                }).catch(function (err) {
                    if (handler) handler(err, messageId)
                    if (handler) { handler(err, messageId);return;}
                })
            } else {
                if (handler) handler("用户不在此会话当中!", messageId);
                if (handler){ handler("用户不在此会话当中!", messageId);return;}
            }
        })
    }

+ 1 - 2
src/server/models/sessions/topics.js

@ -112,10 +112,9 @@ class Topics extends RedisModel {
            if (err || res.length == 0) {
                ModelUtil.emitOK(self.eventEmitter, {status: -1, message: "找不到对应的会话记录!"});
            }
            if(!res[0].session_id){
            if(!res[0]||!res[0].session_id){
                ModelUtil.emitOK(self.eventEmitter, {status: -1, message: err});
            }
            let sessions = new Sessions();
            sessions.getMessages(res[0].session_id, user, startMsgId, endMsgId, page, pagesize, 0, function (err, messages) {
                if (err) {