Merge pull request #95 from IanLeeClaxton/feature/fix_missing_user_icons

Missing bot user image in Slack
alexkvak · Mar 21, 2020 · ea1075e · ea1075e
2 parents f8c9abe + 78abf3a
commit ea1075e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/slackIntegration-server/src/main/scala/com/fpd/teamcity/slack/SlackGateway.scala b/slackIntegration-server/src/main/scala/com/fpd/teamcity/slack/SlackGateway.scala
@@ -121,7 +121,12 @@ class SlackGateway(val configManager: ConfigManager, logger: Logger) {
     }
 
   private def channelChatConfiguration =
-    SlackChatConfiguration.getConfiguration.withName(configManager.senderName.getOrElse(Strings.channelMessageOwner))
+    configManager.senderName match {
+      case Some(senderName) ⇒
+        SlackChatConfiguration.getConfiguration.withName(senderName)
+      case _ ⇒
+        SlackChatConfiguration.getConfiguration.asUser()
+    }
 
   private def sendMessageInternal(destination: Destination, message: SlackMessage): MessageSent = session match {
     case Some(x) ⇒

diff --git a/slackIntegration-server/src/main/scala/com/fpd/teamcity/slack/Strings.scala b/slackIntegration-server/src/main/scala/com/fpd/teamcity/slack/Strings.scala
@@ -6,7 +6,6 @@ object Strings {
   lazy val logCategory = "Slack Integration"
   def label: String = "Slack"
   def tabId: String = "Slack"
-  lazy val channelMessageOwner = "TeamCity"
 
   private def unableToCreateSessionByConfig(reason: String): String = s"Unable to create session by config: $reason"