Merge branch 'main' into fetch/fix-track1099

Author: fetchfern

apps/labrinth/.sqlx/query-81cfa59dafa8dac87a917a3ddda93d412a579ab17d9dad754e7d9e26d78e0e80.json renamed to apps/labrinth/.sqlx/query-057b0fda8e0ad34fc880121b6461ddfc3c61d4a0bf95e376e24440b6a58d2844.json

@@ -0,0 +1,2 @@
+ALTER TABLE affiliate_codes
+ADD COLUMN source_name VARCHAR(255) NOT NULL DEFAULT '(unnamed)';

apps/labrinth/.sqlx/query-d51d96a9771ce1c3a2987e0790ef25bc55122c934c73418a97ee9cd81f56b251.json renamed to apps/labrinth/.sqlx/query-0e6d18643a4a7834eb34fe519b073e290b1089d2d0cfdfdb45b5125a931d08ca.json

@@ -9,6 +9,7 @@ pub struct DBAffiliateCode {
     pub created_at: DateTime<Utc>,
     pub created_by: DBUserId,
     pub affiliate: DBUserId,
+    pub source_name: String,
 }
 
 impl DBAffiliateCode {
@@ -17,7 +18,7 @@ impl DBAffiliateCode {
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Option<DBAffiliateCode>, DatabaseError> {
         let record = sqlx::query!(
-            "SELECT id, created_at, created_by, affiliate
+            "SELECT id, created_at, created_by, affiliate, source_name
             FROM affiliate_codes WHERE id = $1",
             id as DBAffiliateCodeId
         )
@@ -29,6 +30,7 @@ impl DBAffiliateCode {
             created_at: record.created_at,
             created_by: DBUserId(record.created_by),
             affiliate: DBUserId(record.affiliate),
+            source_name: record.source_name,
         }))
     }
 
@@ -37,7 +39,7 @@ impl DBAffiliateCode {
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Vec<DBAffiliateCode>, DatabaseError> {
         let records = sqlx::query!(
-            "SELECT id, created_at, created_by, affiliate
+            "SELECT id, created_at, created_by, affiliate, source_name
             FROM affiliate_codes WHERE affiliate = $1",
             affiliate as DBUserId
         )
@@ -49,6 +51,7 @@ impl DBAffiliateCode {
                 created_at: record.created_at,
                 created_by: DBUserId(record.created_by),
                 affiliate: DBUserId(record.affiliate),
+                source_name: record.source_name,
             })
         })
         .try_collect::<Vec<_>>()
@@ -62,12 +65,13 @@ impl DBAffiliateCode {
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         sqlx::query!(
-            "INSERT INTO affiliate_codes (id, created_at, created_by, affiliate)
-            VALUES ($1, $2, $3, $4)",
+            "INSERT INTO affiliate_codes (id, created_at, created_by, affiliate, source_name)
+            VALUES ($1, $2, $3, $4, $5)",
             self.id as DBAffiliateCodeId,
             self.created_at,
             self.created_by as DBUserId,
-            self.affiliate as DBUserId
+            self.affiliate as DBUserId,
+            self.source_name
         )
         .execute(exec)
         .await?;
@@ -92,11 +96,27 @@ impl DBAffiliateCode {
         }
     }
 
+    pub async fn update_source_name(
+        id: DBAffiliateCodeId,
+        source_name: &str,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
+    ) -> Result<bool, DatabaseError> {
+        let result = sqlx::query!(
+            "UPDATE affiliate_codes SET source_name = $1 WHERE id = $2",
+            source_name,
+            id as DBAffiliateCodeId
+        )
+        .execute(exec)
+        .await?;
+
+        Ok(result.rows_affected() > 0)
+    }
+
     pub async fn get_all(
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Vec<DBAffiliateCode>, DatabaseError> {
         let records = sqlx::query!(
-            "SELECT id, created_at, created_by, affiliate
+            "SELECT id, created_at, created_by, affiliate, source_name
             FROM affiliate_codes ORDER BY created_at DESC"
         )
         .fetch(exec)
@@ -107,6 +127,7 @@ impl DBAffiliateCode {
                 created_at: record.created_at,
                 created_by: DBUserId(record.created_by),
                 affiliate: DBUserId(record.affiliate),
+                source_name: record.source_name,
             })
         })
         .try_collect::<Vec<_>>()

apps/labrinth/.sqlx/query-6ef8402f0f0685acda118c024d82e31b1b235ab7c5ec00a86af4dfbe81342a58.json renamed to apps/labrinth/.sqlx/query-1bd7365eaeac25b1286030a900767eef3b1b6e200ab0dbb3a4274eeba95f9568.json

@@ -17,17 +17,15 @@ bitflags::bitflags! {
         const ALPHA_TESTER = 1 << 4;
         const CONTRIBUTOR = 1 << 5;
         const TRANSLATOR = 1 << 6;
-
-        const ALL = 0b1111111;
-        const NONE = 0b0;
+        const AFFILIATE = 1 << 7;
     }
 }
 
 bitflags_serde_impl!(Badges, u64);
 
 impl Default for Badges {
     fn default() -> Badges {
-        Badges::NONE
+        Badges::empty()
     }
 }