Add self-configuration feature

2025-12-12 13:56:18 +00:00 · 2020-08-17 20:22:27 +02:00
8 changed files with 59 additions and 161 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,15 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/OwnerCli.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" 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/Cli.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/AdminCli.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/DataIO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/DataIO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Main.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Main.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/web/SiteWatcher.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/web/SiteWatcher.kt" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -122,7 +130,7 @@
      <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot\src\main\kotlin\de\wulkanat" />
    </key>
  </component>
-  <component name="RunManager" selected="Kotlin.MainKt">
+  <component name="RunManager" selected="Gradle.HytaleUpdateBot [fatJar]">
    <configuration name="HytaleUpdateBot [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
      <ExternalSystemSettings>
        <option name="executionName" />
@@ -199,8 +207,8 @@
    </configuration>
    <recent_temporary>
      <list>
-        <item itemvalue="Kotlin.MainKt" />
        <item itemvalue="Gradle.HytaleUpdateBot [fatJar]" />
+        <item itemvalue="Kotlin.MainKt" />
        <item itemvalue="Gradle.HytaleUpdateBot [build]" />
        <item itemvalue="Gradle.HytaleUpdateBot [clean]" />
        <item itemvalue="JAR Application.HytaleUpdateBot-all-1.0-SNAPSHOT.jar" />
@@ -280,26 +288,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="1597739482072">
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom" timestamp="1597438612599">
      <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="1597739482072" />
-    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1597739482072">
+    <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="1597438612599" />
+    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1597438612598">
      <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="1597739482072" />
-    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1597739482072">
+    <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="1597438612598" />
+    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1597438612597">
      <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="1597739482072" />
-    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1597739482072">
+    <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="1597438612597" />
+    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1597438612599">
      <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="1597739482072" />
+    <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="1597438612599" />
    <state width="1006" height="588" key="GridCell.Tab.1.bottom" timestamp="1597366506508">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
@@ -341,10 +349,10 @@
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="616" y="240" key="run.anything.popup/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597325088886" />
-    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1597702900013">
+    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1597363843473">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
-    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597702900013" />
+    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597363843473" />
  </component>
  <component name="XDebuggerManager">
    <watches-manager>
--- a/README.md
+++ b/README.md
@@ -16,8 +16,7 @@ Add your Discord ID (not name), Bot token, and update frequency to the `admin.js
 {
  "adminId": 12345678910,
  "token": "AOGH@(AKnjsfjiJijaig3ijgG92jaij",
-  "updateMs": 30000,
-  "watchingMessage": "for new Blogposts"
+  "updateMs":30000
 }
 ```
 * add your servers to `servers.json`
@@ -26,20 +25,17 @@ Add your Discord ID (not name), Bot token, and update frequency to the `admin.js
  {
    "id": 15050067772322222,
    "mentionedRole": "everyone",
-    "autoPublish": true,
-    "message": null
+    "autoPublish":true
  },
  {
    "id": 74050067772325222,
    "mentionedRole": null,
-    "autoPublish":false,
-    "message": null
+    "autoPublish":false
  },
  {
    "id": 74050067772325222,
    "mentionedRole": "74036067771625222",
-    "autoPublish":false,
-    "message": null
+    "autoPublish":false
  }
 ]
 ```
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }

 group 'de.wulkanat'
