Merge pull request #2902 from oxen-io/clearnet

Bump to 1.11.2

.eslintrc.js

@@ -2,6 +2,11 @@ module.exports = {
   root: true,
   settings: {
     'import/core-modules': ['electron'],
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx'],
+      },
+    },
     react: {
       version: 'detect',
     },

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit "$1"

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+# Disabling this hook for now because the BuildLintCommand has issues. If you have an error in a file that eslint catches the commit fails silently instead of explaining the error (Will 04/09/2023)
+# npx lint-staged

.lintstagedrc.js

@@ -0,0 +1,42 @@
+const { ESLint } = require('eslint');
+
+const removeIgnoredFiles = async files => {
+  const eslint = new ESLint();
+  const isIgnored = await Promise.all(
+    files.map(file => {
+      return eslint.isPathIgnored(file);
+    })
+  );
+  const filteredFiles = files.filter((_, i) => !isIgnored[i]);
+  return filteredFiles.join(' ');
+};
+
+const buildFormatCommand = async files => {
+  const filesToLint = await removeIgnoredFiles(files);
+
+  if (!filesToLint || !filesToLint.length) {
+    return '';
+  }
+
+  const results = filesToLint.map(f => path.relative(process.cwd(), f));
+
+  return results.length
+    ? `prettier --ignore-unknown --list-different --write ${results.join(' ')}`
+    : '';
+};
+
+const buildLintCommand = async files => {
+  const filesToLint = await removeIgnoredFiles(files);
+
+  if (!filesToLint || !filesToLint.length) {
+    return '';
+  }
+
+  const results = filesToLint.map(f => path.relative(process.cwd(), f));
+
+  return results.length ? `eslint --cache ${results.join(' ')}` : '';
+};
+
+module.exports = {
+  '*.{css,js,json,scss,ts,tsx}': [buildFormatCommand, buildLintCommand],
+};

.yarnclean

@@ -37,3 +37,7 @@ Gruntfile.js
 
 !istanbul-reports/lib/html/assets
 !istanbul-api/node_modules/istanbul-reports/lib/html/assets
+
+# lint-staged fix
+# https://github.com/eemeli/yaml/issues/384#issuecomment-1368496106
+!**/yaml/dist/**/doc

CONTRIBUTING.md

@@ -10,7 +10,7 @@ It's a good idea to gauge interest in your intended work by finding the current
 for it or creating a new one yourself. Use Github issues as a place to signal
 your intentions and get feedback from the users most likely to appreciate your changes.
 
-You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging. 
+You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging.
 
 Of course we encourage community developers to work on ANY issue filed on our Github regardless of how it’s tagged, however if you pick up or create an issue without the “Good first issue” tag it would be best if you leave a comment on the issue so that the core team can give you any guidance required, especially around UI heavy features or issues which require cross platform integration.
 
@@ -45,10 +45,10 @@ Building on Windows versions 8+ is supported out of the box
 1.  Install `make`
 1.  Depending on your distro, you might need to install `hunspell` and `hunspell-<lan>` (e.g. `hunspell-en-au`)
 
-If you are using a Debian based Linux distribution gcc, g++ and make can be installed as part of the `build-essential` package using 
+If you are using a Debian based Linux distribution gcc, g++ and make can be installed as part of the `build-essential` package using
 
