聊天:增加私聊部分逻辑

测试:增加测试脚本,减少socket断开的打印
This commit is contained in:
liangtongchuan
2021-03-04 18:27:39 +08:00
parent d4561c2e3d
commit 0bb4caf291
10 changed files with 232 additions and 7 deletions

View File

@@ -0,0 +1,14 @@
export const MSG_CODE_LEN = 8;
export const MSG_STATUS = {
NORMAL: 0,
BLOCKED: 1
}
export const MSG_TYPE = {
TEXT: 0,
RICH_TEXT: 1,
IMG: 2
}
export const ON_MSG_ROUTE = 'onMessage';

View File

@@ -6,5 +6,6 @@ export * from './constModules/itemConst';
export * from './constModules/sysConst';
export * from './constModules/guildConst';
export * from './constModules/selectConst';
export * from './constModules/chatConst';
export * from './statusCode';
export * from './dataName';

View File

@@ -28,11 +28,11 @@ export default class GroupMessage extends BaseModel {
targetRoleName: string; // 被回复者名称
@prop({ required: true, default: '' })
msgId: string; // 消息唯一 Id
msgCode: string; // 消息唯一 Id
@prop({ required: true, default: 0 })
seqId: number; // 消息在本聊天室的递增 Id
@prop({ required: true, default: '' })
targetMsgId: string; // 回复消息的唯一 Id
targetMsgCode: string; // 回复消息的唯一 Id
@prop({ required: true, default: 0 })
status: number; // 消息状态0正常1屏蔽
@@ -45,3 +45,4 @@ export default class GroupMessage extends BaseModel {
export const GroupMessageModel = getModelForClass(GroupMessage);
export interface GroupMessageType extends Pick<DocumentType<GroupMessage>, keyof GroupMessage> {};
export type GroupMessageParam = Partial<GroupMessageType>;

43
shared/db/Message.ts Normal file
View File

@@ -0,0 +1,43 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';
/**
* 信息基类
**/
@modelOptions({ schemaOptions: { id: false } })
@index({ roomId: 1, seqId: 1 })
@index({ msgId: 1 })
export default class Message extends BaseModel {
@prop({ required: true, default: '' })
roomId: string; // 频道唯一 Id由 roleId 和 targetRoleId 排序后拼接
@prop({ required: true, default: 0 })
type: number; // 消息类型0纯文本1富文本2表情
@prop({ required: true, default: '' })
roleId: string; // 消息发送者 roleId
@prop({ required: true, default: '' })
roleName: string; // 消息发送者名称
@prop({ required: false, default: '' })
targetRoleId: string; // 接收者 roleId
@prop({ required: false, default: '' })
targetRoleName: string; // 接收者名称
@prop({ required: true, default: '' })
msgId: string; // 消息唯一 Id
@prop({ required: true, default: 0 })
seqId: number; // 消息在本聊天室的递增 Id
@prop({ required: false, default: '' })
targetMsgId: string; // 回复消息的唯一 Id
@prop({ required: true, default: 0 })
status: number; // 消息状态0正常1屏蔽
@prop({ required: true, default: '' })
content: string; // 消息内容
}
export const MessageModel = getModelForClass(Message);
export interface MessageType extends Pick<DocumentType<Message>, keyof Message> {};
export type MessageParam = Partial<MessageType>;

View File

@@ -23,20 +23,31 @@ export default class PrivateMessage extends BaseModel {
targetRoleName: string; // 接收者名称
@prop({ required: true, default: '' })
msgId: string; // 消息唯一 Id
msgCode: string; // 消息唯一 Id
@prop({ required: true, default: 0 })
seqId: number; // 消息在本聊天室的递增 Id
@prop({ required: true, default: '' })
targetMsgId: string; // 回复消息的唯一 Id
targetMsgCode: string; // 回复消息的唯一 Id
@prop({ required: true, default: 0 })
status: number; // 消息状态0正常1屏蔽
@prop({ required: true, default: '' })
content: string; // 消息内容
public static async createMsg(data: PrivateMessageParam) {
const result = await PrivateMessageModel.findOneAndUpdate({}, {...data}, {upsert: true, new: true}).lean();
return result;
}
public static async findOneMsg(query: PrivateMessageParam) {
const result = await PrivateMessageModel.findOne(query).lean();
return result;
}
}
export const PrivateMessageModel = getModelForClass(PrivateMessage);
export interface PrivateMessageType extends Pick<DocumentType<PrivateMessage>, keyof PrivateMessage> {};
export type PrivateMessageParam = Partial<PrivateMessageType>;