invite friends to closed group: hide already members

pull/1074/head
Audric Ackermann 5 years ago
parent ab77b0f9a5
commit 645b2d55fc
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -126,7 +126,7 @@
// trigger a change event on this component. // trigger a change event on this component.
// this will call generateProps and refresh the Message.tsx component with new props // this will call generateProps and refresh the Message.tsx component with new props
this.listenTo(conversation, 'disable:input', triggerChange ); this.listenTo(conversation, 'disable:input', triggerChange);
if (fromContact) { if (fromContact) {
this.listenTo( this.listenTo(
fromContact, fromContact,

@ -14,7 +14,7 @@
const convos = window.getConversations().models; const convos = window.getConversations().models;
if (convo.isPublic) { if (convo.isPublic()) {
this.friends = convos.filter( this.friends = convos.filter(
d => !!d && d.isFriend() && d.isPrivate() && !d.isMe() d => !!d && d.isFriend() && d.isPrivate() && !d.isMe()
); );

@ -1140,7 +1140,9 @@ export class Message extends React.PureComponent<Props, State> {
}} }}
> >
{this.renderError(isIncoming)} {this.renderError(isIncoming)}
{isRss || isKickedFromGroup ? null : this.renderMenu(!isIncoming, triggerId)} {isRss || isKickedFromGroup
? null
: this.renderMenu(!isIncoming, triggerId)}
<div <div
className={classNames( className={classNames(
'module-message__container', 'module-message__container',

@ -221,7 +221,9 @@ export class SessionGroupSettings extends React.Component<Props, any> {
const hasDisappearingMessages = !isPublic && !isKickedFromGroup; const hasDisappearingMessages = !isPublic && !isKickedFromGroup;
const leaveGroupString = isPublic const leaveGroupString = isPublic
? window.i18n('leaveOpenGroup') ? window.i18n('leaveOpenGroup')
: isKickedFromGroup ? window.i18n('youAreKickedFromThisGroup') : window.i18n('leaveClosedGroup'); : isKickedFromGroup
? window.i18n('youAreKickedFromThisGroup')
: window.i18n('leaveClosedGroup');
const disappearingMessagesOptions = timerOptions.map(option => { const disappearingMessagesOptions = timerOptions.map(option => {
return { return {
@ -232,8 +234,10 @@ export class SessionGroupSettings extends React.Component<Props, any> {
}; };
}); });
const showUpdateGroupNameButton = isPublic && !isKickedFromGroup ? amMod : isAdmin; const showUpdateGroupNameButton =
const showUpdateGroupMembersButton = !isPublic && !isKickedFromGroup && isAdmin; isPublic && !isKickedFromGroup ? amMod : isAdmin;
const showUpdateGroupMembersButton =
!isPublic && !isKickedFromGroup && isAdmin;
return ( return (
<div className="group-settings"> <div className="group-settings">

Loading…
Cancel
Save