Updated querying
This commit is contained in:
@@ -38,7 +38,7 @@ export default {
|
||||
const setting = interaction.options.getString("setting")!
|
||||
const value = interaction.options.getString("value")!
|
||||
const settingsData = await db.query.settings.findFirst({
|
||||
where: (settings, { eq }) => eq(settings.name, setting)
|
||||
where: ({ name }, { eq }) => eq(name, setting)
|
||||
})
|
||||
|
||||
if (!settingsData) {
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
import { devMessage, embedColor } from "config/options.js"
|
||||
import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import db from "src/db/db.js"
|
||||
import { verifies } from "src/db/schema.js"
|
||||
import { getHeadURL, getIGN, getUUID } from "utils/Hypixel.js"
|
||||
|
||||
export default {
|
||||
@@ -40,7 +38,7 @@ export default {
|
||||
}
|
||||
|
||||
const verifyData = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.uuid, uuid)
|
||||
where: ({ uuid: uuidfromdb }, { eq }) => eq(uuidfromdb, uuid)
|
||||
})
|
||||
if (!verifyData) {
|
||||
await interaction.editReply({
|
||||
|
||||
@@ -29,7 +29,7 @@ export default {
|
||||
async execute({ interaction }) {
|
||||
const member = interaction.options.getMember("user") as GuildMember
|
||||
const verifiedUser = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, member.user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, member.user.id)
|
||||
})
|
||||
const mod = interaction.user
|
||||
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
|
||||
import { waitingListRole } from "config/roles.js"
|
||||
import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import db from "src/db/db.js"
|
||||
import { verifies } from "src/db/schema.js"
|
||||
import roleManage from "utils/functions/rolesmanage.js"
|
||||
import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js"
|
||||
|
||||
@@ -32,7 +30,7 @@ export default {
|
||||
const user = interaction.options.getMember("user") as GuildMember
|
||||
const usermentioned = userMention(user.user.id)
|
||||
const verifyData = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, user.user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, user.user.id)
|
||||
})
|
||||
|
||||
if (!verifyData) {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
|
||||
import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import db from "src/db/db.js"
|
||||
import { verifies } from "src/db/schema.js"
|
||||
@@ -38,7 +37,7 @@ export default {
|
||||
const mod = interaction.user
|
||||
|
||||
const verifyData = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, user.user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, user.user.id)
|
||||
})
|
||||
if (verifyData) {
|
||||
interaction.editReply("That user is already verified.")
|
||||
|
||||
@@ -38,7 +38,7 @@ export default {
|
||||
const reason = interaction.options.getString("reason") ?? "No reason provided."
|
||||
const mod = interaction.user!
|
||||
const waiting = await db.query.waitingLists.findFirst({
|
||||
where: eq(waitingLists.userID, member.user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, member.user.id)
|
||||
})
|
||||
|
||||
if (!waiting) {
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
|
||||
import { waitingListRole } from "config/roles.js"
|
||||
import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import db from "src/db/db.js"
|
||||
import { verifies } from "src/db/schema.js"
|
||||
import roleManage from "utils/functions/rolesmanage.js"
|
||||
import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js"
|
||||
|
||||
@@ -24,7 +22,7 @@ export default {
|
||||
|
||||
const user = interaction.member as GuildMember
|
||||
const verifyData = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, user.user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, user.user.id)
|
||||
})
|
||||
|
||||
if (!verifyData) {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
|
||||
import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import { IPlayerData } from "interfaces"
|
||||
import { IGuildData } from "interfaces"
|
||||
@@ -35,7 +34,7 @@ export default {
|
||||
const ign = interaction.options.getString("ign")!
|
||||
|
||||
const verifyData = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, user.user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, user.id)
|
||||
})
|
||||
if (verifyData) {
|
||||
interaction.editReply("You are already verified.\n" + "Try running /update to update your roles.")
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
import { devMessage, embedColor } from "config/options.js"
|
||||
import { InteractionContextType, SlashCommandBuilder, userMention } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import db from "src/db/db.js"
|
||||
import { verifies } from "src/db/schema.js"
|
||||
import { getHeadURL, getIGN } from "utils/Hypixel.js"
|
||||
|
||||
export default {
|
||||
@@ -22,7 +20,7 @@ export default {
|
||||
|
||||
const user = interaction.user
|
||||
const verifyData = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, user.id)
|
||||
})
|
||||
|
||||
if (!verifyData) {
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
import { devMessage, embedColor } from "config/options.js"
|
||||
import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
|
||||
import { eq } from "drizzle-orm"
|
||||
import { ICommand } from "interfaces"
|
||||
import db from "src/db/db.js"
|
||||
import { verifies } from "src/db/schema.js"
|
||||
import { getHeadURL, getIGN } from "utils/Hypixel.js"
|
||||
|
||||
export default {
|
||||
@@ -29,7 +27,7 @@ export default {
|
||||
|
||||
const user = interaction.options.getUser("user")!
|
||||
const verifiedUser = await db.query.verifies.findFirst({
|
||||
where: eq(verifies.userID, user.id)
|
||||
where: ({ userID }, { eq }) => eq(userID, user.id)
|
||||
})
|
||||
if (!verifiedUser) {
|
||||
interaction.editReply({
|
||||
|
||||
Reference in New Issue
Block a user