prepare twitter integration

.gitignore

@@ -1,7 +1,7 @@
 servers.json
-config.json
+admin.json
+twitter.json
 service_channels.json
 *.hprof
-/build/
-/.gradle/
-/.idea/
+/build
+/.gradle

.idea/dictionaries/wulkanat.xml

@@ -2,7 +2,6 @@
   <dictionary name="wulkanat">
     <words>
       <w>crosspost</w>
-      <w>hytale</w>
     </words>
   </dictionary>
 </component>

.idea/gradle.xml

@@ -4,15 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
-        <option name="useAutoImport" value="true" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/jarRepositories.xml

@@ -21,5 +21,10 @@
       <option name="name" value="BintrayJCenter" />
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://dl.bintray.com/nephyproject/stable" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/workspace.xml

@@ -4,9 +4,19 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="no idea what that did">
+    <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$/.idea/compiler.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Twitter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <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/DiscordRpc.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/DiscordRpc.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" 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/DataIO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/DataIO.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,25 +53,17 @@
       <list>
         <option value="Class" />
         <option value="Kotlin Class" />
-        <option value="Kotlin Object" />
         <option value="Kotlin File" />
+        <option value="Kotlin Object" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="not-sure" />
-      </map>
-    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/build.gradle" root0="SKIP_INSPECTION" />
   </component>
-  <component name="MacroExpansionManager">
-    <option name="directoryName" value="o7p0t8es" />
-  </component>
   <component name="ProjectId" id="1g2oQiuUv1Bu6ZCW2NSVzB1V6Sc" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -71,13 +73,17 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/build/libs" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="last_opened_file_path" value="D:/wulkanat/Desktop/scad" />
+    <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot" />
+      <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot\src\main\kotlin\de\wulkanat" />
+    </key>
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
       <recent name="de.wulkanat" />
     </key>
@@ -85,12 +91,8 @@
       <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot\build\libs" />
       <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot\src" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot" />
-      <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot\src\main\kotlin\de\wulkanat" />
-    </key>
   </component>
-  <component name="RunManager" selected="Application.MainKt">
+  <component name="RunManager" selected="Kotlin.MainKt">
     <configuration name="HytaleUpdateBot [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -107,9 +109,7 @@
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
     <configuration name="HytaleUpdateBot [clean]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -128,9 +128,7 @@
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
     <configuration name="HytaleUpdateBot [fatJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -149,9 +147,7 @@
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
       <method v="2" />
     </configuration>
     <configuration name="HytaleUpdateBot-all-1.0-SNAPSHOT.jar" type="JarApplication" temporary="true">
@@ -173,10 +169,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Gradle.HytaleUpdateBot [fatJar]" />
-        <item itemvalue="Gradle.HytaleUpdateBot [build]" />
-        <item itemvalue="Gradle.HytaleUpdateBot [clean]" />
+        <item itemvalue="Kotlin.MainKt" />
         <item itemvalue="JAR Application.HytaleUpdateBot-all-1.0-SNAPSHOT.jar" />
+        <item itemvalue="Gradle.HytaleUpdateBot [fatJar]" />
+        <item itemvalue="Gradle.HytaleUpdateBot [clean]" />
+        <item itemvalue="Gradle.HytaleUpdateBot [build]" />
       </list>
     </recent_temporary>
   </component>
@@ -220,35 +217,131 @@
       <option name="project" value="LOCAL" />
       <updated>1597839954909</updated>
     </task>
-    <task id="LOCAL-00005" summary="prepare twitter integration">
-      <created>1601042375685</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1601042375685</updated>
-    </task>
-    <option name="localTasksCounter" value="6" />
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Add auto publish feature" />
     <MESSAGE value="[1.1]" />
     <MESSAGE value="Add service announcement channel" />
     <MESSAGE value="fix crash on missing permission&#10;add removeInactive command" />
-    <MESSAGE value="prepare twitter integration" />
-    <option name="LAST_COMMIT_MESSAGE" value="prepare twitter integration" />
+    <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">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="552" y="179" key="#Project_Structure/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597687666334" />
+    <state x="-1050" y="581" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1597352463714">
+      <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="721" y="322" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1600521197421">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="721" y="322" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1600521197421" />
+    <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>
+    <state x="633" y="446" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362173063" />
+    <state x="690" y="268" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1600521191335">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="690" y="268" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1600521191335" />
+    <state x="739" y="173" width="484" height="693" key="#org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog" timestamp="1600521350860">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="739" y="173" width="484" height="693" key="#org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1600521350860" />
+    <state x="128" y="270" width="490" height="591" key="#xdebugger.evaluate" timestamp="1597332665464">
+      <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="707" y="410" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1600519459190">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="707" y="410" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1600519459190" />
+    <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="1598896749015" />
+    <state x="740" y="238" key="FileChooserDialogImpl" timestamp="1600526412825">
+      <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="1600526412825" />
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom" timestamp="1598897086460">
+      <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="1598897086460" />
+    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1598897086460">
+      <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="1598897086460" />
+    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1598897086460">
+      <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="1598897086460" />
+    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1598897086460">
+      <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="1598897086460" />
+    <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="1597840755247" />
+    <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="1597840755246" />
+    <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="1597840755246" />
+    <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="1597840755247" />
+    <state x="540" y="255" key="IDE.errors.dialog" timestamp="1600518939456">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="540" y="255" key="IDE.errors.dialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1600518939456" />
+    <state x="672" y="237" key="MultipleFileMergeDialog" timestamp="1597438068748">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="672" y="237" key="MultipleFileMergeDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597438068748" />
+    <state x="258" y="129" width="1040" height="840" key="SettingsEditor" timestamp="1600519526693">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </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="258" y="129" width="1040" height="840" key="SettingsEditor/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1600519526693" />
+    <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="1597839957675" />
+    <state x="497" y="233" key="new project wizard" timestamp="1599125522860">
+      <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="1599125522860" />
+    <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" />
+    </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">
+      <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" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

