Skip to content

Commit

Permalink
Fix compilation issue
Browse files Browse the repository at this point in the history
  • Loading branch information
sschr15 committed Feb 6, 2024
1 parent 83669e7 commit d544297
Show file tree
Hide file tree
Showing 14 changed files with 79 additions and 87 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ action {
val member = user.asMember(guild!!.id)
val roles = member.roles.toList().map { it.id }
if (MODERATOR_ROLES.any { it in roles }) {
targetMessages.forEach { it.pin("Pinned by ${member.tagOrUsername()}") }
targetMessages.forEach { it.pin("Pinned by ${member.tag}") }
edit { content = "Messages pinned." }
return@action
}
if (channel.ownerId != user.id && threads.isOwner(channel, user) != true) {
respond { content = "**Error:** This is not your thread." }
return@action
}
targetMessages.forEach { it.pin("Pinned by ${member.tagOrUsername()}") }
targetMessages.forEach { it.pin("Pinned by ${member.tag}") }
edit { content = "Messages pinned." }
}
```
Expand All @@ -130,7 +130,7 @@ action {
if (this.member?.asMemberOrNull()?.mayManageRole(arguments.role) == true) {
arguments.targetUser.removeRole(
arguments.role.id,
"${this.user.asUserOrNull()?.tagOrUsername() ?: this.user.id} used /team remove"
"${this.user.asUserOrNull()?.tag ?: this.user.id} used /team remove"
)
respond {
content = "Successfully removed ${arguments.targetUser.mention} from " +
Expand Down Expand Up @@ -166,7 +166,7 @@ action {
val roles = member.roles.toList().map { it.id }

if (MODERATOR_ROLES.any { it in roles }) {
targetMessages.forEach { it.pin("Pinned by ${member.tagOrUsername()}") }
targetMessages.forEach { it.pin("Pinned by ${member.tag}") }
edit { content = "Messages pinned." }

return@action
Expand All @@ -178,7 +178,7 @@ action {
return@action
}

targetMessages.forEach { it.pin("Pinned by ${member.tagOrUsername()}") }
targetMessages.forEach { it.pin("Pinned by ${member.tag}") }

edit { content = "Messages pinned." }
}
Expand All @@ -190,7 +190,7 @@ action {
arguments.targetUser.removeRole(
arguments.role.id,

"${this.user.asUserOrNull()?.tagOrUsername() ?: this.user.id} used /team remove"
"${this.user.asUserOrNull()?.tag ?: this.user.id} used /team remove"
)

respond {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.kotlindiscord.kord.extensions.components.ComponentContainer
import com.kotlindiscord.kord.extensions.components.components
import com.kotlindiscord.kord.extensions.components.ephemeralButton
import com.kotlindiscord.kord.extensions.utils.loadModule
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import dev.kord.common.Color
import dev.kord.common.entity.ButtonStyle
import dev.kord.common.entity.Snowflake
Expand Down Expand Up @@ -49,7 +48,7 @@ public val User.uniqueName: String
"@${this.username}"
} else {
// Still using name#discrim system
this.tagOrUsername()
this.tag
}

public fun EmbedBuilder.questionEmbed(
Expand Down Expand Up @@ -383,7 +382,7 @@ public suspend inline fun ComponentContainer.answeringButtons(

check {
if (event.interaction.user != claimer) {
fail("You did not claim this question! ${claimer.tagOrUsername()} did")
fail("You did not claim this question! ${claimer.tag} did")
}
}

Expand All @@ -407,7 +406,7 @@ public suspend inline fun ComponentContainer.answeringButtons(
style = ButtonStyle.Success
check {
if (event.interaction.user != claimer) {
fail("You did not claim the question! ${claimer.tagOrUsername()} did")
fail("You did not claim the question! ${claimer.tag} did")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ public class ModerationExtension(
if (arguments.duration != null) {
arguments.user.timeout(
arguments.duration!!,
reason = "Timed out by ${user.asUser().tagOrUsername()}: $reason"
reason = "Timed out by ${user.asUser().tag}: $reason"
)

respond {
content = "Timeout applied."
}
} else {
arguments.user.removeTimeout(
reason = "Timeout removed by ${user.asUser().tagOrUsername()}: $reason"
reason = "Timeout removed by ${user.asUser().tag}: $reason"
)

respond {
Expand Down Expand Up @@ -281,15 +281,15 @@ public class ModerationExtension(
if (arguments.duration != null) {
arguments.user.timeout(
arguments.duration!!,
reason = "Timed out by ${user?.asUser()?.tagOrUsername()}: $reason"
reason = "Timed out by ${user?.asUser()?.tag}: $reason"
)

message.respond {
content = "Timeout applied."
}
} else {
arguments.user.removeTimeout(
reason = "Timeout removed by ${user?.asUser()?.tagOrUsername()}: $reason"
reason = "Timeout removed by ${user?.asUser()?.tag}: $reason"
)

message.respond {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import com.kotlindiscord.kord.extensions.time.TimestampType
import com.kotlindiscord.kord.extensions.time.toDiscord
import com.kotlindiscord.kord.extensions.utils.scheduling.Scheduler
import com.kotlindiscord.kord.extensions.utils.scheduling.Task
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import dev.kord.core.behavior.channel.createMessage
import dev.kord.core.entity.Guild
import dev.kord.core.entity.Member
Expand Down Expand Up @@ -106,7 +105,7 @@ public class UserCleanupExtension(
description = "**Mention** | **Tag** | **Join date**\n\n"

chunk.forEach { member ->
description += "${member.mention} | ${member.tagOrUsername()} |" +
description += "${member.mention} | ${member.tag} |" +
"${member.joinedAt.toDiscord(TimestampType.Default)}\n"
}
}
Expand Down Expand Up @@ -151,7 +150,7 @@ public class UserCleanupExtension(
"| ------- | --- | --------------- |\n" +

removed.joinToString("\n") {
"| ${it.id} | ${it.tagOrUsername()} | ${instantFormatter.format(it.joinedAt.toJavaInstant())} |"
"| ${it.id} | ${it.tag} | ${instantFormatter.format(it.joinedAt.toJavaInstant())} |"
}

config.getLoggingChannel(guild).createMessage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.string
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.extensions.event
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import dev.kord.common.entity.Snowflake
import dev.kord.core.behavior.channel.asChannelOf
import dev.kord.core.behavior.channel.asChannelOfOrNull
Expand Down Expand Up @@ -142,7 +141,7 @@ public class WelcomeExtension : Extension() {
name = "Staff Member"
value = "${user.mention} (" +
"`${user.id}` / " +
"`${user.asUser().tagOrUsername()}`" +
"`${user.asUser().tag}`" +
")"
}
}
Expand Down Expand Up @@ -217,7 +216,7 @@ public class WelcomeExtension : Extension() {
name = "Staff Member"
value = "${user.mention} (" +
"`${user.id}` / " +
"`${user.asUser().tagOrUsername()}`" +
"`${user.asUser().tag}`" +
")"
}
}
Expand Down Expand Up @@ -286,7 +285,7 @@ public class WelcomeExtension : Extension() {
name = "Staff Member"
value = "${user.mention} (" +
"`${user.id}` / " +
"`${user.asUser().tagOrUsername()}`" +
"`${user.asUser().tag}`" +
")"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ package org.quiltmc.community.cozy.modules.welcome.blocks

import com.kotlindiscord.kord.extensions.DISCORD_BLURPLE
import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import dev.kord.common.entity.ButtonStyle
import dev.kord.common.entity.Snowflake
import dev.kord.core.Kord
Expand Down Expand Up @@ -134,7 +133,7 @@ public data class ComplianceBlock(
inline = true
name = "User"

value = "${user.mention} (`${user.tagOrUsername()}` / `${user.id}`)"
value = "${user.mention} (`${user.tag}` / `${user.id}`)"
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/quiltmc/community/_Utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ suspend fun Guild.getFilterLogChannel(): GuildMessageChannel? {
suspend fun EmbedBuilder.userField(user: UserBehavior, role: String? = null, inline: Boolean = false) {
field {
name = role ?: "User"
value = "${user.mention} (`${user.id}` / `${user.asUser().tagOrUsername()}`)"
value = "${user.mention} (`${user.id}` / `${user.asUser().tag}`)"

this.inline = inline
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.time.TimestampType
import com.kotlindiscord.kord.extensions.time.toDiscord
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import com.kotlindiscord.kord.extensions.utils.translate
import dev.kord.common.entity.Snowflake
import dev.kord.rest.Image
Expand Down Expand Up @@ -75,7 +74,7 @@ class LookupExtension : Extension() {
color = DISCORD_BLURPLE

description = "**__Basic Information__**\n" +
"**Tag:** `${user.tagOrUsername()}`\n" +
"**Tag:** `${user.tag}`\n" +
"**ID:** `${user.id.value}`\n" +
"**Mention:** ${user.mention}\n\n" +

Expand All @@ -97,7 +96,7 @@ class LookupExtension : Extension() {
}

author {
name = user.tagOrUsername()
name = user.tag
icon = user.avatar?.cdnUrl?.toUrl()
}

Expand Down Expand Up @@ -269,7 +268,7 @@ class LookupExtension : Extension() {

builder.append(
"**__Inviter Information__**\n" +
"**Tag:** `${user.tagOrUsername()}`\n" +
"**Tag:** `${user.tag}`\n" +
"**ID:** `${user.id.value}`\n" +
"**Mention:** ${user.mention}\n\n" +

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ class ApplicationsExtension : Extension() {
field {
inline = true
name = "Moderator"
value = "${user.asUser().tagOrUsername()} (${user.mention})"
value = "${user.asUser().tag} (${user.mention})"
}

field {
inline = true
name = "User"
value = "${member.tagOrUsername()} (${member.mention})"
value = "${member.tag} (${member.mention})"
}
}

Expand Down Expand Up @@ -330,13 +330,13 @@ class ApplicationsExtension : Extension() {
field {
inline = true
name = "Moderator"
value = "${user!!.asUser().tagOrUsername()} (${user!!.mention})"
value = "${user!!.asUser().tag} (${user!!.mention})"
}

field {
inline = true
name = "User"
value = "${member.tagOrUsername()} (${member.mention})"
value = "${member.tag} (${member.mention})"
}
}

Expand Down Expand Up @@ -431,15 +431,15 @@ class ApplicationsExtension : Extension() {

// Not actually deprecated, Kord walled themselves into a hole here
@Suppress("DEPRECATION_ERROR")
val thread = threadChannel.startPrivateThread("App: ${user.tagOrUsername()}")
val thread = threadChannel.startPrivateThread("App: ${user.tag}")
val initialMessage = thread.createMessage("Better get the mods in...")

initialMessage.edit { content = settings.moderatorRoles.joinToString { "<@&$it>" } }
delay(2.seconds)

initialMessage.edit {
content = buildString {
appendLine("**Application thread for ${user.tagOrUsername()}**")
appendLine("**Application thread for ${user.tag}**")
append("User ID below.")
}
}
Expand Down Expand Up @@ -503,13 +503,13 @@ class ApplicationsExtension : Extension() {
field {
inline = true
name = "Moderator"
value = "${event.interaction.user.tagOrUsername()} (${event.interaction.user.mention})"
value = "${event.interaction.user.tag} (${event.interaction.user.mention})"
}

field {
inline = true
name = "User"
value = "${member.tagOrUsername()} (${member.mention})"
value = "${member.tag} (${member.mention})"
}
}

Expand Down Expand Up @@ -786,7 +786,7 @@ class ApplicationsExtension : Extension() {
title = "Application (${event.request.status.name.capitalizeWords()})"

description = buildString {
appendLine("**User:** ${user.tagOrUsername()}")
appendLine("**User:** ${user.tag}")
appendLine("**Mention:** ${user.mention}")
appendLine(
"**Created:** ${user.id.timestamp.longAndRelative}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import com.kotlindiscord.kord.extensions.storage.StorageUnit
import com.kotlindiscord.kord.extensions.utils.authorId
import com.kotlindiscord.kord.extensions.utils.capitalizeWords
import com.kotlindiscord.kord.extensions.utils.dm
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import dev.kord.common.entity.ChannelType
import dev.kord.common.entity.MessageType
import dev.kord.common.entity.Permission
Expand Down Expand Up @@ -122,7 +121,7 @@ class ShowcaseExtension : Extension() {

val thread = channel.startPublicThreadWithMessage(
event.message.id, title
) { reason = "Showcase thread created for ${event.message.author?.tagOrUsername()}" }
) { reason = "Showcase thread created for ${event.message.author?.tag}" }

threads.set(
OwnedThread(thread.id, authorId, guild.id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.member
import com.kotlindiscord.kord.extensions.commands.converters.impl.role
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.utils.tagOrUsername
import dev.kord.common.entity.Permission
import dev.kord.core.entity.Member
import dev.kord.core.entity.Role
Expand Down Expand Up @@ -43,7 +42,7 @@ class SubteamsExtension : Extension() {
if (this.member?.asMemberOrNull()?.mayManageRole(arguments.role) == true) {
arguments.targetUser.addRole(
arguments.role.id,
"${this.user.asUserOrNull()?.tagOrUsername() ?: this.user.id} used /team add"
"${this.user.asUserOrNull()?.tag ?: this.user.id} used /team add"
)

respond {
Expand All @@ -70,7 +69,7 @@ class SubteamsExtension : Extension() {
if (this.member?.asMemberOrNull()?.mayManageRole(arguments.role) == true) {
arguments.targetUser.removeRole(
arguments.role.id,
"${this.user.asUserOrNull()?.tagOrUsername() ?: this.user.id} used /team remove"
"${this.user.asUserOrNull()?.tag ?: this.user.id} used /team remove"
)
respond {
content = "Successfully removed ${arguments.targetUser.mention} from " +
Expand Down
Loading

0 comments on commit d544297

Please sign in to comment.