Mystara/refraction
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use http client from context

Browse source
This commit is contained in:
seth 2024-04-26 20:53:13 -04:00
parent 921540e249
commit 84a7cfe151
No known key found for this signature in database
GPG key ID: D31BD0D494BBEE86
26 changed files with 148 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/utils/messages.rs
View file

@ -1,4 +1,4 @@
use crate::api::pluralkit;
use crate::api::{pluralkit, HttpClient};
use std::{str::FromStr, sync::OnceLock};
@ -23,8 +23,8 @@ fn find_first_image(message: &Message) -> Option<String> {
.map(|res| res.url.clone())
}
async fn find_real_author_id(message: &Message) -> UserId {
if let Ok(sender) = pluralkit::sender_from(message.id).await {
async fn find_real_author_id(http: &HttpClient, message: &Message) -> UserId {
if let Ok(sender) = pluralkit::sender_from(http, message.id).await {
sender
} else {
message.author.id
@ -109,7 +109,11 @@ pub async fn to_embed(
Ok(embed)
}
pub async fn from_message(ctx: &Context, msg: &Message) -> Result<Vec<CreateEmbed>> {
pub async fn from_message(
ctx: &Context,
http: &HttpClient,
msg: &Message,
) -> Result<Vec<CreateEmbed>> {
static MESSAGE_PATTERN: OnceLock<Regex> = OnceLock::new();
let message_pattern = MESSAGE_PATTERN.get_or_init(|| Regex::new(r"(?:https?:\/\/)?(?:canary\.|ptb\.)?discord(?:app)?\.com\/channels\/(?<server_id>\d+)\/(?<channel_id>\d+)\/(?<message_id>\d+)").unwrap());
@ -121,7 +125,7 @@ pub async fn from_message(ctx: &Context, msg: &Message) -> Result<Vec<CreateEmbe
// if the message was sent through pluralkit, we'll want
// to reference the Member of the unproxied account
let author_id = if msg.webhook_id.is_some() {
find_real_author_id(msg).await
find_real_author_id(http, msg).await
} else {
msg.author.id
};