README.md

@@ -31,17 +31,15 @@ the bot should message you on Discord.
 
 *Note:* You need to invite the bot into a server before it can message you.
 
-Run it once (it should crash or print an error), so `config.json`, `servers.json` and `service_channels.json`
+Run it once (it should crash or print an error), so `admin.json`, `servers.json` and `service_channels.json`
 are being created.
-Add your Discord ID `adminId` (not name), Bot token `token`, and update frequency `updateMs` to the `config.json`,
+Add your Discord ID `adminId` (not name), Bot token `token`, and update frequency `updateMs` to the `admin.json`,
 optionally you can add your own messages for when the bot is looking and when it can't reach Hytale Servers.
 
 If you verified that everything works correctly, you can start the server in the background, on Linux that is
-`nohup java -Xmx1024m -jar [server-file-name]`. To stop it you can either type `!stop` in the Admin Console (Discord PM) or
+`nohup java -jar [server-file-name]`. To stop it you can either type `!stop` in the Admin Console (Discord PM) or
 if the bot is unresponsive the the PID of it through `ps -ef` and `kill [pid]`
 
-I'm not 100% certain how much RAM the bot needs, default is typically `-Xmx256m`, and that lead to some issues, `-Xmx512m` is probably plenty, because my server has
-tons of unused ram I set it to `-Xmx2048m`, just try and look what works for you.
 
 ## Compiling yourself
 I developed it under Windows, and had some trouble compiling it on Linux. You mileage may vary.
@@ -59,7 +57,7 @@ I developed it under Windows, and had some trouble compiling it on Linux. You mi
 | !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 `config.json`.
+come from the admin registered in the `admin.json`.
 
 ## TODO
 
@@ -69,4 +67,4 @@ we were over the official Hytale Twitter.
 ## Other
 
 Thanks to [Forcellrus](https://github.com/Forcellrus/Discord-Auto-Publisher) for discovering a way to auto publish messages
-in news channels
+in news channels

build.gradle

@@ -0,0 +1,50 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.4.0'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.0'
+}
+
+group 'de.wulkanat'
+version '1.4.1'
+
+repositories {
+    mavenCentral()
+    jcenter()
+
+    maven {
+        url 'https://dl.bintray.com/nephyproject/stable'
+    }
+}
+
+dependencies {
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    implementation 'blue.starry:penicillin:5.0.0'
+
+    compile 'net.dv8tion:JDA:4.2.0_204'
+    compile 'org.jsoup:jsoup:1.13.1'
+    compile 'org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC'
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = '1.8'
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = '1.8'
+}
+
+jar {
+    manifest {
+        attributes('Main-Class': 'de.wulkanat.MainKt')
+    }
+}
+
+task fatJar(type: Jar) {
+    baseName = project.name + '-all'
+    from((configurations.compile.findAll { !it.path.endsWith('.pom') }).collect {
+        it.isDirectory() ? it : zipTree(it)
+    })
+    with jar
+    manifest {
+        attributes 'Main-Class': 'de.wulkanat.MainKt',
+                'Implementation-Version': version
+    }
+}

build.gradle.kts

