fix crash

.idea/codeStyles/Project.xml

@@ -1,6 +1,22 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="kotlin">

.idea/workspace.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="">
+    <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="fix crash on missing permission&#10;add removeInactive command">
-      <change afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/DiscordRpc.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/extensions/File.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" 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$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" 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/AdminCli.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/AdminCli.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/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/OwnerCli.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/OwnerCli.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" />
@@ -134,7 +126,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" />
@@ -251,13 +243,22 @@
       <option name="project" value="LOCAL" />
       <updated>1597438317540</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="Add service announcement channel">
+      <created>1597839954908</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1597839954909</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Add auto publish feature" />
     <MESSAGE value="[1.1]" />
-    <option name="LAST_COMMIT_MESSAGE" value="[1.1]" />
+    <MESSAGE value="Add service announcement channel" />
+    <MESSAGE value="fix crash on missing permission&#10;add removeInactive command" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix crash on missing permission&#10;add removeInactive command" />
   </component>
   <component name="WindowStateProjectService">
     <state x="552" y="179" key="#Project_Structure" timestamp="1597687666334">
@@ -268,6 +269,10 @@
       <screen x="-1050" y="105" width="1050" height="1640" />
     </state>
     <state x="-1050" y="581" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597352463714" />
+    <state x="640" y="249" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1597933755909">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="640" y="249" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597933755909" />
     <state x="633" y="446" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1597362173063">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -284,54 +289,54 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="128" y="270" width="490" height="591" key="#xdebugger.evaluate/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597332665464" />
-    <state x="569" y="115" key="CommitChangelistDialog2" timestamp="1597438316655">
+    <state x="569" y="115" key="CommitChangelistDialog2" timestamp="1598896749015">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="569" y="115" key="CommitChangelistDialog2/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597438316655" />
+    <state x="569" y="115" key="CommitChangelistDialog2/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1598896749015" />
     <state x="740" y="238" key="FileChooserDialogImpl" timestamp="1597605616287">
       <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="1597839551368">
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom" timestamp="1598896802046">
       <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="1597839551368" />
+    <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="1598896802046" />
-    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1597839551368">
+    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1598896802046">
       <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="1597839551368" />
+    <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="1598896802046" />
-    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1597839551368">
+    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1598896802046">
       <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="1597839551368" />
+    <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="1598896802046" />
-    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1597839551368">
+    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1598896802046">
       <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="1597839551368" />
+    <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="1598896802046" />
-    <state width="1876" height="348" key="GridCell.Tab.1.bottom" timestamp="1597837225399">
+    <state width="1876" height="348" key="GridCell.Tab.1.bottom" timestamp="1597840755247">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
-    <state width="1876" height="348" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597837225399" />
+    <state width="1876" height="348" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597840755247" />
-    <state width="1876" height="348" key="GridCell.Tab.1.center" timestamp="1597837225398">
+    <state width="1876" height="348" key="GridCell.Tab.1.center" timestamp="1597840755246">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.1.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
-    <state width="1876" height="348" key="GridCell.Tab.1.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597837225398" />
+    <state width="1876" height="348" key="GridCell.Tab.1.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597840755246" />
-    <state width="1876" height="348" key="GridCell.Tab.1.left" timestamp="1597837225398">
+    <state width="1876" height="348" key="GridCell.Tab.1.left" timestamp="1597840755246">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.1.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
-    <state width="1876" height="348" key="GridCell.Tab.1.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597837225398" />
+    <state width="1876" height="348" key="GridCell.Tab.1.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597840755246" />
-    <state width="1876" height="348" key="GridCell.Tab.1.right" timestamp="1597837225399">
+    <state width="1876" height="348" key="GridCell.Tab.1.right" timestamp="1597840755247">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="1006" height="588" key="GridCell.Tab.1.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
-    <state width="1876" height="348" key="GridCell.Tab.1.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597837225399" />
+    <state width="1876" height="348" key="GridCell.Tab.1.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597840755247" />
     <state x="672" y="237" key="MultipleFileMergeDialog" timestamp="1597438068748">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -341,13 +346,14 @@
     </state>
     <state x="-1040" y="568" key="SettingsEditor/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597353858648" />
     <state x="94" y="257" key="SettingsEditor/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597361509050" />
