From a72abf67d42a13029e97e025d318a12cb7197a8a Mon Sep 17 00:00:00 2001 From: Jo Vandeginste Date: Tue, 20 Sep 2016 20:03:46 +0200 Subject: [PATCH] Add username@channel option --- .../mattermost/StandardMattermostService.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/jenkins/plugins/mattermost/StandardMattermostService.java b/src/main/java/jenkins/plugins/mattermost/StandardMattermostService.java index 0419abe..e829baa 100755 --- a/src/main/java/jenkins/plugins/mattermost/StandardMattermostService.java +++ b/src/main/java/jenkins/plugins/mattermost/StandardMattermostService.java @@ -39,9 +39,23 @@ public boolean publish(String message) { public boolean publish(String message, String color) { boolean result = true; - for (String roomId : roomIds) { + for (String userAndRoomId : roomIds) { String url = endpoint; + String roomId = ""; + String userId = "jenkins"; + String[] splitUserAndRoomId = userAndRoomId.split("@"); + switch (splitUserAndRoomId.length) { + case 1: + roomId = splitUserAndRoomId[0]; + break; + case 2: + userId = splitUserAndRoomId[0]; + roomId = splitUserAndRoomId[1]; + break; + } + String roomIdString = roomId; + if (StringUtils.isEmpty(roomIdString)) { roomIdString = "(default)"; } @@ -72,7 +86,7 @@ public boolean publish(String message, String color) { json.put("attachments", attachments); if (!roomId.isEmpty()) json.put("channel", roomId); - json.put("username", "jenkins"); + json.put("username", userId); json.put("icon_url", icon); post.addParameter("payload", json.toString());