Merge branch 'jude/fix-dashboard-patreon' into current
This commit is contained in:
commit
9bf0b5d7e4
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -2431,7 +2431,7 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reminder-rs"
|
name = "reminder-rs"
|
||||||
version = "1.7.24"
|
version = "1.7.26"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "reminder-rs"
|
name = "reminder-rs"
|
||||||
version = "1.7.24"
|
version = "1.7.27"
|
||||||
authors = ["Jude Southworth <judesouthworth@pm.me>"]
|
authors = ["Jude Southworth <judesouthworth@pm.me>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0 only"
|
license = "AGPL-3.0 only"
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import { ChannelSelector } from "./ChannelSelector";
|
import { ChannelSelector } from "./ChannelSelector";
|
||||||
import { DateTime } from "luxon";
|
|
||||||
import { IntervalSelector } from "./IntervalSelector";
|
import { IntervalSelector } from "./IntervalSelector";
|
||||||
import { useQuery } from "react-query";
|
import { useQuery } from "react-query";
|
||||||
import { fetchGuildInfo, fetchUserInfo } from "../../api";
|
import { fetchGuildInfo, fetchUserInfo } from "../../api";
|
||||||
|
@ -20,7 +20,7 @@ pub async fn delete_macro(
|
|||||||
SELECT m.id
|
SELECT m.id
|
||||||
FROM command_macro m
|
FROM command_macro m
|
||||||
INNER JOIN guilds
|
INNER JOIN guilds
|
||||||
ON guilds.guild = m.guild_id
|
ON guilds.id = m.guild_id
|
||||||
WHERE guild = ?
|
WHERE guild = ?
|
||||||
AND m.name = ?
|
AND m.name = ?
|
||||||
",
|
",
|
||||||
|
@ -55,9 +55,11 @@ To stay up to date on the latest features and fixes, join our [Discord](https://
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
FullEvent::GuildDelete { incomplete, .. } => {
|
FullEvent::GuildDelete { incomplete, .. } => {
|
||||||
let _ = sqlx::query!("DELETE FROM guilds WHERE guild = ?", incomplete.id.get())
|
if !incomplete.unavailable {
|
||||||
.execute(&data.database)
|
let _ = sqlx::query!("DELETE FROM guilds WHERE guild = ?", incomplete.id.get())
|
||||||
.await;
|
.execute(&data.database)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
FullEvent::InteractionCreate { interaction } => {
|
FullEvent::InteractionCreate { interaction } => {
|
||||||
if let Some(component) = interaction.clone().message_component() {
|
if let Some(component) = interaction.clone().message_component() {
|
||||||
|
@ -68,7 +68,7 @@ impl Data {
|
|||||||
guild_id: GuildId,
|
guild_id: GuildId,
|
||||||
) -> Result<Vec<CommandMacro>, Error> {
|
) -> Result<Vec<CommandMacro>, Error> {
|
||||||
let rows = sqlx::query!(
|
let rows = sqlx::query!(
|
||||||
"SELECT name, description, commands FROM macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
|
"SELECT name, description, commands FROM command_macro WHERE guild_id = (SELECT id FROM guilds WHERE guild = ?)",
|
||||||
guild_id.get()
|
guild_id.get()
|
||||||
)
|
)
|
||||||
.fetch_all(&self.database)
|
.fetch_all(&self.database)
|
||||||
@ -76,7 +76,7 @@ impl Data {
|
|||||||
guild_id,
|
guild_id,
|
||||||
name: row.name.clone(),
|
name: row.name.clone(),
|
||||||
description: row.description.clone(),
|
description: row.description.clone(),
|
||||||
commands: serde_json::from_str(&row.commands).unwrap(),
|
commands: serde_json::from_str(&row.commands.to_string()).unwrap(),
|
||||||
}).collect();
|
}).collect();
|
||||||
|
|
||||||
Ok(rows)
|
Ok(rows)
|
||||||
|
Loading…
Reference in New Issue
Block a user