From e39736b4dac1aafb191204b06898a31ba3b6d1a9 Mon Sep 17 00:00:00 2001
From: Caleb Roseland <caleb@calebroseland.com>
Date: Wed, 22 Nov 2023 22:54:42 -0600
Subject: [PATCH] parameter cleanup

---
 app/utils/deep_link/index.ts | 11 +++++------
 app/utils/url/test.ts        |  2 +-
 types/launch/index.ts        |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/utils/deep_link/index.ts b/app/utils/deep_link/index.ts
index 336075c6b..86f5261de 100644
--- a/app/utils/deep_link/index.ts
+++ b/app/utils/deep_link/index.ts
@@ -95,7 +95,7 @@ export async function handleDeepLink(deepLinkUrl: string, intlShape?: IntlShape,
             }
             case DeepLink.GroupMessage: {
                 const deepLinkData = parsed.data as DeepLinkGM;
-                switchToChannelByName(existingServerUrl, deepLinkData.channelId, deepLinkData.teamName, errorBadChannel, intl);
+                switchToChannelByName(existingServerUrl, deepLinkData.channelName, deepLinkData.teamName, errorBadChannel, intl);
                 break;
             }
             case DeepLink.Permalink: {
@@ -131,10 +131,9 @@ type ChannelPathParams = {
     teamName: string;
     path: 'channels' | 'messages';
     identifier: string;
-    postId?: string;
 };
 
-const CHANNEL_PATH = `:serverUrl(.*)/:teamName(${TEAM_NAME_PATH_PATTERN})/:path(channels|messages)/:identifier(${IDENTIFIER_PATH_PATTERN})/:postId(${ID_PATH_PATTERN})?`;
+const CHANNEL_PATH = `:serverUrl(.*)/:teamName(${TEAM_NAME_PATH_PATTERN})/:path(channels|messages)/:identifier(${IDENTIFIER_PATH_PATTERN})`;
 export const matchChannelDeeplink = match<ChannelPathParams>(CHANNEL_PATH, matcherOpts);
 
 type PermalinkPathParams = {
@@ -151,10 +150,10 @@ export function parseDeepLink(deepLinkUrl: string): DeepLinkWithData {
 
         const channelMatch = matchChannelDeeplink(url);
         if (channelMatch) {
-            const {params: {serverUrl, teamName, path, identifier, postId}} = channelMatch;
+            const {params: {serverUrl, teamName, path, identifier}} = channelMatch;
 
             if (path === 'channels') {
-                return {type: DeepLink.Channel, url: deepLinkUrl, data: {serverUrl, teamName, channelName: identifier, postId}};
+                return {type: DeepLink.Channel, url: deepLinkUrl, data: {serverUrl, teamName, channelName: identifier}};
             }
 
             if (path === 'messages') {
@@ -162,7 +161,7 @@ export function parseDeepLink(deepLinkUrl: string): DeepLinkWithData {
                     return {type: DeepLink.DirectMessage, url: deepLinkUrl, data: {serverUrl, teamName, userName: identifier.substring(1)}};
                 }
 
-                return {type: DeepLink.GroupMessage, url: deepLinkUrl, data: {serverUrl, teamName, channelId: identifier}};
+                return {type: DeepLink.GroupMessage, url: deepLinkUrl, data: {serverUrl, teamName, channelName: identifier}};
             }
         }
 
diff --git a/app/utils/url/test.ts b/app/utils/url/test.ts
index c24280946..eed9fab90 100644
--- a/app/utils/url/test.ts
+++ b/app/utils/url/test.ts
@@ -323,7 +323,7 @@ describe('UrlUtils', () => {
                 },
                 expected: {
                     data: {
-                        channelId: GM_CHANNEL_NAME,
+                        channelName: GM_CHANNEL_NAME,
                         serverUrl: URL_NO_PROTOCOL,
                         teamName: 'pl',
                     },
diff --git a/types/launch/index.ts b/types/launch/index.ts
index 334e9c392..e25baf93a 100644
--- a/types/launch/index.ts
+++ b/types/launch/index.ts
@@ -21,7 +21,7 @@ export interface DeepLinkPermalink extends DeepLink {
 }
 
 export interface DeepLinkGM extends DeepLink {
-    channelId: string;
+    channelName: string;
 }
 
 export interface DeepLinkPlugin extends DeepLink {