Move away from buckets terminology

Author: hypergonial

src/external/s3.rs

@@ -202,12 +202,12 @@ impl S3Service {
 #[derive(Clone, Debug)]
 pub struct Bucket<'a> {
     name: &'static str,
-    buckets: &'a S3Service,
+    s3: &'a S3Service,
 }
 
 impl<'a> Bucket<'a> {
-    pub const fn new(buckets: &'a S3Service, name: &'static str) -> Self {
-        Self { name, buckets }
+    pub const fn new(s3: &'a S3Service, name: &'static str) -> Self {
+        Self { name, s3 }
     }
 
     /// The name of this bucket.
@@ -230,14 +230,7 @@ impl<'a> Bucket<'a> {
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
     pub async fn get_object(&self, key: impl Into<String>) -> Result<Bytes, AppError> {
-        let mut resp = self
-            .buckets
-            .client()
-            .get_object()
-            .bucket(self.name)
-            .key(key)
-            .send()
-            .await?;
+        let mut resp = self.s3.client().get_object().bucket(self.name).key(key).send().await?;
 
         let mut bytes = BytesMut::new();
         while let Some(chunk) = resp.body.next().await {
@@ -264,7 +257,7 @@ impl<'a> Bucket<'a> {
         data: impl Into<ByteStream>,
         content_type: &Mime,
     ) -> Result<(), AppError> {
-        self.buckets
+        self.s3
             .client()
             .put_object()
             .bucket(self.name)
@@ -296,7 +289,7 @@ impl<'a> Bucket<'a> {
         let mut objects = Vec::new();
 
         // AWS-SDK has a nice pagination API to send continuation tokens implicitly, so we use that
-        let mut req = self.buckets.client().list_objects_v2().bucket(self.name).prefix(prefix);
+        let mut req = self.s3.client().list_objects_v2().bucket(self.name).prefix(prefix);
 
         if let Some(limit) = limit {
             req = req.max_keys(limit);
@@ -324,7 +317,7 @@ impl<'a> Bucket<'a> {
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
     pub async fn delete_object(&self, key: impl Into<String>) -> Result<(), AppError> {
-        self.buckets
+        self.s3
             .client()
             .delete_object()
             .bucket(self.name)
@@ -363,7 +356,7 @@ impl<'a> Bucket<'a> {
             })
             .collect();
 
-        self.buckets
+        self.s3
             .client()
             .delete_objects()
             .bucket(self.name)

src/models/attachment.rs

@@ -27,7 +27,7 @@ pub trait AttachmentLike {
     /// This determines the ordering of attachments within a message, starting from 0.
     fn id(&self) -> u8;
     /// The name of the attachment file, including the file extension.
-    fn filename(&self) -> &String;
+    fn filename(&self) -> &str;
     /// The ID of the message this attachment belongs to.
     fn message_id(&self) -> Snowflake<Message>;
     /// The ID of the channel the message was sent to.
@@ -164,9 +164,8 @@ impl FullAttachment {
     /// ## Errors
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
-    pub async fn upload(&self, buckets: &S3Service) -> Result<(), AppError> {
-        buckets
-            .attachments()
+    pub async fn upload(&self, s3: &S3Service) -> Result<(), AppError> {
+        s3.attachments()
             .put_object(self.s3_key(), self.content.clone(), &self.mime())
             .await
     }
@@ -176,8 +175,8 @@ impl FullAttachment {
     /// ## Errors
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
-    pub async fn download(&mut self, buckets: &S3Service) -> Result<(), AppError> {
-        self.content = buckets.attachments().get_object(self.s3_key()).await?;
+    pub async fn download(&mut self, s3: &S3Service) -> Result<(), AppError> {
+        self.content = s3.attachments().get_object(self.s3_key()).await?;
         Ok(())
     }
 
@@ -187,8 +186,8 @@ impl FullAttachment {
     /// ## Errors
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
-    pub async fn delete(&self, buckets: &S3Service) -> Result<(), AppError> {
-        buckets.attachments().delete_object(self.s3_key()).await
+    pub async fn delete(&self, s3: &S3Service) -> Result<(), AppError> {
+        s3.attachments().delete_object(self.s3_key()).await
     }
 }
 
@@ -197,7 +196,7 @@ impl AttachmentLike for FullAttachment {
         self.id
     }
 
-    fn filename(&self) -> &String {
+    fn filename(&self) -> &str {
         &self.filename
     }
 
@@ -264,7 +263,7 @@ impl PartialAttachment {
     /// ## Errors
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
-    pub async fn download(self, buckets: &S3Service) -> Result<FullAttachment, AppError> {
+    pub async fn download(self, s3: &S3Service) -> Result<FullAttachment, AppError> {
         let mut attachment = FullAttachment::new(
             self.id,
             self.filename,
@@ -273,7 +272,7 @@ impl PartialAttachment {
             self.channel_id,
             self.message_id,
         );
-        attachment.download(buckets).await?;
+        attachment.download(s3).await?;
         Ok(attachment)
     }
 
@@ -405,7 +404,7 @@ impl AttachmentLike for PartialAttachment {
         self.id
     }
 
-    fn filename(&self) -> &String {
+    fn filename(&self) -> &str {
         &self.filename
     }
 

src/models/avatar.rs

@@ -291,15 +291,15 @@ impl<K: AvatarKind> PartialAvatar<K> {
     /// ## Errors
     ///
     /// * [`AppError::S3`] - If the S3 request fails.
-    pub async fn download(self, buckets: &S3Service) -> Result<FullAvatar<K>, AppError> {
+    pub async fn download(self, s3: &S3Service) -> Result<FullAvatar<K>, AppError> {
         let mime = self.mime().clone();
         let mut attachment = FullAvatar::builder()
             .avatar_hash(self.avatar_hash)
             .holder_id(self.holder_id)
             .mime(mime)
             .content(Bytes::new())
             .build()?;
-        attachment.download(buckets).await?;
+        attachment.download(s3).await?;
         Ok(attachment)
     }
 }