peace/discord-bot
1
0
Fork 0
forked from Skynet/discord-bot
Code Pull requests Activity

fix: slight duplicate removal

Browse source
This commit is contained in:
silver 2025-02-18 22:44:32 +00:00
parent b6cffd8a22
commit 8c81fb864a
Signed by untrusted user: silver
GPG key ID: 36F93D61BAD3FD7D
1 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/common/database.rs
View file

@ -49,30 +49,33 @@ impl<'r> FromRow<'r, SqliteRow> for ServerMembersWolves {
fn from_row(row: &'r SqliteRow) -> Result<Self, Error> { fn from_row(row: &'r SqliteRow) -> Result<Self, Error> {
let server_tmp: i64 = row.try_get("server")?; let server_tmp: i64 = row.try_get("server")?;
let server = GuildId::from(server_tmp as u64); let server = GuildId::from(server_tmp as u64);
let discord = match row.try_get("discord") {
Ok(x) => {
let tmp: i64 = x;
if tmp == 0 {
None
} else {
Some(UserId::from(tmp as u64))
}
}
_ => None,
};
Ok(Self { Ok(Self {
server, server,
id_wolves: row.try_get("id_wolves")?, id_wolves: row.try_get("id_wolves")?,
expiry: row.try_get("expiry")?, expiry: row.try_get("expiry")?,
email: row.try_get("email")?, email: row.try_get("email")?,
discord, discord: get_discord_from_row(row),
minecraft: row.try_get("minecraft")?, minecraft: row.try_get("minecraft")?,
minecraft_uid: row.try_get("minecraft_uid")?, minecraft_uid: row.try_get("minecraft_uid")?,
}) })
} }
} }
fn get_discord_from_row(row: &SqliteRow) -> Option<UserId> {
match row.try_get("discord") {
Ok(x) => {
let tmp: i64 = x;
if tmp == 0 {
None
} else {
Some(UserId::from(tmp as u64))
}
}
_ => None,
}
}
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
pub struct Wolves { pub struct Wolves {
pub id_wolves: i64, pub id_wolves: i64,
@ -83,22 +86,10 @@ pub struct Wolves {
impl<'r> FromRow<'r, SqliteRow> for Wolves { impl<'r> FromRow<'r, SqliteRow> for Wolves {
fn from_row(row: &'r SqliteRow) -> Result<Self, Error> { fn from_row(row: &'r SqliteRow) -> Result<Self, Error> {
let discord = match row.try_get("discord") {
Ok(x) => {
let tmp: i64 = x;
if tmp == 0 {
None
} else {
Some(UserId::from(tmp as u64))
}
}
_ => None,
};
Ok(Self { Ok(Self {
id_wolves: row.try_get("id_wolves")?, id_wolves: row.try_get("id_wolves")?,
email: row.try_get("email")?, email: row.try_get("email")?,
discord, discord: get_discord_from_row(row),
minecraft: row.try_get("minecraft")?, minecraft: row.try_get("minecraft")?,
}) })
} }