Merge pull request #746 from msgmaxim/no-autojoin-loki-chats

Disable auto-joining default loki open groups
pull/754/head
Maxim Shishmarev 5 years ago committed by GitHub
commit d910633422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -914,7 +914,12 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
profileAvatar: 'images/loki/loki_icon.png', profileAvatar: 'images/loki/loki_icon.png',
}; };
await initConversation(publicChatData); const autoJoinLokiChats = false;
if (autoJoinLokiChats) {
await initConversation(publicChatData);
}
await initConversation(newsRssFeedData); await initConversation(newsRssFeedData);
await initConversation(updatesRssFeedData); await initConversation(updatesRssFeedData);

@ -1471,6 +1471,7 @@ class LokiPublicChannelAPI {
/* eslint-enable no-param-reassign */ /* eslint-enable no-param-reassign */
// process remaining messages // process remaining messages
/* eslint-disable no-param-reassign */
slaveMessages.forEach(messageData => { slaveMessages.forEach(messageData => {
const slaveKey = messageData.source; const slaveKey = messageData.source;
@ -1500,6 +1501,7 @@ class LokiPublicChannelAPI {
message: messageData, message: messageData,
}); });
}); });
/* eslint-enable no-param-reassign */
// if we received one of our own messages // if we received one of our own messages
if (lastProfileName !== false) { if (lastProfileName !== false) {

Loading…
Cancel
Save