Skip to content

Commit

Permalink
Update and fix some warnings
Browse files Browse the repository at this point in the history
Mainly just changing old deprecated functions to their newer counterparts
  • Loading branch information
BuyMyMojo committed Jul 3, 2024
1 parent bbe1ee2 commit f3811ac
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
13 changes: 7 additions & 6 deletions src/commands/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ pub async fn search(
ctx: Context<'_>,
#[description = "Member to search for. This must be a user ID."] user_id: String,
) -> Result<(), Error> {
use chrono::DateTime;
use pastemyst::paste::*;
use pastemyst::str;
use poise::serenity_prelude::User;
Expand Down Expand Up @@ -381,12 +382,11 @@ pub async fn search(

#[allow(clippy::cast_possible_truncation)]
// this shouldn't be able to break but just in case I'm making the `unwrap_or` output NaiveDateTime::MIN
let date_time_stamp = chrono::NaiveDateTime::from_timestamp_opt(unix_timecode as i64, 0)
.unwrap_or(chrono::NaiveDateTime::MIN);
let date_time_stamp = DateTime::from_timestamp(unix_timecode as i64, 0).unwrap_or(DateTime::UNIX_EPOCH);

let age = chrono::Utc::now()
.naive_utc()
.signed_duration_since(date_time_stamp)
.signed_duration_since(date_time_stamp.naive_local())
.num_days();

let is_user_in_db: Option<String> = check_username_against_db(ctx.author().id.0).await.unwrap();
Expand Down Expand Up @@ -626,6 +626,8 @@ pub async fn footprint_lookup(
BlacklistOutput,
>,
) -> Result<(), Error> {
use chrono::DateTime;

ctx.defer().await?;

let mut con = open_redis_connection().await?;
Expand Down Expand Up @@ -929,12 +931,11 @@ pub async fn footprint_lookup(

#[allow(clippy::cast_possible_truncation)]
// this shouldn't be able to break but just in case I'm making the `unwrap_or` output NaiveDateTime::MIN
let date_time_stamp = chrono::NaiveDateTime::from_timestamp_opt(unix_timecode as i64, 0)
.unwrap_or(chrono::NaiveDateTime::MIN);
let date_time_stamp = DateTime::from_timestamp(unix_timecode as i64, 0).unwrap_or(DateTime::UNIX_EPOCH);

let age = chrono::Utc::now()
.naive_utc()
.signed_duration_since(date_time_stamp)
.signed_duration_since(date_time_stamp.naive_local())
.num_days();

let is_user_in_db: Option<String> =
Expand Down
12 changes: 6 additions & 6 deletions src/commands/tools.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use chrono::NaiveDateTime;
use chrono::DateTime;
use poise::serenity_prelude::{self as serenity, AttachmentType, RichInvite};
use rusted_fbt_lib::{
checks::guild_auth_check,
Expand Down Expand Up @@ -26,11 +26,11 @@ pub async fn account_age(
#[allow(clippy::cast_possible_truncation)]
// this shouldn't be able to break but just in case I'm making the `unwrap_or` output NaiveDateTime::MIN
let date_time_stamp =
NaiveDateTime::from_timestamp_opt(unix_timecode as i64, 0).unwrap_or(NaiveDateTime::MIN);
DateTime::from_timestamp(unix_timecode as i64, 0).unwrap_or(DateTime::UNIX_EPOCH);

let age = chrono::Utc::now()
.naive_utc()
.signed_duration_since(date_time_stamp)
.signed_duration_since(date_time_stamp.naive_local())
.num_days();

ctx.say(format!(
Expand All @@ -56,7 +56,7 @@ pub async fn creation_date(
#[allow(clippy::cast_possible_truncation)]
// this shouldn't be able to break but just in case I'm making the `unwrap_or` output NaiveDateTime::MIN
let date_time_stamp =
NaiveDateTime::from_timestamp_opt(unix_timecode as i64, 0).unwrap_or(NaiveDateTime::MIN);
DateTime::from_timestamp(unix_timecode as i64, 0).unwrap_or(DateTime::UNIX_EPOCH);

ctx.say(format!("Created/Joined on {date_time_stamp}"))
.await?;
Expand Down Expand Up @@ -277,11 +277,11 @@ pub async fn invite_info(
#[allow(clippy::cast_possible_truncation)]
// this shouldn't be able to break but just in case I'm making the `unwrap_or` output NaiveDateTime::MIN
let date_time_stamp =
NaiveDateTime::from_timestamp_opt(unix_timecode as i64, 0).unwrap_or(NaiveDateTime::MIN);
DateTime::from_timestamp(unix_timecode as i64, 0).unwrap_or(DateTime::UNIX_EPOCH);

let age = chrono::Utc::now()
.naive_utc()
.signed_duration_since(date_time_stamp)
.signed_duration_since(date_time_stamp.naive_local())
.num_days();

let is_user_in_db: Option<String> =
Expand Down
9 changes: 5 additions & 4 deletions src/lib/event_handlers.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::structs::{GuildSettings, UserInfo, WaybackResponse, WaybackStatus};
use crate::utils::snowflake_to_unix;
use crate::vars::FBT_GUILD_ID;
use chrono::NaiveDateTime;
// use chrono::NaiveDateTime;
use chrono::Utc;
use chrono_tz::Australia::Melbourne;
use colored::Colorize;
Expand Down Expand Up @@ -90,6 +90,8 @@ pub async fn alt_kicker(
ctx: &serenity::Context,
member: &serenity::Member,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
use chrono::DateTime;

use crate::utils::open_redis_connection;
use std::collections::HashSet;

Expand Down Expand Up @@ -133,12 +135,11 @@ pub async fn alt_kicker(

#[allow(clippy::pedantic)]
// it literally only take's i64, no need to warn about truncation here.
let date_time_stamp = NaiveDateTime::from_timestamp_opt(unix_timecode as i64, 0)
.unwrap_or(NaiveDateTime::MIN);
let date_time_stamp = DateTime::from_timestamp(unix_timecode as i64, 0).unwrap_or(DateTime::UNIX_EPOCH);

let age = chrono::Utc::now()
.naive_utc()
.signed_duration_since(date_time_stamp)
.signed_duration_since(date_time_stamp.naive_local())
.num_days();

// Compare user age
Expand Down
2 changes: 1 addition & 1 deletion src/lib/memes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub async fn pog_be_gone(
let mut hits: Vec<&str> = Vec::new();

for word in words {
POG_RE.find(word).map_or((), |pog| {
let _ = POG_RE.find(word).map_or((), |pog| {
hits.push(pog.as_str());
});
}
Expand Down
8 changes: 4 additions & 4 deletions src/lib/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ pub fn verbose_mode() -> bool {
/// Open a tokio redis connection
#[cfg(feature = "database")]
#[instrument()]
pub async fn open_redis_connection() -> Result<redis::aio::Connection, anyhow::Error> {
pub async fn open_redis_connection() -> Result<redis::aio::MultiplexedConnection, anyhow::Error> {
let redis_connection = redis::Client::open(REDIS_ADDR)?
.get_tokio_connection()
.get_multiplexed_tokio_connection()
.await?;

Ok(redis_connection)
Expand All @@ -38,7 +38,7 @@ pub async fn open_redis_connection() -> Result<redis::aio::Connection, anyhow::E
#[instrument(skip(con))]
pub async fn set_guild_settings(
ctx: Context<'_>,
con: &mut redis::aio::Connection,
con: &mut redis::aio::MultiplexedConnection,
settings: GuildSettings,
) -> Result<(), Error> {
let json = serde_json::to_string(&settings).unwrap();
Expand All @@ -64,7 +64,7 @@ pub async fn set_guild_settings(
#[instrument(skip(con))]
pub async fn auth(
ctx: Context<'_>,
con: &mut redis::aio::Connection,
con: &mut redis::aio::MultiplexedConnection,
uid: String,
) -> Result<(), Error> {
redis::cmd("SADD")
Expand Down

0 comments on commit f3811ac

Please sign in to comment.