Browse Source

try catch

push-params
Evan Feenstra 4 years ago
parent
commit
1a46af2eb9
  1. 7
      api/controllers/chatTribes.ts
  2. 8
      dist/api/controllers/chatTribes.js
  3. 2
      dist/api/controllers/chatTribes.js.map

7
api/controllers/chatTribes.ts

@ -131,8 +131,6 @@ export async function receiveMemberRequest(payload) {
const member = chat_members[sender_pub_key] const member = chat_members[sender_pub_key]
const senderAlias = sender_alias || (member && member.alias) || 'Unknown' const senderAlias = sender_alias || (member && member.alias) || 'Unknown'
try {
const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } })
if (sender) { if (sender) {
theSender = sender // might already include?? theSender = sender // might already include??
@ -158,6 +156,7 @@ export async function receiveMemberRequest(payload) {
lastActive: date, lastActive: date,
}) })
// maybe check here manually???? // maybe check here manually????
try{
await models.ChatMember.upsert({ await models.ChatMember.upsert({
contactId: theSender.id, contactId: theSender.id,
chatId: chat.id, chatId: chat.id,
@ -165,6 +164,7 @@ export async function receiveMemberRequest(payload) {
status: constants.chat_statuses.pending, status: constants.chat_statuses.pending,
lastActive: date, lastActive: date,
}) })
} catch(e){}
const msg:{[k:string]:any} = { const msg:{[k:string]:any} = {
chatId: chat.id, chatId: chat.id,
@ -188,9 +188,6 @@ export async function receiveMemberRequest(payload) {
message: jsonUtils.messageToJson(message, theChat) message: jsonUtils.messageToJson(message, theChat)
} }
}) })
} catch(e) {
console.log('=> receiveMemberRequest ERROR',e)
}
} }
export async function editTribe(req, res) { export async function editTribe(req, res) {

8
dist/api/controllers/chatTribes.js

@ -132,7 +132,6 @@ function receiveMemberRequest(payload) {
let theSender = null; let theSender = null;
const member = chat_members[sender_pub_key]; const member = chat_members[sender_pub_key];
const senderAlias = sender_alias || (member && member.alias) || 'Unknown'; const senderAlias = sender_alias || (member && member.alias) || 'Unknown';
try {
const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } });
if (sender) { if (sender) {
theSender = sender; // might already include?? theSender = sender; // might already include??
@ -159,6 +158,7 @@ function receiveMemberRequest(payload) {
lastActive: date, lastActive: date,
}); });
// maybe check here manually???? // maybe check here manually????
try {
yield models_1.models.ChatMember.upsert({ yield models_1.models.ChatMember.upsert({
contactId: theSender.id, contactId: theSender.id,
chatId: chat.id, chatId: chat.id,
@ -166,6 +166,8 @@ function receiveMemberRequest(payload) {
status: constants.chat_statuses.pending, status: constants.chat_statuses.pending,
lastActive: date, lastActive: date,
}); });
}
catch (e) { }
const msg = { const msg = {
chatId: chat.id, chatId: chat.id,
type: constants.message_types.member_request, type: constants.message_types.member_request,
@ -187,10 +189,6 @@ function receiveMemberRequest(payload) {
message: jsonUtils.messageToJson(message, theChat) message: jsonUtils.messageToJson(message, theChat)
} }
}); });
}
catch (e) {
console.log('=> receiveMemberRequest ERROR', e);
}
}); });
} }
exports.receiveMemberRequest = receiveMemberRequest; exports.receiveMemberRequest = receiveMemberRequest;

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

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