+ {cannotMessage && (
+
setCannotMessage(false)}
>
+ {i18n('GroupV2--cannot-send')}
+
+ )}
+
+
+
+ {isEditingMessage ? (
+ setIsEditingMessage(false)}
+ type="button"
+ >
+
+
+ ) : (
+
{i18n('forwardMessage')}
+
{isEditingMessage ? (
-
setIsEditingMessage(false)}
- type="button"
- >
-
-
- ) : (
-
- )}
-
{i18n('forwardMessage')}
-
- {linkPreview ? (
-
-
+ {linkPreview ? (
+
+ removeLinkPreview()}
+ title={linkPreview.title}
+ />
+
+ ) : null}
+ {attachmentsToForward && attachmentsToForward.length ? (
+ removeLinkPreview()}
- title={linkPreview.title}
+ onCloseAttachment={(attachment: AttachmentType) => {
+ const newAttachments = attachmentsToForward.filter(
+ currentAttachment => currentAttachment !== attachment
+ );
+ setAttachmentsToForward(newAttachments);
+ }}
/>
-
- ) : null}
- {attachmentsToForward && attachmentsToForward.length ? (
-
{
- const newAttachments = attachmentsToForward.filter(
- currentAttachment => currentAttachment !== attachment
- );
- setAttachmentsToForward(newAttachments);
- }}
- />
- ) : null}
-
-
{
- setMessageBodyText(messageText);
- onEditorStateChange(messageText, bodyRanges, caretLocation);
- }}
- onPickEmoji={onPickEmoji}
- onSubmit={forwardMessage}
- onTextTooLong={onTextTooLong}
- />
-
-
+ {
+ setMessageBodyText(messageText);
+ onEditorStateChange(messageText, bodyRanges, caretLocation);
+ }}
+ onPickEmoji={onPickEmoji}
+ onSubmit={forwardMessage}
+ onTextTooLong={onTextTooLong}
/>
+
+
-
{
- setSearchTerm(event.target.value);
- }}
- ref={inputRef}
- value={searchTerm}
- />
- {candidateConversations.length ? (
-
- {({ contentRect, measureRef }: MeasuredComponentProps) => {
- // We disable this ESLint rule because we're capturing a bubbled keydown
- // event. See [this note in the jsx-a11y docs][0].
- //
- // [0]: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/c275964f52c35775208bd00cb612c6f82e42e34f/docs/rules/no-static-element-interactions.md#case-the-event-handler-is-only-being-used-to-capture-bubbled-events
- /* eslint-disable jsx-a11y/no-static-element-interactions */
- return (
-
-
{
- if (
- disabledReason !==
- ContactCheckboxDisabledReason.MaximumContactsSelected
- ) {
- toggleSelectedConversation(conversationId);
- }
- }}
- onSelectConversation={shouldNeverBeCalled}
- renderMessageSearchResult={() => {
- shouldNeverBeCalled();
- return
;
- }}
- rowCount={rowCount}
- shouldRecomputeRowHeights={false}
- showChooseGroupMembers={shouldNeverBeCalled}
- startNewConversationFromPhoneNumber={
- shouldNeverBeCalled
- }
- />
-
+
{
+ setSearchTerm(event.target.value);
}}
-
- ) : (
-
- {i18n('noContactsFound')}
-
- )}
-
-
- {Boolean(selectedContacts.length) &&
- selectedContacts.map(contact => contact.title).join(', ')}
-
-
- {isEditingMessage || !isMessageEditable ? (
-
- ) : (
-
setIsEditingMessage(true)}
- />
- )}
+ {candidateConversations.length ? (
+
+ {({ contentRect, measureRef }: MeasuredComponentProps) => {
+ // We disable this ESLint rule because we're capturing a bubbled
+ // keydown event. See [this note in the jsx-a11y docs][0].
+ //
+ // [0]: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/c275964f52c35775208bd00cb612c6f82e42e34f/docs/rules/no-static-element-interactions.md#case-the-event-handler-is-only-being-used-to-capture-bubbled-events
+ /* eslint-disable jsx-a11y/no-static-element-interactions */
+ return (
+
+
{
+ if (
+ disabledReason !==
+ ContactCheckboxDisabledReason.MaximumContactsSelected
+ ) {
+ toggleSelectedConversation(conversationId);
+ }
+ }}
+ onSelectConversation={shouldNeverBeCalled}
+ renderMessageSearchResult={() => {
+ shouldNeverBeCalled();
+ return
;
+ }}
+ rowCount={rowCount}
+ shouldRecomputeRowHeights={false}
+ showChooseGroupMembers={shouldNeverBeCalled}
+ startNewConversationFromPhoneNumber={
+ shouldNeverBeCalled
+ }
+ />
+
+ ) : (
+
+ {i18n('noContactsFound')}
+
+ )}
+
+ )}
+
+
+ {Boolean(selectedContacts.length) &&
+ selectedContacts.map(contact => contact.title).join(', ')}
+
+
+ {isEditingMessage || !isMessageEditable ? (
+ setIsEditingMessage(true)}
+ />
+ )}
+
+
+
);
};
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index a5441a1ec..d4a6244fe 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -41,6 +41,8 @@ export type PropsDataType = {
} & Pick<
ConversationType,
| 'acceptedMessageRequest'
+ | 'announcementsOnly'
+ | 'areWeAdmin'
| 'avatarPath'
| 'canChangeTimer'
| 'color'
@@ -291,6 +293,8 @@ export class ConversationHeader extends React.Component
{
private renderOutgoingCallButtons(): ReactNode {
const {
+ announcementsOnly,
+ areWeAdmin,
i18n,
onOutgoingAudioCallInConversation,
onOutgoingVideoCallInConversation,
@@ -301,15 +305,18 @@ export class ConversationHeader extends React.Component {
const videoButton = (
{
return (
{isNarrow ? null : i18n('joinOngoingCall')}
diff --git a/ts/components/conversation/GroupV2Change.stories.tsx b/ts/components/conversation/GroupV2Change.stories.tsx
index f8e7ef0fb..ce5efb9b0 100644
--- a/ts/components/conversation/GroupV2Change.stories.tsx
+++ b/ts/components/conversation/GroupV2Change.stories.tsx
@@ -1383,4 +1383,62 @@ storiesOf('Components/Conversation/GroupV2Change', module)
)}
);
+ })
+ .add('Announcement Group (Change)', () => {
+ return (
+ <>
+ {renderChange({
+ from: OUR_ID,
+ details: [
+ {
+ type: 'announcements-only',
+ announcementsOnly: true,
+ },
+ ],
+ })}
+ {renderChange({
+ from: ADMIN_A,
+ details: [
+ {
+ type: 'announcements-only',
+ announcementsOnly: true,
+ },
+ ],
+ })}
+ {renderChange({
+ details: [
+ {
+ type: 'announcements-only',
+ announcementsOnly: true,
+ },
+ ],
+ })}
+ {renderChange({
+ from: OUR_ID,
+ details: [
+ {
+ type: 'announcements-only',
+ announcementsOnly: false,
+ },
+ ],
+ })}
+ {renderChange({
+ from: ADMIN_A,
+ details: [
+ {
+ type: 'announcements-only',
+ announcementsOnly: false,
+ },
+ ],
+ })}
+ {renderChange({
+ details: [
+ {
+ type: 'announcements-only',
+ announcementsOnly: false,
+ },
+ ],
+ })}
+
+ );
});
diff --git a/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
index 369903dd0..8b742891a 100644
--- a/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
@@ -139,3 +139,15 @@ story.add('Group Links On', () => {
return {
+ const error = new Error();
+ error.code = 'E_NO_CAPABILITY';
+ throw error;
+ }}
+ />
+));
diff --git a/ts/components/conversation/conversation-details/ConversationDetails.tsx b/ts/components/conversation/conversation-details/ConversationDetails.tsx
index 4ca850e7d..ca1f60b7c 100644
--- a/ts/components/conversation/conversation-details/ConversationDetails.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetails.tsx
@@ -30,6 +30,7 @@ import {
import { EditConversationAttributesModal } from './EditConversationAttributesModal';
import { RequestState } from './util';
import { getCustomColorStyle } from '../../../util/getCustomColorStyle';
+import { ConfirmationDialog } from '../../ConfirmationDialog';
enum ModalState {
NothingOpen,
@@ -109,6 +110,9 @@ export const ConversationDetails: React.ComponentType = ({
addGroupMembersRequestState,
setAddGroupMembersRequestState,
] = useState(RequestState.Inactive);
+ const [membersMissingCapability, setMembersMissingCapability] = useState(
+ false
+ );
if (conversation === undefined) {
throw new Error('ConversationDetails rendered without a conversation');
@@ -194,7 +198,12 @@ export const ConversationDetails: React.ComponentType = ({
setModalState(ModalState.NothingOpen);
setAddGroupMembersRequestState(RequestState.Inactive);
} catch (err) {
- setAddGroupMembersRequestState(RequestState.InactiveWithError);
+ if (err.code === 'E_NO_CAPABILITY') {
+ setMembersMissingCapability(true);
+ setAddGroupMembersRequestState(RequestState.InactiveWithError);
+ } else {
+ setAddGroupMembersRequestState(RequestState.InactiveWithError);
+ }
}
}}
onClose={() => {
@@ -211,6 +220,16 @@ export const ConversationDetails: React.ComponentType = ({
return (
+ {membersMissingCapability && (
+
setMembersMissingCapability(false)}
+ >
+ {i18n('GroupV2--add--missing-capability')}
+
+ )}
+
({
@@ -36,6 +38,7 @@ const createProps = (): PropsType => ({
'setAccessControlAttributesSetting'
),
setAccessControlMembersSetting: action('setAccessControlMembersSetting'),
+ setAnnouncementsOnly: action('setAnnouncementsOnly'),
});
story.add('Basic', () => {
diff --git a/ts/components/conversation/conversation-details/GroupV2Permissions.tsx b/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
index 417989b2f..18870c643 100644
--- a/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
+++ b/ts/components/conversation/conversation-details/GroupV2Permissions.tsx
@@ -6,6 +6,7 @@ import React from 'react';
import { ConversationType } from '../../../state/ducks/conversations';
import { LocalizerType } from '../../../types/Util';
import { getAccessControlOptions } from '../../../util/getAccessControlOptions';
+import { SignalService as Proto } from '../../../protobuf';
import { PanelRow } from './PanelRow';
import { PanelSection } from './PanelSection';
@@ -16,14 +17,16 @@ export type PropsType = {
i18n: LocalizerType;
setAccessControlAttributesSetting: (value: number) => void;
setAccessControlMembersSetting: (value: number) => void;
+ setAnnouncementsOnly: (value: boolean) => void;
};
-export const GroupV2Permissions: React.ComponentType = ({
+export const GroupV2Permissions = ({
conversation,
i18n,
setAccessControlAttributesSetting,
setAccessControlMembersSetting,
-}) => {
+ setAnnouncementsOnly,
+}: PropsType): JSX.Element => {
if (conversation === undefined) {
throw new Error('GroupV2Permissions rendered without a conversation');
}
@@ -34,7 +37,16 @@ export const GroupV2Permissions: React.ComponentType = ({
const updateAccessControlMembers = (value: string) => {
setAccessControlMembersSetting(Number(value));
};
+ const AccessControlEnum = Proto.AccessControl.AccessRequired;
+ const updateAnnouncementsOnly = (value: string) => {
+ setAnnouncementsOnly(Number(value) === AccessControlEnum.ADMINISTRATOR);
+ };
const accessControlOptions = getAccessControlOptions(i18n);
+ const announcementsOnlyValue = String(
+ conversation.announcementsOnly
+ ? AccessControlEnum.ADMINISTRATOR
+ : AccessControlEnum.MEMBER
+ );
return (
@@ -60,6 +72,19 @@ export const GroupV2Permissions: React.ComponentType = ({
/>
}
/>
+ {conversation.areWeAdmin && conversation.announcementsOnlyReady && (
+
);
};
diff --git a/ts/groupChange.ts b/ts/groupChange.ts
index ee7a86726..9f4f20fee 100644
--- a/ts/groupChange.ts
+++ b/ts/groupChange.ts
@@ -850,6 +850,29 @@ export function renderChangeDetail(
}
return renderString('GroupV2--description--change--unknown', i18n);
}
+ if (detail.type === 'announcements-only') {
+ if (detail.announcementsOnly) {
+ if (fromYou) {
+ return renderString('GroupV2--announcements--admin--you', i18n);
+ }
+ if (from) {
+ return renderString('GroupV2--announcements--admin--other', i18n, [
+ renderContact(from),
+ ]);
+ }
+ return renderString('GroupV2--announcements--admin--unknown', i18n);
+ }
+
+ if (fromYou) {
+ return renderString('GroupV2--announcements--member--you', i18n);
+ }
+ if (from) {
+ return renderString('GroupV2--announcements--member--other', i18n, [
+ renderContact(from),
+ ]);
+ }
+ return renderString('GroupV2--announcements--member--unknown', i18n);
+ }
throw missingCaseError(detail);
}
diff --git a/ts/groups.ts b/ts/groups.ts
index 89a540c9f..8a91130ff 100644
--- a/ts/groups.ts
+++ b/ts/groups.ts
@@ -78,98 +78,102 @@ import AccessRequiredEnum = Proto.AccessControl.AccessRequired;
export { joinViaLink } from './groups/joinViaLink';
-export type GroupV2AccessCreateChangeType = {
+type GroupV2AccessCreateChangeType = {
type: 'create';
};
-export type GroupV2AccessAttributesChangeType = {
+type GroupV2AccessAttributesChangeType = {
type: 'access-attributes';
newPrivilege: number;
};
-export type GroupV2AccessMembersChangeType = {
+type GroupV2AccessMembersChangeType = {
type: 'access-members';
newPrivilege: number;
};
-export type GroupV2AccessInviteLinkChangeType = {
+type GroupV2AccessInviteLinkChangeType = {
type: 'access-invite-link';
newPrivilege: number;
};
-export type GroupV2AvatarChangeType = {
+type GroupV2AnnouncementsOnlyChangeType = {
+ type: 'announcements-only';
+ announcementsOnly: boolean;
+};
+type GroupV2AvatarChangeType = {
type: 'avatar';
removed: boolean;
};
-export type GroupV2TitleChangeType = {
+type GroupV2TitleChangeType = {
type: 'title';
// Allow for null, because the title could be removed entirely
newTitle?: string;
};
-export type GroupV2GroupLinkAddChangeType = {
+type GroupV2GroupLinkAddChangeType = {
type: 'group-link-add';
privilege: number;
};
-export type GroupV2GroupLinkResetChangeType = {
+type GroupV2GroupLinkResetChangeType = {
type: 'group-link-reset';
};
-export type GroupV2GroupLinkRemoveChangeType = {
+type GroupV2GroupLinkRemoveChangeType = {
type: 'group-link-remove';
};
// No disappearing messages timer change type - message.expirationTimerUpdate used instead
-export type GroupV2MemberAddChangeType = {
+type GroupV2MemberAddChangeType = {
type: 'member-add';
conversationId: string;
};
-export type GroupV2MemberAddFromInviteChangeType = {
+type GroupV2MemberAddFromInviteChangeType = {
type: 'member-add-from-invite';
conversationId: string;
inviter?: string;
};
-export type GroupV2MemberAddFromLinkChangeType = {
+type GroupV2MemberAddFromLinkChangeType = {
type: 'member-add-from-link';
conversationId: string;
};
-export type GroupV2MemberAddFromAdminApprovalChangeType = {
+type GroupV2MemberAddFromAdminApprovalChangeType = {
type: 'member-add-from-admin-approval';
conversationId: string;
};
-export type GroupV2MemberPrivilegeChangeType = {
+type GroupV2MemberPrivilegeChangeType = {
type: 'member-privilege';
conversationId: string;
newPrivilege: number;
};
-export type GroupV2MemberRemoveChangeType = {
+type GroupV2MemberRemoveChangeType = {
type: 'member-remove';
conversationId: string;
};
-export type GroupV2PendingAddOneChangeType = {
+type GroupV2PendingAddOneChangeType = {
type: 'pending-add-one';
conversationId: string;
};
-export type GroupV2PendingAddManyChangeType = {
+type GroupV2PendingAddManyChangeType = {
type: 'pending-add-many';
count: number;
};
// Note: pending-remove is only used if user didn't also join the group at the same time
-export type GroupV2PendingRemoveOneChangeType = {
+type GroupV2PendingRemoveOneChangeType = {
type: 'pending-remove-one';
conversationId: string;
inviter?: string;
};
// Note: pending-remove is only used if user didn't also join the group at the same time
-export type GroupV2PendingRemoveManyChangeType = {
+type GroupV2PendingRemoveManyChangeType = {
type: 'pending-remove-many';
count: number;
inviter?: string;
};
-export type GroupV2AdminApprovalAddOneChangeType = {
+type GroupV2AdminApprovalAddOneChangeType = {
type: 'admin-approval-add-one';
conversationId: string;
};
// Note: admin-approval-remove-one is only used if user didn't also join the group at
// the same time
-export type GroupV2AdminApprovalRemoveOneChangeType = {
+type GroupV2AdminApprovalRemoveOneChangeType = {
type: 'admin-approval-remove-one';
conversationId: string;
inviter?: string;
@@ -188,6 +192,7 @@ export type GroupV2ChangeDetailType =
| GroupV2AccessMembersChangeType
| GroupV2AdminApprovalAddOneChangeType
| GroupV2AdminApprovalRemoveOneChangeType
+ | GroupV2AnnouncementsOnlyChangeType
| GroupV2AvatarChangeType
| GroupV2DescriptionChangeType
| GroupV2GroupLinkAddChangeType
@@ -901,6 +906,20 @@ export function buildAccessControlAddFromInviteLinkChange(
return actions;
}
+export function buildAnnouncementsOnlyChange(
+ group: ConversationAttributesType,
+ value: boolean
+): Proto.GroupChange.Actions {
+ const action = new Proto.GroupChange.Actions.ModifyAnnouncementsOnlyAction();
+ action.announcementsOnly = value;
+
+ const actions = new Proto.GroupChange.Actions();
+ actions.version = (group.revision || 0) + 1;
+ actions.modifyAnnouncementsOnly = action;
+
+ return actions;
+}
+
export function buildAccessControlAttributesChange(
group: ConversationAttributesType,
value: AccessRequiredEnum
@@ -3876,6 +3895,15 @@ function extractDiffs({
});
});
+ // announcementsOnly
+
+ if (old.announcementsOnly !== current.announcementsOnly) {
+ details.push({
+ type: 'announcements-only',
+ announcementsOnly: Boolean(current.announcementsOnly),
+ });
+ }
+
// final processing
let message: MessageAttributesType | undefined;
diff --git a/ts/model-types.d.ts b/ts/model-types.d.ts
index ceb6f0b65..e85630b27 100644
--- a/ts/model-types.d.ts
+++ b/ts/model-types.d.ts
@@ -290,6 +290,7 @@ export type ConversationAttributesType = {
members: AccessRequiredEnum;
addFromInviteLink: AccessRequiredEnum;
};
+ announcementsOnly?: boolean;
avatar?: {
url: string;
path: string;
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index d3d42991d..e0d80c534 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -541,6 +541,16 @@ export class ConversationModel extends window.Backbone
);
}
+ if (
+ this.get('announcementsOnly') &&
+ !toRequest.get('capabilities')?.announcementGroup
+ ) {
+ window.log.warn(
+ `addPendingApprovalRequest/${idLog}: member needs to upgrade.`
+ );
+ return undefined;
+ }
+
// We need the user's profileKeyCredential, which requires a roundtrip with the
// server, and most definitely their profileKey. A getProfiles() call will
// ensure that we have as much as we can get with the data we have.
@@ -585,6 +595,16 @@ export class ConversationModel extends window.Backbone
);
}
+ if (
+ this.get('announcementsOnly') &&
+ !toRequest.get('capabilities')?.announcementGroup
+ ) {
+ window.log.warn(
+ `addMember/${idLog}: ${conversationId} needs to upgrade.`
+ );
+ return undefined;
+ }
+
// We need the user's profileKeyCredential, which requires a roundtrip with the
// server, and most definitely their profileKey. A getProfiles() call will
// ensure that we have as much as we can get with the data we have.
@@ -1436,6 +1456,8 @@ export class ConversationModel extends window.Backbone
?.addFromInviteLink,
accessControlAttributes: this.get('accessControl')?.attributes,
accessControlMembers: this.get('accessControl')?.members,
+ announcementsOnly: Boolean(this.get('announcementsOnly')),
+ announcementsOnlyReady: this.canBeAnnouncementGroup(),
expireTimer: this.get('expireTimer'),
muteExpiresAt: this.get('muteExpiresAt')!,
name: this.get('name')!,
@@ -1830,6 +1852,20 @@ export class ConversationModel extends window.Backbone
}
async addMembersV2(conversationIds: ReadonlyArray): Promise {
+ if (this.get('announcementsOnly')) {
+ const isEveryMemberCapable = conversationIds.every(conversationId => {
+ const model = window.ConversationController.get(conversationId);
+ return Boolean(model?.get('capabilities')?.announcementGroup);
+ });
+ if (!isEveryMemberCapable) {
+ const error = new Error(
+ 'addMembersV2: some or all members need to upgrade.'
+ );
+ error.code = 'E_NO_CAPABILITY';
+ throw error;
+ }
+ }
+
await this.modifyGroupV2({
name: 'addMembersV2',
createGroupChange: () =>
@@ -2975,6 +3011,17 @@ export class ConversationModel extends window.Backbone
);
}
+ canBeAnnouncementGroup(): boolean {
+ if (!isGroupV2(this.attributes)) {
+ return false;
+ }
+
+ const members = getConversationMembers(this.attributes);
+ return members.every(conversationAttrs =>
+ Boolean(conversationAttrs.capabilities?.announcementGroup)
+ );
+ }
+
getMemberIds(): Array {
const members = this.getMembers();
return members.map(member => member.id);
@@ -4004,6 +4051,23 @@ export class ConversationModel extends window.Backbone
});
}
+ async updateAnnouncementsOnly(value: boolean): Promise {
+ if (!isGroupV2(this.attributes) || !this.canBeAnnouncementGroup()) {
+ return;
+ }
+
+ await this.modifyGroupV2({
+ name: 'updateAnnouncementsOnly',
+ createGroupChange: async () =>
+ window.Signal.Groups.buildAnnouncementsOnlyChange(
+ this.attributes,
+ value
+ ),
+ });
+
+ this.set({ announcementsOnly: value });
+ }
+
async updateExpirationTimer(
providedExpireTimer: number | undefined,
providedSource?: unknown,
@@ -5150,6 +5214,12 @@ export class ConversationModel extends window.Backbone
return;
}
+ // Drop typing indicators for announcement only groups where the sender
+ // is not an admin
+ if (this.get('announcementsOnly') && !this.isAdmin(senderId)) {
+ return;
+ }
+
const typingToken = `${senderId}.${senderDevice}`;
this.contactTypingTimers = this.contactTypingTimers || {};
diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 33cd00173..05757518c 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -2737,6 +2737,15 @@ export class MessageModel extends window.Backbone.Model {
return;
}
+ // Drop incoming messages to announcement only groups where sender is not admin
+ if (
+ conversation.get('announcementsOnly') &&
+ !conversation.isAdmin(senderId)
+ ) {
+ confirm();
+ return;
+ }
+
const messageId = window.getGuid();
// Send delivery receipts, but only for incoming sealed sender messages
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 3cde62c9e..16f780d85 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -121,6 +121,8 @@ export type ConversationType = {
accessControlAddFromInviteLink?: number;
accessControlAttributes?: number;
accessControlMembers?: number;
+ announcementsOnly?: boolean;
+ announcementsOnlyReady?: boolean;
expireTimer?: number;
memberships?: Array<{
conversationId: string;
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 649193a9f..54a6cd2d2 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -26,6 +26,7 @@ import { isConversationUnregistered } from '../../util/isConversationUnregistere
import { filterAndSortConversationsByTitle } from '../../util/filterAndSortConversations';
import { ContactNameColors, ContactNameColorType } from '../../types/Colors';
import { isInSystemContacts } from '../../util/isInSystemContacts';
+import { isGroupV2 } from '../../util/whatTypeOfConversation';
import {
getIntl,
@@ -894,3 +895,32 @@ export function isMissingRequiredProfileSharing(
conversation.messageCount > 0
);
}
+
+export const getGroupAdminsSelector = createSelector(
+ getConversationSelector,
+ (conversationSelector: GetConversationByIdType) => {
+ return (conversationId: string): Array => {
+ const { groupId, groupVersion, memberships = [] } = conversationSelector(
+ conversationId
+ );
+
+ if (
+ !isGroupV2({
+ groupId,
+ groupVersion,
+ })
+ ) {
+ return [];
+ }
+
+ const admins: Array = [];
+ memberships.forEach(membership => {
+ if (membership.isAdmin) {
+ const admin = conversationSelector(membership.conversationId);
+ admins.push(admin);
+ }
+ });
+ return admins;
+ };
+ }
+);
diff --git a/ts/state/selectors/message.ts b/ts/state/selectors/message.ts
index 83fbdac45..0794e3416 100644
--- a/ts/state/selectors/message.ts
+++ b/ts/state/selectors/message.ts
@@ -1133,6 +1133,11 @@ export function canReply(
return false;
}
+ // Groups where only admins can send messages
+ if (conversation.announcementsOnly && !conversation.areWeAdmin) {
+ return false;
+ }
+
// We can reply if this is outgoing and sent to at least one recipient
if (isOutgoing(message)) {
return (
diff --git a/ts/state/smart/CompositionArea.tsx b/ts/state/smart/CompositionArea.tsx
index 6bc555603..88b843227 100644
--- a/ts/state/smart/CompositionArea.tsx
+++ b/ts/state/smart/CompositionArea.tsx
@@ -12,6 +12,7 @@ import { selectRecentEmojis } from '../selectors/emojis';
import { getIntl, getUserConversationId } from '../selectors/user';
import {
getConversationSelector,
+ getGroupAdminsSelector,
isMissingRequiredProfileSharing,
} from '../selectors/conversations';
import { getPropsForQuote } from '../selectors/message';
@@ -38,7 +39,12 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
throw new Error(`Conversation id ${id} not found!`);
}
- const { draftText, draftBodyRanges } = conversation;
+ const {
+ announcementsOnly,
+ areWeAdmin,
+ draftText,
+ draftBodyRanges,
+ } = conversation;
const receivedPacks = getReceivedStickerPacks(state);
const installedPacks = getInstalledStickerPacks(state);
@@ -109,6 +115,10 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
isMissingMandatoryProfileSharing: isMissingRequiredProfileSharing(
conversation
),
+ // Groups
+ announcementsOnly,
+ areWeAdmin,
+ groupAdmins: getGroupAdminsSelector(state)(conversation.id),
};
};
diff --git a/ts/state/smart/ConversationHeader.tsx b/ts/state/smart/ConversationHeader.tsx
index 29d30b979..cba5be402 100644
--- a/ts/state/smart/ConversationHeader.tsx
+++ b/ts/state/smart/ConversationHeader.tsx
@@ -93,10 +93,13 @@ const mapStateToProps = (state: StateType, ownProps: OwnProps) => {
return {
...pick(conversation, [
'acceptedMessageRequest',
+ 'announcementsOnly',
+ 'areWeAdmin',
'avatarPath',
'canChangeTimer',
'color',
'expireTimer',
+ 'groupVersion',
'isArchived',
'isMe',
'isPinned',
@@ -107,10 +110,9 @@ const mapStateToProps = (state: StateType, ownProps: OwnProps) => {
'name',
'phoneNumber',
'profileName',
+ 'sharedGroupNames',
'title',
'type',
- 'groupVersion',
- 'sharedGroupNames',
'unblurredAvatarPath',
]),
conversationTitle: state.conversations.selectedConversationTitle,
diff --git a/ts/state/smart/GroupV2Permissions.tsx b/ts/state/smart/GroupV2Permissions.tsx
index 80ac406e0..64cf0d0b6 100644
--- a/ts/state/smart/GroupV2Permissions.tsx
+++ b/ts/state/smart/GroupV2Permissions.tsx
@@ -15,6 +15,7 @@ export type SmartGroupV2PermissionsProps = {
conversationId: string;
setAccessControlAttributesSetting: (value: number) => void;
setAccessControlMembersSetting: (value: number) => void;
+ setAnnouncementsOnly: (value: boolean) => void;
};
const mapStateToProps = (
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index b93a98a63..ca5c51ce0 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -892,11 +892,13 @@ export type WebAPIConnectType = {
};
export type CapabilitiesType = {
+ announcementGroup: boolean;
gv2: boolean;
'gv1-migration': boolean;
senderKey: boolean;
};
export type CapabilitiesUploadType = {
+ announcementGroup: boolean;
'gv2-3': boolean;
'gv1-migration': boolean;
senderKey: boolean;
@@ -1558,6 +1560,7 @@ export function initialize({
options: { accessKey?: ArrayBuffer } = {}
) {
const capabilities: CapabilitiesUploadType = {
+ announcementGroup: true,
'gv2-3': true,
'gv1-migration': true,
senderKey: false,
diff --git a/ts/util/whatTypeOfConversation.ts b/ts/util/whatTypeOfConversation.ts
index ac03274b4..db818837c 100644
--- a/ts/util/whatTypeOfConversation.ts
+++ b/ts/util/whatTypeOfConversation.ts
@@ -25,7 +25,7 @@ export function isMe(conversationAttrs: ConversationAttributesType): boolean {
}
export function isGroupV1(
- conversationAttrs: ConversationAttributesType
+ conversationAttrs: Pick
): boolean {
const { groupId } = conversationAttrs;
if (!groupId) {
@@ -37,7 +37,10 @@ export function isGroupV1(
}
export function isGroupV2(
- conversationAttrs: ConversationAttributesType
+ conversationAttrs: Pick<
+ ConversationAttributesType,
+ 'groupId' | 'groupVersion'
+ >
): boolean {
const { groupId, groupVersion = 0 } = conversationAttrs;
if (!groupId) {
diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 7a2b5189b..15b6407cd 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -335,6 +335,10 @@ Whisper.UnableToLoadToast = Whisper.ToastView.extend({
},
});
+Whisper.CannotStartGroupCallToast = Whisper.ToastView.extend({
+ template: () => window.i18n('GroupV2--cannot-start-group-call'),
+});
+
Whisper.DangerousFileTypeToast = Whisper.ToastView.extend({
template: () => window.i18n('dangerousFileType'),
});
@@ -555,6 +559,11 @@ Whisper.ConversationView = Whisper.View.extend({
);
const isVideoCall = true;
+ if (model.get('announcementsOnly') && !model.areWeAdmin()) {
+ this.showToast(Whisper.CannotStartGroupCallToast);
+ return;
+ }
+
if (await this.isCallSafe()) {
window.log.info(
'onOutgoingVideoCallInConversation: call is deemed "safe". Making call'
@@ -722,6 +731,8 @@ Whisper.ConversationView = Whisper.View.extend({
this.disableLinkPreviews = true;
this.removeLinkPreview();
},
+
+ openConversation: this.openConversation.bind(this),
};
this.compositionAreaView = new Whisper.ReactWrapperView({
@@ -733,7 +744,7 @@ Whisper.ConversationView = Whisper.View.extend({
});
// Finally, add it to the DOM
- this.$('.composition-area-placeholder').append(this.compositionAreaView.el);
+ this.$('.CompositionArea__placeholder').append(this.compositionAreaView.el);
},
async longRunningTaskWrapper({
@@ -2316,17 +2327,24 @@ Whisper.ConversationView = Whisper.View.extend({
includedAttachments?: Array,
linkPreview?: LinkPreviewType
) => {
- const didForwardSuccessfully = await this.maybeForwardMessage(
- message,
- conversationIds,
- messageBody,
- includedAttachments,
- linkPreview
- );
+ try {
+ const didForwardSuccessfully = await this.maybeForwardMessage(
+ message,
+ conversationIds,
+ messageBody,
+ includedAttachments,
+ linkPreview
+ );
- if (didForwardSuccessfully) {
- this.forwardMessageModal.remove();
- this.forwardMessageModal = null;
+ if (didForwardSuccessfully) {
+ this.forwardMessageModal.remove();
+ this.forwardMessageModal = null;
+ }
+ } catch (err) {
+ window.log.warn(
+ 'doForwardMessage',
+ err && err.stack ? err.stack : err
+ );
}
},
isSticker: Boolean(message.get('sticker')),
@@ -2380,6 +2398,14 @@ Whisper.ConversationView = Whisper.View.extend({
window.ConversationController.get(id)
);
+ const cannotSend = conversations.some(
+ conversation =>
+ conversation?.get('announcementsOnly') && !conversation.areWeAdmin()
+ );
+ if (!cannotSend) {
+ throw new Error('Cannot send to group');
+ }
+
// Verify that all contacts that we're forwarding
// to are verified and trusted
const unverifiedContacts: Array = [];
@@ -3253,6 +3279,7 @@ Whisper.ConversationView = Whisper.View.extend({
setAccessControlMembersSetting: this.setAccessControlMembersSetting.bind(
this
),
+ setAnnouncementsOnly: this.setAnnouncementsOnly.bind(this),
}
),
});
@@ -3301,6 +3328,10 @@ Whisper.ConversationView = Whisper.View.extend({
},
showConversationDetails() {
+ // Run a getProfiles in case member's capabilities have changed
+ // Redux should cover us on the return here so no need to await this.
+ this.model.throttledGetProfiles();
+
const { model }: { model: ConversationModel } = this;
const messageRequestEnum = Proto.SyncMessage.MessageRequestResponse.Type;
@@ -3593,7 +3624,9 @@ Whisper.ConversationView = Whisper.View.extend({
});
},
- async setAccessControlAddFromInviteLinkSetting(value: boolean) {
+ async setAccessControlAddFromInviteLinkSetting(
+ value: boolean
+ ): Promise {
const { model }: { model: ConversationModel } = this;
await this.longRunningTaskWrapper({
@@ -3602,7 +3635,7 @@ Whisper.ConversationView = Whisper.View.extend({
});
},
- async setAccessControlAttributesSetting(value: number) {
+ async setAccessControlAttributesSetting(value: number): Promise {
const { model }: { model: ConversationModel } = this;
await this.longRunningTaskWrapper({
@@ -3611,7 +3644,7 @@ Whisper.ConversationView = Whisper.View.extend({
});
},
- async setAccessControlMembersSetting(value: number) {
+ async setAccessControlMembersSetting(value: number): Promise {
const { model }: { model: ConversationModel } = this;
await this.longRunningTaskWrapper({
@@ -3620,6 +3653,15 @@ Whisper.ConversationView = Whisper.View.extend({
});
},
+ async setAnnouncementsOnly(value: boolean): Promise {
+ const { model }: { model: ConversationModel } = this;
+
+ await this.longRunningTaskWrapper({
+ name: 'updateAnnouncementsOnly',
+ task: async () => model.updateAnnouncementsOnly(value),
+ });
+ },
+
async destroyMessages() {
const { model }: { model: ConversationModel } = this;
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 9bb12201b..5128e997e 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -638,6 +638,7 @@ export type WhisperType = {
CannotMixImageAndNonImageAttachmentsToast: typeof window.Whisper.ToastView;
CaptchaSolvedToast: typeof window.Whisper.ToastView;
CaptchaFailedToast: typeof window.Whisper.ToastView;
+ CannotStartGroupCallToast: typeof window.Whisper.ToastView;
DangerousFileTypeToast: typeof window.Whisper.ToastView;
DecryptionErrorToast: typeof window.Whisper.ToastView;
ExpiredToast: typeof window.Whisper.ToastView;