Merge pull request #2896 from oxen-io/clearnet

merge clearnet to unstable

.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,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

.lintstagedrc.js

@@ -0,0 +1,29 @@
+const ignoredFiles = [
+  'package.json',
+  'yarn.lock',
+  'tsconfig.json',
+  '.lintstagedrc.js',
+  '.eslintrc.js',
+];
+
+const path = require('path');
+
+const buildFormatCommand = filenames => {
+  const results = filenames
+    .map(f => path.relative(process.cwd(), f))
+    .filter(f => !ignoredFiles.includes(f));
+
+  return results.length ? `prettier --list-different --write ${results.join(' ')}` : '';
+};
+
+const buildLintCommand = filenames => {
+  const results = filenames
+    .map(f => path.relative(process.cwd(), f))
+    .filter(f => !ignoredFiles.includes(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

@@ -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.

commitlint.config.js

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

package.json

@@ -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/components/conversation/message/message-content/MessageContent.tsx

@@ -86,7 +86,7 @@ const StyledMessageOpaqueContent = styled(StyledMessageHighlighter)<{
   align-self: ${props => (props.messageDirection === 'incoming' ? 'flex-start' : 'flex-end')};
   padding: var(--padding-message-content);
   border-radius: var(--border-radius-message-box);
-  max-width: 100%;
+  width: 100%;
 `;
 
 export const IsMessageVisibleContext = createContext(false);

ts/components/conversation/message/message-content/MessageContextMenu.tsx

@@ -24,18 +24,6 @@ import {
   showMessageDetailsView,
   toggleSelectedMessageId,
 } from '../../../../state/ducks/conversations';
-import {
-  useSelectedConversationKey,
-  useSelectedIsBlocked,
-  useSelectedIsPublic,
-  useSelectedWeAreAdmin,
-  useSelectedWeAreModerator,
-} from '../../../../state/selectors/selectedConversation';
-import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil';
-import { Reactions } from '../../../../util/reactions';
-import { SessionContextMenuContainer } from '../../../SessionContextMenuContainer';
-import { SessionEmojiPanel, StyledEmojiPanel } from '../../SessionEmojiPanel';
-import { MessageReactBar } from './MessageReactBar';
 import {
   useMessageAttachments,
   useMessageBody,
@@ -48,7 +36,18 @@ import {
   useMessageStatus,
   useMessageTimestamp,
 } from '../../../../state/selectors';
-import { useIsPublic } from '../../../../hooks/useParamSelector';
+import {
+  useSelectedConversationKey,
+  useSelectedIsBlocked,
+  useSelectedIsPublic,
+  useSelectedWeAreAdmin,
+  useSelectedWeAreModerator,
+} from '../../../../state/selectors/selectedConversation';
+import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil';
+import { Reactions } from '../../../../util/reactions';
+import { SessionContextMenuContainer } from '../../../SessionContextMenuContainer';
+import { SessionEmojiPanel, StyledEmojiPanel } from '../../SessionEmojiPanel';
+import { MessageReactBar } from './MessageReactBar';
 
 export type MessageContextMenuSelectorProps = Pick<
   MessageRenderingProps,
@@ -149,10 +148,11 @@ const SaveAttachment = ({ messageId }: MessageId) => {
 
 const AdminActionItems = ({ messageId }: MessageId) => {
   const convoId = useSelectedConversationKey();
-  const isPublic = useIsPublic();
+  const isPublic = useSelectedIsPublic();
   const weAreModerator = useSelectedWeAreModerator();
   const weAreAdmin = useSelectedWeAreAdmin();
   const showAdminActions = (weAreAdmin || weAreModerator) && isPublic;
+
   const sender = useMessageSender(messageId);
   const isSenderAdmin = useMessageSenderIsAdmin(messageId);
 

ts/components/leftpane/overlay/OverlayMessage.tsx

@@ -86,7 +86,7 @@ export const OverlayMessage = () => {
     const pubkeyorOnsTrimmed = pubkeyOrOns.trim();
 
     if (!PubKey.validateWithErrorNoBlinding(pubkeyorOnsTrimmed)) {
-      await openConvoOnceResolved(pubkeyOrOns);
+      await openConvoOnceResolved(pubkeyorOnsTrimmed);
       return;
     }