Introduce a get! macro to avoid some code duplication

src/models/blog_authors.rs

@@ -26,11 +26,5 @@ impl BlogAuthor {
             .expect("Error saving new blog author")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<BlogAuthor> {
+    get!(blog_authors);
-        blog_authors::table.filter(blog_authors::id.eq(id))
-            .limit(1)
-            .load::<BlogAuthor>(conn)
-            .expect("Error loading blog author by id")
-            .into_iter().nth(0)
-    }
 }

src/models/blogs.rs

@@ -63,13 +63,7 @@ impl Blog {
             .expect("Error saving new blog")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Blog> {
+    get!(blogs);
-        blogs::table.filter(blogs::id.eq(id))
-            .limit(1)
-            .load::<Blog>(conn)
-            .expect("Error loading blog by id")
-            .into_iter().nth(0)
-    }
 
     pub fn find_for_author(conn: &PgConnection, author_id: i32) -> Vec<Blog> {
         use schema::blog_authors;

src/models/comments.rs

@@ -54,13 +54,7 @@ impl Comment {
             .expect("Error saving new comment")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Comment> {
+    get!(comments);
-        comments::table.filter(comments::id.eq(id))
-            .limit(1)
-            .load::<Comment>(conn)
-            .expect("Error loading comment by id")
-            .into_iter().nth(0)
-    }
 
     find_by!(comments, find_by_post, post_id as i32);
     find_by!(comments, find_by_ap_url, ap_url as String);

src/models/follows.rs

@@ -32,13 +32,7 @@ impl Follow {
             .expect("Unable to insert new follow")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Follow> {
+    get!(follows);
-        follows::table.filter(follows::id.eq(id))
-            .limit(1)
-            .load::<Follow>(conn)
-            .expect("Unable to load follow by id")
-            .into_iter().nth(0)
-    }
 
     pub fn accept_follow<A: Signer + IntoId + Clone, B: Clone + WithInbox + Actor>(
         conn: &PgConnection,

src/models/instance.rs

@@ -55,13 +55,7 @@ impl Instance {
             .expect("Error saving new instance")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Instance> {
+    get!(instances);
-        instances::table.filter(instances::id.eq(id))
-            .limit(1)
-            .load::<Instance>(conn)
-            .expect("Error loading local instance infos")
-            .into_iter().nth(0)
-    }
 
     find_by!(instances, find_by_domain, public_domain as String);
 

src/models/likes.rs

@@ -50,13 +50,7 @@ impl Like {
         }
     }
 
-     pub fn get(conn: &PgConnection, id: i32) -> Option<Like> {
+    get!(likes);
-        likes::table.filter(likes::id.eq(id))
-            .limit(1)
-            .load::<Like>(conn)
-            .expect("Error loading like by ID")
-            .into_iter().nth(0)
-    }
 
     find_by!(likes, find_by_ap_url, ap_url as String);
 

src/models/mod.rs

@@ -12,6 +12,18 @@ macro_rules! find_by {
     };
 }
 
+macro_rules! get {
+    ($table:ident) => {
+        pub fn get(conn: &PgConnection, id: i32) -> Option<Self> {
+            $table::table.filter($table::id.eq(id))
+                .limit(1)
+                .load::<Self>(conn)
+                .expect("Error loading $table by id")
+                .into_iter().nth(0)
+        }
+    };
+}
+
 pub mod blog_authors;
 pub mod blogs;
 pub mod comments;

src/models/notifications.rs

@@ -33,13 +33,7 @@ impl Notification {
             .expect("Couldn't save notification")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Notification> {
+    get!(notifications);
-        notifications::table.filter(notifications::id.eq(id))
-            .limit(1)
-            .load::<Notification>(conn)
-            .expect("Couldn't load notification by ID")
-            .into_iter().nth(0)
-    }
 
     pub fn find_for_user(conn: &PgConnection, user: &User) -> Vec<Notification> {
         notifications::table.filter(notifications::user_id.eq(user.id))

src/models/post_authors.rs

@@ -23,18 +23,12 @@ pub struct NewPostAuthor {
 }
 
 impl PostAuthor {
-    pub fn insert (conn: &PgConnection, new: NewPostAuthor) -> PostAuthor {
+    pub fn insert(conn: &PgConnection, new: NewPostAuthor) -> PostAuthor {
         diesel::insert_into(post_authors::table)
             .values(new)
             .get_result(conn)
             .expect("Error saving new blog author")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<PostAuthor> {
+    get!(post_authors);
-        post_authors::table.filter(post_authors::id.eq(id))
-            .limit(1)
-            .load::<PostAuthor>(conn)
-            .expect("Error loading blog author by id")
-            .into_iter().nth(0)
-    }
 }

src/models/posts.rs

@@ -57,13 +57,7 @@ impl Post {
             .expect("Error saving new post")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Post> {
+    get!(posts);
-        posts::table.filter(posts::id.eq(id))
-            .limit(1)
-            .load::<Post>(conn)
-            .expect("Error loading post by id")
-            .into_iter().nth(0)
-    }
 
     pub fn count_local(conn: &PgConnection) -> usize {
         use schema::post_authors;

src/models/reshares.rs

@@ -31,13 +31,7 @@ impl Reshare {
             .expect("Couldn't save reshare")
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<Reshare> {
+    get!(reshares);
-        reshares::table.filter(reshares::id.eq(id))
-            .limit(1)
-            .load::<Reshare>(conn)
-            .expect("Could'nt load reshare")
-            .into_iter().nth(0)
-    }
 
     pub fn update_ap_url(&self, conn: &PgConnection) {
         if self.ap_url.len() == 0 {

src/models/users.rs

@@ -110,13 +110,7 @@ impl User {
             .into_iter().nth(0).unwrap()
     }
 
-    pub fn get(conn: &PgConnection, id: i32) -> Option<User> {
+    get!(users);
-        users::table.filter(users::id.eq(id))
-            .limit(1)
-            .load::<User>(conn)
-            .expect("Error loading user by id")
-            .into_iter().nth(0)
-    }
 
     pub fn count_local(conn: &PgConnection) -> usize {
         users::table.filter(users::instance_id.eq(Instance::local_id(conn)))