-version '1.3'
+version '1.1'

 repositories {
    mavenCentral()
--- a/src/main/kotlin/de/wulkanat/Admin.kt
+++ b/src/main/kotlin/de/wulkanat/Admin.kt
@@ -13,7 +13,6 @@ object Admin {
    val userId: Long
    val token: String
    val updateMs: Long
-    val message: String

    var testModeEnabled: Boolean = false
    set(value) {
@@ -37,7 +36,6 @@ object Admin {
        userId = admin.adminId
        token = admin.token
        updateMs = admin.updateMs
-        message = admin.watchingMessage
    }

    var jda: JDA? = null
@@ -73,19 +71,12 @@ object Admin {
        )
    }

-    fun error(msg: String, error: String, author: User? = null) {
+    fun error(msg: String, error: String) {
        sendDevMessage(
            EmbedBuilder()
                .setTitle(msg)
                .setDescription(error)
                .setColor(Color.RED)
-                .run {
-                    if (author == null) {
-                        this
-                    } else {
-                        this.setAuthor(author.asTag, author.avatarUrl, author.avatarUrl)
-                    }
-                }
                .build()
            , "$msg\n\n${error}"
        )
--- a/src/main/kotlin/de/wulkanat/Channels.kt
+++ b/src/main/kotlin/de/wulkanat/Channels.kt
@@ -8,7 +8,6 @@ import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.entities.MessageEmbed
 import net.dv8tion.jda.api.entities.TextChannel
-import net.dv8tion.jda.api.exceptions.ErrorResponseException

 object Channels {
    var jda: JDA? = null
@@ -24,35 +23,20 @@ object Channels {
            return

        for (channel_pair in channels) {
-            try {
-                val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue
-                val customMessage = channel_pair.message?.message ?: ""
+            val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue

-                if (channel_pair.mentionedRole != null) {
-                    val message = if (channel_pair.mentionedRole == "everyone") {
-                        "@everyone $customMessage"
-                    } else {
-                        "<@&${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()
-                        }
-                    }
+            if (channel_pair.mentionedRole != null) {
+                val message = if (channel_pair.mentionedRole == "everyone") {
+                    "New Blogpost @everyone"
+                } else {
+                    "New Blogpost <@&${channel_pair.mentionedRole}>"
                }
-                channel.sendMessage(messageEmbed).queue {
-                    if (channel_pair.autoPublish) {
-                        it.crosspost().queue()
-                    }
+                channel.sendMessage(message).queue()
+            }
+            channel.sendMessage(messageEmbed).queue {
+                if (channel_pair.autoPublish) {
+                    it.crosspost().queue()
                }
-            } catch (e: ErrorResponseException) {
-                Admin.error("Error in server", e.message ?: e.localizedMessage)
            }
        }
    }
@@ -86,7 +70,7 @@ object Channels {
        if (jda == null)
            return listOf()

-        return channels.filter { server == null || (jda!!.getTextChannelById(it.id)?.guild?.idLong == server) }.map {
+        return channels.filter { server != null && (jda!!.getTextChannelById(it.id)?.guild?.idLong == server) }.map {
            val channel = jda!!.getTextChannelById(it.id)
            if (channel == null) {
                Admin.warning("Channel ${it.id} is no longer active!")
@@ -98,13 +82,7 @@ object Channels {
                "everyone" -> " @everyone"
                else -> " @${channel.guild.getRoleById(it.mentionedRole ?: "")?.name}"
            }
-            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 ""}"
-            }
-            }"
+            "**${channel.guild.name}**\n#${channel.name}${role}"
        }
    }

--- a/src/main/kotlin/de/wulkanat/DataIO.kt
+++ b/src/main/kotlin/de/wulkanat/DataIO.kt
@@ -7,22 +7,14 @@ import java.io.File
 data class DiscordChannel(
    val id: Long,
    var mentionedRole: String? = null,
-    var autoPublish: Boolean = false,
-    var message: CustomMessage? = null
-)
-
-@Serializable
-data class CustomMessage(
-    var message: String,
-    var pushAnnouncement: Boolean = false
+    var autoPublish: Boolean = false
 )

@Serializable
 data class AdminFile(
    val adminId: Long,
    val token: String,
-    val updateMs: Long,
-    val watchingMessage: String
+    val updateMs: Long
 )

 val SERVERS_FILE = File("servers.json")
--- 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(Admin.message))
+        .setActivity(Activity.watching("for new Blogposts"))
        .build()

    builder.addEventListener(AdminCli())
--- a/src/main/kotlin/de/wulkanat/OwnerCli.kt
+++ b/src/main/kotlin/de/wulkanat/OwnerCli.kt
@@ -45,12 +45,12 @@ class OwnerCli : ListenerAdapter() {
                        result.autoPublish = command[1] == "on"
                        Channels.saveChannels()

-                        event.message.channel.sendMessage("Auto publish is now ${command[1]}").queue()
+                        event.message.channel.sendMessage("Auto publish is now on").queue()
                    } else {
                        event.message.channel.sendMessage("Usage: `${prefix}publish [on|off]`")
                    }
                } else {
-                    event.message.channel.sendMessage("Channel not registered.").queue()
+                    event.message.channel.sendMessage("Added.").queue()
                }
            }
            "ping" -> {
@@ -84,80 +84,21 @@ 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()
-            }
-            "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("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()
            }
            "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**
@@ -166,20 +107,12 @@ 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()
            }
        }
    }