From 91c955578d2d852d5086be0a3d569144fb0e9b0a Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Mon, 22 Aug 2022 19:45:00 -0500
Subject: [PATCH] Fix incorrect permission override on ticket create

---
 build.gradle.kts                                                | 2 +-
 .../ticketbird/business/DefaultPermissionService.kt             | 2 +-
 .../org/dreamexposure/ticketbird/service/ActivityMonitor.kt     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8aad27c..0e88a40 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -93,7 +93,7 @@ dependencies {
 }
 
 group = "org.dreamexposure"
-version = "2.0.0"
+version = "2.0.0.hf1"
 description = "TicketBird"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
diff --git a/src/main/kotlin/org/dreamexposure/ticketbird/business/DefaultPermissionService.kt b/src/main/kotlin/org/dreamexposure/ticketbird/business/DefaultPermissionService.kt
index cd5be01..4138e94 100644
--- a/src/main/kotlin/org/dreamexposure/ticketbird/business/DefaultPermissionService.kt
+++ b/src/main/kotlin/org/dreamexposure/ticketbird/business/DefaultPermissionService.kt
@@ -61,7 +61,7 @@ class DefaultPermissionService(
     override fun getTicketChannelOverwrites(guildId: Snowflake, creator: Snowflake, staff: List<Snowflake>): List<PermissionOverwrite> {
         val overwrites = mutableListOf<PermissionOverwrite>()
 
-        overwrites += PermissionOverwrite.forMember(guildId, getTicketGrantOverrides(), PermissionSet.none())
+        overwrites += PermissionOverwrite.forMember(creator, getTicketGrantOverrides(), PermissionSet.none())
         overwrites += PermissionOverwrite.forRole(guildId, PermissionSet.none(), PermissionSet.all())
         overwrites += staff.map { PermissionOverwrite.forMember(it, getTicketGrantOverrides(), PermissionSet.none()) }
 
diff --git a/src/main/kotlin/org/dreamexposure/ticketbird/service/ActivityMonitor.kt b/src/main/kotlin/org/dreamexposure/ticketbird/service/ActivityMonitor.kt
index b24496a..8b35a69 100644
--- a/src/main/kotlin/org/dreamexposure/ticketbird/service/ActivityMonitor.kt
+++ b/src/main/kotlin/org/dreamexposure/ticketbird/service/ActivityMonitor.kt
@@ -64,6 +64,7 @@ class ActivityMonitor(
                         .collectList().awaitSingle()
                     val respondedCategoryChannels = guild.getChannelById(settings.respondedCategory!!)
                         .ofType(Category::class.java)
+                        .onErrorResume { Mono.empty() }
                         .flatMapMany { it.channels.ofType(TextChannel::class.java) }
                         .collectList().awaitSingle()