@@ -1,61 +0,0 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    val kotlinVersion = "1.4.10"
-
-    kotlin("jvm") version kotlinVersion
-    kotlin("plugin.serialization") version kotlinVersion
-
-    id("org.jetbrains.kotlin.kapt") version kotlinVersion
-}
-
-group = "de.wulkanat"
-version = "2.0.0"
-
-repositories {
-    mavenCentral()
-    jcenter()
-    maven("https://kotlin.bintray.com/koltinx")
-    maven("https://dl.bintray.com/kordlib/Kord")
-}
-
-dependencies {
-    testImplementation(kotlin("test-junit"))
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-
-    implementation("org.jsoup:jsoup:1.13.1")
-
-    implementation("dev.kord:kord-common:0.7.0-RC")
-    implementation("com.gitlab.kordlib.kordx:kordx-commands-runtime-kord:0.3.4")
-    implementation("com.gitlab.kordlib:kordx.emoji:0.4.0")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
-
-    kapt("com.gitlab.kordlib.kordx:kordx-commands-processor:0.3.4")
-}
-
-tasks.test {
-    useJUnit()
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-tasks.withType<Jar> {
-    manifest {
-        attributes(mapOf(Pair("Main-Class", "de.wulkanat.MainKt")))
-    }
-}
-
-tasks.create<Jar>("fatJar") {
-    archiveBaseName.set("${project.name}-all")
-    manifest {
-        attributes["Implementation-Version"] = archiveVersion
-        attributes["Main-Class"] = "de.wulkanat.MainKt"
-    }
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    with(tasks.jar.get() as CopySpec)
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'HytaleUpdateBot'
+

settings.gradle.kts

@@ -1,2 +0,0 @@
-rootProject.name = "HytaleUpdateBot"
-

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

@@ -1,82 +1,142 @@
 package de.wulkanat
 
-import com.gitlab.kordlib.common.entity.Snowflake
-import com.gitlab.kordlib.core.Kord
-import com.gitlab.kordlib.core.behavior.channel.createEmbed
-import com.gitlab.kordlib.core.entity.User
-import com.gitlab.kordlib.rest.builder.message.EmbedBuilder
-import de.wulkanat.files.Config
-import de.wulkanat.files.ServiceChannels
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.JDA
+import net.dv8tion.jda.api.entities.MessageEmbed
+import net.dv8tion.jda.api.entities.User
 import java.awt.Color
 
 object Admin {
-    var jda: Kord? = null
+    val userId: Long
+    val token: String
+    val updateMs: Long
+    val message: String
+    val offlineMessage: String
+
+    init {
+        val admin = Json { allowStructuredMapKeys = true }.decodeFromString(
+            AdminFile.serializer(),
+            ADMIN_FILE.readText()
+        )
+        userId = admin.adminId
+        token = admin.token
+        updateMs = admin.updateMs
+        message = admin.watchingMessage
+        offlineMessage = admin.offlineMessage
+    }
+
+    var jda: JDA? = null
     set(value) {
         field = value
 
-        GlobalScope.launch {
-            admin = value?.getUser(Snowflake(Config.adminId))
-            if (admin == null) {
-                kotlin.io.println("Connection to de.wulkanat.Admin failed!")
-            } else {
-                kotlin.io.println("Connected to ${admin!!.username}. No further errors will be printed here.")
-            }
+        admin = value?.retrieveUserById(userId)?.complete()
+        if (admin == null) {
+            kotlin.io.println("Connection to de.wulkanat.Admin failed!")
+        } else {
+            kotlin.io.println("Connected to ${admin!!.name}. No further errors will be printed here.")
         }
     }
     var admin: User? = null
 
-    suspend fun println(msg: String) {
-        sendDevMessage(msg) {
-            title = msg
-            color = Color.WHITE
-        }
+    fun println(msg: String) {
+        sendDevMessage(
+            EmbedBuilder()
+                .setTitle(msg)
+                .setColor(Color.WHITE)
+                .build(),
+            msg
+        )
     }
 
-    suspend fun error(msg: String, error: String, author: User? = null) {
-        sendDevMessage("$msg\n\n$error") {
-            title = msg
-            description = error
-            color = Color.RED
-            author?.let { author {
-                name = it.tag
-                icon = it.avatar.url
-                url = it.avatar.url
-            }}
-        }
+    fun printlnBlocking(msg: String) {
+        senDevMessageBlocking(
+            EmbedBuilder()
+                .setTitle(msg)
+                .setColor(Color.WHITE)
+                .build(),
+            msg
+        )
     }
 
-    suspend fun warning(msg: String) {
-        sendDevMessage(msg) {
-            title = msg
-            color = Color.YELLOW
-        }
+    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}"
+        )
     }
 
-    suspend fun info() {
-        sendDevMessage("Now watching for new Hytale BlogPosts") {
-            title = "Now watching for new Hytale Blogposts every ${Config.updateMs / 1000}s"
-            description = """
-                ${ServiceChannels.getServerNames().joinToString("\n")}
-                
-                **_Service Channels_**
-                ${ServiceChannels.getServiceChannelServers().joinToString("\n")}
-            """.trimIndent()
-            color = Color.GREEN
-        }
+    fun errorBlocking(msg: String, error: Exception) {
+        senDevMessageBlocking(
+            EmbedBuilder()
+                .setTitle(msg)
+                .setDescription(error.message)
+                .setColor(Color.RED)
+                .build()
+            , "$msg\n\n${error.message}"
+        )
+    }
+
+    fun warning(msg: String) {
+        sendDevMessage(
+            EmbedBuilder()
+                .setTitle(msg)
+                .setColor(Color.YELLOW)
+                .build(),
+            msg
+        )
+    }
+
+    fun info() {
+        sendDevMessage(
+            EmbedBuilder()
+                .setTitle("Now watching for new Hytale Blogposts every ${updateMs / 1000}s")
+                .setDescription("""
+                    ${Channels.getServerNames().joinToString("\n")}
+                    
+                    **_Service Channels_**
+                    ${Channels.getServiceChannelServers().joinToString("\n")}
+                """.trimIndent())
+                .setColor(Color.GREEN)
+                .build(),
+            "Now watching for new Hytale BlogPosts"
+        )
     }
 
     fun silent(msg: String) {
         kotlin.io.println(msg)
     }
 
-    private suspend inline fun sendDevMessage(fallback: String, crossinline embed: EmbedBuilder.() -> Unit) {
-        val devChannel = admin?.getDmChannel() ?: kotlin.run {
+    private fun senDevMessageBlocking(messageEmbed: MessageEmbed, fallback: String) {
+        admin = jda!!.retrieveUserById(userId).complete()
+        val devChannel = admin?.openPrivateChannel() ?: kotlin.run {
             kotlin.io.println(fallback)
             return
         }
 
-        devChannel.createEmbed(embed)
+        devChannel.complete()
+            .sendMessage(messageEmbed).complete()
+    }
+
+    fun sendDevMessage(messageEmbed: MessageEmbed, fallback: String) {
+        val devChannel = admin?.openPrivateChannel() ?: kotlin.run {
+            kotlin.io.println(fallback)
+            return
+        }
+
+        devChannel.queue {
+            it.sendMessage(messageEmbed).queue()
+        }
     }
 }

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

@@ -0,0 +1,91 @@
+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(prefix)
+        ) {
+            return
+        }
+        val command = Regex("[^\\s`]+|`[^`]*`").findAll(msg.removePrefix("!")).toList()
+
+        when (command[0].value) {
+            "stop" -> exitProcess(1)
+            "fakeUpdate" -> {
+                SiteWatcher.newestBlog = BlogPostPreview(
+                    title = "FakePost",
+                    imgUrl = "",
+                    fullPostUrl = "",
+                    author = "wulkanat",
+                    date = "now",
+                    description = "Lorem Ipsum"
+                )
+
+                Admin.println("Posting on next update cycle.")
+            }
+            "info" -> {
+                Admin.info()
+            }
+            "serviceMessage" -> {
+                if (command.size != 3) {
+                    Admin.println("Enclose message and title in backticks (`)")
+                } else {
+                    Channels.sendServiceMessage(command[1].value.trim('`'), command[2].value.trim('`'))
+                }
+            }
+            "refreshList" -> {
+                Channels.channels = Channels.refreshChannelsFromDisk()
+                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,10 +1,6 @@
-package de.wulkanat.files
+package de.wulkanat
 
-import com.gitlab.kordlib.core.Kord
-import com.gitlab.kordlib.core.entity.Embed
-import com.gitlab.kordlib.rest.builder.message.EmbedBuilder
-import de.wulkanat.*
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.ListSerializer
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.Permission
@@ -12,8 +8,8 @@ import net.dv8tion.jda.api.entities.MessageEmbed
 import net.dv8tion.jda.api.entities.TextChannel
 import java.awt.Color
 
-object ServiceChannels {
-    var client: Kord? = null
+object Channels {
+    var jda: JDA? = null
 
     /**
      * List of (ServerID, ChannelID)
@@ -21,13 +17,13 @@ object ServiceChannels {
     var channels: MutableList<DiscordChannel> = refreshChannelsFromDisk()
     var serviceChannels: MutableList<ServiceChannel> = refreshServiceChannelsFromDisk()
 
-    fun sentToAll(messageEmbed: Embed) {
-        if (client == null)
+    fun sentToAll(messageEmbed: MessageEmbed) {
+        if (jda == null)
             return
 
         for (channel_pair in channels) {
             try {
-                val channel = client!!.getTextChannelById(channel_pair.id) ?: continue
+                val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue
                 val customMessage = channel_pair.message?.message ?: ""
 
                 if (channel_pair.mentionedRole != null) {
@@ -69,14 +65,13 @@ object ServiceChannels {
             .build()
 
         for (channelInfo in serviceChannels) {
-            val channel = client!!.getTextChannelById(channelInfo.id)
+            val channel = jda!!.getTextChannelById(channelInfo.id)
 
             channel?.sendMessage(serviceMessage)?.queue()
         }
 
         Admin.println("Service message distributed to ${serviceChannels.size} channels.")
-        Admin.sendDevMessage(
-            serviceMessage, """
+        Admin.sendDevMessage(serviceMessage, """
             ***************
             SERVICE MESSAGE
             
@@ -84,13 +79,12 @@ object ServiceChannels {
             -------
             $message
             ***************
-        """.trimIndent()
-        )
+        """.trimIndent())
     }
 
     fun checkEveryonePermission() {
         for (channel_pair in channels) {
-            val channel = client!!.getTextChannelById(channel_pair.id) ?: continue
+            val channel = jda!!.getTextChannelById(channel_pair.id) ?: continue
 
             if (channel_pair.mentionedRole == "everyone" &&
                 channel.guild.selfMember.hasPermission(Permission.MESSAGE_MENTION_EVERYONE)
@@ -104,23 +98,23 @@ object ServiceChannels {
     }
 
     fun refreshChannelsFromDisk(): MutableList<DiscordChannel> {
-        return json.parse(
-            DiscordChannel.serializer().list, (SERVERS_FILE).readText()
+        return json.decodeFromString(
+            ListSerializer(DiscordChannel.serializer()), (SERVERS_FILE).readText()
         ).toMutableList()
     }
 
     fun refreshServiceChannelsFromDisk(): MutableList<ServiceChannel> {
-        return json.parse(
-            ServiceChannel.serializer().list, (SERVICE_CHANNELS_FILE).readText()
+        return json.decodeFromString(
+            ListSerializer(ServiceChannel.serializer()), (SERVICE_CHANNELS_FILE).readText()
         ).toMutableList()
     }
 
     fun getServerNames(server: Long? = null): List<String> {
-        if (client == null)
+        if (jda == null)
             return listOf()
 
-        return channels.filter { server == null || (client!!.getTextChannelById(it.id)?.guild?.idLong == server) }.map {
-            val channel = client!!.getTextChannelById(it.id)
+        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!")
                 return@map "**${it.id}** *(inactive)*"
@@ -142,17 +136,17 @@ object ServiceChannels {
     }
 
     fun getServiceChannelServers(server: Long? = null): List<String> {
-        if (client == null)
+        if (jda == null)
             return listOf()
 
-        return serviceChannels.filter { server == null || (client!!.getTextChannelById(it.id)?.guild?.idLong == server) }.map {
-            val channel = client!!.getTextChannelById(it.id)
+        return serviceChannels.filter { server == null || (jda!!.getTextChannelById(it.id)?.guild?.idLong == server) }.map {
+            val channel = jda!!.getTextChannelById(it.id)
             "**${channel?.guild?.name ?: it.id}** #${channel?.name ?: "(inactive)"}"
         }
     }
 
     fun testServerId(id: Long): TextChannel? {
-        return client?.getTextChannelById(id)
+        return jda?.getTextChannelById(id)
     }
 
     fun addChannel(id: Long, role: String?): DiscordChannel? {
@@ -167,14 +161,14 @@ object ServiceChannels {
 
     fun saveChannels() {
         SERVERS_FILE.writeText(
-            json.stringify(
-                DiscordChannel.serializer().list,
+            json.encodeToString(
+                ListSerializer(DiscordChannel.serializer()),
                 channels
             )
         )
         SERVICE_CHANNELS_FILE.writeText(
-            json.stringify(
-                ServiceChannel.serializer().list,
+            json.encodeToString(
+                ListSerializer(ServiceChannel.serializer()),
                 serviceChannels
             )
         )

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

@@ -2,15 +2,18 @@ package de.wulkanat
 
 import de.wulkanat.extensions.ensureExists
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.list
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
+import kotlinx.serialization.stringify
 import java.io.File
 
 @Serializable
 data class DiscordChannel(
     val id: Long,
-    var mentionedRole: Long? = null,
+    var mentionedRole: String? = null,
     var autoPublish: Boolean = false,
     var message: CustomMessage? = null
 )
@@ -35,9 +38,26 @@ data class AdminFile(
     val offlineMessage: String = "CONNECTION FAILED"
 )
 
-val json = Json(JsonConfiguration.Stable)
+@Serializable
+data class TwitterFile(
+    val accessToken: String = "",
+    val accessTokenSecret: String = "",
+    val apiKey: String = "",
+    val apiSecretKey: String = "",
+    val bearerToken: String = "",
+    val env: String = "dev",
+)
 
-val SERVERS_FILE = File("servers.json").ensureExists(json.stringify(DiscordChannel.serializer().list, listOf()))
+val json = Json { allowStructuredMapKeys = true }
+
+val SERVERS_FILE =
+    File("servers.json").ensureExists(json.encodeToString(ListSerializer(DiscordChannel.serializer()), listOf()))
 val SERVICE_CHANNELS_FILE =
-    File("service_channels.json").ensureExists(json.stringify(ServiceChannel.serializer().list, listOf()))
-val ADMIN_FILE = File("admin.json").ensureExists(json.stringify(AdminFile.serializer(), AdminFile()))
+    File("service_channels.json").ensureExists(
+        json.encodeToString(
+            ListSerializer(ServiceChannel.serializer()),
+            listOf()
+        )
+    )
+val ADMIN_FILE = File("admin.json").ensureExists(json.encodeToString(AdminFile.serializer(), AdminFile()))
+val TWITTER_FILE = File("twitter.json").ensureExists(json.encodeToString(TwitterFile.serializer(), TwitterFile()))

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

@@ -7,11 +7,9 @@ object DiscordRpc {
     var jda: JDA? = null
 
     fun updatePresence(available: Boolean) {
-        // jda ?: return
+        jda ?: return
 
-        // jda!!.presence.activity = Activity.watching(if (available) Admin.message else Admin.offlineMessage)
-        // jda!!.presence.isIdle = !available
-        // noop
-        if (available) Admin.println("Back online") else Admin.error("Gone offline", "Can't reach Hytale server")
+        jda!!.presence.activity = Activity.watching(if (available) Admin.message else Admin.offlineMessage)
+        jda!!.presence.isIdle = !available
     }
 }

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

@@ -1,6 +1,5 @@
 package de.wulkanat
 
-import de.wulkanat.files.ServiceChannels
 import net.dv8tion.jda.api.JDABuilder
 import net.dv8tion.jda.api.entities.Activity
 import net.dv8tion.jda.api.requests.GatewayIntent
@@ -19,7 +18,7 @@ fun main() {
     builder.addEventListener(OwnerCli())
     builder.awaitReady()
 
-    ServiceChannels.client = builder
+    Channels.jda = builder
     Admin.jda = builder
     DiscordRpc.jda = builder
     Admin.info()
@@ -35,7 +34,7 @@ fun main() {
 
     timer("Updater", daemon = true, initialDelay = 0L, period = Admin.updateMs) {
         if (SiteWatcher.hasNewBlogPost()) {
-            ServiceChannels.sentToAll(SiteWatcher.newestBlog!!.toMessageEmbed())
+            Channels.sentToAll(SiteWatcher.newestBlog!!.toMessageEmbed())
         }
     }
 }

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

@@ -0,0 +1,215 @@
+package de.wulkanat
+
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.Permission
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent
+import net.dv8tion.jda.api.hooks.ListenerAdapter
+import java.awt.Color
+
+class OwnerCli : ListenerAdapter() {
+    private val prefix = "%!"
+
+    override fun onMessageReceived(event: MessageReceivedEvent) {
+        val msg = event.message.contentRaw
+        // Only accept admin requests
+        if (event.message.member?.hasPermission(Permission.ADMINISTRATOR) != true || !msg.startsWith(prefix)) {
+            return
+        }
+
+        val command = msg.removePrefix(prefix).split(Regex("\\s+"))
+        val channelId = event.message.channel.idLong
+
+        when (command.first()) {
+            "add" -> {
+                val result = Channels.addChannel(channelId, null)
+                if (result == null) {
+                    event.message.channel.sendMessage("Already added.").queue()
+                } else {
+                    event.message.channel.sendMessage("Added.").queue()
+                    Admin.info()
+                }
+            }
+            "remove" -> {
+                val result = Channels.channels.removeAll { it.id == channelId }
+                Channels.saveChannels()
+                if (result) {
+                    event.message.channel.sendMessage("Removed.").queue()
+                } else {
+                    event.message.channel.sendMessage("This channel is not registered.").queue()
+                }
+            }
+            "publish" -> {
+                val result = Channels.channels.find { it.id == channelId }
+                if (result != null) {
+                    if (command.size > 1 && listOf("on", "off").contains(command[1])) {
+                        result.autoPublish = command[1] == "on"
+                        Channels.saveChannels()
+
+                        event.message.channel.sendMessage("Auto publish is now ${command[1]}").queue()
+                    } else {
+                        event.message.channel.sendMessage("Usage: `${prefix}publish [on|off]`")
+                    }
+                } else {
+                    event.message.channel.sendMessage("Channel not registered.").queue()
+                }
+            }
+            "ping" -> {
+                val result = Channels.channels.find { it.id == channelId }
+                if (result != null) {
+                    if (command.size > 1) {
+                        val roles = event.message.guild.getRolesByName(command[1], false)
+                        result.mentionedRole = when {
+                            command[1] == "everyone" -> {
+                                event.message.channel.sendMessage("Now pinging everyone.").queue()
+                                "everyone"
+                            }
+                            command[1] == "none" -> {
+                                event.message.channel.sendMessage("Now pinging none.").queue()
+                                null
+                            }
+                            roles.firstOrNull() != null -> {
+                                event.message.channel.sendMessage("Now pinging ${roles.first().name}").queue()
+                                roles.first().id
+                            }
+                            else -> {
+                                event.message.channel.sendMessage("Unknown role.").queue()
+                                result.mentionedRole
+                            }
+                        }
+                        Channels.saveChannels()
+                    } else {
+                        event.message.channel.sendMessage("Usage: `${prefix}ping [everyone|none|roleName]`")
+                    }
+                } else {
+                    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()
+                }
+            }
+            "serviceChannel" -> {
+                if (command.size > 1 && listOf("add", "remove").contains(command[1])) {
+                    if (command[1] == "add") {
+                        if (Channels.serviceChannels.find { it.id == channelId } != null) {
+                            event.message.channel.sendMessage("Already a service channel.").queue()
+                        } else {
+                            Channels.serviceChannels.add(ServiceChannel(channelId))
+                            Channels.saveChannels()
+                            event.message.channel.sendMessage("Added as service channel.").queue()
+                        }
+                    } else {
+                        event.message.channel.sendMessage(
+                            if (Channels.serviceChannels.removeAll { it.id == channelId }) "Channel removed."
+                            else "Not a service channel."
+                        ).queue()
+                    }
+                    Channels.saveChannels()
+                } else {
+                    event.message.channel.sendMessage("Usage: `${prefix}serviceChannel [add|remove]`")
+                }
+
+            }
+            "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")}
+                                                
+                            **_Service Channels_**
+                            ${Channels.getServiceChannelServers(event.message.guild.idLong).joinToString("\n")}
+                        """.trimIndent())
+                        .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()
+            }
+            "help" -> {
+                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}serviceChannel [add|remove]**
+                            Add or remove this channel to receive service message from the bot developer (recommended)
+                            **${prefix}remove**
+                            Remove this channel to the notified list
+                            **${prefix}publish [on|off]**
+                            [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()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,34 @@
+package de.wulkanat
+
+import blue.starry.penicillin.PenicillinClient
+import blue.starry.penicillin.core.session.ApiClient
+import blue.starry.penicillin.core.session.config.account
+import blue.starry.penicillin.core.session.config.token
+import blue.starry.penicillin.endpoints.accountActivity
+import blue.starry.penicillin.endpoints.accountactivity.subscribe
+import blue.starry.penicillin.extensions.queue
+import kotlinx.serialization.json.Json
+
+object Twitter {
+    private val twitterFile: TwitterFile = Json { allowStructuredMapKeys = true }.decodeFromString(
+        TwitterFile.serializer(),
+        TWITTER_FILE.readText()
+    )
+    private val apiKey get() = twitterFile.apiKey
+    private val apiSecretKey get() = twitterFile.apiSecretKey
+    private val bearerToken get() = twitterFile.bearerToken
+    private val accessToken get() = twitterFile.accessToken
+    private val accessTokenSecret get() = twitterFile.accessTokenSecret
+    private val env get() = twitterFile.env
+
+    val api: ApiClient = PenicillinClient {
+        account {
+            token(Twitter.accessToken, Twitter.accessTokenSecret)
+        }
+    }
+
+    init {
+        api.accountActivity.subscribe(env).queue()
+        api.
+    }
+}

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

@@ -1,109 +0,0 @@
-@file:AutoWired
-
-package de.wulkanat.cli
-
-import com.gitlab.kordlib.core.entity.channel.DmChannel
-import com.gitlab.kordlib.kordx.commands.annotation.AutoWired
-import com.gitlab.kordlib.kordx.commands.argument.primitive.BooleanArgument
-import com.gitlab.kordlib.kordx.commands.argument.text.StringArgument
-import com.gitlab.kordlib.kordx.commands.kord.model.precondition.precondition
-import com.gitlab.kordlib.kordx.commands.kord.model.prefix.kord
-import com.gitlab.kordlib.kordx.commands.kord.model.prefix.mention
-import com.gitlab.kordlib.kordx.commands.kord.model.respondEmbed
-import com.gitlab.kordlib.kordx.commands.kord.module.module
-import com.gitlab.kordlib.kordx.commands.model.command.invoke
-import com.gitlab.kordlib.kordx.commands.model.prefix.literal
-import com.gitlab.kordlib.kordx.commands.model.prefix.or
-import com.gitlab.kordlib.kordx.commands.model.prefix.prefix
-import de.wulkanat.Admin
-import de.wulkanat.extensions.alsoIf
-import de.wulkanat.extensions.isBotAdmin
-import de.wulkanat.files.ServiceChannels
-import de.wulkanat.model.BlogPostPreview
-import de.wulkanat.web.SiteWatcher
-
-val prefixes = prefix {
-    kord { mention() or literal("%!") }
-}
-
-fun adminCommands() = module("admin-commands") {
-    precondition { author.isBotAdmin && channel.asChannelOrNull() is DmChannel }
-
-    command("stop") {
-        invoke {
-            respond("Shutting down...")
-            kord.shutdown()
-        }
-    }
-
-    command("info") {
-        invoke {
-            Admin.info()
-        }
-    }
-
-    command("fakeUpdate") {
-        invoke {
-            respond("THIS WILL CAUSE A MESSAGE ON **ALL** SERVERS.\nContinue? [y/n]")
-            if (read(BooleanArgument(trueValue = "y", falseValue = "n"))) {
-                respond("Sending fake update on next cycle")
-
-                SiteWatcher.newestBlog = BlogPostPreview(
-                    title = "FakePost",
-                    imgUrl = "",
-                    fullPostUrl = "",
-                    author = "wulkanat",
-                    date = "now",
-                    description = "Lorem Ipsum"
-                )
-            } else {
-                respond("Aborting")
-            }
-        }
-    }
-
-    command("serviceMessage") {
-        invoke {
-            respond("What's the title?")
-            val title = read(StringArgument)
-            respond("What's the message?")
-            val message = read(StringArgument)
-            respondEmbed {
-                this.title = title
-                description = message
-                footer {
-                    text = "Is that correct? [y/n]"
-                }
-            }
-            if (read(BooleanArgument(trueValue = "y", falseValue = "n"))) {
-                respond("Sending")
-                ServiceChannels.sendServiceMessage(title, message)
-            } else {
-                respond("Aborting")
-            }
-        }
-    }
-
-    command("refreshList") {
-        invoke {
-            ServiceChannels.channels = ServiceChannels.refreshChannelsFromDisk()
-            ServiceChannels.serviceChannels = ServiceChannels.refreshServiceChannelsFromDisk()
-            Admin.info()
-        }
-    }
-
-    command("removeInactive") {
-        invoke {
-            respondEmbed {
-                title = "Channels removed"
-
-                ServiceChannels.channels.removeAll { channel ->
-                    (ServiceChannels.testServerId(channel.id) == null).alsoIf(true) {
-                        field { name = channel.id.toString() }
-                    }
-                }
-            }
-            ServiceChannels.saveChannels()
-        }
-    }
-}

src/main/kotlin/de/wulkanat/cli/OwnerCli.kt

@@ -1,159 +0,0 @@
-@file:AutoWired
-
-package de.wulkanat.cli
-
-import com.gitlab.kordlib.common.entity.Permission
-import com.gitlab.kordlib.kordx.commands.annotation.AutoWired
-import com.gitlab.kordlib.kordx.commands.argument.primitive.BooleanArgument
-import com.gitlab.kordlib.kordx.commands.argument.text.StringArgument
-import com.gitlab.kordlib.kordx.commands.kord.argument.RoleArgument
-import com.gitlab.kordlib.kordx.commands.kord.model.precondition.precondition
-import com.gitlab.kordlib.kordx.commands.kord.model.respondEmbed
-import com.gitlab.kordlib.kordx.commands.kord.module.module
-import com.gitlab.kordlib.kordx.commands.model.command.invoke
-import de.wulkanat.Admin
-import de.wulkanat.CustomMessage
-import de.wulkanat.ServiceChannel
-import de.wulkanat.files.ServiceChannels
-import java.awt.Color
-
-// TODO: channel argument?
-fun ownerCommands() = module("owner-commands") {
-    precondition {
-        message.getAuthorAsMember()?.getPermissions()?.contains(Permission.Administrator) ?: false
-    }
-
-    command("add") {
-        invoke {
-            if (ServiceChannels.addChannel(channel.id.longValue, null) == null) {
-                respond("Already added.")
-            } else {
-                respond("Added.")
-                Admin.info()
-            }
-        }
-    }
-
-    command("remove") {
-        invoke {
-            val result = ServiceChannels.channels.removeAll { it.id == channel.id.longValue }
-            ServiceChannels.saveChannels()
-            if (result) {
-                respond("Removed.")
-            } else {
-                respond("This channel is not registered.")
-            }
-        }
-    }
-
-    command("publish") {
-        invoke(BooleanArgument(trueValue = "on", falseValue = "off")) { doAutoPublish ->
-            ServiceChannels.channels.find { it.id == channel.id.longValue }?.also {
-                it.autoPublish = doAutoPublish
-                ServiceChannels.saveChannels()
-            } ?: respond("Channel not registered")
-        }
-    }
-
-    command("ping") {
-        invoke(RoleArgument) { role ->
-            ServiceChannels.channels.find { it.id == channel.id.longValue }?.also {
-                // TODO: @everyone
-                it.mentionedRole = role.id.longValue
-                ServiceChannels.saveChannels()
-            } ?: respond("Channel not registered")
-        }
-    }
-
-    command("setMessage") {
-        invoke(StringArgument) { message ->
-            ServiceChannels.channels.find { it.id == channel.id.longValue}?.also {
-                it.message = CustomMessage(message)
-                respond("Set `$message` as a message.")
-            } ?: respond("Channel not registered!")
-        }
-    }
-
-    command("resetMessage") {
-        invoke {
-            ServiceChannels.channels.find { it.id == channel.id.longValue }?.also {
-                it.message = null
-                respond("Reset to no message")
-            } ?: respond("Channel not registered!")
-        }
-    }
-
-    command("serviceChannel") {
-        invoke(BooleanArgument(trueValue = "add", falseValue = "remove")) { addChannel ->
-            if (addChannel) {
-                ServiceChannels.serviceChannels.find { it.id == channel.id.longValue }?.also {
-                    respond("Already a service channel")
-                } ?: run {
-                    ServiceChannels.serviceChannels.add(ServiceChannel(channel.id.longValue))
-                    respond("Added as a service channel")
-                }
-            } else {
-                respond(if (ServiceChannels.serviceChannels.removeAll { it.id == channel.id.longValue })
-                    "Channel removed" else "Not a service channel")
-            }
-        }
-    }
-
-    command("publishMessage") {
-        invoke(BooleanArgument(trueValue = "on", falseValue = "off")) { doAutoPublish ->
-            ServiceChannels.channels.find { it.id == channel.id.longValue }?.also {
-                it.message?.pushAnnouncement = doAutoPublish
-                ServiceChannels.saveChannels()
-                respond("Auto publish is now ${if (doAutoPublish) "on" else "off"}")
-            } ?: respond("Channel not registered!")
-        }
-    }
-
-    command("info") {
-        invoke {
-            respondEmbed {
-                title = "Server Overview"
-                color = Color.GREEN
-                description = """
-                    ${ServiceChannels.getServerNames(guild?.id?.longValue).joinToString("\n")}
-                    
-                    **_Service Channels_**
-                    ${ServiceChannels.getServiceChannelServers(guild?.id?.longValue).joinToString("\n")}
-                """.trimIndent()
-                Admin.admin?.let {
-                    author {
-                        name = it.username
-                        icon = it.avatar.url
-                        url = "https://github.com/wulkanat/BlogShot"
-                    }
-                }
-            }
-        }
-    }
-
-    command("report") {
-        invoke {
-            respond("What is the error you encountered?")
-            val errorReport = read(StringArgument)
-            respondEmbed {
-                title = "Error Report Preview"
-                color = Color.RED
-                description = errorReport
-                message.author?.let {
-                    author {
-                        name = it.username
-                        icon = it.avatar.url
-                    }
-                }
-
-            }
-            respond("Send? [y/n]")
-            if (read(BooleanArgument(trueValue = "y", falseValue = "n"))) {
-                respond("Sent")
-                Admin.error(guild?.asGuildOrNull()?.name ?: "Unknown Guild", errorReport, author)
-            } else {
-                respond("Aborting")
-            }
-        }
-    }
-}

src/main/kotlin/de/wulkanat/extensions/Generic.kt

@@ -1,8 +0,0 @@
-package de.wulkanat.extensions
-
-inline fun <T> Boolean.alsoIf(other: T, body: () -> Unit): Boolean {
-    if (this == other) {
-        body()
-    }
-    return this
-}

src/main/kotlin/de/wulkanat/extensions/User.kt

@@ -1,7 +0,0 @@
-package de.wulkanat.extensions
-
-import com.gitlab.kordlib.core.entity.User
-import de.wulkanat.files.Config
-
-val User.isBotAdmin: Boolean
-    get() = id.longValue == Config.adminId

src/main/kotlin/de/wulkanat/files/Config.kt

@@ -1,26 +0,0 @@
-package de.wulkanat.files
-
-import de.wulkanat.files.concept.SerializableObject
-import kotlinx.serialization.Serializable
-
-object Config : SerializableObject<Config.Data>("config.json", Data(), Data.serializer()) {
-    val adminId: Long
-        get() = instance.adminId
-    val token: String
-        get() = instance.token
-    val updateMs: Long
-        get() = instance.updateMs
-    val watchingMessage: String
-        get() = instance.watchingMessage
-    val offlineMessage: String
-        get() = instance.offlineMessage
-
-    @Serializable
-    data class Data(
-        val adminId: Long = 12345,
-        val token: String = "12345",
-        val updateMs: Long = 30000,
-        val watchingMessage: String = "for new Blogposts",
-        val offlineMessage: String = "CONNECTION FAILED"
-    )
-}

src/main/kotlin/de/wulkanat/files/Servers.kt

@@ -1,4 +0,0 @@
-package de.wulkanat.files
-
-object Servers {
-}

src/main/kotlin/de/wulkanat/files/concept/SerializableObject.kt

@@ -1,24 +0,0 @@
-package de.wulkanat.files.concept
-
-import de.wulkanat.extensions.ensureExists
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.json.Json
-import java.io.File
-
-abstract class SerializableObject<T>(
-    fileName: String,
-    defaultText: T? = null,
-    private val childSerializer: KSerializer<T>
-) {
-    private val json = Json { allowStructuredMapKeys = true }
-    private val file = File(fileName).ensureExists(defaultText?.let { json.encodeToString(childSerializer, it) })
-    var instance: T = json.decodeFromString(childSerializer, file.readText())
-
-    fun refresh() {
-        instance = json.decodeFromString(childSerializer, file.readText())
-    }
-
-    fun save() {
-        file.writeText(json.encodeToString(childSerializer, instance))
-    }
-}

src/main/kotlin/de/wulkanat/web/SiteWatcher.kt

@@ -3,8 +3,6 @@ package de.wulkanat.web
 import de.wulkanat.Admin
 import de.wulkanat.DiscordRpc
 import de.wulkanat.model.BlogPostPreview
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
 import java.io.IOException
 
@@ -13,14 +11,9 @@ object SiteWatcher {
     var newestBlog: BlogPostPreview? = null
     private var siteOnline = false
 
-    suspend fun hasNewBlogPost(): Boolean {
+    fun hasNewBlogPost(): Boolean {
         try {
-            val doc = withContext(Dispatchers.IO) {
-                // solved by `withContext`
-                // https://stackoverflow.com/a/63332658
-                @Suppress("BlockingMethodInNonBlockingContext")
-                Jsoup.connect(BLOG_INDEX_URL).get()
-            }
+            val doc = Jsoup.connect(BLOG_INDEX_URL).get()
             val newBlog = BlogPostParser.getFistBlog(doc)
 
             if (newestBlog == newBlog) {
@@ -41,7 +34,7 @@ object SiteWatcher {
             return false
         }
 
-        if (!siteOnline) {
+        if (siteOnline) {
             siteOnline = true
             DiscordRpc.updatePresence(siteOnline)
         }