From 617f682f36dae7d5a037edc101a9ad73087ab5db Mon Sep 17 00:00:00 2001
From: Mike Hadley <mikewesthad@gmail.com>
Date: Fri, 1 Nov 2024 11:05:37 -0500
Subject: [PATCH 1/2] Fix

---
 src/constants.ts       | 5 ++++-
 src/createWindow.ts    | 4 +++-
 src/deeplink.ts        | 7 ++++++-
 src/isSupportedPage.ts | 2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/constants.ts b/src/constants.ts
index 9caa8b8..8375830 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -25,8 +25,11 @@ export const isLoadingProdReplit = baseUrl === defaultBaseUrl;
 // Matches /@:username/:slug
 export const personalReplUrlRegex = /^\/@([^/#?]+?)(?:\/([^/#?]+?))[/#?]?$/i;
 // Matches /t/:orgSlug/:orgId/repls/:replSlug
-export const teamReplUrlRegex =
+export const legacyTeamReplUrlRegex =
   /^\/t(?:\/([^/#?]+?))(?:\/([^/#?]+?))\/repls(?:\/([^/#?]+?))[/#?]?$/i;
+// Matches /t/:orgSlug/:orgId/repls/:replSlug
+export const teamReplUrlRegex =
+  /^\/t(?:\/([^/#?]+?))\/repls(?:\/([^/#?]+?))[/#?]?$/i;
 
 export const homePage = '/desktopApp/home';
 export const authPage = '/desktopApp/auth';
diff --git a/src/createWindow.ts b/src/createWindow.ts
index 633712c..e4fc590 100644
--- a/src/createWindow.ts
+++ b/src/createWindow.ts
@@ -15,6 +15,7 @@ import {
   personalReplUrlRegex,
   homePage,
   isProduction,
+  legacyTeamReplUrlRegex,
 } from './constants';
 import log from 'electron-log/main';
 import { events } from './events';
@@ -57,7 +58,8 @@ function setLastOpenRepl(url: string, lastOpenRepl: string | null) {
 
   if (
     !personalReplUrlRegex.test(u.pathname) &&
-    !teamReplUrlRegex.test(u.pathname)
+    !teamReplUrlRegex.test(u.pathname) &&
+    !legacyTeamReplUrlRegex.test(u.pathname)
   ) {
     return;
   }
diff --git a/src/deeplink.ts b/src/deeplink.ts
index c9de88a..c8097a1 100644
--- a/src/deeplink.ts
+++ b/src/deeplink.ts
@@ -8,6 +8,7 @@ import {
   semverRegex,
   authPage,
   homePage,
+  legacyTeamReplUrlRegex,
 } from './constants';
 import path from 'path';
 import { createWindow } from './createWindow';
@@ -128,7 +129,11 @@ function handleNew(language: string) {
 }
 
 function handleRepl(url: string) {
-  if (!personalReplUrlRegex.test(url) && !teamReplUrlRegex.test(url)) {
+  if (
+    !personalReplUrlRegex.test(url) && 
+    !teamReplUrlRegex.test(url) && 
+    !legacyTeamReplUrlRegex.test(url)
+  ) {
     log.error('Expected valid workspace URL');
 
     return;
diff --git a/src/isSupportedPage.ts b/src/isSupportedPage.ts
index 791b8f5..a85711a 100644
--- a/src/isSupportedPage.ts
+++ b/src/isSupportedPage.ts
@@ -1,5 +1,6 @@
 import {
   desktopAppPrefix,
+  legacyTeamReplUrlRegex,
   personalReplUrlRegex,
   teamReplUrlRegex,
 } from './constants';
@@ -11,6 +12,7 @@ export default function isSupportedPage(page: string): boolean {
     page.startsWith(desktopAppPrefix) ||
     personalReplUrlRegex.test(page) ||
     teamReplUrlRegex.test(page) ||
+    legacyTeamReplUrlRegex.test(page) ||
     supportedNonDesktopAppPages.includes(page)
   );
 }

From b69c9e98eed5ae713764f2a50a3fa64a9f70d545 Mon Sep 17 00:00:00 2001
From: Mike Hadley <mikewesthad@gmail.com>
Date: Fri, 1 Nov 2024 11:11:04 -0500
Subject: [PATCH 2/2] Fix

---
 src/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.ts b/src/constants.ts
index 8375830..e34728d 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -27,7 +27,7 @@ export const personalReplUrlRegex = /^\/@([^/#?]+?)(?:\/([^/#?]+?))[/#?]?$/i;
 // Matches /t/:orgSlug/:orgId/repls/:replSlug
 export const legacyTeamReplUrlRegex =
   /^\/t(?:\/([^/#?]+?))(?:\/([^/#?]+?))\/repls(?:\/([^/#?]+?))[/#?]?$/i;
-// Matches /t/:orgSlug/:orgId/repls/:replSlug
+// Matches /t/:orgSlug/repls/:replSlug
 export const teamReplUrlRegex =
   /^\/t(?:\/([^/#?]+?))\/repls(?:\/([^/#?]+?))[/#?]?$/i;