Add self-configuration feature

README.md

@@ -1,8 +1,14 @@
 # BlogShot
 A bot that automatically polls the newest blogpost from [Hytale News Tab](https://www.hytale.com/news) and posts a message into servers if there is a new one.
-## Setup
-Okay, this isn't really meant for you to setup, if you want it though it first is easier to just dm me on Twitter [@tale_talk](https://twitter.com/tale_talk) so I can add you to the server list.
-If you *really* want to set it up yourself, fine.
+## Add to your server
+Click [this](https://discord.com/api/oauth2/authorize?client_id=743447329901641799&permissions=150528&scope=bot) link to invite
+the bot to your server. Please note that only people with *Administrator* permission will be able to
+configure it.
+
+You can type `%!info` to get an overview over all available commands.
+
+## Self Hosting
+Okay, this isn't really meant for you to setup, but if you *really* want to set it up yourself, fine.
 * first go to the release tab, download the jar, and put it in a folder
 * Add two files in the root of the repo, an `admin.json` and a `servers.json`.
 Add your Discord ID (not name), Bot token, and update frequency to the `admin.json`:

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'de.wulkanat'
-version '1.1'
+version '1.2'
 
 repositories {
     mavenCentral()

src/main/kotlin/de/wulkanat/Admin.kt

@@ -49,7 +49,7 @@ object Admin {
             kotlin.io.println("Connected to ${admin!!.name}. No further errors will be printed here.")
         }
     }
-    private var admin: User? = null
+    var admin: User? = null
 
     fun println(msg: String) {
         sendDevMessage(
@@ -71,12 +71,19 @@ object Admin {
         )
     }
 
-    fun error(msg: String, error: String) {
+    fun error(msg: String, error: String, author: User? = null) {
         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}"
         )

src/main/kotlin/de/wulkanat/Cli.kt → src/main/kotlin/de/wulkanat/AdminCli.kt

@@ -8,7 +8,7 @@ import net.dv8tion.jda.api.events.ExceptionEvent
 import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent
 import kotlin.system.exitProcess
 
-class Cli : ListenerAdapter() {
+class AdminCli : ListenerAdapter() {
     override fun onPrivateMessageReceived(event: PrivateMessageReceivedEvent) {
         val msg = event.message.contentRaw
         if (event.author.idLong != Admin.userId ||

src/main/kotlin/de/wulkanat/Channels.kt

@@ -8,6 +8,7 @@ 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
@@ -23,20 +24,24 @@ object Channels {
             return
 
         for (channel_pair in channels) {
-            val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue
-
-            if (channel_pair.mentionedRole != null) {
-                val message = if (channel_pair.mentionedRole == "everyone") {
-                    "New Blogpost @everyone"
-                } else {
-                    "New Blogpost <@&${channel_pair.mentionedRole}>"
+            try {
+                val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue
+
+                if (channel_pair.mentionedRole != null) {
+                    val message = if (channel_pair.mentionedRole == "everyone") {
+                        "New Blogpost @everyone"
+                    } else {
+                        "New Blogpost <@&${channel_pair.mentionedRole}>"
+                    }
+                    channel.sendMessage(message).queue()
                 }
-                channel.sendMessage(message).queue()
-            }
-            channel.sendMessage(messageEmbed).queue {
-                if (channel_pair.autoPublish) {
-                    it.crosspost().queue()
+                channel.sendMessage(messageEmbed).queue {
+                    if (channel_pair.autoPublish) {
+                        it.crosspost().queue()
+                    }
                 }
+            } catch (e: ErrorResponseException) {
+                Admin.error("Error in server", e.message ?: e.localizedMessage)
             }
         }
     }
@@ -66,11 +71,11 @@ object Channels {
         ).toMutableList()
     }
 
-    fun getServerNames(): List<String> {
+    fun getServerNames(server: Long? = null): List<String> {
         if (jda == null)
             return listOf()
 
-        return channels.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!")
@@ -80,7 +85,7 @@ object Channels {
             val role = when (it.mentionedRole) {
                 null -> ""
                 "everyone" -> " @everyone"
-                else -> " @${channel.guild.getRoleById(it.mentionedRole)?.name}"
+                else -> " @${channel.guild.getRoleById(it.mentionedRole ?: "")?.name}"
             }
             "**${channel.guild.name}**\n#${channel.name}${role}"
         }
@@ -90,12 +95,17 @@ object Channels {
         return jda?.getTextChannelById(id)
     }
 
-    fun addChannel(id: Long, role: String?) {
-        channels.add(DiscordChannel(id, role))
+    fun addChannel(id: Long, role: String?): DiscordChannel? {
+        if (channels.find { it.id == id } != null) {
+            return null
+        }
+        val out = DiscordChannel(id, role)
+        channels.add(out)
         saveChannels()
+        return out
     }
 
-    private fun saveChannels() {
+    fun saveChannels() {
         SERVERS_FILE.writeText(
             json.stringify(
                 DiscordChannel.serializer().list,

src/main/kotlin/de/wulkanat/DataIO.kt

@@ -6,8 +6,8 @@ import java.io.File
 @Serializable
 data class DiscordChannel(
     val id: Long,
-    val mentionedRole: String? = null,
-    val autoPublish: Boolean = false
+    var mentionedRole: String? = null,
+    var autoPublish: Boolean = false
 )
 
 @Serializable

src/main/kotlin/de/wulkanat/Main.kt

@@ -13,8 +13,9 @@ fun main() {
         .setActivity(Activity.watching("for new Blogposts"))
         .build()
 
-    builder.addEventListener(Cli())
+    builder.addEventListener(AdminCli())
     builder.addEventListener(ErrorHandler())
+    builder.addEventListener(OwnerCli())
     builder.awaitReady()
 
     Channels.jda = builder