lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

try catch

push-params
Evan Feenstra 4 years ago
parent
59e7c0fcfd
commit
1a46af2eb9
3 changed files with 95 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 97
      api/controllers/chatTribes.ts
  2. 96
      dist/api/controllers/chatTribes.js
  3. 2
      dist/api/controllers/chatTribes.js.map

97
api/controllers/chatTribes.ts
View File

@ -130,34 +130,33 @@ export async function receiveMemberRequest(payload) {
let theSender: any = null let theSender: any = 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 = await models.Contact.findOne({ where: { publicKey: sender_pub_key } })
if (sender) {
const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) theSender = sender // might already include??
if (sender) { } else {
theSender = sender // might already include?? if(member && member.key) {
} else { const createdContact = await models.Contact.create({
if(member && member.key) { publicKey: sender_pub_key,
const createdContact = await models.Contact.create({ contactKey: member.key,
publicKey: sender_pub_key, alias: senderAlias,
contactKey: member.key, status: 1,
alias: senderAlias, fromGroup: true,
status: 1, })
fromGroup: true, theSender = createdContact
})
theSender = createdContact
}
} }
if(!theSender) return console.log('no sender') // fail (no contact key?) }
if(!theSender) return console.log('no sender') // fail (no contact key?)
console.log("UPSERT",{ console.log("UPSERT",{
contactId: theSender.id, contactId: theSender.id,
chatId: chat.id, chatId: chat.id,
role: constants.chat_roles.reader, role: constants.chat_roles.reader,
status: constants.chat_statuses.pending, status: constants.chat_statuses.pending,
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,32 +164,30 @@ 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,
type: constants.message_types.member_request, type: constants.message_types.member_request,
sender: (theSender && theSender.id) || 0, sender: (theSender && theSender.id) || 0,
messageContent:'', remoteMessageContent:'', messageContent:'', remoteMessageContent:'',
status: constants.statuses.confirmed, status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date date: date, createdAt: date, updatedAt: date
}
if(isTribe) {
msg.senderAlias = sender_alias
}
const message = await models.Message.create(msg)
const theChat = await addPendingContactIdsToChat(chat)
socket.sendJson({
type: 'member_request',
response: {
contact: jsonUtils.contactToJson(theSender||{}),
chat: jsonUtils.chatToJson(theChat),
message: jsonUtils.messageToJson(message, theChat)
}
})
} catch(e) {
console.log('=> receiveMemberRequest ERROR',e)
} }
if(isTribe) {
msg.senderAlias = sender_alias
}
const message = await models.Message.create(msg)
const theChat = await addPendingContactIdsToChat(chat)
socket.sendJson({
type: 'member_request',
response: {
contact: jsonUtils.contactToJson(theSender||{}),
chat: jsonUtils.chatToJson(theChat),
message: jsonUtils.messageToJson(message, theChat)
}
})
} }
export async function editTribe(req, res) { export async function editTribe(req, res) {

96
dist/api/controllers/chatTribes.js
View File

@ -132,33 +132,33 @@ 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?? }
} else {
else { if (member && member.key) {
if (member && member.key) { const createdContact = yield models_1.models.Contact.create({
const createdContact = yield models_1.models.Contact.create({ publicKey: sender_pub_key,
publicKey: sender_pub_key, contactKey: member.key,
contactKey: member.key, alias: senderAlias,
alias: senderAlias, status: 1,
status: 1, fromGroup: true,
fromGroup: true, });
}); theSender = createdContact;
theSender = createdContact;
}
} }
if (!theSender) }
return console.log('no sender'); // fail (no contact key?) if (!theSender)
console.log("UPSERT", { return console.log('no sender'); // fail (no contact key?)
contactId: theSender.id, console.log("UPSERT", {
chatId: chat.id, contactId: theSender.id,
role: constants.chat_roles.reader, chatId: chat.id,
status: constants.chat_statuses.pending, role: constants.chat_roles.reader,
lastActive: date, status: constants.chat_statuses.pending,
}); 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,31 +166,29 @@ function receiveMemberRequest(payload) {
status: constants.chat_statuses.pending, status: constants.chat_statuses.pending,
lastActive: date, lastActive: date,
}); });
const msg = {
chatId: chat.id,
type: constants.message_types.member_request,
sender: (theSender && theSender.id) || 0,
messageContent: '', remoteMessageContent: '',
status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date
};
if (isTribe) {
msg.senderAlias = sender_alias;
}
const message = yield models_1.models.Message.create(msg);
const theChat = yield addPendingContactIdsToChat(chat);
socket.sendJson({
type: 'member_request',
response: {
contact: jsonUtils.contactToJson(theSender || {}),
chat: jsonUtils.chatToJson(theChat),
message: jsonUtils.messageToJson(message, theChat)
}
});
} }
catch (e) { catch (e) { }
console.log('=> receiveMemberRequest ERROR', e); const msg = {
chatId: chat.id,
type: constants.message_types.member_request,
sender: (theSender && theSender.id) || 0,
messageContent: '', remoteMessageContent: '',
status: constants.statuses.confirmed,
date: date, createdAt: date, updatedAt: date
};
if (isTribe) {
msg.senderAlias = sender_alias;
} }
const message = yield models_1.models.Message.create(msg);
const theChat = yield addPendingContactIdsToChat(chat);
socket.sendJson({
type: 'member_request',
response: {
contact: jsonUtils.contactToJson(theSender || {}),
chat: jsonUtils.chatToJson(theChat),
message: jsonUtils.messageToJson(message, theChat)
}
});
}); });
} }
exports.receiveMemberRequest = receiveMemberRequest; exports.receiveMemberRequest = receiveMemberRequest;

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

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