From 490a5dcd411779ba6778cf56847626f8739a1bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= <wulkanat@gmail.com>
Date: Tue, 18 Aug 2020 10:25:19 +0200
Subject: [PATCH] Add ability to customize message

---
 .idea/workspace.xml                     | 21 +++---
 README.md                               | 12 ++-
 build.gradle                            |  2 +-
 src/main/kotlin/de/wulkanat/Admin.kt    |  2 +
 src/main/kotlin/de/wulkanat/Channels.kt | 25 ++++++-
 src/main/kotlin/de/wulkanat/DataIO.kt   | 12 ++-
 src/main/kotlin/de/wulkanat/Main.kt     |  2 +-
 src/main/kotlin/de/wulkanat/OwnerCli.kt | 97 +++++++++++++++++++------
 8 files changed, 128 insertions(+), 45 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 661bd09..85f887a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Admin.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Admin.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Channels.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Channels.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/OwnerCli.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/OwnerCli.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -283,26 +280,26 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="740" y="238" key="FileChooserDialogImpl/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597605616287" />
-    <state width="1876" height="161" key="GridCell.Tab.0.bottom" timestamp="1597703826263">
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom" timestamp="1597739482072">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
-    <state width="1876" height="161" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597703826263" />
-    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1597703826263">
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597739482072" />
+    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1597739482072">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.0.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329411" />
-    <state width="1876" height="161" key="GridCell.Tab.0.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597703826263" />
-    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1597703826263">
+    <state width="1876" height="161" key="GridCell.Tab.0.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597739482072" />
+    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1597739482072">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.0.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329411" />
-    <state width="1876" height="161" key="GridCell.Tab.0.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597703826263" />
-    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1597703826263">
+    <state width="1876" height="161" key="GridCell.Tab.0.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597739482072" />
+    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1597739482072">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.0.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329411" />
-    <state width="1876" height="161" key="GridCell.Tab.0.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597703826263" />
+    <state width="1876" height="161" key="GridCell.Tab.0.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597739482072" />
     <state width="1006" height="588" key="GridCell.Tab.1.bottom" timestamp="1597366506508">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
diff --git a/README.md b/README.md
index e02f0ab..9099bbb 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ Add your Discord ID (not name), Bot token, and update frequency to the `admin.js
 {
   "adminId": 12345678910,
   "token": "AOGH@(AKnjsfjiJijaig3ijgG92jaij",
-  "updateMs":30000
+  "updateMs": 30000,
+  "watchingMessage": "for new Blogposts"
 }
 ```
 * add your servers to `servers.json`
@@ -25,17 +26,20 @@ Add your Discord ID (not name), Bot token, and update frequency to the `admin.js
   {
     "id": 15050067772322222,
     "mentionedRole": "everyone",
-    "autoPublish":true
+    "autoPublish": true,
+    "message": null
   },
   {
     "id": 74050067772325222,
     "mentionedRole": null,
-    "autoPublish":false
+    "autoPublish":false,
+    "message": null
   },
   {
     "id": 74050067772325222,
     "mentionedRole": "74036067771625222",
-    "autoPublish":false
+    "autoPublish":false,
+    "message": null
   }
 ]
 ```
