Rename: from_db07() -> from_db()

plume-common/src/activity_pub/inbox.rs

@@ -349,7 +349,7 @@ pub trait FromId<C>: Sized {
         object: Option<Self::Object>,
         proxy: Option<&reqwest::Proxy>,
     ) -> Result<Self, (Option<serde_json::Value>, Self::Error)> {
-        match Self::from_db07(ctx, id) {
+        match Self::from_db(ctx, id) {
             Ok(x) => Ok(x),
             _ => match object {
                 Some(o) => Self::from_activity(ctx, o).map_err(|e| (None, e)),
@@ -380,7 +380,7 @@ pub trait FromId<C>: Sized {
     fn from_activity(ctx: &C, activity: Self::Object) -> Result<Self, Self::Error>;
 
     /// Tries to find a `Self` with a given ID (`id`), using `ctx` (a database)
-    fn from_db07(ctx: &C, id: &str) -> Result<Self, Self::Error>;
+    fn from_db(ctx: &C, id: &str) -> Result<Self, Self::Error>;
 
     fn get_sender07() -> &'static dyn Signer;
 }
@@ -606,7 +606,7 @@ mod tests {
         type Error = ();
         type Object = Person07;
 
-        fn from_db07(_: &(), _id: &str) -> Result<Self, Self::Error> {
+        fn from_db(_: &(), _id: &str) -> Result<Self, Self::Error> {
             Ok(Self)
         }
 
@@ -634,7 +634,7 @@ mod tests {
         type Error = ();
         type Object = Note07;
 
-        fn from_db07(_: &(), _id: &str) -> Result<Self, Self::Error> {
+        fn from_db(_: &(), _id: &str) -> Result<Self, Self::Error> {
             Ok(Self)
         }
 
@@ -785,7 +785,7 @@ mod tests {
         type Error = ();
         type Object = Person07;
 
-        fn from_db07(_: &(), _id: &str) -> Result<Self, Self::Error> {
+        fn from_db(_: &(), _id: &str) -> Result<Self, Self::Error> {
             Err(())
         }
 

plume-models/src/blogs.rs

@@ -365,7 +365,7 @@ impl FromId<DbConn> for Blog {
     type Error = Error;
     type Object = CustomGroup;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Self::find_by_ap_url(conn, id)
     }
 

plume-models/src/comments.rs

@@ -221,7 +221,7 @@ impl FromId<DbConn> for Comment {
     type Error = Error;
     type Object = Note;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Self::find_by_ap_url(conn, id)
     }
 

plume-models/src/follows.rs

@@ -172,7 +172,7 @@ impl FromId<DbConn> for Follow {
     type Error = Error;
     type Object = FollowAct;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Follow::find_by_ap_url(conn, id)
     }
 

plume-models/src/likes.rs

@@ -109,7 +109,7 @@ impl FromId<DbConn> for Like {
     type Error = Error;
     type Object = LikeAct;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Like::find_by_ap_url(conn, id)
     }
 

plume-models/src/posts.rs

@@ -620,7 +620,7 @@ impl FromId<DbConn> for Post {
     type Error = Error;
     type Object = LicensedArticle;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Self::find_by_ap_url(conn, id)
     }
 
@@ -674,7 +674,7 @@ impl FromId<DbConn> for Post {
             .url()
             .and_then(|url| url.to_as_uri().or(id))
             .ok_or(Error::MissingApProperty)?;
-        let post = Post::from_db07(conn, &ap_url)
+        let post = Post::from_db(conn, &ap_url)
             .and_then(|mut post| {
                 let mut updated = false;
 
@@ -849,7 +849,7 @@ impl FromId<DbConn> for PostUpdate {
     type Error = Error;
     type Object = LicensedArticle;
 
-    fn from_db07(_: &DbConn, _: &str) -> Result<Self> {
+    fn from_db(_: &DbConn, _: &str) -> Result<Self> {
         // Always fail because we always want to deserialize the AP object
         Err(Error::NotFound)
     }

plume-models/src/reshares.rs

@@ -138,7 +138,7 @@ impl FromId<DbConn> for Reshare {
     type Error = Error;
     type Object = Announce;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Reshare::find_by_ap_url(conn, id)
     }
 

plume-models/src/users.rs

@@ -948,7 +948,7 @@ impl FromId<DbConn> for User {
     type Error = Error;
     type Object = CustomPerson;
 
-    fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
         Self::find_by_ap_url(conn, id)
     }