|
|
@ -1946,8 +1946,7 @@
|
|
|
|
conversation.setFriendRequestStatus(
|
|
|
|
conversation.setFriendRequestStatus(
|
|
|
|
window.friends.friendRequestStatusEnum.friends
|
|
|
|
window.friends.friendRequestStatusEnum.friends
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
|
|
const fromAdmin = conversation
|
|
|
|
const fromAdmin = conversation
|
|
|
|
.get('groupAdmins')
|
|
|
|
.get('groupAdmins')
|
|
|
|
.includes(primarySource);
|
|
|
|
.includes(primarySource);
|
|
|
@ -1980,6 +1979,7 @@
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
// For every member, see if we need to establish a session:
|
|
|
|
// For every member, see if we need to establish a session:
|
|
|
|
initialMessage.group.members.forEach(memberPubKey => {
|
|
|
|
initialMessage.group.members.forEach(memberPubKey => {
|
|
|
|
const haveSession = _.some(
|
|
|
|
const haveSession = _.some(
|
|
|
|