Update and fix some warnings
Mainly just changing old deprecated functions to their newer counterparts
This commit is contained in:
parent
bbe1ee264b
commit
f3811ac712
5 changed files with 23 additions and 21 deletions
|
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -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?;
|
||||
|
@ -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> =
|
||||
|
|
|
@ -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,
|
||||
|
@ -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!(
|
||||
|
@ -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?;
|
||||
|
@ -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> =
|
||||
|
|
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
|
|
@ -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());
|
||||
});
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
@ -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();
|
||||
|
@ -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")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue