Remove # from channel name when uploading file (#962)

jenkinsci · May 7, 2024 · bacb598 · bacb598
1 parent 41060f5
commit bacb598
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/jenkins/plugins/slack/pipeline/SlackUploadFileRunner.java b/src/main/java/jenkins/plugins/slack/pipeline/SlackUploadFileRunner.java
@@ -198,7 +198,7 @@ private String convertChannelNameToId(String channelName, CloseableHttpClient cl
         JSONArray channelsArray = result.getJSONArray("channels");
         for (int i = 0; i < channelsArray.length(); i++) {
             JSONObject channel = channelsArray.getJSONObject(i);
-            if (channel.getString("name").equals(channelName)) {
+            if (channel.getString("name").equals(cleanChannelName(channelName))) {
                 return channel.getString("id");
             }
         }
@@ -213,6 +213,13 @@ private String convertChannelNameToId(String channelName, CloseableHttpClient cl
         return null;
     }
 
+    private static String cleanChannelName(String channelName) {
+        if (channelName.startsWith("#")) {
+            return channelName.substring(1);
+        }
+        return channelName;
+    }
+
     private boolean uploadFile(String uploadUrl, MultipartEntityBuilder multipartEntityBuilder, CloseableHttpClient client) throws IOException {
         HttpUriRequest request = RequestBuilder
                 .post(uploadUrl)