Closed group chunk1

.eslintrc.js

@@ -1,3 +1,5 @@
+var path = require('path');
+
 module.exports = {
   root: true,
   settings: {
@@ -10,6 +12,11 @@ module.exports = {
     react: {
       version: 'detect',
     },
+    'import/resolver': {
+      node: {
+        paths: [path.resolve(__dirname)],
+      },
+    },
   },
 
   extends: [

.gitignore

@@ -50,5 +50,5 @@ test-results/
 coverage/
 stylesheets/dist/
 
-*.worker.js.LICENSE.txt
+*.LICENSE.txt
 ts/webworker/workers/node/**/*.node

.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

_locales/en/messages.json

@@ -99,6 +99,7 @@
   "delete": "Delete",
   "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?",

build/afterPackHook.js

@@ -5,7 +5,7 @@ const util = require('util');
 const renameAsync = util.promisify(fs.rename);
 const unlinkAsync = util.promisify(fs.unlink);
 
-module.exports = async function(context) {
+module.exports = async function (context) {
   // Replace the app launcher on linux only.
   if (process.platform !== 'linux') {
     return;

js/.eslintrc

@@ -1,7 +1,7 @@
 {
   "env": {
     "browser": true,
-    "node": false
+    "node": true
   },
   "parserOptions": {
     "sourceType": "script"

libsession.worker.config.js

@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 
+const isProd = process.env.NODE_ENV === 'production';
+
 module.exports = {
   entry: './ts/webworker/workers/node/libsession/libsession.worker.ts',
   node: {
@@ -29,11 +31,11 @@ module.exports = {
     },
   },
   output: {
-    filename: 'libsession.worker.js',
+    filename: 'libsession.worker.compiled.js',
     path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'libsession'),
   },
   target: 'node',
   optimization: {
-    minimize: true,
+    minimize: isProd,
   },
 };

package.json

@@ -46,7 +46,7 @@
     "lint-full": "yarn format-full && eslint .",
     "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
     "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .",
-    "test": "mocha  -r jsdom-global/register --recursive --exit --timeout 10000  \"./ts/test/**/*_test.js\"",
+    "test": "mocha",
     "build-release": "run-script-os",
     "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
     "build-release:win32": "yarn build-release-non-linux",
@@ -95,7 +95,7 @@
     "glob": "7.1.2",
     "image-type": "^4.1.0",
     "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.6/libsession_util_nodejs-v0.2.6.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.0/libsession_util_nodejs-v0.4.0.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",
@@ -195,7 +195,7 @@
     "node-loader": "^2.0.0",
     "patch-package": "^6.4.7",
     "postinstall-prepare": "^1.0.1",
-    "prettier": "1.19.0",
+    "prettier": "^3.0.3",
     "protobufjs-cli": "^1.1.1",
     "run-script-os": "^1.1.6",
     "sass": "^1.60.0",

preload.js

@@ -34,7 +34,7 @@ window.sessionFeatureFlags = {
   integrationTestEnv: Boolean(
     process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('test-integration')
   ),
-  useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3,
+  useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA
   debug: {
     debugLogging: !_.isEmpty(process.env.SESSION_DEBUG),
     debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),
@@ -239,8 +239,9 @@ const data = require('./ts/data/dataInit');
 const { setupi18n } = require('./ts/util/i18n');
 window.Signal = data.initData();
 
-const { getConversationController } = require('./ts/session/conversations/ConversationController');
-window.getConversationController = getConversationController;
+const { ConvoHub } = require('./ts/session/conversations/ConversationController');
+window.getConversationController = ConvoHub.use;
+
 // Linux seems to periodically let the event loop stop, so this is a global workaround
 setInterval(() => {
   window.nodeSetImmediate(() => {});

protos/SignalService.proto

@@ -44,9 +44,6 @@ message SharedConfigMessage {
     CONTACTS                  = 2;
     CONVO_INFO_VOLATILE       = 3;
     USER_GROUPS               = 4;
-   // CLOSED_GROUP_INFO       = 5;
-   // CLOSED_GROUP_MEMBERS    = 6;
-   // ENCRYPTION_KEYS         = 7;
   }
 
   required Kind              kind             = 1;
@@ -85,41 +82,7 @@ message DataExtractionNotification {
   optional uint64 timestamp = 2;
 }
 
-// message GroupInviteMessage {
-//   required string         name              = 1;
-//   required bytes          memberPrivateKey  = 2;
-// }
-
-// this will replace our closedGroupControlMessage but we will need to keep both for some time
-// message GroupMessage {
-  // optional GroupAdminMessage           adminMessage         = 31;
-  // optional GroupMemberLeftMessage      memberLeftMessage    = 32;
-  // optional GroupInviteMessage          inviteMessage        = 33;
-  // optional GroupPromoteMessage         promoteMessage       = 34;
-// }
-
-// message GroupPromoteMessage {
-  // required bytes          privateKey        = 1; // this is the group admins key
-// }
-
-// message GroupAdminMessage {
-  // enum Type {
-  //   DELETE_GROUP                   = 1; // members, groupSignature
-  //   DELETE_GROUP_ALL_MEMBERS       = 2;  // groupSignature
-  //   DELETE_MESSAGES_ALL_MEMBERS    = 3;  // groupSignature
-  //   DELETE_ATTACHMENTS_ALL_MEMBERS = 4;  // groupSignature
-  // }
-//
-  // // @required
- //  required Type           type              = 1;
-  // repeated bytes          members           = 2;
-  // @required
- //  required bytes          groupSignature    = 3; // used by every members to make sure incoming admin action can be trusted
-// }
 
-// message GroupMemberLeftMessage {
- // the pubkey of the member who left is already in the senderIdentity
-// }
 
 
 message DataMessage {
@@ -225,7 +188,6 @@ message DataMessage {
   optional ClosedGroupControlMessage closedGroupControlMessage = 104;
   optional string                    syncTarget                = 105;
   optional bool                      blocksCommunityMessageRequests  = 106;
-  // optional GroupMessage              groupMessage              = 120;
 }
 
 message CallMessage {

ts/components/SessionInboxView.tsx

@@ -10,7 +10,7 @@ import useMount from 'react-use/lib/useMount';
 
 import { LeftPane } from './leftpane/LeftPane';
 // moment does not support es-419 correctly (and cause white screen on app start)
-import { getConversationController } from '../session/conversations';
+import { ConvoHub } from '../session/conversations';
 import { UserUtils } from '../session/utils';
 import { createStore } from '../state/createStore';
 import { initialCallState } from '../state/ducks/call';
@@ -39,6 +39,7 @@ import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings';
 import { Storage } from '../util/storage';
 import { NoticeBanner } from './NoticeBanner';
 import { Flex } from './basic/Flex';
+import { groupInfoActions, initialGroupState } from '../state/ducks/groups';
 
 function makeLookup<T>(items: Array<T>, key: string): { [key: string]: T } {
   // Yep, we can't index into item without knowing what it is. True. But we want to.
@@ -60,7 +61,7 @@ const StyledGutter = styled.div`
 
 function createSessionInboxStore() {
   // Here we set up a full redux store with initial state for our LeftPane Root
-  const conversations = getConversationController()
+  const conversations = ConvoHub.use()
     .getConversations()
     .map(conversation => conversation.getConversationModelProps());
 
@@ -88,6 +89,7 @@ function createSessionInboxStore() {
     call: initialCallState,
     sogsRoomInfo: initialSogsRoomInfoState,
     settings: getSettingsInitialState(),
+    groups: initialGroupState,
   };
 
   return createStore(initialState);
@@ -97,6 +99,7 @@ function setupLeftPane(forceUpdateInboxComponent: () => void) {
   window.openConversationWithMessages = openConversationWithMessages;
   window.inboxStore = createSessionInboxStore();
   window.inboxStore.dispatch(updateAllOnStorageReady());
+  window.inboxStore.dispatch(groupInfoActions.loadMetaDumpsFromDB()); // this loads the dumps from DB and fills the 03-groups slice with the corresponding details
   forceUpdateInboxComponent();
 }
 

ts/components/avatar/Avatar.tsx

@@ -111,15 +111,8 @@ const AvatarImage = (
 };
 
 const AvatarInner = (props: Props) => {
-  const {
-    base64Data,
-    size,
-    pubkey,
-    forcedAvatarPath,
-    forcedName,
-    dataTestId,
-    onAvatarClick,
-  } = props;
+  const { base64Data, size, pubkey, forcedAvatarPath, forcedName, dataTestId, onAvatarClick } =
+    props;
   const [imageBroken, setImageBroken] = useState(false);
 
   const isSelectingMessages = useSelector(isMessageSelectionMode);

ts/components/basic/SessionButton.tsx

@@ -116,16 +116,8 @@ type Props = {
 };
 
 export const SessionButton = (props: Props) => {
-  const {
-    buttonType,
-    buttonShape,
-    dataTestId,
-    buttonColor,
-    text,
-    disabled,
-    onClick,
-    margin,
-  } = props;
+  const { buttonType, buttonShape, dataTestId, buttonColor, text, disabled, onClick, margin } =
+    props;
 
   const clickHandler = (e: any) => {
     if (onClick) {

ts/components/basic/SessionToggle.tsx

@@ -16,7 +16,9 @@ const StyledKnob = styled.div<{ active: boolean }>`
       ? '-2px 1px 3px var(--toggle-switch-ball-shadow-color);'
       : '2px 1px 3px var(--toggle-switch-ball-shadow-color);'};
 
-  transition: transform var(--default-duration) ease, background-color var(--default-duration) ease;
+  transition:
+    transform var(--default-duration) ease,
+    background-color var(--default-duration) ease;
 
   transform: ${props => (props.active ? 'translateX(25px)' : '')};
 `;

ts/components/conversation/AddMentions.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { RenderTextCallbackType } from '../../types/Util';
 import { PubKey } from '../../session/types';
-import { getConversationController } from '../../session/conversations';
+import { ConvoHub } from '../../session/conversations';
 import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 
 interface MentionProps {
@@ -26,7 +26,7 @@ const StyledMentionedUs = styled(StyledMentionAnother)`
 
 const Mention = (props: MentionProps) => {
   const blindedOrNotPubkey = props.text.slice(1);
-  const foundConvo = getConversationController().get(blindedOrNotPubkey);
+  const foundConvo = ConvoHub.use().get(blindedOrNotPubkey);
 
   // this call takes care of finding if we have a blindedId of ourself on any sogs we have joined.
   if (isUsAnySogsFromCache(blindedOrNotPubkey)) {

ts/components/conversation/ContactName.tsx

@@ -22,11 +22,13 @@ export const ContactName = (props: Props) => {
   const convoName = useConversationUsernameOrShorten(pubkey);
   const isPrivate = useIsPrivate(pubkey);
   const shouldShowProfile = Boolean(convoName || profileName || name);
-  const styles = (boldProfileName
-    ? {
-        fontWeight: 'bold',
-      }
-    : {}) as React.CSSProperties;
+  const styles = (
+    boldProfileName
+      ? {
+          fontWeight: 'bold',
+        }
+      : {}
+  ) as React.CSSProperties;
   const textProfile = profileName || name || convoName || window.i18n('anonymous');
 
   return (

ts/components/conversation/ConversationHeader.tsx

@@ -36,13 +36,13 @@ import {
   useSelectedIsBlocked,
   useSelectedIsGroup,
   useSelectedIsKickedFromGroup,
+  useSelectedIsNoteToSelf,
   useSelectedIsPrivate,
   useSelectedIsPrivateFriend,
   useSelectedIsPublic,
-  useSelectedMembers,
+  useSelectedMembersCount,
   useSelectedNotificationSetting,
   useSelectedSubscriberCount,
-  useSelectedisNoteToSelf,
 } from '../../state/selectors/selectedConversation';
 import { ExpirationTimerOptions } from '../../util/expiringMessages';
 import { Flex } from '../basic/Flex';
@@ -65,6 +65,7 @@ const SelectionOverlay = () => {
   const selectedConversationKey = useSelectedConversationKey();
   const isPublic = useSelectedIsPublic();
   const dispatch = useDispatch();
+  const isMe = useSelectedIsNoteToSelf();
 
   const { i18n } = window;
 
@@ -85,7 +86,9 @@ const SelectionOverlay = () => {
 
   const isOnlyServerDeletable = isPublic;
   const deleteMessageButtonText = i18n('delete');
-  const deleteForEveryoneMessageButtonText = i18n('deleteForEveryone');
+  const deleteForEveryoneMessageButtonText = isMe
+    ? i18n('deleteFromAllMyDevices')
+    : i18n('deleteForEveryone');
 
   return (
     <div className="message-selection-overlay">
@@ -213,7 +216,7 @@ const CallButton = () => {
   const isPrivate = useSelectedIsPrivate();
   const isBlocked = useSelectedIsBlocked();
   const isActive = useSelectedIsActive();
-  const isMe = useSelectedisNoteToSelf();
+  const isMe = useSelectedIsNoteToSelf();
   const selectedConvoKey = useSelectedConversationKey();
 
   const hasIncomingCall = useSelector(getHasIncomingCall);
@@ -292,9 +295,9 @@ const ConversationHeaderTitle = () => {
 
   const isPublic = useSelectedIsPublic();
   const isKickedFromGroup = useSelectedIsKickedFromGroup();
-  const isMe = useSelectedisNoteToSelf();
+  const isMe = useSelectedIsNoteToSelf();
   const isGroup = useSelectedIsGroup();
-  const members = useSelectedMembers();
+  let memberCount = useSelectedMembersCount();
 
   if (!selectedConvoKey) {
     return null;
@@ -306,13 +309,8 @@ const ConversationHeaderTitle = () => {
     return <div className="module-conversation-header__title">{i18n('noteToSelf')}</div>;
   }
 
-  let memberCount = 0;
-  if (isGroup) {
-    if (isPublic) {
-      memberCount = subscriberCount || 0;
-    } else {
-      memberCount = members.length;
-    }
+  if (isPublic) {
+    memberCount = subscriberCount || 0;
   }
 
   let memberCountText = '';