Wip

build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
 
     implementation(group = "ch.qos.logback", name = "logback-classic", version = "1.2.3")
 
-    implementation(group = "com.sparkjava", name = "spark-core", version = "2.9.2")
+    implementation(group = "com.sparkjava", name = "spark-core", version = "2.9.3")
     implementation(group = "org.apache.velocity", name = "velocity-engine-core", version = "2.2")
 
     implementation(group = "com.github.ben-manes.caffeine", name = "caffeine", version = "2.8.5")

src/main/kotlin/com/dunctebot/dashboard/WebServer.kt

@@ -202,11 +202,6 @@ class WebServer {
                 return@get OtherAPi.uptimeRobot()
             }
 
-            // keep?
-            get("/commands.json") { _, _ ->
-                "TODO: setup websocket to bot"
-            }
-
             post("/update-data") { request, _ ->
                 return@post DataController.updateData(request)
             }
@@ -265,7 +260,9 @@ class WebServer {
                 val tcs = guild.channels
                     .ofType(TextChannel::class.java)
                     .filter {
+                        println("Channel $it")
                         it.getEffectivePermissions(selfId).map { p ->
+                            println("Permissions $p")
                             p.containsAll(PermissionSet.of(
                                 Permission.SEND_MESSAGES, Permission.VIEW_CHANNEL /* read messages */
                             ))
@@ -274,7 +271,7 @@ class WebServer {
                     .collectList()
                     .block()!!
 
-                println(tcs)
+                println("channels $tcs")
 
                 val goodRoles = guild.roles
                     .filter { !it.managed() }

src/main/kotlin/com/dunctebot/dashboard/controllers/DashboardController.kt

@@ -16,7 +16,9 @@ object DashboardController {
 
         if (ses.attribute<String?>(USER_ID) == null || ses.attribute<String?>(SESSION_ID) == null) {
             request.session().attribute(OLD_PAGE, request.pathInfo())
-            return response.redirect("/")
+            response.redirect("/")
+
+            throw Spark.halt()
         }
 
         val guild = request.fetchGuild() ?: throw haltDiscordError(DiscordError.NO_GUILD, request.guildId!!)

src/main/resources/views/dashboard/includes/basic/autoRole.vm

@@ -3,10 +3,10 @@
     <select id="autoRoleRole" name="autoRoleRole">
         <option value="" selected disabled>Select a role</option>
         #foreach($role in $goodRoles)
-            #if($settings.getAutoroleRole() == $role.getIdLong())
-                <option value="$role.getIdLong()" selected>@$role.getName()</option>
+            #if($settings.getAutoroleRole() == $role.id().asLong())
+                <option value="$role.id().asLong()" selected>@$role.name()</option>
             #else
-                <option value="$role.getIdLong()">@$role.getName()</option>
+                <option value="$role.id().asLong()">@$role.name()</option>
             #end
         #end
         <option value="">Disable</option>