-    <state x="552" y="254" key="Vcs.Push.Dialog.v2" timestamp="1597438319085">
+    <state x="552" y="254" key="Vcs.Push.Dialog.v2" timestamp="1597839957675">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="254" key="Vcs.Push.Dialog.v2/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597438319085" />
+    <state x="552" y="254" key="Vcs.Push.Dialog.v2/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597839957675" />
-    <state x="2582" y="100" key="new project wizard" timestamp="1597605657341">
+    <state x="497" y="233" key="new project wizard" timestamp="1597841063797">
-      <screen x="1920" y="-213" width="2560" height="1400" />
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state x="497" y="233" key="new project wizard/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597841063797" />
     <state x="2582" y="100" key="new project wizard/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@1920.-213.2560.1400" timestamp="1597605657341" />
     <state x="616" y="240" key="run.anything.popup" timestamp="1597325088886">
       <screen x="0" y="0" width="1920" height="1040" />
@@ -363,7 +369,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="kotlin-line">
           <url>file://$PROJECT_DIR$/src/main/kotlin/de/wulkanat/AdminCli.kt</url>
-          <line>18</line>
+          <line>22</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>

README.md

@@ -53,6 +53,8 @@ I developed it under Windows, and had some trouble compiling it on Linux. You mi
 | !serviceMessage | message | Send a service message to all registered channels |
 | !fakeUpdate | | Cause a fake update (**WARNING**: This will show on **ALL** registered servers) |
 | !refreshList | | Refresh servers and service channels from disk (if you manually edit the JSON files) |
+| !removeInactive | | Remove inactive channels |
+| !help | | Show a help dialog with all these commands |
 
 These commands will only work by private messaging the bot (and will be ignored if they don't
 come from the admin registered in the `admin.json`.

build.gradle

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

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

@@ -3,14 +3,18 @@ package de.wulkanat
 import de.wulkanat.model.BlogPostPreview
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 import de.wulkanat.web.SiteWatcher
+import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.events.message.priv.PrivateMessageReceivedEvent
+import java.awt.Color
 import kotlin.system.exitProcess
 
 class AdminCli : ListenerAdapter() {
+    val prefix = "!"
+
     override fun onPrivateMessageReceived(event: PrivateMessageReceivedEvent) {
         val msg = event.message.contentRaw
         if (event.author.idLong != Admin.userId ||
-            !msg.startsWith("!")
+            !msg.startsWith(prefix)
         ) {
             return
         }
@@ -45,6 +49,43 @@ class AdminCli : ListenerAdapter() {
                 Channels.serviceChannels = Channels.refreshServiceChannelsFromDisk()
                 Admin.info()
             }
+            "removeInactive" -> {
+                Channels.channels.removeAll { channel ->
+                    Channels.testServerId(channel.id) ?: run {
+                        Admin.println("Removed ${channel.id}")
+                        null
+                    } == null
+                }
+                Admin.info()
+                Channels.saveChannels()
+            }
+            "help" -> {
+                event.message.channel.sendMessage(
+                    EmbedBuilder()
+                        .setTitle("Help")
+                        .setColor(Color.YELLOW)
+                        .setAuthor(Admin.admin?.name, Admin.admin?.avatarUrl, Admin.admin?.avatarUrl)
+                        .setDescription(
+                            """
+                            **${prefix}stop**
+                            Stop the bot
+                            **${prefix}fakeUpdate**
+                            Post a fake update to every registered channel (can be used if bot missed the update)
+                            **${prefix}info**
+                            Show an overview over all registered channels
+                            **${prefix}serviceMessage [title] [message]**
+                            Show a service message (update info etc) to all registered service channels
+                            **${prefix}refreshList**
+                            Refresh server list from disk
+                            **${prefix}removeInactive**
+                            Remove inactive channels
+                            **${prefix}help**
+                            Show this message
+                        """.trimIndent()
+                        )
+                        .build()
+                ).queue()
+            }
         }
     }
 }

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

@@ -1,15 +1,12 @@
 package de.wulkanat
 
 import de.wulkanat.extensions.crosspost
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
 import net.dv8tion.jda.api.EmbedBuilder
 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
 import java.awt.Color
 
 object Channels {
@@ -53,8 +50,8 @@ object Channels {
                         it.crosspost().queue()
                     }
                 }
-            } catch (e: ErrorResponseException) {
+            } catch (e: Exception) {
-                Admin.error("Error in server", e.message ?: e.localizedMessage)
+                Admin.error("Error in server ${channel_pair.id}", e.message ?: e.localizedMessage)
             }
         }
     }