Address review comments

pull/565/head
Maxim Shishmarev 6 years ago
parent 7c05939f55
commit a2f836c690

@ -2158,5 +2158,8 @@
},
"nonAdminDeleteMember": {
"message": "Only group admin can remove members!"
},
"groupNamePlaceholder": {
"message": "Group Name"
}
}

@ -2178,7 +2178,8 @@
if (
!message.get('body') &&
!message.get('attachments').length &&
!message.get('preview').length
!message.get('preview').length &&
!message.get('group_update')
) {
return;
}

@ -2533,9 +2533,10 @@
let allMembers;
if (this.model.isPublic()) {
let members = window.lokiPublicChatAPI.getListOfMembers();
members = members.filter(d => !!d);
members = members.filter(d => d.authorProfileName !== 'Anonymous');
const members = window.lokiPublicChatAPI
.getListOfMembers()
.filter(d => !!d)
.filter(d => d.authorProfileName !== 'Anonymous');
allMembers = _.uniq(members, true, d => d.authorPhoneNumber);
} else {
const members = this.model.get('members');

@ -16,9 +16,8 @@
const convos = window.getConversations().models;
let allMembers = convos.filter(d => !!d);
allMembers = allMembers.filter(
d => d.isFriend() && d.isPrivate() && !d.isMe()
let allMembers = convos.filter(
d => !!d && d.isFriend() && d.isPrivate() && !d.isMe()
);
allMembers = _.uniq(allMembers, true, d => d.id);

@ -294,7 +294,8 @@
async openConversation(id, messageId) {
const conversationExists = await ConversationController.get(id);
// why does this have to be 'private'???
// If we call this to create a new conversation, it can only be private
// (group conversations are created elsewhere)
const conversation = await ConversationController.getOrCreateAndWait(
id,
'private'

@ -30,8 +30,6 @@ export class CreateGroupDialog extends React.Component<Props, State> {
constructor(props: any) {
super(props);
// const _ = window.Lodash;
this.onMemberClicked = this.onMemberClicked.bind(this);
this.onClickOK = this.onClickOK.bind(this);
this.onKeyUp = this.onKeyUp.bind(this);
@ -101,7 +99,7 @@ export class CreateGroupDialog extends React.Component<Props, State> {
type="text"
id="group-name"
className="group-name"
placeholder="Group Name"
placeholder={this.props.i18n('groupNamePlaceholder')}
value={this.state.groupName}
onChange={this.onGroupNameChanged}
tabIndex={0}

@ -20,7 +20,7 @@ interface Props {
i18n: LocalizerType;
convoId: string;
}
// eslint-disable-next-line
const renderMentions: RenderTextCallbackType = ({ text, key, convoId }) => (
<AddMentions key={key} text={text} convoId={convoId} />
);

@ -112,7 +112,7 @@ export class UpdateGroupDialog extends React.Component<Props, State> {
type="text"
id="group-name"
className="group-name"
placeholder="Group Name"
placeholder={this.props.i18n('groupNamePlaceholder')}
value={this.state.groupName}
disabled={!this.props.isAdmin}
onChange={this.onGroupNameChanged}

Loading…
Cancel
Save