Browse Source

create group_kick msg for the person kicked out

bugfix/timeout-logging
Evan Feenstra 5 years ago
parent
commit
16106509ac
  1. 22
      api/controllers/chats.ts
  2. 21
      dist/api/controllers/chats.js
  3. 2
      dist/api/controllers/chats.js.map

22
api/controllers/chats.ts

@ -78,10 +78,10 @@ export async function kickChatMember(req, res){
export async function receiveGroupKick(payload) {
console.log('=> receiveGroupKick')
const { chat } = await helpers.parseReceiveParams(payload)
const { chat, sender, date_string } = await helpers.parseReceiveParams(payload)
if (!chat) return
const owner = await models.Contact.findOne({where:{isOwner:true}})
// const owner = await models.Contact.findOne({where:{isOwner:true}})
// await chat.update({
// deleted: true,
// uuid:'',
@ -92,10 +92,26 @@ export async function receiveGroupKick(payload) {
// name:''
// })
// await models.Message.destroy({ where: { chatId: chat.id } })
var date = new Date();
date.setMilliseconds(0)
if(date_string) date=new Date(date_string)
const msg:{[k:string]:any} = {
chatId: chat.id,
type: constants.message_types.group_kick,
sender: (sender && sender.id) || 0,
messageContent:'', remoteMessageContent:'',
status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date,
}
const message = await models.Message.create(msg)
socket.sendJson({
type: 'group_kick',
response: {
contact: jsonUtils.contactToJson(owner),
contact: jsonUtils.contactToJson(sender),
chat: jsonUtils.chatToJson(chat),
message: jsonUtils.messageToJson(message, null)
}
})
}

21
dist/api/controllers/chats.js

@ -84,10 +84,10 @@ exports.kickChatMember = kickChatMember;
function receiveGroupKick(payload) {
return __awaiter(this, void 0, void 0, function* () {
console.log('=> receiveGroupKick');
const { chat } = yield helpers.parseReceiveParams(payload);
const { chat, sender, date_string } = yield helpers.parseReceiveParams(payload);
if (!chat)
return;
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
// const owner = await models.Contact.findOne({where:{isOwner:true}})
// await chat.update({
// deleted: true,
// uuid:'',
@ -98,10 +98,25 @@ function receiveGroupKick(payload) {
// name:''
// })
// await models.Message.destroy({ where: { chatId: chat.id } })
var date = new Date();
date.setMilliseconds(0);
if (date_string)
date = new Date(date_string);
const msg = {
chatId: chat.id,
type: constants.message_types.group_kick,
sender: (sender && sender.id) || 0,
messageContent: '', remoteMessageContent: '',
status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date,
};
const message = yield models_1.models.Message.create(msg);
socket.sendJson({
type: 'group_kick',
response: {
contact: jsonUtils.contactToJson(owner),
contact: jsonUtils.contactToJson(sender),
chat: jsonUtils.chatToJson(chat),
message: jsonUtils.messageToJson(message, null)
}
});
});

2
dist/api/controllers/chats.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save