Merge branch 'discord-v3'

Author: J0B10

build.sbt

@@ -55,7 +55,7 @@ libraryDependencies ++= Seq(
 
 // JDA
 resolvers += "jcenter-bintray" at "http://jcenter.bintray.com"
-libraryDependencies += "net.dv8tion" % "JDA" % "4.ALPHA.0_82"
+libraryDependencies += "net.dv8tion" % "JDA" % "3.8.3_463"
 
 //Serial Communication
 libraryDependencies += "com.fazecast" % "jSerialComm" % "[2.0.0,3.0.0)"

src/main/scala/org/codeoverflow/chatoverflow/connector/actor/FileSystemActor.scala

@@ -39,8 +39,7 @@ class FileSystemActor extends Actor {
       try {
         sender ! Some(Files.readAllBytes(fixPath(pathInResources).toPath))
       } catch {
-        case e: Exception => e.printStackTrace()
-          None
+        case e: Exception => None
       }
     case SaveFile(pathInResources, content) =>
       try {

src/main/scala/org/codeoverflow/chatoverflow/requirement/service/discord/DiscordChatConnector.scala

@@ -1,13 +1,18 @@
 package org.codeoverflow.chatoverflow.requirement.service.discord
 
+import java.io.File
 import java.util.function.Consumer
 
 import javax.security.auth.login.LoginException
-import net.dv8tion.jda.api.entities.{MessageChannel, TextChannel}
-import net.dv8tion.jda.api.events.message.{MessageDeleteEvent, MessageReceivedEvent, MessageUpdateEvent}
-import net.dv8tion.jda.api.{JDA, JDABuilder}
+import net.dv8tion.jda.core.entities.{Message, MessageEmbed, TextChannel}
+import net.dv8tion.jda.core.events.message.react.{MessageReactionAddEvent, MessageReactionRemoveEvent}
+import net.dv8tion.jda.core.events.message.{MessageDeleteEvent, MessageReceivedEvent, MessageUpdateEvent}
+import net.dv8tion.jda.core.requests.RestAction
+import net.dv8tion.jda.core.{JDA, JDABuilder, MessageBuilder}
 import org.codeoverflow.chatoverflow.WithLogger
 import org.codeoverflow.chatoverflow.connector.Connector
+import org.codeoverflow.chatoverflow.connector.actor.FileSystemActor
+import org.codeoverflow.chatoverflow.connector.actor.FileSystemActor.LoadBinaryFile
 
 /**
   * The discord connector connects to the discord REST API
@@ -19,23 +24,28 @@ class DiscordChatConnector(override val sourceIdentifier: String) extends Connec
 
   private var jda: Option[JDA] = None
 
+  private val fileSystemActor = createActor[FileSystemActor]
+
   override protected var requiredCredentialKeys: List[String] = List("authToken")
   override protected var optionalCredentialKeys: List[String] = List()
 
   private val defaultFailureHandler: Consumer[_ >: Throwable] =
     throwable => logger warn s"Rest action for connector $sourceIdentifier failed: ${throwable.getMessage}"
 
-  def addMessageReceivedListener(listener: MessageReceivedEvent => Unit): Unit = {
+  def addMessageReceivedListener(listener: MessageReceivedEvent => Unit): Unit =
     discordChatListener.addMessageReceivedListener(listener)
-  }
 
-  def addMessageUpdateListener(listener: MessageUpdateEvent => Unit): Unit = {
+  def addMessageUpdateListener(listener: MessageUpdateEvent => Unit): Unit =
     discordChatListener.addMessageUpdateEventListener(listener)
-  }
 
-  def addMessageDeleteListener(listener: MessageDeleteEvent => Unit): Unit = {
+  def addMessageDeleteListener(listener: MessageDeleteEvent => Unit): Unit =
     discordChatListener.addMessageDeleteEventListener(listener)
-  }
+
+  def addReactionAddEventListener(listener: MessageReactionAddEvent => Unit): Unit =
+    discordChatListener.addReactionAddEventListener(listener)
+
+  def addReactionDelEventListener(listener: MessageReactionRemoveEvent => Unit): Unit =
+    discordChatListener.addReactionDelEventListener(listener)
 
   /**
     * Connects to discord
@@ -78,6 +88,24 @@ class DiscordChatConnector(override val sourceIdentifier: String) extends Connec
     }
   }
 
+  /**
+    * Retrieves an already send message from a text channel by it's id
+    *
+    * @param channelId the id of a text channel
+    * @param messageId the id of the message
+    * @return a rest action that will return the message
+    */
+  def retrieveMessage(channelId: String, messageId: String): RestAction[Message] = {
+    Option(validJDA.getTextChannelById(channelId)) match {
+      case Some(channel) => channel.getMessageById(messageId)
+      case None =>
+        Option(validJDA.getPrivateChannelById(channelId)) match {
+          case Some(channel) => channel.getMessageById(messageId)
+          case None => throw new IllegalArgumentException(s"Channel with id $channelId not found")
+        }
+    }
+  }
+
   /**
     * Retrieves a text channel
     *
@@ -98,4 +126,41 @@ class DiscordChatConnector(override val sourceIdentifier: String) extends Connec
       case None => throw new IllegalArgumentException(s"Channel with id $channelId not found")
     }
   }
+
+  /**
+    * Sends a embed to a text channel
+    *
+    * @param channelId the id of the text channel
+    * @param embed     the embed to send
+    */
+  def sendChatMessage(channelId: String, embed: MessageEmbed): Unit = {
+    Option(validJDA.getTextChannelById(channelId)) match {
+      case Some(channel) => channel.sendMessage(embed).queue(null, defaultFailureHandler)
+      case None => throw new IllegalArgumentException(s"Channel with id $channelId not found")
+    }
+  }
+
+  /**
+    * Sends a message with an attachment to a text channel
+    *
+    * @param channelId the id of the text channel
+    * @param file path of a file inside the data folder that should be send
+    * @param message optional containing the actual message (or none)
+    */
+  def sendFile(channelId: String, file: String, message: Option[String] = None): Unit = {
+    val fileName = file.substring(file.lastIndexOf(File.separator) + 1)
+    val fileIn = fileSystemActor.??[Option[Array[Byte]]](3)(LoadBinaryFile(file))
+    if (fileIn.isDefined && fileIn.get.isDefined) {
+      Option(validJDA.getTextChannelById(channelId)) match {
+        case Some(channel) =>
+          message match {
+            case Some(m) => channel.sendFile(fileIn.get.get, fileName, new MessageBuilder(m).build()).queue(null, defaultFailureHandler)
+            case None => channel.sendFile(fileIn.get.get, fileName).queue(null, defaultFailureHandler)
+          }
+        case None => throw new IllegalArgumentException(s"Channel with id $channelId not found")
+      }
+    } else {
+      logger warn s"Could not load file '$file'"
+    }
+  }
 }

src/main/scala/org/codeoverflow/chatoverflow/requirement/service/discord/DiscordChatListener.scala

@@ -1,8 +1,9 @@
 package org.codeoverflow.chatoverflow.requirement.service.discord
 
-import net.dv8tion.jda.api.events.GenericEvent
-import net.dv8tion.jda.api.events.message.{MessageDeleteEvent, MessageReceivedEvent, MessageUpdateEvent}
-import net.dv8tion.jda.api.hooks.EventListener
+import net.dv8tion.jda.core.events.Event
+import net.dv8tion.jda.core.events.message.react.{MessageReactionAddEvent, MessageReactionRemoveEvent}
+import net.dv8tion.jda.core.events.message.{MessageDeleteEvent, MessageReceivedEvent, MessageUpdateEvent}
+import net.dv8tion.jda.core.hooks.EventListener
 
 import scala.collection.mutable.ListBuffer
 
@@ -17,17 +18,27 @@ class DiscordChatListener extends EventListener {
 
   private val messageDeleteEventListener = ListBuffer[MessageDeleteEvent => Unit]()
 
+  private val reactionAddEventListener = ListBuffer[MessageReactionAddEvent => Unit]()
+
+  private val reactionDelEventListener = ListBuffer[MessageReactionRemoveEvent => Unit]()
+
   def addMessageReceivedListener(listener: MessageReceivedEvent => Unit): Unit = messageEventListener += listener
 
   def addMessageUpdateEventListener(listener: MessageUpdateEvent => Unit): Unit = messageUpdateEventListener += listener
 
   def addMessageDeleteEventListener(listener: MessageDeleteEvent => Unit): Unit = messageDeleteEventListener += listener
 
-  override def onEvent(event: GenericEvent): Unit = {
+  def addReactionAddEventListener(listener: MessageReactionAddEvent => Unit): Unit = reactionAddEventListener += listener
+
+  def addReactionDelEventListener(listener: MessageReactionRemoveEvent => Unit): Unit = reactionDelEventListener += listener
+
+  override def onEvent(event: Event): Unit = {
     event match {
       case receivedEvent: MessageReceivedEvent => messageEventListener.foreach(listener => listener(receivedEvent))
       case updateEvent: MessageUpdateEvent => messageUpdateEventListener.foreach(listener => listener(updateEvent))
       case deleteEvent: MessageDeleteEvent => messageDeleteEventListener.foreach(listener => listener(deleteEvent))
+      case reactionAddEvent: MessageReactionAddEvent => reactionAddEventListener.foreach(listener => listener(reactionAddEvent))
+      case reactionDelEvent: MessageReactionRemoveEvent => reactionDelEventListener.foreach(listener => listener(reactionDelEvent))
       case _ => //Any other event, do nothing
     }
   }