Browse Source

update ChatMember status based on approve/reject

push-params
Evan Feenstra 5 years ago
parent
commit
b911ac1960
  1. 16
      api/controllers/chatTribes.ts
  2. 2
      api/network/receive.ts
  3. 14
      dist/api/controllers/chatTribes.js
  4. 2
      dist/api/controllers/chatTribes.js.map
  5. 2
      dist/api/network/receive.js
  6. 2
      dist/api/network/receive.js.map

16
api/controllers/chatTribes.ts

@ -257,7 +257,6 @@ export async function approveOrRejectMember(req,res) {
if(status==='approved') {
memberStatus = constants.chat_statuses.approved
msgType = 'member_approve'
// ADD ID TO CONTACT IDS
const contactIds = JSON.parse(chat.contactIds || '[]')
if(!contactIds.includes(contactId)) contactIds.push(contactId)
await chat.update({ contactIds: JSON.stringify(contactIds) })
@ -267,23 +266,12 @@ export async function approveOrRejectMember(req,res) {
if(!member) {
return failure(res, 'cant find chat member')
}
// update ChatMember status
await member.update({status:memberStatus})
let date = new Date()
date.setMilliseconds(0)
const msg:{[k:string]:any} = {
chatId: chat.id,
type: constants.message_types[msgType],
sender: member.contactId,
messageContent:'', remoteMessageContent:'',
status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date
}
await models.Message.create(msg)
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const chatToSend = chat.dataValues||chat
console.log("SEND THIS MSG", { ...chatToSend, contactIds: [member.contactId] })
network.sendMessage({ // send to the requester
chat: { ...chatToSend, contactIds: [member.contactId], },
amount: 0,

2
api/network/receive.ts

@ -34,7 +34,7 @@ export const typesToReplay=[ // should match typesToForward
msgtypes.message, msgtypes.group_join, msgtypes.group_leave
]
async function onReceive(payload){
console.log("ON RECEIVE",payload)
// console.log("ON RECEIVE",payload)
// if tribe, owner must forward to MQTT
let doAction = true
const toAddIn:{[k:string]:any} = {}

14
dist/api/controllers/chatTribes.js

@ -248,7 +248,6 @@ function approveOrRejectMember(req, res) {
if (status === 'approved') {
memberStatus = constants.chat_statuses.approved;
msgType = 'member_approve';
// ADD ID TO CONTACT IDS
const contactIds = JSON.parse(chat.contactIds || '[]');
if (!contactIds.includes(contactId))
contactIds.push(contactId);
@ -258,21 +257,10 @@ function approveOrRejectMember(req, res) {
if (!member) {
return res_1.failure(res, 'cant find chat member');
}
// update ChatMember status
yield member.update({ status: memberStatus });
let date = new Date();
date.setMilliseconds(0);
const msg = {
chatId: chat.id,
type: constants.message_types[msgType],
sender: member.contactId,
messageContent: '', remoteMessageContent: '',
status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date
};
yield models_1.models.Message.create(msg);
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
const chatToSend = chat.dataValues || chat;
console.log("SEND THIS MSG", Object.assign(Object.assign({}, chatToSend), { contactIds: [member.contactId] }));
network.sendMessage({
chat: Object.assign(Object.assign({}, chatToSend), { contactIds: [member.contactId] }),
amount: 0,

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

File diff suppressed because one or more lines are too long

2
dist/api/network/receive.js

@ -43,7 +43,7 @@ exports.typesToReplay = [
];
function onReceive(payload) {
return __awaiter(this, void 0, void 0, function* () {
console.log("ON RECEIVE", payload);
// console.log("ON RECEIVE",payload)
// if tribe, owner must forward to MQTT
let doAction = true;
const toAddIn = {};

2
dist/api/network/receive.js.map

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