diff --git a/build.gradle b/build.gradle
index 0846f42..d7adb7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'de.wulkanat'
-version '1.2'
+version '1.3'
 
 repositories {
     mavenCentral()
diff --git a/src/main/kotlin/de/wulkanat/Admin.kt b/src/main/kotlin/de/wulkanat/Admin.kt
index 43c57cc..a72da95 100644
--- a/src/main/kotlin/de/wulkanat/Admin.kt
+++ b/src/main/kotlin/de/wulkanat/Admin.kt
@@ -13,6 +13,7 @@ object Admin {
     val userId: Long
     val token: String
     val updateMs: Long
+    val message: String
 
     var testModeEnabled: Boolean = false
     set(value) {
@@ -36,6 +37,7 @@ object Admin {
         userId = admin.adminId
         token = admin.token
         updateMs = admin.updateMs
+        message = admin.watchingMessage
     }
 
     var jda: JDA? = null
diff --git a/src/main/kotlin/de/wulkanat/Channels.kt b/src/main/kotlin/de/wulkanat/Channels.kt
index e04dd39..3f2dcf2 100644
--- a/src/main/kotlin/de/wulkanat/Channels.kt
+++ b/src/main/kotlin/de/wulkanat/Channels.kt
@@ -26,14 +26,25 @@ object Channels {
         for (channel_pair in channels) {
             try {
                 val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue
+                val customMessage = channel_pair.message?.message ?: ""
 
                 if (channel_pair.mentionedRole != null) {
                     val message = if (channel_pair.mentionedRole == "everyone") {
-                        "New Blogpost @everyone"
+                        "@everyone $customMessage"
                     } else {
-                        "New Blogpost <@&${channel_pair.mentionedRole}>"
+                        "<@&${channel_pair.mentionedRole}> $customMessage"
+                    }
+                    channel.sendMessage(message).queue {
+                        if (channel_pair.message?.pushAnnouncement == true) {
+                            it.crosspost().queue()
+                        }
+                    }
+                } else if (channel_pair.message != null) {
+                    channel.sendMessage(customMessage).queue {
+                        if (channel_pair.message?.pushAnnouncement == true) {
+                            it.crosspost().queue()
+                        }
                     }
-                    channel.sendMessage(message).queue()
                 }
                 channel.sendMessage(messageEmbed).queue {
                     if (channel_pair.autoPublish) {
@@ -87,7 +98,13 @@ object Channels {
                 "everyone" -> " @everyone"
                 else -> " @${channel.guild.getRoleById(it.mentionedRole ?: "")?.name}"
             }
-            "**${channel.guild.name}**\n#${channel.name}${role}"
+            val publish = if (it.autoPublish) " (publish)" else ""
+            "**${channel.guild.name}**\n#${channel.name}${role}${publish}${if (it.message == null) {
+                ""
+            } else {
+                "\n*${it.message!!.message}*${if (it.message!!.pushAnnouncement) " (publish)" else ""}"
+            }
+            }"
         }
     }
 
diff --git a/src/main/kotlin/de/wulkanat/DataIO.kt b/src/main/kotlin/de/wulkanat/DataIO.kt
index acf3b3c..dd78425 100644
--- a/src/main/kotlin/de/wulkanat/DataIO.kt
+++ b/src/main/kotlin/de/wulkanat/DataIO.kt
@@ -7,14 +7,22 @@ import java.io.File
 data class DiscordChannel(
     val id: Long,
     var mentionedRole: String? = null,
-    var autoPublish: Boolean = false
+    var autoPublish: Boolean = false,
+    var message: CustomMessage? = null
+)
+
+@Serializable
+data class CustomMessage(
+    var message: String,
+    var pushAnnouncement: Boolean = false
 )
 
 @Serializable
 data class AdminFile(
     val adminId: Long,
     val token: String,
-    val updateMs: Long
+    val updateMs: Long,
+    val watchingMessage: String
 )
 
 val SERVERS_FILE = File("servers.json")
diff --git a/src/main/kotlin/de/wulkanat/Main.kt b/src/main/kotlin/de/wulkanat/Main.kt
index c7d5322..3954c72 100644
--- a/src/main/kotlin/de/wulkanat/Main.kt
+++ b/src/main/kotlin/de/wulkanat/Main.kt
@@ -10,7 +10,7 @@ fun main() {
     val builder = JDABuilder.createLight(
         Admin.token,
         GatewayIntent.GUILD_MESSAGES, GatewayIntent.DIRECT_MESSAGES)
-        .setActivity(Activity.watching("for new Blogposts"))
+        .setActivity(Activity.watching(Admin.message))
         .build()
 
     builder.addEventListener(AdminCli())
diff --git a/src/main/kotlin/de/wulkanat/OwnerCli.kt b/src/main/kotlin/de/wulkanat/OwnerCli.kt
index b86ad86..7a20eee 100644
--- a/src/main/kotlin/de/wulkanat/OwnerCli.kt
+++ b/src/main/kotlin/de/wulkanat/OwnerCli.kt
@@ -50,7 +50,7 @@ class OwnerCli : ListenerAdapter() {
                         event.message.channel.sendMessage("Usage: `${prefix}publish [on|off]`")
                     }
                 } else {
-                    event.message.channel.sendMessage("Added.").queue()
+                    event.message.channel.sendMessage("Channel not registered.").queue()
                 }
             }
             "ping" -> {
@@ -84,31 +84,80 @@ class OwnerCli : ListenerAdapter() {
                     event.message.channel.sendMessage("Channel is not registered.").queue()
                 }
             }
+            "setMessage" -> {
+                val result = Channels.channels.find { it.id == channelId }
+                if (result != null) {
+                    if (command.size > 1) {
+                        val message = event.message.contentRaw.removePrefix("${prefix}setMessage").trim()
+                        result.message = CustomMessage(message)
+                        Channels.saveChannels()
+                        event.message.channel.sendMessage("Set `$message` as message.").queue()
+                    } else {
+                        event.message.channel.sendMessage("Usage: `${prefix}setMessage [message]`")
+                    }
+                } else {
+                    event.message.channel.sendMessage("Channel is not registered.").queue()
+                }
+            }
+            "resetMessage" -> {
+                val result = Channels.channels.find { it.id == channelId }
+                if (result != null) {
+                    result.message = null
+                    Channels.saveChannels()
+                    event.message.channel.sendMessage("Reset to no message.").queue()
+                } else {
+                    event.message.channel.sendMessage("Channel is not registered.").queue()
+                }
+            }
+            "publishMessage" -> {
+                val result = Channels.channels.find { it.id == channelId }
+                if (result != null) {
+                    if (result.message != null) {
+                        if (command.size > 1 && listOf("on", "off").contains(command[1])) {
+                            result.message?.pushAnnouncement = command[1] == "on"
+                            Channels.saveChannels()
+
+                            event.message.channel.sendMessage("Auto publish (message) is now ${command[1]}").queue()
+                        } else {
+                            event.message.channel.sendMessage("Usage: `${prefix}publishMessage [on|off]`")
+                        }
+                    } else {
+                        event.message.channel.sendMessage("Channel has no custom message.").queue()
+                    }
+                } else {
+                    event.message.channel.sendMessage("Channel not registered.").queue()
+                }
+            }
             "info" -> {
-                event.message.channel.sendMessage(EmbedBuilder()
-                    .setTitle("Server overview")
-                    .setColor(Color.GREEN)
-                    .setDescription(Channels.getServerNames(event.message.guild.idLong).joinToString("\n"))
-                    .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
-                    .build()).queue()
+                event.message.channel.sendMessage(
+                    EmbedBuilder()
+                        .setTitle("Server overview")
+                        .setColor(Color.GREEN)
+                        .setDescription(Channels.getServerNames(event.message.guild.idLong).joinToString("\n"))
+                        .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
+                        .build()
+                ).queue()
             }
             "report" -> {
                 val errorReport = event.message.contentRaw.removePrefix("${prefix}report")
                 Admin.error(event.message.guild.name, errorReport, event.author)
-                event.message.channel.sendMessage(EmbedBuilder()
-                    .setTitle("Error Report Received")
-                    .setColor(Color.RED)
-                    .setDescription(errorReport)
-                    .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
-                    .build()).queue()
+                event.message.channel.sendMessage(
+                    EmbedBuilder()
+                        .setTitle("Error Report Received")
+                        .setColor(Color.RED)
+                        .setDescription(errorReport)
+                        .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
+                        .build()
+                ).queue()
             }
             "help" -> {
-                event.message.channel.sendMessage(EmbedBuilder()
-                    .setTitle("Help")
-                    .setColor(Color.YELLOW)
-                    .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
-                    .setDescription(
-                        """
+                event.message.channel.sendMessage(
+                    EmbedBuilder()
+                        .setTitle("Help")
+                        .setColor(Color.YELLOW)
+                        .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
+                        .setDescription(
+                            """
                             **${prefix}add**
                             Add this channel to the notified list
                             **${prefix}remove**
@@ -117,14 +166,20 @@ class OwnerCli : ListenerAdapter() {
                             [Community|Partner|Verified only] Auto publish the message if in an announcement channel
                             **${prefix}ping [none|everyone|roleName]**
                             What role to ping
+                            **${prefix}setMessage [message]**
+                            Set a custom message to show
+                            **${prefix}resetMessage**
+                            Reset the message
                             **${prefix}info**
                             Show an overview about all channels registered on this server
                             **${prefix}report**
                             Report an issue to the Bot Admin (this will share your user name so they can contact you)
                             **${prefix}help**
                             Show this message
-                        """.trimIndent())
-                    .build()).queue()
+                        """.trimIndent()
+                        )
+                        .build()
+                ).queue()
             }
         }
     }