Merge pull request #34 from prvashisht/fix-custom-companies-name

fix: Improved getCompanyName function and stored localStorage data on install

Author: prvashisht

content.js

@@ -89,8 +89,9 @@ const addSignatureToggle = async (messageActions) => {
   icon.src = chrome.runtime.getURL(`icons/${darkModePreference.matches ? 'dark' : 'light'}/icon32.png`);
   icon.alt = 'Toggle Signature';
   icon.style = 'width: 20px; height: 20px; margin: 0 0.5rem; transition: opacity 0.3s; position: relative; bottom: 0.2em;';
-  const item = await chrome.storage.local.get(['linkedinsignature']);
-  icon.style.opacity = item.linkedinsignature.messageSignEnabled ? 1 : 0.4;
+  const { linkedinsignature } = await chrome.storage.local.get(['linkedinsignature']);
+  if (!linkedinsignature) return;
+  icon.style.opacity = linkedinsignature.messageSignEnabled ? 1 : 0.4;
   signatureToggle.appendChild(icon);
 
   messageActions.appendChild(signatureToggle);
@@ -99,19 +100,21 @@ const addSignatureToggle = async (messageActions) => {
 const findCompanyName = (fullName) => {
   if (window.location.href.includes('linkedin.com/in/')) {
     const mainName = document.querySelector('main h1').textContent.trim();
-    if (mainName === fullName) {
-      const experiences = document.querySelector('section #experience').parentElement,
-        latestCompany = experiences.querySelector('li'),
-        latestCompanyName = latestCompany.querySelector('img').getAttribute('alt').split(' ').slice(0, -1).join(' ');
-      
-      let latestTimeline = latestCompany.querySelector('.pvs-entity__caption-wrapper').textContent.trim();
-      
-      const changedRoles = latestTimeline.indexOf(' - ') === -1; // displays "Full-time"
-      if (changedRoles) latestTimeline = latestCompany.querySelector('.pvs-entity__sub-components li .pvs-entity__caption-wrapper').textContent.trim();
-
-      const isCurrentCompany = !latestTimeline.split(' - ')[1].split(' · ')[0].includes(' ');
-      if (isCurrentCompany) return latestCompanyName;
-    }
+    if (mainName !== fullName) return;
+
+    const experienceTitleSelector = 'div.mr1 span[aria-hidden="true"]',
+      experienceSubtitleSelector = 'span.t-14:not(.t-black--light):first-of-type span[aria-hidden="true"]',
+      latestCompany = document.querySelector('section #experience').parentElement.querySelector('li'),
+      changedRoles = latestCompany.querySelector('.pvs-entity__caption-wrapper').textContent.trim().indexOf(' · ') === -1,
+      latestCompanyName = changedRoles ?
+        latestCompany.querySelector(experienceTitleSelector).textContent.trim() :
+        latestCompany.querySelector(experienceSubtitleSelector).textContent.trim().split(' · ')[0],
+      latestTimeline = changedRoles ?
+        latestCompany.querySelector('.pvs-entity__sub-components li .pvs-entity__caption-wrapper').textContent.trim() :
+        latestCompany.querySelector('.pvs-entity__caption-wrapper').textContent.trim(),
+      isCurrentCompany = !latestTimeline.split(' - ')[1].split(' · ')[0].includes(' ');
+
+    if (isCurrentCompany) return latestCompanyName;
   } else if (window.location.href.includes('linkedin.com/search/results/')) {
     let returnValue = null;
     document.querySelectorAll('div.mb1').forEach(result => {

popup/main.js

@@ -10,6 +10,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     messagesTab = document.getElementById('messagesTab'),
     connectionsTab = document.getElementById('connectionsTab');
 
+  // TODO: move to a common file and import
   const defaultSignature = {
     messageSignEnabled: true,
     connectNoteSignEnabled: true,

service_worker.js

@@ -1,3 +1,7 @@
+if (typeof browser === "undefined") {
+    var browser = chrome;
+}
+  
 chrome.runtime.onMessage.addListener((request) => {
     if (request.type === "themeChange") {
         let icon_paths = {
@@ -10,14 +14,27 @@ chrome.runtime.onMessage.addListener((request) => {
     }
 });
 
+// TODO: move to a common file and import
+const defaultSignature = {
+    messageSignEnabled: true,
+    connectNoteSignEnabled: true,
+    messageSignatures: [{
+        name: "Default",
+        text: "\nRegards"
+    }],
+    connectionSignatures: [{
+        name: "Default",
+        text: "\nRegards"
+    }],
+};
 chrome.runtime.onInstalled.addListener(installInfo => {
     let installDate, updateDate;
     if (installInfo.reason === "install") {
         installDate = new Date();
     } else {
         updateDate = new Date().toISOString();
     }
-    chrome.runtime.getPlatformInfo(platformInfo => {
+    chrome.runtime.getPlatformInfo(async platformInfo => {
         let debugData = {
             ...platformInfo,
             agent: navigator.userAgent,
@@ -34,5 +51,7 @@ chrome.runtime.onInstalled.addListener(installInfo => {
             .join("\n")
         );
         chrome.runtime.setUninstallURL(`https://pratyushvashisht.com/signaturesync/uninstall?utm_source=browser&utm_medium=extension&utm_campaign=uninstall&debugData=${encodedDebugData}`);
+
+        await browser.storage.local.set({ linkedinsignature: defaultSignature });
     });
 });