allow timeline manipulation from plm

2022-12-16 22:51:14 +01:00
parent 620726cc25
commit 1536a6d3f3
14 changed files with 373 additions and 98 deletions
@@ -1,6 +1,6 @@
 use crate::{
-    ap_url, db_conn::DbConn, instance::Instance, safe_string::SafeString, schema::medias,
-    users::User, Connection, Error, Result, CONFIG,
+    ap_url, instance::Instance, safe_string::SafeString, schema::medias, users::User, Connection,
+    Error, Result, CONFIG,
 };
 use activitystreams::{object::Image, prelude::*};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
@@ -206,7 +206,7 @@ impl Media {
    }

    // TODO: merge with save_remote?
-    pub fn from_activity(conn: &DbConn, image: &Image) -> Result<Media> {
+    pub fn from_activity(conn: &Connection, image: &Image) -> Result<Media> {
        let remote_url = image
            .url()
            .and_then(|url| url.to_as_uri())
@@ -258,7 +258,7 @@ impl Media {
                    updated = true;
                }
                if updated {
-                    diesel::update(&media).set(&media).execute(&**conn)?;
+                    diesel::update(&media).set(&media).execute(conn)?;
                }
                Ok(media)
            })