chore: update lodash types, use prebuilt curbe25519-js

package.json

@@ -65,8 +65,7 @@
     "sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json",
     "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json",
     "ready": "yarn build-everything && yarn lint-full && yarn test",
-    "postinstall": "yarn patch-package && yarn electron-builder install-app-deps && yarn rebuild-curve25519-js",
-    "rebuild-curve25519-js": "cd node_modules/curve25519-js && yarn install && yarn build && cd ../../",
+    "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"
@@ -104,7 +103,7 @@
     "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "long": "^4.0.0",
     "mic-recorder-to-mp3": "^2.2.2",
     "moment": "^2.29.4",
@@ -161,7 +160,7 @@
     "@types/fs-extra": "5.0.5",
     "@types/libsodium-wrappers-sumo": "^0.7.5",
     "@types/linkify-it": "2.0.3",
-    "@types/lodash": "4.14.106",
+    "@types/lodash": "^4.14.194",
     "@types/mocha": "5.0.0",
     "@types/mustache": "^4.1.2",
     "@types/node-fetch": "^2.5.7",

ts/curve25519-js.d.ts

@@ -1 +0,0 @@
-declare module 'curve25519-js';

ts/receiver/dataMessage.ts

@@ -45,7 +45,9 @@ function cleanAttachments(decrypted: SignalService.DataMessage) {
 
   decrypted.group = null;
 
-  decrypted.attachments = (decrypted.attachments || []).map(cleanAttachment);
+  // when receiving a message we get keys of attachment as buffer, but we override the data with the decrypted string instead.
+  // TODO it would be nice to get rid of that as any here, but not in this PR
+  decrypted.attachments = (decrypted.attachments || []).map(cleanAttachment) as any;
   decrypted.preview = (decrypted.preview || []).map((item: any) => {
     const { image } = item;
 

ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts

@@ -52,10 +52,10 @@ const capabilitiesFetchForServer = async (
  * @returns the sorted list of capabilities contained in that response, or null
  */
 export function parseCapabilities(body: any): null | Array<string> {
-  if (!body || isEmpty(body) || !isObject(body) || !isArray(body.capabilities)) {
+  if (!body || isEmpty(body) || !isObject(body) || !isArray((body as any).capabilities)) {
     return null;
   }
-  return ((body.capabilities as Array<string>) || []).sort();
+  return (((body as any).capabilities as Array<string>) || []).sort(); // FIXME fix this type
 }
 
 export type ParsedBase64Avatar = {

ts/session/apis/snode_api/onions.ts

@@ -1013,7 +1013,9 @@ const sendOnionRequestNoRetries = async ({
       destCtx = useV4
         ? await encryptOnionV4RequestForPubkey(
             destX25519hex,
-            throwIfInvalidV4RequestInfos(finalDestOptions)
+            throwIfInvalidV4RequestInfos(
+              finalDestOptions as FinalDestSnodeOptions | FinalDestNonSnodeOptions // FIXME fix this type
+            )
           )
         : await encryptForPubKey(destX25519hex, finalDestOptions);
     }

ts/state/selectors/conversations.ts

@@ -401,7 +401,7 @@ const _getUnreadConversationRequests = (
   sortedConversationRequests: Array<ReduxConversationType>
 ): Array<ReduxConversationType> => {
   return filter(sortedConversationRequests, conversation => {
-    return conversation && conversation.unreadCount && conversation.unreadCount > 0;
+    return Boolean(conversation && conversation.unreadCount && conversation.unreadCount > 0);
   });
 };
 

yarn.lock

@@ -1099,10 +1099,10 @@
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.0.3.tgz#5352a2d7a35d7c77b527483cd6e68da9148bd780"
   integrity sha512-WRj1rJPkj3fyDME63xUkWvcWzq0XjpiqjJGNCH4Y6Fbiv2fVMDCqeIA6ch/UUG3VYrfGq1VNFLsz6Sat6FjsPw==
 
-"@types/lodash@4.14.106":
-  version "4.14.106"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd"
-  integrity sha512-tOSvCVrvSqFZ4A/qrqqm6p37GZoawsZtoR0SJhlF7EonNZUgrn8FfT+RNQ11h+NUpMt6QVe36033f3qEKBwfWA==
+"@types/lodash@^4.14.194":
+  version "4.14.194"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
+  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
 
 "@types/long@*", "@types/long@^4.0.1":
   version "4.0.2"
@@ -2854,7 +2854,7 @@ csstype@^3.0.2, csstype@^3.0.6:
 
 "curve25519-js@https://github.com/oxen-io/curve25519-js":
   version "0.0.4"
-  resolved "https://github.com/oxen-io/curve25519-js#f36559e591fec0849166bbf1b22a6a39180b10c8"
+  resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6"
 
 data-urls@^3.0.1:
   version "3.0.2"