Skip to content

Commit 6c959db

Browse files
committed
refactor: Rename getDiscordUser method to getFoxyProfile
1 parent 8fe25fe commit 6c959db

File tree

11 files changed

+12
-12
lines changed

11 files changed

+12
-12
lines changed

foxy/src/main/kotlin/net/cakeyfox/foxy/command/FoxyInteractionContext.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class FoxyInteractionContext(
3535
val guild = event.guild
3636

3737
suspend fun getAuthorData(): FoxyUser {
38-
return db.utils.user.getDiscordUser(user.id)
38+
return db.utils.user.getFoxyProfile(user.id)
3939
}
4040

4141
suspend fun reply(

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/economy/AtmExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import net.dv8tion.jda.api.entities.User
99
class AtmExecutor : FoxyCommandExecutor() {
1010
override suspend fun execute(context: FoxyInteractionContext) {
1111
val user = context.getOption<User>("user") ?: context.event.user
12-
val userBalance = context.foxy.mongoClient.utils.user.getDiscordUser(user.id).userCakes.balance
12+
val userBalance = context.foxy.mongoClient.utils.user.getFoxyProfile(user.id).userCakes.balance
1313
val formattedBalance = context.utils.formatUserBalance(userBalance.toLong(), context.locale)
1414

1515
context.reply {

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/economy/CoinflipBetExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CoinflipBetExecutor : FoxyCommandExecutor() {
1313
val amount = context.getOption<Long>("amount")!!
1414
val formattedAmount = context.utils.formatUserBalance(amount, context.locale)
1515
val side = context.getOption<String>("side")!!
16-
val userToBet = context.db.utils.user.getDiscordUser(user.id)
16+
val userToBet = context.db.utils.user.getFoxyProfile(user.id)
1717

1818
if (amount < 1) {
1919
context.reply {

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/economy/RobExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RobExecutor : FoxyCommandExecutor() {
2121

2222
// TODO: Add cooldown field to database
2323

24-
val userToRobData = context.db.utils.user.getDiscordUser(userToRob.id)
24+
val userToRobData = context.db.utils.user.getFoxyProfile(userToRob.id)
2525

2626
if (userToRobData.userCakes.balance < 100) {
2727
context.reply(true) {

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/social/DivorceExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DivorceExecutor : FoxyCommandExecutor() {
1919
return
2020
}
2121

22-
val partner = context.db.utils.user.getDiscordUser(
22+
val partner = context.db.utils.user.getFoxyProfile(
2323
context.getAuthorData().marryStatus.marriedWith!!
2424
)
2525
val partnerAsUser = context.jda.retrieveUserById(partner._id).await()

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/social/MarryExecutor.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class MarryExecutor : FoxyCommandExecutor() {
4343
return
4444
}
4545

46-
val userData = context.db.utils.user.getDiscordUser(user.id)
46+
val userData = context.db.utils.user.getFoxyProfile(user.id)
4747
val authorData = context.getAuthorData()
4848

4949
if (userData.marryStatus.marriedWith != null) {
@@ -103,7 +103,7 @@ class MarryExecutor : FoxyCommandExecutor() {
103103

104104
private suspend fun buildMarryMessage(context: FoxyInteractionContext) {
105105
val user = context.getOption<User>("user")!!
106-
val userData = context.db.utils.user.getDiscordUser(user.id)
106+
val userData = context.db.utils.user.getFoxyProfile(user.id)
107107
val authorData = context.getAuthorData()
108108
val isUserPremium =
109109
if (userData.userPremium.premiumDate != null) {

foxy/src/main/kotlin/net/cakeyfox/foxy/command/vanilla/social/ProfileViewExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ProfileViewExecutor: FoxyCommandExecutor() {
1717
context.defer()
1818

1919
val user = context.getOption<User>("user") ?: context.event.user
20-
val userData = context.db.utils.user.getDiscordUser(user.id)
20+
val userData = context.db.utils.user.getFoxyProfile(user.id)
2121

2222
if (userData.isBanned == true) {
2323
context.reply {

foxy/src/main/kotlin/net/cakeyfox/foxy/listeners/InteractionsListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class InteractionsListener(
5656
}
5757
} else null
5858

59-
if (context.db.utils.user.getDiscordUser(event.user.id).isBanned == true) {
59+
if (context.db.utils.user.getFoxyProfile(event.user.id).isBanned == true) {
6060
foxy.utils.handleBan(event, context)
6161
return@launchMessageJob
6262
}

foxy/src/main/kotlin/net/cakeyfox/foxy/utils/FoxyUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class FoxyUtils(
7676
}
7777

7878
suspend fun handleBan(event: SlashCommandInteractionEvent, context: FoxyInteractionContext) {
79-
val user = context.db.utils.user.getDiscordUser(event.user.id)
79+
val user = context.db.utils.user.getFoxyProfile(event.user.id)
8080

8181
context.reply {
8282
embed {

foxy/src/main/kotlin/net/cakeyfox/foxy/utils/PremiumUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import kotlin.time.Duration.Companion.days
77

88
object PremiumUtils {
99
suspend fun eligibleForEarlyAccess(context: FoxyInteractionContext): Boolean {
10-
val user = context.db.utils.user.getDiscordUser(context.user.id)
10+
val user = context.db.utils.user.getFoxyProfile(context.user.id)
1111
var isEligible = false
1212

1313
if (isUserPremium(user)) {

foxy/src/main/kotlin/net/cakeyfox/foxy/utils/database/utils/UserUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class UserUtils(
1717
private val client: MongoDBClient,
1818
private val foxy: FoxyInstance
1919
) {
20-
suspend fun getDiscordUser(userId: String): FoxyUser {
20+
suspend fun getFoxyProfile(userId: String): FoxyUser {
2121
return withContext(Dispatchers.IO) {
2222
val collection = client.database.getCollection<Document>("users")
2323

0 commit comments

Comments
 (0)