fix connection failed message not disappearing

.gitignore

@@ -1,6 +1,5 @@
 servers.json
 admin.json
-twitter.json
 service_channels.json
 *.hprof
 /build

.idea/gradle.xml

@@ -4,16 +4,15 @@
   <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,10 +21,5 @@
       <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="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/workspace.xml

@@ -6,17 +6,9 @@
   <component name="ChangeListManager">
     <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$/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/web/SiteWatcher.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/web/SiteWatcher.kt" 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" />
@@ -53,12 +45,17 @@
       <list>
         <option value="Class" />
         <option value="Kotlin Class" />
-        <option value="Kotlin File" />
         <option value="Kotlin Object" />
+        <option value="Kotlin File" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="add-twitter-integration" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
@@ -73,17 +70,13 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="last_opened_file_path" value="D:/wulkanat/Desktop/scad" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/build/libs" />
-    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.last.edited" value="Modules" />
     <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>
@@ -91,8 +84,12 @@
       <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="Kotlin.MainKt">
+  <component name="RunManager" selected="Gradle.HytaleUpdateBot [fatJar]">
     <configuration name="HytaleUpdateBot [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -170,14 +167,13 @@
     <recent_temporary>
       <list>
         <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]" />
+        <item itemvalue="Gradle.HytaleUpdateBot [clean]" />
+        <item itemvalue="JAR Application.HytaleUpdateBot-all-1.0-SNAPSHOT.jar" />
       </list>
     </recent_temporary>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="project-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -217,7 +213,14 @@
       <option name="project" value="LOCAL" />
       <updated>1597839954909</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <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" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">
@@ -225,7 +228,8 @@
     <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" />
+    <MESSAGE value="prepare twitter integration" />
+    <option name="LAST_COMMIT_MESSAGE" value="prepare twitter integration" />
   </component>
   <component name="WindowStateProjectService">
     <state x="552" y="179" key="#Project_Structure" timestamp="1597687666334">
@@ -236,10 +240,6 @@
       <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>
@@ -248,50 +248,46 @@
       <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">
+    <state x="690" y="268" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1597831342920">
       <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="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="1597831342920" />
-    <state x="739" y="173" width="484" height="693" key="#org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog" timestamp="1600521350860">
+    <state x="739" y="173" width="484" height="693" key="#org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog" timestamp="1597362199927">
       <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="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="1597362199927" />
     <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">
+    <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="1600526412825" />
+    <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="1598897086460">
+    <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="1598897086460" />
+    <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="1598897086460">
+    <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="1598897086460" />
+    <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="1598897086460">
+    <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="1598897086460" />
+    <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="1598897086460">
+    <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="1598897086460" />
+    <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="1597840755247">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -312,27 +308,27 @@
     </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">
+    <state x="94" y="257" key="SettingsEditor" timestamp="1597361509050">
       <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="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="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">
+    <state x="777" y="434" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1601042455663">
       <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="777" y="434" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1601042455663" />
+    <state x="497" y="233" key="new project wizard" timestamp="1597841063797">
+      <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" />

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Aug 13 18:41:46 CEST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

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

@@ -1,8 +1,10 @@
 package de.wulkanat
 
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.JDA
+import net.dv8tion.jda.api.entities.Activity
 import net.dv8tion.jda.api.entities.MessageEmbed
 import net.dv8tion.jda.api.entities.User
 import java.awt.Color
@@ -15,10 +17,7 @@ object Admin {
     val offlineMessage: String
 
     init {
-        val admin = Json { allowStructuredMapKeys = true }.decodeFromString(
+        val admin = Json(JsonConfiguration.Stable).parse(AdminFile.serializer(), ADMIN_FILE.readText())
-            AdminFile.serializer(),
-            ADMIN_FILE.readText()
-        )
         userId = admin.adminId
         token = admin.token
         updateMs = admin.updateMs

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

@@ -1,6 +1,7 @@
 package de.wulkanat
 
-import kotlinx.serialization.builtins.ListSerializer
+import de.wulkanat.extensions.crosspost
+import kotlinx.serialization.list
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.Permission
@@ -98,14 +99,14 @@ object Channels {
     }
 
     fun refreshChannelsFromDisk(): MutableList<DiscordChannel> {
-        return json.decodeFromString(
+        return json.parse(
-            ListSerializer(DiscordChannel.serializer()), (SERVERS_FILE).readText()
+            DiscordChannel.serializer().list, (SERVERS_FILE).readText()
         ).toMutableList()
     }
 
     fun refreshServiceChannelsFromDisk(): MutableList<ServiceChannel> {
-        return json.decodeFromString(
+        return json.parse(
-            ListSerializer(ServiceChannel.serializer()), (SERVICE_CHANNELS_FILE).readText()
+            ServiceChannel.serializer().list, (SERVICE_CHANNELS_FILE).readText()
         ).toMutableList()
     }
 
@@ -161,14 +162,14 @@ object Channels {
 
     fun saveChannels() {
         SERVERS_FILE.writeText(
-            json.encodeToString(
+            json.stringify(
-                ListSerializer(DiscordChannel.serializer()),
+                DiscordChannel.serializer().list,
                 channels
             )
         )
         SERVICE_CHANNELS_FILE.writeText(
-            json.encodeToString(
+            json.stringify(
-                ListSerializer(ServiceChannel.serializer()),
+                ServiceChannel.serializer().list,
                 serviceChannels
             )
         )

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

@@ -2,12 +2,9 @@ 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
@@ -38,26 +35,9 @@ data class AdminFile(
     val offlineMessage: String = "CONNECTION FAILED"
 )
 
-@Serializable
+val json = Json(JsonConfiguration.Stable)
-data class TwitterFile(
-    val accessToken: String = "",
-    val accessTokenSecret: String = "",
-    val apiKey: String = "",
-    val apiSecretKey: String = "",
-    val bearerToken: String = "",
-    val env: String = "dev",
-)
 
-val json = Json { allowStructuredMapKeys = true }
+val SERVERS_FILE = File("servers.json").ensureExists(json.stringify(DiscordChannel.serializer().list, listOf()))
-
-val SERVERS_FILE =
-    File("servers.json").ensureExists(json.encodeToString(ListSerializer(DiscordChannel.serializer()), listOf()))
 val SERVICE_CHANNELS_FILE =
-    File("service_channels.json").ensureExists(
+    File("service_channels.json").ensureExists(json.stringify(ServiceChannel.serializer().list, listOf()))
-        json.encodeToString(
+val ADMIN_FILE = File("admin.json").ensureExists(json.stringify(AdminFile.serializer(), AdminFile()))
-            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/Twitter.kt

@@ -1,34 +0,0 @@
-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/web/SiteWatcher.kt

@@ -34,7 +34,7 @@ object SiteWatcher {
             return false
         }
 
-        if (siteOnline) {
+        if (!siteOnline) {
             siteOnline = true
             DiscordRpc.updatePresence(siteOnline)
         }