X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Fimpls%2Factivity.rs;h=87b78a1d61fb765333a26e0558aa189a5427bbbd;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=b22550a4e75df4f1c726ec86d2c7a400adad5ba6;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git

diff --git a/crates/db_schema/src/impls/activity.rs b/crates/db_schema/src/impls/activity.rs
index b22550a4..87b78a1d 100644
--- a/crates/db_schema/src/impls/activity.rs
+++ b/crates/db_schema/src/impls/activity.rs
@@ -9,12 +9,12 @@ use serde_json::Value;
 impl Crud for Activity {
   type Form = ActivityForm;
   type IdType = i32;
-  fn read(conn: &PgConnection, activity_id: i32) -> Result<Self, Error> {
+  fn read(conn: &mut PgConnection, activity_id: i32) -> Result<Self, Error> {
     use crate::schema::activity::dsl::*;
     activity.find(activity_id).first::<Self>(conn)
   }
 
-  fn create(conn: &PgConnection, new_activity: &ActivityForm) -> Result<Self, Error> {
+  fn create(conn: &mut PgConnection, new_activity: &ActivityForm) -> Result<Self, Error> {
     use crate::schema::activity::dsl::*;
     insert_into(activity)
       .values(new_activity)
@@ -22,7 +22,7 @@ impl Crud for Activity {
   }
 
   fn update(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     activity_id: i32,
     new_activity: &ActivityForm,
   ) -> Result<Self, Error> {
@@ -31,7 +31,7 @@ impl Crud for Activity {
       .set(new_activity)
       .get_result::<Self>(conn)
   }
-  fn delete(conn: &PgConnection, activity_id: i32) -> Result<usize, Error> {
+  fn delete(conn: &mut PgConnection, activity_id: i32) -> Result<usize, Error> {
     use crate::schema::activity::dsl::*;
     diesel::delete(activity.find(activity_id)).execute(conn)
   }
@@ -40,7 +40,7 @@ impl Crud for Activity {
 impl Activity {
   /// Returns true if the insert was successful
   pub fn insert(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     ap_id: DbUrl,
     data: Value,
     local: bool,
@@ -64,12 +64,12 @@ impl Activity {
     }
   }
 
-  pub fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Activity, Error> {
+  pub fn read_from_apub_id(conn: &mut PgConnection, object_id: &DbUrl) -> Result<Activity, Error> {
     use crate::schema::activity::dsl::*;
     activity.filter(ap_id.eq(object_id)).first::<Self>(conn)
   }
 
-  pub fn delete_olds(conn: &PgConnection) -> Result<usize, Error> {
+  pub fn delete_olds(conn: &mut PgConnection) -> Result<usize, Error> {
     use crate::schema::activity::dsl::*;
     diesel::delete(activity.filter(published.lt(now - 6.months()))).execute(conn)
   }
@@ -93,7 +93,7 @@ mod tests {
   #[test]
   #[serial]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = &mut establish_unpooled_connection();
 
     let creator_form = PersonForm {
       name: "activity_creator_pm".into(),
@@ -101,7 +101,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let inserted_creator = Person::create(&conn, &creator_form).unwrap();
+    let inserted_creator = Person::create(conn, &creator_form).unwrap();
 
     let ap_id: DbUrl = Url::parse(
       "https://enterprise.lemmy.ml/activities/delete/f1b5d57c-80f8-4e03-a615-688d552e946c",
@@ -130,7 +130,7 @@ mod tests {
       updated: None,
     };
 
-    let inserted_activity = Activity::create(&conn, &activity_form).unwrap();
+    let inserted_activity = Activity::create(conn, &activity_form).unwrap();
 
     let expected_activity = Activity {
       ap_id: ap_id.clone(),
@@ -142,10 +142,10 @@ mod tests {
       updated: None,
     };
 
-    let read_activity = Activity::read(&conn, inserted_activity.id).unwrap();
-    let read_activity_by_apub_id = Activity::read_from_apub_id(&conn, &ap_id).unwrap();
-    Person::delete(&conn, inserted_creator.id).unwrap();
-    Activity::delete(&conn, inserted_activity.id).unwrap();
+    let read_activity = Activity::read(conn, inserted_activity.id).unwrap();
+    let read_activity_by_apub_id = Activity::read_from_apub_id(conn, &ap_id).unwrap();
+    Person::delete(conn, inserted_creator.id).unwrap();
+    Activity::delete(conn, inserted_activity.id).unwrap();
 
     assert_eq!(expected_activity, read_activity);
     assert_eq!(expected_activity, read_activity_by_apub_id);