discord
/
badgey
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Don't award XP in quarantine channels' (#10) from feature/no-xp-in-quarantine-channels into main
Badgey Deployment / build (push) Successful in 6m25s Details
Badgey Deployment / deploy (BADGEY) (push) Successful in 7s Details
Badgey Deployment / deploy (M5_COMPUTER) (push) Successful in 7s Details 

Reviewed-on: #10
This commit is contained in:
Xyon 2024-10-13 14:44:11 +00:00
parent 090223388d ed93d60a69
commit 67c17aced6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/badgey/models/xp.rs
View File

@ -10,6 +10,7 @@ use manifold::models::user::UserInfo;
use manifold::schema::userinfo; use manifold::schema::userinfo;
use poise::FrameworkContext; use poise::FrameworkContext;
use poise::serenity_prelude::{Context, Mentionable, Message, RoleId}; use poise::serenity_prelude::{Context, Mentionable, Message, RoleId};
use crate::badgey::models::quarantine_channel::QuarantineChannel;
use crate::badgey::schema::xp as xp_table; use crate::badgey::schema::xp as xp_table;
use crate::badgey::schema::*; use crate::badgey::schema::*;
@ -135,7 +136,7 @@ impl Xp {
}; };
let valid = match xp.last_given_xp { let valid = match xp.last_given_xp {
Some(t) => (chrono::Utc::now().timestamp() - 60) > t, Some(t) => (chrono::Utc::now().timestamp() - 60) > t && QuarantineChannel::get(&fctx.user_data.database, msg.channel_id.as_u64().clone() as i64).is_err(),
None => true None => true
}; };