-``` 
-apt install build-essential 
+```
+apt install build-essential
 ```
 
 ### All platforms
@@ -129,6 +129,16 @@ Please write tests! Our testing framework is
 
 The easiest way to run all tests at once is `yarn test`.
 
+## Committing your changes
+
+Before a commit is accepted the staged changes will be formatted using [prettier](https://prettier.io/) and linted using [eslint](https://eslint.org/). The commit will be reverted if files are formatted or lint errors are returned.
+
+### Commit Message Convention
+
+This project follows [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+
+Commit messages will be checked using [husky](https://typicode.github.io/husky/#/) and [commitlint](https://commitlint.js.org/).
+
 ## Pull requests
 
 So you wanna make a pull request? Please observe the following guidelines.

README.md

@@ -12,6 +12,10 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about
 
 Please search for any [existing issues](https://github.com/oxen-io/session-desktop/issues) that describe your bug in order to avoid duplicate submissions. <br><br>Submissions can be made by making a pull request to our development branch.If you don't know where to start contributing please read [Contributing.md](CONTRIBUTING.md) and refer to issues tagged with the [Good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag.
 
+## Supported platforms
+
+Session requires Windows 10 or later, macOS Catalina (10.15) or later, or a linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04.
+
 ## Build instruction
 
 Build instructions can be found in [Contributing.md](CONTRIBUTING.md).

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",
@@ -64,7 +64,8 @@
     "postinstall": "yarn patch-package && yarn electron-builder install-app-deps",
     "update-git-info": "node ./build/updateLocalConfig.js",
     "worker:utils": "webpack  --config=./utils.worker.config.js",
-    "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack  --config=./libsession.worker.config.js"
+    "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack  --config=./libsession.worker.config.js",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@emoji-mart/data": "^1.1.2",
@@ -132,6 +133,9 @@
     "webrtc-adapter": "^4.1.1"
   },
   "devDependencies": {
+    "@commitlint/cli": "^17.7.1",
+    "@commitlint/config-conventional": "^17.7.0",
+    "@commitlint/types": "^17.4.4",
     "@electron/notarize": "^2.1.0",
     "@types/backbone": "1.4.2",
     "@types/blueimp-load-image": "5.14.4",
@@ -182,8 +186,10 @@
     "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "events": "^3.3.0",
+    "husky": "^8.0.0",
     "jsdom": "^22.1.0",
     "jsdom-global": "^3.0.2",
+    "lint-staged": "^14.0.1",
     "mini-css-extract-plugin": "^2.7.5",
     "mocha": "10.0.0",
     "node-loader": "^2.0.0",

ts/receiver/contentMessage.ts

@@ -35,6 +35,7 @@ import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGrou
 import { ConfigMessageHandler } from './configMessage';
 import { ECKeyPair } from './keypairs';
 import { ContactsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface';
+import { isUsFromCache } from '../session/utils/User';
 
 export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) {
   try {
@@ -292,27 +293,42 @@ async function decrypt(envelope: EnvelopePlus): Promise<any> {
   return plaintext;
 }
 
-async function shouldDropIncomingPrivateMessage(sentAtTimestamp: number, envelope: EnvelopePlus) {
+async function shouldDropIncomingPrivateMessage(
+  sentAtTimestamp: number,
+  envelope: EnvelopePlus,
+  content: SignalService.Content
+) {
   // sentAtMoreRecentThanWrapper is going to be true, if the latest contact wrapper we processed was roughly more recent that this message timestamp
   const moreRecentOrNah = await sentAtMoreRecentThanWrapper(sentAtTimestamp, 'ContactsConfig');
+  const isSyncedMessage = isUsFromCache(envelope.source);
 
   if (moreRecentOrNah === 'wrapper_more_recent') {
-    // we need to check if that conversation is already in the wrapper, and if yes
+    // we need to check if that conversation is already in the wrapper
     try {
-      const privateConvoInWrapper = await ContactsWrapperActions.get(envelope.source);
+      // let's check if the corresponding conversation is hidden in the contacts wrapper or not.
+      // the corresponding conversation is syncTarget when this is a synced message only, so we need to rely on it first, then the envelope.source.
+      const syncTargetOrSource = isSyncedMessage
+        ? content.dataMessage?.syncTarget || undefined
+        : envelope.source;
+
+      if (!syncTargetOrSource) {
+        return false;
+      }
+
+      const privateConvoInWrapper = await ContactsWrapperActions.get(syncTargetOrSource);
       if (
         !privateConvoInWrapper ||
         privateConvoInWrapper.priority <= CONVERSATION_PRIORITIES.hidden
       ) {
         // the wrapper is more recent that this message and there is no such private conversation. Just drop this incoming message.
         window.log.info(
-          `received message from contact ${envelope.source} which appears to be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. Dropping it`
+          `received message on conversation ${syncTargetOrSource} which appears to be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. Dropping it`
         );
         return true;
       }
 
       window.log.info(
-        `received message from contact ${envelope.source} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
+        `received message on conversation ${syncTargetOrSource} which appears to NOT be hidden/removed in our most recent libsession contactconfig, sentAt: ${sentAtTimestamp}. `
       );
     } catch (e) {
       window.log.warn(
@@ -409,7 +425,7 @@ export async function innerHandleSwarmContentMessage(
     const isPrivateConversationMessage = !envelope.senderIdentity;
 
     if (isPrivateConversationMessage) {
-      if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope)) {
+      if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope, content)) {
         await removeFromCache(envelope);
         return;
       }