Disable cache lookup for users
This commit is contained in:
@@ -215,30 +215,30 @@ impl<'a> MultiReminderBuilder<'a> {
|
|||||||
for scope in self.scopes {
|
for scope in self.scopes {
|
||||||
let db_channel_id = match scope {
|
let db_channel_id = match scope {
|
||||||
ReminderScope::User(user_id) => {
|
ReminderScope::User(user_id) => {
|
||||||
if let Ok(user) = UserId::new(user_id).to_user(&self.ctx).await {
|
let user_id = UserId::new(user_id);
|
||||||
let user_data = UserData::from_user(
|
match UserData::from_user(
|
||||||
&user,
|
&user_id,
|
||||||
&self.ctx.serenity_context(),
|
&self.ctx.serenity_context(),
|
||||||
&self.ctx.data().database,
|
&self.ctx.data().database,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
{
|
||||||
|
Ok(user_data) => {
|
||||||
if let Some(guild_id) = self.guild_id {
|
if let Some(guild_id) = self.guild_id {
|
||||||
if guild_id.member(&self.ctx, user).await.is_err() {
|
if guild_id.member(&self.ctx, user_id).await.is_err() {
|
||||||
Err(ReminderError::InvalidTag)
|
Err(ReminderError::InvalidTag)
|
||||||
} else if self.set_by.map_or(true, |i| i != user_data.id)
|
} else if self.set_by.map_or(true, |i| i != user_data.id)
|
||||||
&& !user_data.allowed_dm
|
&& !user_data.allowed_dm
|
||||||
{
|
{
|
||||||
Err(ReminderError::UserBlockedDm)
|
Err(ReminderError::UserBlockedDm)
|
||||||
|
} else {
|
||||||
|
Ok((user_data.dm_channel, None))
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
Ok((user_data.dm_channel, None))
|
Ok((user_data.dm_channel, None))
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
Ok((user_data.dm_channel, None))
|
|
||||||
}
|
}
|
||||||
} else {
|
Err(_) => Err(ReminderError::InvalidTag),
|
||||||
Err(ReminderError::InvalidTag)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ReminderScope::Channel(channel_with_thread) => {
|
ReminderScope::Channel(channel_with_thread) => {
|
||||||
|
|||||||
+1
-1
@@ -63,7 +63,7 @@ use log::{error, info, warn};
|
|||||||
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
|
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
|
||||||
use poise::serenity_prelude::{
|
use poise::serenity_prelude::{
|
||||||
client::Context,
|
client::Context,
|
||||||
model::id::{ChannelId, GuildId, UserId},
|
model::id::{GuildId, UserId},
|
||||||
};
|
};
|
||||||
use rocket::{
|
use rocket::{
|
||||||
catchers,
|
catchers,
|
||||||
|
|||||||
Reference in New Issue
Block a user