Update to serenity 12
This commit is contained in:
1 parent
cd5651c7f6
commit
e632f55b4e
14 files changed
+1669
-1116
No files matched your search
+20
-22
@@ -47,14 +47,13 @@ impl JoinSoundCtx for Data {
|
||||
sqlx::query_as!(
|
||||
JoinSound,
|
||||
"
|
||||
SELECT join_sound_id
|
||||
FROM join_sounds
|
||||
WHERE user = ?
|
||||
AND guild = ?
|
||||
ORDER BY guild IS NULL
|
||||
",
|
||||
user_id.as_u64(),
|
||||
guild_id.map(|g| g.0)
|
||||
SELECT join_sound_id
|
||||
FROM join_sounds
|
||||
WHERE user = ?
|
||||
AND guild = ?
|
||||
ORDER BY guild IS NULL",
|
||||
user_id.get(),
|
||||
guild_id.map(|g| g.get())
|
||||
)
|
||||
.fetch_one(&self.database)
|
||||
.await
|
||||
@@ -62,14 +61,13 @@ SELECT join_sound_id
|
||||
sqlx::query_as!(
|
||||
JoinSound,
|
||||
"
|
||||
SELECT join_sound_id
|
||||
FROM join_sounds
|
||||
WHERE user = ?
|
||||
AND (guild IS NULL OR guild = ?)
|
||||
ORDER BY guild IS NULL
|
||||
",
|
||||
user_id.as_u64(),
|
||||
guild_id.map(|g| g.0)
|
||||
SELECT join_sound_id
|
||||
FROM join_sounds
|
||||
WHERE user = ?
|
||||
AND (guild IS NULL OR guild = ?)
|
||||
ORDER BY guild IS NULL",
|
||||
user_id.get(),
|
||||
guild_id.map(|g| g.get())
|
||||
)
|
||||
.fetch_one(&self.database)
|
||||
.await
|
||||
@@ -111,17 +109,17 @@ SELECT join_sound_id
|
||||
Some(join_id) => {
|
||||
sqlx::query!(
|
||||
"DELETE FROM join_sounds WHERE user = ? AND guild <=> ?",
|
||||
user_id.0,
|
||||
guild_id.map(|g| g.0)
|
||||
user_id.get(),
|
||||
guild_id.map(|g| g.get())
|
||||
)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
"INSERT INTO join_sounds (user, join_sound_id, guild) VALUES (?, ?, ?)",
|
||||
user_id.0,
|
||||
user_id.get(),
|
||||
join_id,
|
||||
guild_id.map(|g| g.0)
|
||||
guild_id.map(|g| g.get())
|
||||
)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
@@ -130,8 +128,8 @@ SELECT join_sound_id
|
||||
None => {
|
||||
sqlx::query!(
|
||||
"DELETE FROM join_sounds WHERE user = ? AND guild <=> ?",
|
||||
user_id.0,
|
||||
guild_id.map(|g| g.0)
|
||||
user_id.get(),
|
||||
guild_id.map(|g| g.get())
|
||||
)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
|
||||
Reference in new issue
Block a user