Merge pull request #23 from DreamExposure/hotfix/permissions

Hotfix - incorrect permission override on ticket create
DreamExposure · Aug 23, 2022 · c5502c8 · c5502c8
2 parents a010f3c + 91c9555
commit c5502c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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()