From 26ea0d3ce497d62c2614a4056c1acfb26e328407 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Thu, 12 Dec 2019 19:11:53 -0800
Subject: [PATCH 1/5] take out unneeded dollar signs
---
ts/components/conversation/ModeratorsAddDialog.tsx | 2 +-
ts/components/conversation/ModeratorsRemoveDialog.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ts/components/conversation/ModeratorsAddDialog.tsx b/ts/components/conversation/ModeratorsAddDialog.tsx
index 8c0de8e17..f55e6680c 100644
--- a/ts/components/conversation/ModeratorsAddDialog.tsx
+++ b/ts/components/conversation/ModeratorsAddDialog.tsx
@@ -130,7 +130,7 @@ export class AddModeratorsDialog extends React.Component<Props, State> {
return (
<div className="content">
<p className="titleText">
- ${i18n('addModerators')} <span>${this.props.chatName}</span>
+ {i18n('addModerators')} <span>{this.props.chatName}</span>
</p>
<div className="addModeratorBox">
<p>Add Moderator:</p>
diff --git a/ts/components/conversation/ModeratorsRemoveDialog.tsx b/ts/components/conversation/ModeratorsRemoveDialog.tsx
index acb69c693..c4a71121f 100644
--- a/ts/components/conversation/ModeratorsRemoveDialog.tsx
+++ b/ts/components/conversation/ModeratorsRemoveDialog.tsx
@@ -63,7 +63,7 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
return (
<div className="content">
<p className="titleText">
- ${i18n('removeModerators')} <span>${this.props.chatName}</span>
+ {i18n('removeModerators')} <span>{this.props.chatName}</span>
</p>
<div className="moderatorList">
<p>Existing moderators:</p>
From e7a08b696b376748df5b0cc0a88de0ce2f63ba4f Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Thu, 12 Dec 2019 21:44:23 -0800
Subject: [PATCH 2/5] make sure isPublic/isRss are boolean values
---
js/models/conversations.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 65de492d8..f10377fdd 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -210,13 +210,13 @@
return this.id === window.storage.get('primaryDevicePubKey');
},
isPublic() {
- return this.id && this.id.match(/^publicChat:/);
+ return !!(this.id && this.id.match(/^publicChat:/));
},
isClosable() {
return !this.isRss() || this.get('closable');
},
isRss() {
- return this.id && this.id.match(/^rss:/);
+ return !!(this.id && this.id.match(/^rss:/));
},
isBlocked() {
return BlockedNumberController.isBlocked(this.id);
From 60b595c5efe41ab85244f5d0f72f2b03d11974fe Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Thu, 12 Dec 2019 21:44:55 -0800
Subject: [PATCH 3/5] remove add moderator scroll bars
---
stylesheets/_mentions.scss | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/stylesheets/_mentions.scss b/stylesheets/_mentions.scss
index 65576f7c6..6d5682600 100644
--- a/stylesheets/_mentions.scss
+++ b/stylesheets/_mentions.scss
@@ -29,6 +29,11 @@
margin-left: 10px;
}
+/* remove scroll bars */
+.loki-dialog .add-moderators-dialog .content {
+ padding: 1.1em;
+}
+
.invite-friends-dialog,
.add-moderators-dialog,
.remove-moderators-dialog,
From b2632554baaec550b27b6a39b00469f67f43c53b Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Thu, 12 Dec 2019 21:45:39 -0800
Subject: [PATCH 4/5] expose isRss to react
---
js/views/conversation_view.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 8af78423d..5663d35f4 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -228,6 +228,7 @@
isOnline: this.model.isOnline(),
isArchived: this.model.get('isArchived'),
isPublic: this.model.isPublic(),
+ isRss: this.model.isRss(),
amMod: this.model.isModerator(
window.storage.get('primaryDevicePubKey')
),
From 472d5ed3be2f26e43f956af0e12ac036f5d8c8ce Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Thu, 12 Dec 2019 21:46:39 -0800
Subject: [PATCH 5/5] correct menu for RSS conversations
---
ts/components/conversation/ConversationHeader.tsx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 9c710e03e..43b7070fe 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -30,6 +30,7 @@ interface Props {
isGroup: boolean;
isArchived: boolean;
isPublic: boolean;
+ isRss: boolean;
amMod: boolean;
members: Array<any>;
@@ -235,6 +236,7 @@ export class ConversationHeader extends React.Component<Props> {
isMe,
isClosable,
isPublic,
+ isRss,
isGroup,
amMod,
onDeleteMessages,
@@ -247,7 +249,7 @@ export class ConversationHeader extends React.Component<Props> {
onInviteFriends,
} = this.props;
- const isPrivateGroup = isGroup && !isPublic;
+ const isPrivateGroup = isGroup && !isPublic && !isRss;
const copyIdLabel = isGroup ? i18n('copyChatId') : i18n('copyPublicKey');
@@ -340,6 +342,7 @@ export class ConversationHeader extends React.Component<Props> {
isGroup,
isArchived,
isPublic,
+ isRss,
onResetSession,
onSetDisappearingMessages,
// onShowAllMedia,
@@ -355,7 +358,7 @@ export class ConversationHeader extends React.Component<Props> {
onChangeNickname,
} = this.props;
- if (isPublic) {
+ if (isPublic || isRss) {
return null;
}