Merge branch 'main' into fix-release-process

forge.config.ts

@@ -94,9 +94,9 @@ function removeCodeSignatures(dir: string) {
 
 const config: ForgeConfig = {
   packagerConfig: {
-    name: 'Cyd',
-    executableName: os.platform() == 'linux' ? 'cyd' : 'Cyd',
-    appBundleId: 'systems.lockdown.cyd',
+    name: process.env.CYD_ENV == 'prod' ? 'Cyd' : 'Cyd Dev',
+    executableName: os.platform() == 'linux' ? (process.env.CYD_ENV == 'prod' ? 'cyd' : 'cyd-dev') : (process.env.CYD_ENV == 'prod' ? 'Cyd' : 'Cyd Dev'),
+    appBundleId: process.env.CYD_ENV == 'prod' ? 'systems.lockdown.cyd' : 'systems.lockdown.cyd-dev',
     appCopyright: `Copyright ${new Date().getFullYear()} Lockdown Systems LLC`,
     asar: true,
     icon: path.join(assetsPath, 'icon'),
@@ -121,7 +121,7 @@ const config: ForgeConfig = {
     // Windows
     new MakerSquirrel({
       iconUrl: "https://releases.lockdown.systems/cyd/icon.ico",
-      name: "Cyd",
+      name: process.env.CYD_ENV == 'prod' ? "Cyd" : "CydDev",
       setupIcon: path.join(assetsPath, "installer-icon.ico"),
       loadingGif: path.join(assetsPath, "installer-loading.gif"),
       windowsSign: process.env.WINDOWS_RELEASE === 'true' ? {
@@ -133,13 +133,13 @@ const config: ForgeConfig = {
     }),
     // macOS DMG
     new MakerDMG({
-      name: `Cyd ${version}`,
+      name: process.env.CYD_ENV == 'prod' ? `Cyd ${version}` : `Cyd Dev ${version}`,
       background: path.join(assetsPath, 'dmg-background.png'),
       icon: path.join(assetsPath, 'installer-icon.icns'),
       iconSize: 110,
       overwrite: true,
       contents: [
-        { "x": 270, "y": 142, "type": "file", "path": `${process.cwd()}/out/Cyd-darwin-universal/Cyd.app` },
+        { "x": 270, "y": 142, "type": "file", "path": process.env.CYD_ENV == 'prod' ? `${process.cwd()}/out/Cyd-darwin-universal/Cyd.app` : `${process.cwd()}/out/Cyd Dev-darwin-universal/Cyd Dev.app` },
         { "x": 428, "y": 142, "type": "link", "path": "/Applications" }
       ],
       additionalDMGOptions: {
@@ -156,7 +156,16 @@ const config: ForgeConfig = {
       macUpdateManifestBaseUrl: `https://releases.lockdown.systems/cyd/${process.env.CYD_ENV}/macos/universal`
     }),
     // Linux RPM
-    new MakerRpm({}),
+    new MakerRpm({
+      // @ts-expect-error I think the typescript definitions are wrong, but this should work
+      icon: path.join(assetsPath, 'icon.png'),
+      homepage: 'https://cyd.social',
+      categories: ['Utility', 'Network'],
+      description: 'Claw back your data from Big Tech',
+      productName: process.env.CYD_ENV == 'prod' ? "Cyd" : "Cyd Dev",
+      bin: process.env.CYD_ENV == 'prod' ? "cyd" : "cyd-dev",
+      name: process.env.CYD_ENV == 'prod' ? "cyd" : "cyd-dev",
+    }),
     // Linux Debian
     new MakerDeb({
       options: {
@@ -165,7 +174,9 @@ const config: ForgeConfig = {
         homepage: 'https://cyd.social',
         categories: ['Utility', 'Network'],
         description: 'Claw back your data from Big Tech',
-        productName: "Cyd",
+        productName: process.env.CYD_ENV == 'prod' ? "Cyd" : "Cyd Dev",
+        bin: process.env.CYD_ENV == 'prod' ? "cyd" : "cyd-dev",
+        name: process.env.CYD_ENV == 'prod' ? "cyd" : "cyd-dev",
       }
     })
   ],
@@ -210,8 +221,8 @@ const config: ForgeConfig = {
 
       console.log('🍎 Preparing to codesign macOS app bundle');
 
-      const universalBuildPath = path.join(__dirname, 'out', 'Cyd-darwin-universal');
-      const appPath = path.join(universalBuildPath, "Cyd.app");
+      const universalBuildPath = path.join(__dirname, 'out', process.env.CYD_ENV == 'prod' ? 'Cyd-darwin-universal' : 'Cyd Dev-darwin-universal');
+      const appPath = path.join(universalBuildPath, process.env.CYD_ENV == 'prod' ? "Cyd.app" : "Cyd Dev.app");
       const identity = "Developer ID Application: Lockdown Systems LLC (G762K6CH36)";
       const entitlementDefault = path.join(assetsPath, 'entitlements', 'default.plist');
       const entitlementGpu = path.join(assetsPath, 'entitlements', 'gpu.plist');

scripts/make-dev-linux.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=dev
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge make

scripts/make-dev-macos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=dev
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge make --arch universal

scripts/make-dev-windows.ps1

@@ -1,6 +1,6 @@
 #!/usr/bin/env pwsh
 $env:CYD_ENV = "dev"
-$env:DEBUG = "electron-packager,electron-universal,electron-forge*"
+$env:DEBUG = "electron-packager,electron-universal,electron-forge*,electron-installer*"
 $env:WINDOWS_RELEASE = "false"
 
 # https://github.com/Squirrel/Squirrel.Windows/issues/1838#issuecomment-1514089628

scripts/make-local-linux.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=local
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge make

scripts/make-local-macos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=local
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge make --arch universal

scripts/make-prod-linux.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=prod
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge make

scripts/make-prod-macos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=prod
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge make --arch universal

scripts/make-prod-windows.ps1

@@ -1,6 +1,6 @@
 #!/usr/bin/env pwsh
 $env:CYD_ENV = "prod"
-$env:DEBUG = "electron-packager,electron-universal,electron-forge*"
+$env:DEBUG = "electron-packager,electron-universal,electron-forge*,electron-installer*"
 $env:WINDOWS_RELEASE = "false"
 
 # https://github.com/Squirrel/Squirrel.Windows/issues/1838#issuecomment-1514089628

scripts/publish-dev-macos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=dev
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge publish --arch universal

scripts/publish-dev-windows.ps1

@@ -1,6 +1,6 @@
 #!/usr/bin/env pwsh
 $env:CYD_ENV = "dev"
-$env:DEBUG = "electron-packager,electron-universal,electron-forge*"
+$env:DEBUG = "electron-packager,electron-universal,electron-forge*,electron-installer*"
 $env:WINDOWS_RELEASE = "true"
 
 # https://github.com/Squirrel/Squirrel.Windows/issues/1838#issuecomment-1514089628

scripts/publish-prod-macos.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 export CYD_ENV=prod
-export DEBUG=electron-packager,electron-universal,electron-forge*
+export DEBUG=electron-packager,electron-universal,electron-forge*,electron-installer*
 
 ./scripts/clean.sh
 electron-forge publish --arch universal

scripts/publish-prod-windows.ps1

@@ -1,6 +1,6 @@
 #!/usr/bin/env pwsh
 $env:CYD_ENV = "prod"
-$env:DEBUG = "electron-packager,electron-universal,electron-forge*"
+$env:DEBUG = "electron-packager,electron-universal,electron-forge*,electron-installer*"
 $env:WINDOWS_RELEASE = "true"
 
 # https://github.com/Squirrel/Squirrel.Windows/issues/1838#issuecomment-1514089628

src/main.ts

@@ -49,6 +49,17 @@ if (!fs.existsSync(configPath)) {
 }
 const config: Config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
 
+// Attach the mode to the process environment
+process.env.CYD_MODE = config.mode;
+
+// Set the app name
+if (config.mode == "prod") {
+    // cyd with a lowercase c, for backwards compatibility
+    app.setName('cyd');
+} else {
+    app.setName('Cyd Dev');
+}
+
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require('electron-squirrel-startup')) {
     app.quit();
@@ -71,13 +82,13 @@ async function initializeApp() {
     // Display message in dev mode
     if (config.mode == "dev") {
         dialog.showMessageBoxSync({
-            title: `Cyd ${app.getVersion()}`,
+            title: `Cyd Dev ${app.getVersion()}`,
             message: `You're running Cyd ${app.getVersion()}. It uses the dev server and it might contain bugs.`,
             type: 'info',
         });
     } else if (config.mode == "local") {
         dialog.showMessageBoxSync({
-            title: `Cyd ${app.getVersion()}`,
+            title: `Cyd Local ${app.getVersion()}`,
             message: `You're running Cyd ${app.getVersion()} in local mode.`,
             type: 'info',
         });
@@ -154,7 +165,7 @@ async function createWindow() {
             webviewTag: true,
             preload: path.join(__dirname, './preload.js')
         },
-        icon: icon
+        icon: icon,
     });
 
     // Handle power monitor events
@@ -249,6 +260,14 @@ async function createWindow() {
             }
         });
 
+        ipcMain.handle('getMode', async () => {
+            try {
+                return config.mode;
+            } catch (error) {
+                throw new Error(packageExceptionForReport(error as Error));
+            }
+        });
+
         ipcMain.handle('getPlatform', async () => {
             try {
                 return os.platform();

src/preload.ts

@@ -24,6 +24,9 @@ contextBridge.exposeInMainWorld('electron', {
     getVersion: (): Promise<string> => {
         return ipcRenderer.invoke('getVersion')
     },
+    getMode: (): Promise<string> => {
+        return ipcRenderer.invoke('getMode')
+    },
     getPlatform: (): Promise<string> => {
         return ipcRenderer.invoke('getPlatform')
     },

src/renderer/src/App.vue

@@ -99,6 +99,14 @@ onMounted(async () => {
   }
 
   isReady.value = true;
+
+  // Change the app title
+  const mode = await window.electron.getMode();
+  if (mode === 'prod') {
+    document.title = 'Cyd';
+  } else {
+    document.title = `Cyd (${mode})`;
+  }
 });
 </script>
 

src/renderer/src/main.ts

@@ -29,6 +29,7 @@ declare global {
         electron: {
             checkForUpdates: () => void;
             getVersion: () => Promise<string>;
+            getMode: () => Promise<string>;
             getPlatform: () => Promise<string>;
             getAPIURL: () => Promise<string>;
             getDashURL: () => Promise<string>;

src/renderer/src/test_util.ts

@@ -2,6 +2,7 @@ export const stubElectron = () => {
     return {
         checkForUpdates: cy.stub(),
         getVersion: cy.stub(),
+        getMode: cy.stub(),
         getPlatform: cy.stub(),
         getAPIURL: cy.stub(),
         getDashURL: cy.stub(),
@@ -20,6 +21,12 @@ export const stubElectron = () => {
         database: {
             getConfig: cy.stub(),
             setConfig: cy.stub(),
+            getErrorReport: cy.stub(),
+            getNewErrorReports: cy.stub(),
+            createErrorReport: cy.stub(),
+            updateErrorReportSubmitted: cy.stub(),
+            dismissNewErrorReports: cy.stub(),
+            getAccount: cy.stub(),
             getAccounts: cy.stub(),
             createAccount: cy.stub(),
             selectAccountType: cy.stub(),
@@ -37,10 +44,12 @@ export const stubElectron = () => {
             updateJob: cy.stub(),
             indexStart: cy.stub(),
             indexStop: cy.stub(),
+            indexParseAllJSON: cy.stub(),
             indexParseTweets: cy.stub(),
             indexParseLikes: cy.stub(),
             indexParseConversations: cy.stub(),
             indexIsThereMore: cy.stub(),
+            resetThereIsMore: cy.stub(),
             indexMessagesStart: cy.stub(),
             indexParseMessages: cy.stub(),
             indexTweetsFinished: cy.stub(),
@@ -65,11 +74,14 @@ export const stubElectron = () => {
             saveProfileImage: cy.stub(),
             getLatestResponseData: cy.stub(),
             deleteTweetsStart: cy.stub(),
+            deleteTweetsCountNotArchived: cy.stub(),
             deleteRetweetsStart: cy.stub(),
             deleteLikesStart: cy.stub(),
             deleteTweet: cy.stub(),
             deleteDMsMarkAllDeleted: cy.stub(),
             deleteDMsScrollToBottom: cy.stub(),
+            verifyXArchive: cy.stub(),
+            importXArchive: cy.stub(),
             getConfig: cy.stub(),
             setConfig: cy.stub(),
         },

src/renderer/src/views/AboutView.vue

@@ -3,6 +3,7 @@ import { ref, onMounted } from "vue";
 
 const currentYear = new Date().getFullYear();
 const appVersion = ref("");
+const mode = ref("prod");
 
 defineProps<{
     shouldShow: boolean;
@@ -18,6 +19,7 @@ const termsClicked = async () => {
 
 onMounted(async () => {
     appVersion.value = await window.electron.getVersion();
+    mode.value = await window.electron.getMode();
 });
 </script>
 
@@ -36,6 +38,7 @@ onMounted(async () => {
             </p>
             <p class="text-muted">
                 <img src="/assets/wordmark.svg" class="cyd-wordmark mr-2" alt="Cyd">
+                {{ mode != 'prod' ? 'Dev' : '' }}
                 version {{ appVersion }}
             </p>
             <p class="text-muted">

src/util.ts

@@ -67,7 +67,11 @@ export const getDataPath = () => {
     // Get dataPath from config
     let dataPath = getConfig('dataPath');
     if (!dataPath) {
-        dataPath = path.join(app.getPath('documents'), 'Cyd');
+        if (process.env.CYD_MODE === 'prod') {
+            dataPath = path.join(app.getPath('documents'), 'Cyd');
+        } else {
+            dataPath = path.join(app.getPath('documents'), 'Cyd Dev');
+        }
         setConfig('dataPath', dataPath);
     }