Remove # consistently from channel name in file upload (#1004)

jenkinsci · Aug 29, 2024 · 00f9591 · 00f9591
1 parent e9a39ec
commit 00f9591
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/main/java/jenkins/plugins/slack/cache/SlackChannelIdCache.java b/src/main/java/jenkins/plugins/slack/cache/SlackChannelIdCache.java
@@ -72,10 +72,13 @@ public long getRetryInterval() {
         }
     }
 
-    public static String getChannelId(String botUserToken, String channelName) throws ExecutionException, InterruptedException, AbortException {
-        if (channelName.matches("^(C[A-Z0-9]{8}|G[A-Z0-9]{10}||D[A-Z0-9]{8})$")) {
-            return channelName;
+    public static String getChannelId(String botUserToken, String channel) throws ExecutionException, InterruptedException, AbortException {
+        if (channel.matches("^(C[A-Z0-9]{8}|G[A-Z0-9]{10}||D[A-Z0-9]{8})$")) {
+            return channel;
         }
+
+        String channelName = cleanChannelName(channel);
+
         Map<String, String> channelNameToIdMap = CHANNEL_METADATA_CACHE.get(botUserToken);
         String channelId = channelNameToIdMap.get(channelName);
 
@@ -95,6 +98,19 @@ public static String getChannelId(String botUserToken, String channelName) throw
         return channelId;
     }
 
+    private static String cleanChannelName(String channelName) {
+        String[] splitForThread = channelName.split(":", 2);
+        String channel = channelName;
+        if (splitForThread.length == 2) {
+            channel = splitForThread[0];
+        }
+        if (channel.startsWith("#")) {
+            return channel.substring(1);
+        }
+        return channel;
+    }
+
+
     private static Map<String, String> convertChannelNameToId(CloseableHttpClient client, String token, Map<String, String> channels, String cursor) throws IOException {
         convertPublicChannelNameToId(client, token, channels, cursor);
         convertPrivateChannelNameToId(client, token, channels, cursor);

diff --git a/src/main/java/jenkins/plugins/slack/pipeline/SlackUploadFileStep.java b/src/main/java/jenkins/plugins/slack/pipeline/SlackUploadFileStep.java
@@ -141,11 +141,10 @@ protected Void run() throws IOException, InterruptedException, ExecutionExceptio
 
             String channelId;
             try {
-                String channelName = cleanChannelName(channel);
-                channelId = SlackChannelIdCache.getChannelId(populatedToken, channelName);
+                channelId = SlackChannelIdCache.getChannelId(populatedToken, channel);
                 if (channelId == null) {
                     // possibly a user ID which won't be found in the channel ID cache
-                    channelId = channelName;
+                    channelId = channel;
                 }
             } catch (CompletionException | SlackChannelIdCache.HttpStatusCodeException e) {
                 throw new AbortException("Failed uploading file to slack, channel not found: " + channel + ", error: " + e.getMessage());
@@ -182,17 +181,4 @@ private static String getThreadTs(String channelName) {
         }
         return null;
     }
-
-    private static String cleanChannelName(String channelName) {
-        String[] splitForThread = channelName.split(":", 2);
-        String channel = channelName;
-        if (splitForThread.length == 2) {
-            channel = splitForThread[0];
-            if (channel.startsWith("#")) {
-                return channel.substring(1);
-            }
-            return channel;
-        }
-        return channelName;
-    }
 }