Merge pull request #9 from sarsey-walker/main

fix: Able to recognize x on actions
eddieoz · May 17, 2024 · e15130c · e15130c
2 parents c616f15 + 52ed34a
commit e15130c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -20,6 +20,18 @@ const siteActions = {
       type: 'decrypt', action: () => document.querySelectorAll('body, body *'),
     },
   ],
+  x: [
+    { type: 'sender', action: findUsernameFromInitialState },
+    { type: 'userid', action: findTwitterHandle },
+    { type: 'senderButton', action: ()=> document.querySelector('[data-testid="dmComposerSendButton"]') },
+    {
+      type: 'input', action: () =>
+        document.querySelector('[data-testid="dmComposerTextInput"]'),
+    },
+    {
+      type: 'decrypt', action: () => document.querySelectorAll('body, body *'),
+    },
+  ],
   whatsapp: [
     { type: 'sender', action: findWhatsappNumberSender },
     { type: 'userid', action: findWhatsappNumber },

diff --git a/src/content.js b/src/content.js
@@ -1,14 +1,5 @@
 
 
-
-// Retrieve the session passphrase securely
-async function getSessionPassphrase() {
-  if (!sessionPassphrase) {
-    return '[Decryption Failed - No Passphrase]';
-  }
-  return sessionPassphrase;
-}
-
 // Retrieve private key of the extension user from storage
 async function retrieveExtensionUserPrivateKey() {
   const extensionUserHandle = globalThis.getAction('sender');
@@ -326,6 +317,14 @@ async function handleEncryptAndSend() {
       const extensionUserHandle = globalThis.getAction('sender');
 
       try {
+        if(!userHandle){
+          alert('Failed to encrypt text. Was not possible to get receiver info.');
+          return null;
+        }
+        if(!extensionUserHandle){
+          alert('Failed to encrypt text. Was not possible to get your user info.');
+          return null;
+        }
         const recipientPublicKey = await retrieveUserPublicKey(userHandle);
         const extensionUserPublicKey = await retrieveUserPublicKeyFromPrivate(extensionUserHandle);
 
@@ -347,7 +346,7 @@ async function handleEncryptAndSend() {
 
         // Optionally, click the original send button
         // const sendButton = document.querySelector('[data-testid="dmComposerSendButton"]');
-        // if (sendButton) sendButton.click();
+        // if (sendButton) sendButton.click();      
       } catch (err) {
         console.error('Failed to encrypt text:', err);
         alert('Failed to encrypt text.');