Closed group chunk3

.eslintrc.js

@@ -58,6 +58,9 @@ module.exports = {
     // it helps readability to put public API at top,
     'no-use-before-define': 'off',
 
+    // we need them with code in WIP sometimes, and it doesn't do any harm
+    'no-useless-return': 'off',
+
     // useful for unused or internal fields
     'no-underscore-dangle': 'off',
 

.github/workflows/pull-request.yml

@@ -6,7 +6,6 @@ on:
     branches:
       - clearnet
       - unstable
-      - unstable1
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.gitignore

@@ -53,5 +53,4 @@ stylesheets/dist/
 *.LICENSE.txt
 ts/webworker/workers/node/**/*.node
 
-.yarn/**/*.mjs
-.yarn/**/*.cjs
+.yarn/

.mocharc.yml

@@ -0,0 +1,11 @@
+jobs: 1
+package: './package.json'
+parallel: false
+exit: true
+recursive: true
+require: 'jsdom-global/register'
+sort: false
+spec:
+  - './ts/test/**/*_test.js' # the positional arguments!
+timeout: 1000
+watch: false

.yarnrc.yml

@@ -0,0 +1,2 @@
+nodeLinker: node-modules
+patchFolder: patches

_locales/ar/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/be/messages.json

@@ -491,7 +491,7 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/bg/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/ca/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/cs/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "Máte novou žádost o přátelství",
   "clearAllConfirmationTitle": "Vymazat všechny žádosti o zprávy",
   "clearAllConfirmationBody": "Jste si jisti, že chcete vymazat všechny žádosti o zprávy?",
-  "noMessagesInReadOnly": "V <b>$name$</b> nejsou žádné zprávy.",
+  "thereAreNoMessagesIn": "V <b>$name$</b> nejsou žádné zprávy.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "V <b>$name$</b> nemáte žádné zprávy.",
   "noMessagesInEverythingElse": "Nemáte žádné zprávy od <b>$name$</b>. Pošlete zprávu pro zahájení konverzace!",

_locales/da/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/de/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "Du hast eine neue Freundschaftsanfrage",
   "clearAllConfirmationTitle": "Alle Nachrichtenanfragen löschen",
   "clearAllConfirmationBody": "Bist Du sicher, dass Du alle Nachrichtenanfragen löschen möchtest?",
-  "noMessagesInReadOnly": "Es sind keine Nachrichten in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "Es sind keine Nachrichten in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "Sie haben keine Nachrichten in <b>$name$</b>.",
   "noMessagesInEverythingElse": "Sie haben keine Nachrichten von <b>$name$</b>. Senden Sie eine Nachricht, um das Gespräch zu beginnen!",

_locales/el/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "Έχετε ένα νέο αίτημα φιλίας",
   "clearAllConfirmationTitle": "Διαγραφή Όλων των Αιτημάτων Μηνυμάτων",
   "clearAllConfirmationBody": "Σίγουρα θέλετε να διαγράψετε όλα τα αιτήματα μηνυμάτων;",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/en/messages.json

@@ -38,6 +38,7 @@
   "done": "Done",
   "youLeftTheGroup": "You have left the group.",
   "youGotKickedFromGroup": "You were removed from the group.",
+  "youWereRemovedFrom": "You were removed from <b>$name$</b>.",
   "unreadMessages": "Unread Messages",
   "debugLogExplanation": "This log will be saved to your desktop.",
   "reportIssue": "Report a Bug",
@@ -83,7 +84,6 @@
   "replyingToMessage": "Replying to:",
   "originalMessageNotFound": "Original message not found",
   "you": "You",
-  "audioPermissionNeededTitle": "Microphone Access Required",
   "audioPermissionNeeded": "You can enable microphone access under: Settings (Gear icon) => Privacy",
   "image": "Image",
   "audio": "Audio",
@@ -100,6 +100,7 @@
   "hide": "Hide",
   "messageDeletionForbidden": "You don’t have permission to delete others’ messages",
   "deleteJustForMe": "Delete just for me",
+  "deleteFromAllMyDevices": "Delete from all my devices",
   "deleteForEveryone": "Delete for everyone",
   "deleteMessagesQuestion": "Delete $count$ messages?",
   "deleteMessageQuestion": "Delete this message?",
@@ -247,11 +248,12 @@
   "disappearingMessagesModeLegacy": "Legacy",
   "disappearingMessagesModeLegacySubtitle": "Original version of disappearing messages.",
   "disappearingMessagesDisabled": "Disappearing messages disabled",
-  "disabledDisappearingMessages": "<b>$name$</b> has turned <b>off</b> disappearing messages.",
-  "youDisabledDisappearingMessages": "<b>You</b> have turned <b>off</b> disappearing messages.",
-  "youDisabledYourDisappearingMessages": "<b>You</b> turned <b>off</b> disappearing messages. Messages you send will no longer disappear.",
+  "groupDisabledDisappearingMessages": "<b>$name$</b> has turned disappearing messages <b>off</b>.",
+  "updateDisappearingMessagesFallback": "<b>$name$</b> updated disappearing message settings.",
+  "youDisabledDisappearingMessages": "<b>You</b> have turned disappearing messages <b>off</b>.",
+  "youDisabledYourDisappearingMessages": "<b>You</b> turned disappearing messages <b>off</b>. Messages you send will no longer disappear.",
   "youSetYourDisappearingMessages": "<b>You</b> set your messages to disappear <b>$time$</b> after they have been <b>$type$</b>.",
-  "theyDisabledTheirDisappearingMessages": "<b>$name$</b> has turned <b>off</b> disappearing messages. Messages they send will no longer disappear.",
+  "theyDisabledTheirDisappearingMessages": "<b>$name$</b> has turned disappearing messages <b>off</b>. Messages they send will no longer disappear.",
   "theySetTheirDisappearingMessages": "<b>$name$</b> has set their messages to disappear <b>$time$</b> after they have been <b>$type$</b>.",
   "timerSetTo": "Disappearing message time set to $time$",
   "set": "Set",
@@ -280,12 +282,49 @@
   "autoUpdateDownloadInstructions": "Would you like to download the update?",
   "leftTheGroup": "$name$ has left the group.",
   "multipleLeftTheGroup": "$name$ left the group",
-  "updatedTheGroup": "Group updated",
   "titleIsNow": "Group name is now '$name$'.",
+  "groupNameChange": "Group name is now <b>$name$</b>.",
+  "groupNameChangeFallback": "Group name updated.",
+  "groupAvatarChange": "Group display picture updated.",
+
+  "groupOneJoined": "<b>$name$</b> was invited to join the group.",
+  "groupYouJoined": "<b>You</b> were invited to join the group.",
+  "groupTwoJoined": "<b>$first$</b> and <b>$second$</b> were invited to join the group.",
+  "groupOthersJoined": "<b>$name$</b> and <b>$count$ others</b> were invited to join the group.",
+
+  "groupOneJoinedWithHistory": "<b>$name$</b> was invited to join the group. Chat history was shared.",
+  "groupYouJoinedWithHistory": "<b>You</b> were invited to join the group. Chat history was shared.",
+  "groupTwoJoinedWithHistory": "<b>$first$</b> and <b>$second$</b> were invited to join the group. Chat history was shared.",
+  "groupOthersJoinedWithHistory": "<b>$name$</b> and <b>$count$ others</b> were invited to join the group. Chat history was shared.",
+
+  "groupOneRemoved": "<b>$name$</b> was removed from the group.",
+  "groupYouRemoved": "<b>You</b> were removed from the group.",
+  "groupTwoRemoved": "<b>$first$</b> and <b>$second$</b> were removed from the group.",
+  "groupOthersRemoved": "<b>$name$</b> and <b>$count$ others</b> were removed from the group.",
+
+  "groupOnePromoted": "<b>$name$</b> was promoted to Admin.",
+  "groupYouPromoted": "<b>You</b> were promoted to Admin.",
+  "groupTwoPromoted": "<b>$first$</b> and <b>$second$</b> were promoted to Admin.",
+  "groupOthersPromoted": "<b>$name$</b> and <b>$count$ others</b> were promoted to Admin.",
+
+  "inviteFailed": "Invite Failed",
+  "inviteSent": "Invite Sent",
+  "inviteSending": "Sending Invite",
+  "promotionFailed": "Promotion Failed",
+  "promotionSent": "Promotion Sent",
+  "promotionSending": "Sending Promotion",
+  "groupInviteFailedOne": "Failed to invite <b>$name$</b> to <b>$groupname$</b>",
+  "groupInviteFailedTwo": "Failed to invite <b>$first$</b> and <b>$second$</b> to <b>$groupname$</b>",
+  "groupInviteFailedOthers": "Failed to invite <b>$first$</b> and <b>$count$ others</b> to <b>$groupname$</b>",
+
+  "groupOneLeft": "<b>$name$</b> left the group.",
+  "groupYouLeft": "<b>You</b> left the group.",
+
   "joinedTheGroup": "$name$ joined the group.",
   "multipleJoinedTheGroup": "$name$ joined the group.",
   "kickedFromTheGroup": "$name$ was removed from the group.",
   "multipleKickedFromTheGroup": "$name$ were removed from the group.",
+
   "block": "Block",
   "unblock": "Unblock",
   "unblocked": "Unblocked",
@@ -304,7 +343,7 @@
   "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone",
   "leaveGroupConfirmation": "Are you sure you want to leave <b>$name$</b>?",
   "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?",
-  "leaveGroupConrirmationOnlyAdminLegacy": "Are you sure you want to leave <b>$name$</b>? This will deactivate the group for all members.",
+  "leaveGroupConfirmationOnlyAdminLegacy": "Because you are the creator of this group it will be deleted for everyone. This cannot be undone.",
   "leaveGroupConfirmationOnlyAdmin": "You are the only admin in <b>$name$</b>",
   "leaveGroupConfirmationOnlyAdminWarning": "Group settings and members cannot be changed without an admin",
   "leaveGroupFailed": "Failed to leave Group!",
@@ -314,6 +353,7 @@
   "leaveCommunityFailedPleaseTryAgain": "Unable to leave the Community, please try again",
   "cannotRemoveCreatorFromGroup": "Cannot remove this user",
   "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.",
+  "cannotRemoveAdminFromGroup": "Admins cannot be removed",
   "noContactsForGroup": "You don't have any contacts yet",
   "failedToAddAsModerator": "Failed to add user as admin",
   "failedToRemoveFromModerator": "Failed to remove user from the admin list",
@@ -353,9 +393,6 @@
   "setPasswordInvalid": "Passwords do not match",
   "changePasswordInvalid": "The old password you entered is incorrect",
   "removePasswordInvalid": "Incorrect password",
-  "setPasswordTitle": "Password Set",
-  "changePasswordTitle": "Password Changed",
-  "removePasswordTitle": "Password Removed",
   "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
   "removePasswordToastDescription": "Your password has been removed.",
@@ -384,7 +421,6 @@
   "noContactsToAdd": "No contacts to add",
   "noMembersInThisGroup": "No other members in this group",
   "noModeratorsToRemove": "no admins to remove",
-  "onlyAdminCanRemoveMembers": "You are not the creator",
   "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users",
   "createAccount": "Create account",
   "startInTrayTitle": "Keep in System Tray",
@@ -450,7 +486,7 @@
   "closedGroupInviteSuccessMessage": "Successfully invited group members",
   "notificationForConvo": "Notifications",
   "notificationForConvo_all": "All",
-  "notificationForConvo_disabled": "Disabled",
+  "notificationForConvo_disabled": "Mute",
   "notificationForConvo_mentions_only": "Mentions only",
   "onionPathIndicatorTitle": "Path",
   "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:",
@@ -512,12 +548,9 @@
   "endCall": "End call",
   "permissionsSettingsTitle": "Permissions",
   "helpSettingsTitle": "Help",
-  "cameraPermissionNeededTitle": "Voice/Video Call permissions required",
   "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.",
   "unableToCall": "Cancel your ongoing call first",
-  "unableToCallTitle": "Cannot start new call",
   "callMissed": "Missed call from $name$",
-  "callMissedTitle": "Call missed",
   "noCameraFound": "No camera found",
   "noAudioInputFound": "No audio input found",
   "noAudioOutputFound": "No audio output found",
@@ -538,21 +571,28 @@
   "messageRequestAcceptedOurs": "You have accepted $name$'s message request",
   "messageRequestAcceptedOursNoName": "You have accepted the message request",
   "declineRequestMessage": "Are you sure you want to decline this message request?",
+  "deleteGroupRequest": "Are you sure you want to delete this group invite?",
+  "deleteGroupRequestAndBlock": "Are you sure you want to block <b>$name$</b>?<br/>Blocked users cannot send you message requests, group invites or call you.",
   "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.",
+  "respondingToGroupRequestWarning": "Sending a message to this group will automatically accept the group invite.",
+  "userInvitedYouToGroup": "<b>$name$</b> invited you to join <b>$groupName$</b>.",
+  "youWereInvitedToGroup": "<b>You</b> were invited to join <b>$groupName$</b>.",
   "hideRequestBanner": "Hide Message Request Banner",
   "openMessageRequestInbox": "Message Requests",
   "noMessageRequestsPending": "No pending message requests",
   "noMediaUntilApproved": "You cannot send attachments until the conversation is approved",
   "mustBeApproved": "This conversation must be accepted to use this feature",
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
-  "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "clearAllConfirmationBody": "Are you sure you want to clear all message requests and group invites?",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",
   "hideBanner": "Hide",
   "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.",
+  "versionRequiredForNewGroupDescription": "Users must have version {VERSION} or higher to receive invitations",
+  "upgradeYourGroupBefore": "Groups have been upgraded. Upgrade your group chats by creating a new Group. Support for old Groups will be discontinued on [Date].",
   "openMessageRequestInboxDescription": "View your Message Request inbox",
   "clearAllReactions": "Are you sure you want to clear all $emoji$ ?",
   "expandedReactionsText": "Show Less",

_locales/eo/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "You have a new friend request",
   "clearAllConfirmationTitle": "Clear All Message Requests",
   "clearAllConfirmationBody": "Are you sure you want to clear all message requests?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",

_locales/es/messages.json

@@ -490,7 +490,7 @@
   "youHaveANewFriendRequest": "Tienes una nueva solicitud de amistad",
   "clearAllConfirmationTitle": "Borrar todas las solicitudes de mensajes",
   "clearAllConfirmationBody": "¿Estás seguro/a que quieres borrar todas las solicitudes de mensajes?",
-  "noMessagesInReadOnly": "There are no messages in <b>$name$</b>.",
+  "thereAreNoMessagesIn": "There are no messages in <b>$name$</b>.",
   "noMessagesInBlindedDisabledMsgRequests": "<b>$name$</b> has message requests from Community conversations turned off, so you cannot send them a message.",
   "noMessagesInNoteToSelf": "You have no messages in <b>$name$</b>.",
   "noMessagesInEverythingElse": "You have no messages from <b>$name$</b>. Send a message to start the conversation!",