annotate content patch

diff --git a/.npmrc b/.npmrc
index d8d704d6cf178fb8a63594cc38f28e1ca2086569..ce46d514d589953abd9d21eded83d5de99b2ad89 100644 (file)
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1,2 @@
 @crimata:registry=https://gitlab.com/api/v4/projects/28849281/packages/npm/
-//gitlab.com/api/v4/projects/28849281/packages/npm/:_authToken=${NPM_TOKEN}
+//gitlab.com/api/v4/projects/28849281/packages/npm/:_authToken=${API_TOKEN}
\ No newline at end of file

diff --git a/README.md b/README.md
index 1bec458de59494f17154c35784b95756da1909e5..e9fefb08dae98b92eaf376cfcd83699b7ef91a3d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Debug electron-osx-sign:
 
 ### Some things to note:
 
-If new package.json, build manually. Only copies src code into /Resources/app.
+Notarize only when distributing outside the Mac App Store.
 
 #### Gatekeeper Assess
 Electron-osx-sign seems to have a bug where the sign will fail if "gatekeeper-assess" is true (default).
@@ -57,7 +57,7 @@ Electron-osx-sign seems to have a bug where the sign will fail if "gatekeeper-as
 Not to be confused with Info.plist, this file specifies entitlements the app can have in hardened runtime (e.g. Can I use the microphone?).  Only including the ones Electron reccommends seems to work (including audio of course and omitting allow-unsigned-executable-memory).
 
 #### The Benifit of Electron OSX Sign
-Without this package, we would have to manually go in and figure out how to sign each level of the app.  While it didn't work out of the box (gatekeeper-assess) it's proven to be good otherwise.  However, there is a bug where it puts multiple runtime flags on each command - not catastrophic though. 
+Without this package, we would have to manually go in and figure out how to sign each level of the app.  While it didn't work out of the box (gatekeeper-assess) it seems to be good otherwise.  However, there is a bug where it puts multiple runtime flags on each command - not catastrophic though. 
 
 #### Apple Password
 This must be an app specific password, not your normal Apple ID password.

diff --git a/icon.png b/icon.png
new file mode 100644 (file)
index 0000000..2897b98
Binary files /dev/null and b/icon.png differ

diff --git a/notarize.js b/notarize.js
index 39449da271f085c6aaa584f5e81201ef3573494b..cd3b19ab94bef02659528fefa7b2f46a49c06ece 100644 (file)
--- a/notarize.js
+++ b/notarize.js
@@ -2,7 +2,7 @@ const exec = require('child_process').exec;
 const sign = require("electron-osx-sign").signAsync;
 const notarize = require("electron-notarize").notarize;
 
-const app = "Electron.app";
+const app = "Crimata.app";
 const dir = `${app}/Contents/Resources/app`;
 
 const runShellCommand = (cmd) => (new Promise((resolve, reject) => {
@@ -23,7 +23,7 @@ const signConfig = {
 const notarizeConfig = {
     appPath: app,
     appleId: "gundersena@crimata.com",
-    appBundleId: "com.github.Electron",
+    appBundleId: "com.crimata.CrimataMessenger",
     appleIdPassword: process.env["AC_PASSWORD"]
 };
 

diff --git a/package-lock.json b/package-lock.json
index 6505d8aaf9fc7703ac12325512269d04712497e4..cc9403eade0b5c79cfad3b5c913f5d740be6f127 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "Crimata",
       "version": "1.0.0",
       "dependencies": {
-        "@crimata/nodeaudio": "^0.0.0",
+        "@crimata/nodeaudio": "0.0.0",
         "axios": "^0.21.1",
         "base64-arraybuffer": "^1.0.1",
         "electron-store": "^8.0.0",
@@ -22,7 +22,7 @@
     "node_modules/@crimata/nodeaudio": {
       "version": "0.0.0",
       "resolved": "https://gitlab.com/api/v4/projects/28849281/packages/npm/@crimata/nodeaudio/-/@crimata/nodeaudio-0.0.0.tgz",
-      "integrity": "sha1-epnrLe2KfWntf4tPqwW4KVb/sQ0=",
+      "integrity": "sha1-4lPe1QynEwebXcjezyAPhfwI+VM=",
       "hasInstallScript": true,
       "dependencies": {
         "bindings": "~1.2.1",
@@ -634,7 +634,7 @@
     "@crimata/nodeaudio": {
       "version": "0.0.0",
       "resolved": "https://gitlab.com/api/v4/projects/28849281/packages/npm/@crimata/nodeaudio/-/@crimata/nodeaudio-0.0.0.tgz",
-      "integrity": "sha1-epnrLe2KfWntf4tPqwW4KVb/sQ0=",
+      "integrity": "sha1-4lPe1QynEwebXcjezyAPhfwI+VM=",
       "requires": {
         "bindings": "~1.2.1",
         "sleep": "^6.3.0"

diff --git a/package.json b/package.json
index 9f62421e45f01ab6a0db62976839bc7447f21cba..6b6c32974fa87f39b0dcfe073b3a1e4ff7a19970 100644 (file)
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "start": "electron ."
   },
   "dependencies": {
-    "@crimata/nodeaudio": "^0.0.0",
+    "@crimata/nodeaudio": "0.0.0",
     "axios": "^0.21.1",
     "base64-arraybuffer": "^1.0.1",
     "electron-store": "^8.0.0",

diff --git a/src/config.js b/src/config.js
index cabf8f3e6709f16629734725eb232caa8b85a42b..bc47fb5429781f7025c320923ab33e1b75e6d8c6 100644 (file)
--- a/src/config.js
+++ b/src/config.js
@@ -3,6 +3,7 @@ const { app } = require("electron");
 const DOMAIN = "crimata.com";
 
 const prod = !process.defaultApp;
+// const prod = true;
 
 module.exports = {
     PLATFORM: prod ? `https://app.${DOMAIN}` : `http://localhost:8760`,

diff --git a/src/render/components/messenger.js b/src/render/components/messenger.js
index ed7ca40b5653512a371513d64c286a28d0cbf4c7..4ed4912b83aa0e8326111fbbec5cf44cc640d9d5 100644 (file)
--- a/src/render/components/messenger.js
+++ b/src/render/components/messenger.js
@@ -45,6 +45,13 @@ const Messenger = {
                 {
                     search(update.message).context = update.context;
                 }
+                else if (update.text)
+                {
+                    search(update.message).content.at(-1).text = update.text;
+                    setTimeout(() => {
+                        document.getElementById("messenger").dispatchEvent(new CustomEvent('adjust-scroll'))
+                    }, 100);
+                }
 
             });
 

diff --git a/src/session.js b/src/session.js
index 9cd33cace578dae3dd3bd455205b0da8bba3a197..8d31656ae679b2f0b477c55a80434d53a0ba26fb 100644 (file)
--- a/src/session.js
+++ b/src/session.js
@@ -53,6 +53,10 @@ function handleMessageQueue()
             {
                 search(update.message).context = update.context;
             }
+            else if (update.text) /* Update the text of last message */
+            {
+                search(update.message).content.at(-1).text = update.text;
+            }
 
             ipcEmit("message", update);
         }