merge dialog refctor with clearnet
Audric Ackermann
4 years ago
parent
c9d7f4a1ab
commit
a5d7995168
File diff suppressed because it is too large
Load Diff
@ -1,43 +0,0 @@
|
||||
/* global Whisper */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.AdminLeaveClosedGroupDialog = Whisper.View.extend({
|
||||
className: 'loki-dialog modal',
|
||||
initialize(convo) {
|
||||
this.close = this.close.bind(this);
|
||||
this.submit = this.submit.bind(this);
|
||||
this.theme = convo.theme;
|
||||
this.groupName = convo.get('name');
|
||||
this.convo = convo;
|
||||
|
||||
this.$el.focus();
|
||||
this.render();
|
||||
},
|
||||
render() {
|
||||
const view = new Whisper.ReactWrapperView({
|
||||
className: 'admin-leave-closed-group',
|
||||
Component: window.Signal.Components.AdminLeaveClosedGroupDialog,
|
||||
props: {
|
||||
onSubmit: this.submit,
|
||||
onClose: this.close,
|
||||
groupName: this.groupName,
|
||||
theme: this.theme,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(view.el);
|
||||
return this;
|
||||
},
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
submit() {
|
||||
this.convo.leaveClosedGroup();
|
||||
},
|
||||
});
|
||||
})();
|
||||
@ -1,36 +0,0 @@
|
||||
/* global Whisper */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.AddModeratorsDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog modal',
|
||||
async initialize(convo) {
|
||||
this.close = this.close.bind(this);
|
||||
this.theme = convo.theme;
|
||||
this.convo = convo;
|
||||
this.$el.focus();
|
||||
this.render();
|
||||
},
|
||||
render() {
|
||||
const view = new Whisper.ReactWrapperView({
|
||||
className: 'add-moderators-dialog',
|
||||
Component: window.Signal.Components.AddModeratorsDialog,
|
||||
props: {
|
||||
onClose: this.close,
|
||||
convo: this.convo,
|
||||
theme: this.theme,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(view.el);
|
||||
return this;
|
||||
},
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
});
|
||||
})();
|
||||
@ -1,36 +0,0 @@
|
||||
/* global Whisper */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.RemoveModeratorsDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog modal',
|
||||
async initialize(convo) {
|
||||
this.close = this.close.bind(this);
|
||||
this.convo = convo;
|
||||
|
||||
this.$el.focus();
|
||||
this.render();
|
||||
},
|
||||
render() {
|
||||
const view = new Whisper.ReactWrapperView({
|
||||
className: 'remove-moderators-dialog',
|
||||
Component: window.Signal.Components.RemoveModeratorsDialog,
|
||||
props: {
|
||||
onClose: this.close,
|
||||
convo: this.convo,
|
||||
theme: this.convo.theme,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(view.el);
|
||||
return this;
|
||||
},
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
});
|
||||
})();
|
||||
@ -1,196 +0,0 @@
|
||||
/* global Whisper, i18n, _ */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.UpdateGroupNameDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog modal',
|
||||
initialize(groupConvo) {
|
||||
this.groupName = groupConvo.get('name');
|
||||
|
||||
this.conversation = groupConvo;
|
||||
this.titleText = i18n('updateGroupDialogTitle', this.groupName);
|
||||
|
||||
this.close = this.close.bind(this);
|
||||
this.onSubmit = this.onSubmit.bind(this);
|
||||
this.isPublic = groupConvo.isPublic();
|
||||
this.groupId = groupConvo.id;
|
||||
this.members = groupConvo.get('members') || [];
|
||||
this.avatarPath = groupConvo.getAvatarPath();
|
||||
this.theme = groupConvo.theme;
|
||||
|
||||
// any member can update a closed group name
|
||||
this.isAdmin = true;
|
||||
|
||||
// public chat settings overrides
|
||||
if (this.isPublic) {
|
||||
// fix the title
|
||||
this.titleText = i18n('updateGroupDialogTitle', this.groupName);
|
||||
// I'd much prefer to integrate mods with groupAdmins
|
||||
// but lets discuss first...
|
||||
this.isAdmin = groupConvo.isAdmin(window.storage.get('primaryDevicePubKey'));
|
||||
}
|
||||
|
||||
this.$el.focus();
|
||||
this.render();
|
||||
},
|
||||
render() {
|
||||
this.dialogView = new Whisper.ReactWrapperView({
|
||||
className: 'create-group-dialog',
|
||||
Component: window.Signal.Components.UpdateGroupNameDialog,
|
||||
props: {
|
||||
titleText: this.titleText,
|
||||
isPublic: this.isPublic,
|
||||
pubkey: this.groupId,
|
||||
groupName: this.groupName,
|
||||
okText: i18n('ok'),
|
||||
cancelText: i18n('cancel'),
|
||||
isAdmin: this.isAdmin,
|
||||
i18n,
|
||||
onSubmit: this.onSubmit,
|
||||
onClose: this.close,
|
||||
avatarPath: this.avatarPath,
|
||||
theme: this.theme,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(this.dialogView.el);
|
||||
return this;
|
||||
},
|
||||
onSubmit(groupName, avatar) {
|
||||
if (groupName !== this.groupName || avatar !== this.avatarPath) {
|
||||
window.libsession.ClosedGroup.initiateGroupUpdate(
|
||||
this.groupId,
|
||||
groupName,
|
||||
this.members,
|
||||
avatar
|
||||
);
|
||||
}
|
||||
},
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
});
|
||||
|
||||
Whisper.UpdateGroupMembersDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog modal',
|
||||
initialize(groupConvo) {
|
||||
this.groupName = groupConvo.get('name');
|
||||
this.close = this.close.bind(this);
|
||||
this.onSubmit = this.onSubmit.bind(this);
|
||||
this.isPublic = groupConvo.isPublic();
|
||||
this.groupId = groupConvo.id;
|
||||
this.avatarPath = groupConvo.getAvatarPath();
|
||||
this.theme = groupConvo.theme;
|
||||
|
||||
if (this.isPublic) {
|
||||
throw new Error('UpdateGroupMembersDialog is only made for Closed/Medium groups');
|
||||
}
|
||||
this.titleText = i18n('updateGroupDialogTitle', this.groupName);
|
||||
// anybody can edit a closed group name or members
|
||||
const ourPK = window.libsession.Utils.UserUtils.getOurPubKeyStrFromCache();
|
||||
this.isAdmin = groupConvo.get('groupAdmins').includes(ourPK);
|
||||
this.admins = groupConvo.get('groupAdmins');
|
||||
const convos = window
|
||||
.getConversationController()
|
||||
.getConversations()
|
||||
.filter(d => !!d);
|
||||
|
||||
this.existingMembers = groupConvo.get('members') || [];
|
||||
this.existingZombies = groupConvo.get('zombies') || [];
|
||||
// Show a contact if they are our friend or if they are a member
|
||||
this.contactsAndMembers = convos.filter(
|
||||
d => this.existingMembers.includes(d.id) && d.isPrivate() && !d.isMe()
|
||||
);
|
||||
this.contactsAndMembers = _.uniq(this.contactsAndMembers, true, d => d.id);
|
||||
|
||||
// at least make sure it's an array
|
||||
if (!Array.isArray(this.existingMembers)) {
|
||||
this.existingMembers = [];
|
||||
}
|
||||
|
||||
this.$el.focus();
|
||||
this.render();
|
||||
},
|
||||
render() {
|
||||
this.dialogView = new Whisper.ReactWrapperView({
|
||||
className: 'create-group-dialog',
|
||||
Component: window.Signal.Components.UpdateGroupMembersDialog,
|
||||
props: {
|
||||
titleText: this.titleText,
|
||||
okText: i18n('ok'),
|
||||
cancelText: i18n('cancel'),
|
||||
isPublic: this.isPublic,
|
||||
existingMembers: this.existingMembers,
|
||||
existingZombies: this.existingZombies,
|
||||
contactList: this.contactsAndMembers,
|
||||
isAdmin: this.isAdmin,
|
||||
admins: this.admins,
|
||||
onClose: this.close,
|
||||
onSubmit: this.onSubmit,
|
||||
groupId: this.groupId,
|
||||
theme: this.theme,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(this.dialogView.el);
|
||||
return this;
|
||||
},
|
||||
async onSubmit(newMembers) {
|
||||
const _ = window.Lodash;
|
||||
const ourPK = window.libsession.Utils.UserUtils.getOurPubKeyStrFromCache();
|
||||
|
||||
const allMembersAfterUpdate = window.Lodash.concat(newMembers, [ourPK]);
|
||||
|
||||
if (!this.isAdmin) {
|
||||
window.log.warn('Skipping update of members, we are not the admin');
|
||||
return;
|
||||
}
|
||||
// new members won't include the zombies. We are the admin and we want to remove them not matter what
|
||||
|
||||
// We need to NOT trigger an group update if the list of member is the same.
|
||||
// we need to merge all members, including zombies for this call.
|
||||
|
||||
// we consider that the admin ALWAYS wants to remove zombies (actually they should be removed
|
||||
// automatically by him when the LEFT message is received)
|
||||
const allExistingMembersWithZombies = _.uniq(
|
||||
this.existingMembers.concat(this.existingZombies)
|
||||
);
|
||||
|
||||
const notPresentInOld = allMembersAfterUpdate.filter(
|
||||
m => !allExistingMembersWithZombies.includes(m)
|
||||
);
|
||||
|
||||
// be sure to include zombies in here
|
||||
const membersToRemove = allExistingMembersWithZombies.filter(
|
||||
m => !allMembersAfterUpdate.includes(m)
|
||||
);
|
||||
|
||||
const xor = _.xor(membersToRemove, notPresentInOld);
|
||||
if (xor.length === 0) {
|
||||
window.log.info('skipping group update: no detected changes in group member list');
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// If any extra devices of removed exist in newMembers, ensure that you filter them
|
||||
// Note: I think this is useless
|
||||
const filteredMembers = allMembersAfterUpdate.filter(
|
||||
member => !_.includes(membersToRemove, member)
|
||||
);
|
||||
|
||||
window.libsession.ClosedGroup.initiateGroupUpdate(
|
||||
this.groupId,
|
||||
this.groupName,
|
||||
filteredMembers,
|
||||
this.avatarPath
|
||||
);
|
||||
},
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
});
|
||||
})();
|
||||
@ -1,47 +0,0 @@
|
||||
/* global i18n, Whisper */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.UserDetailsDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog modal',
|
||||
initialize({ profileName, avatarPath, pubkey, onOk, onStartConversation, theme }) {
|
||||
this.close = this.close.bind(this);
|
||||
|
||||
this.profileName = profileName;
|
||||
this.pubkey = pubkey;
|
||||
this.avatarPath = avatarPath;
|
||||
this.onOk = onOk;
|
||||
this.onStartConversation = onStartConversation;
|
||||
this.theme = theme;
|
||||
|
||||
this.$el.focus();
|
||||
this.render();
|
||||
},
|
||||
render() {
|
||||
this.dialogView = new Whisper.ReactWrapperView({
|
||||
className: 'user-details-dialog',
|
||||
Component: window.Signal.Components.UserDetailsDialog,
|
||||
props: {
|
||||
onOk: this.onOk,
|
||||
onClose: this.close,
|
||||
onStartConversation: this.onStartConversation,
|
||||
profileName: this.profileName,
|
||||
pubkey: this.pubkey,
|
||||
avatarPath: this.avatarPath,
|
||||
i18n,
|
||||
theme: this.theme,
|
||||
},
|
||||
});
|
||||
|
||||
this.$el.append(this.dialogView.el);
|
||||
return this;
|
||||
},
|
||||
close() {
|
||||
this.remove();
|
||||
},
|
||||
});
|
||||
})();
|
||||
Loading…
Reference in New Issue