Browse Source

fix

push-params
Evan Feenstra 5 years ago
parent
commit
2b848fbc8e
  1. 3
      api/controllers/chatTribes.ts
  2. 2
      api/network/receive.ts
  3. 3
      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

3
api/controllers/chatTribes.ts

@ -318,9 +318,10 @@ export async function receiveMemberApprove(payload) {
}
})
const theChat = chat.dataValues||chat
// send my info to all
network.sendMessage({
chat: { ...chat,
chat: { ...theChat,
members: {
[owner.publicKey]: {
key: owner.contactKey,

2
api/network/receive.ts

@ -41,7 +41,7 @@ async function onReceive(payload){
let isTribe = false
let isTribeOwner = false
let chat
if(payload.chat) {
if(payload.chat&&payload.chat.uuid) {
isTribe = payload.chat.type===constants.chat_types.tribe
chat = await models.Chat.findOne({where:{uuid:payload.chat.uuid}})
if(chat) chat.update({seen:false})

3
dist/api/controllers/chatTribes.js

@ -307,9 +307,10 @@ function receiveMemberApprove(payload) {
message: jsonUtils.messageToJson(message, null)
}
});
const theChat = chat.dataValues || chat;
// send my info to all
network.sendMessage({
chat: Object.assign(Object.assign({}, chat), { members: {
chat: Object.assign(Object.assign({}, theChat), { members: {
[owner.publicKey]: {
key: owner.contactKey,
alias: owner.alias || ''

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

File diff suppressed because one or more lines are too long

2
dist/api/network/receive.js

@ -50,7 +50,7 @@ function onReceive(payload) {
let isTribe = false;
let isTribeOwner = false;
let chat;
if (payload.chat) {
if (payload.chat && payload.chat.uuid) {
isTribe = payload.chat.type === constants.chat_types.tribe;
chat = yield models_1.models.Chat.findOne({ where: { uuid: payload.chat.uuid } });
if (chat)

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

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