From 7053d63ebcd6eefde2c4683c23eb48611efcfc69 Mon Sep 17 00:00:00 2001
From: Quaternion <quat3rnion@proton.me>
Date: Fri, 26 May 2023 11:44:02 -0400
Subject: [PATCH] Simplify locks

---
 src/types/entities/application.rs | 4 +---
 src/types/entities/attachment.rs  | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/types/entities/application.rs b/src/types/entities/application.rs
index 2ab3f99..748e8ff 100644
--- a/src/types/entities/application.rs
+++ b/src/types/entities/application.rs
@@ -2,11 +2,9 @@ use crate::types::utils::Snowflake;
 use bitflags::{bitflags, Flags};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-#[cfg(feature = "sqlx")]
-use sqlx::FromRow;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(feature = "sqlx", derive(FromRow))]
+#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
 pub struct Application {
     pub id: Snowflake,
     pub name: String,
diff --git a/src/types/entities/attachment.rs b/src/types/entities/attachment.rs
index c93ab8f..03dfe13 100644
--- a/src/types/entities/attachment.rs
+++ b/src/types/entities/attachment.rs
@@ -3,6 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::types::utils::Snowflake;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
 pub struct Attachment {
     pub id: Snowflake,
     pub filename: String,
@@ -18,6 +19,7 @@ pub struct Attachment {
     pub duration_secs: Option<f32>,
     pub waveform: Option<String>,
     #[serde(skip_serializing)]
+    #[cfg_attr(feature = "sqlx", sqlx(default)]
     pub content: Vec<u8>,
 }