build: update dependencies
This commit is contained in:
parent
407460d2aa
commit
36d3a18b08
5 changed files with 13 additions and 19 deletions
|
@ -45,7 +45,7 @@ pub async fn upload(
|
|||
|
||||
guild
|
||||
.set_icon(
|
||||
&data.bunny_cdn,
|
||||
&data.bunny_storage,
|
||||
&mut conn,
|
||||
data.config.bunny.cdn_url.clone(),
|
||||
bytes,
|
||||
|
|
11
src/main.rs
11
src/main.rs
|
@ -40,7 +40,7 @@ pub struct Data {
|
|||
pub config: Config,
|
||||
pub argon2: Argon2<'static>,
|
||||
pub start_time: SystemTime,
|
||||
pub bunny_cdn: bunny_api_tokio::Client,
|
||||
pub bunny_storage: bunny_api_tokio::EdgeStorageClient,
|
||||
pub mail_client: MailClient,
|
||||
}
|
||||
|
||||
|
@ -65,14 +65,9 @@ async fn main() -> Result<(), Error> {
|
|||
|
||||
let cache_pool = redis::Client::open(config.cache_database.url())?;
|
||||
|
||||
let mut bunny_cdn = bunny_api_tokio::Client::new("").await?;
|
||||
|
||||
let bunny = config.bunny.clone();
|
||||
|
||||
bunny_cdn
|
||||
.storage
|
||||
.init(bunny.api_key, bunny.endpoint, bunny.storage_zone)
|
||||
.await?;
|
||||
let bunny_storage = bunny_api_tokio::EdgeStorageClient::new(bunny.api_key, bunny.endpoint, bunny.storage_zone).await?;
|
||||
|
||||
let mail = config.mail.clone();
|
||||
|
||||
|
@ -122,7 +117,7 @@ async fn main() -> Result<(), Error> {
|
|||
// TODO: Possibly implement "pepper" into this (thinking it could generate one if it doesnt exist and store it on disk)
|
||||
argon2: Argon2::default(),
|
||||
start_time: SystemTime::now(),
|
||||
bunny_cdn,
|
||||
bunny_storage,
|
||||
mail_client,
|
||||
};
|
||||
|
||||
|
|
|
@ -188,7 +188,7 @@ impl Guild {
|
|||
// FIXME: Horrible security
|
||||
pub async fn set_icon(
|
||||
&mut self,
|
||||
bunny_cdn: &bunny_api_tokio::Client,
|
||||
bunny_storage: &bunny_api_tokio::EdgeStorageClient,
|
||||
conn: &mut Conn,
|
||||
cdn_url: Url,
|
||||
icon: BytesMut,
|
||||
|
@ -199,12 +199,12 @@ impl Guild {
|
|||
if let Some(icon) = &self.icon {
|
||||
let relative_url = icon.path().trim_start_matches('/');
|
||||
|
||||
bunny_cdn.storage.delete(relative_url).await?;
|
||||
bunny_storage.delete(relative_url).await?;
|
||||
}
|
||||
|
||||
let path = format!("icons/{}/icon.{}", self.uuid, image_type);
|
||||
|
||||
bunny_cdn.storage.upload(path.clone(), icon.into()).await?;
|
||||
bunny_storage.upload(path.clone(), icon.into()).await?;
|
||||
|
||||
let icon_url = cdn_url.join(&path)?;
|
||||
|
||||
|
|
|
@ -85,13 +85,12 @@ impl Me {
|
|||
|
||||
let relative_url = avatar_url.path().trim_start_matches('/');
|
||||
|
||||
data.bunny_cdn.storage.delete(relative_url).await?;
|
||||
data.bunny_storage.delete(relative_url).await?;
|
||||
}
|
||||
|
||||
let path = format!("avatar/{}/avatar.{}", self.uuid, image_type);
|
||||
|
||||
data.bunny_cdn
|
||||
.storage
|
||||
data.bunny_storage
|
||||
.upload(path.clone(), avatar.into())
|
||||
.await?;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue