]> Untitled Git - lemmy.git/commitdiff
Merge remote-tracking branch 'yerba/main' into main
authorDessalines <tyhou13@gmx.com>
Fri, 27 Nov 2020 21:00:15 +0000 (16:00 -0500)
committerDessalines <tyhou13@gmx.com>
Fri, 27 Nov 2020 21:00:15 +0000 (16:00 -0500)
1  2 
lemmy_api/src/post.rs

diff --combined lemmy_api/src/post.rs
index 9aa0b4facb6dbf0c70d0307dc6027d0cb2856525,d5515b5cd48a2fff6c93c0d9a510758a679c2e68..298076f75bbdcf1dd4dc9d9981b9e7d36d98ef31
@@@ -247,7 -247,7 +247,7 @@@ impl Perform for GetPosts 
      let community_name = data.community_name.to_owned();
      let posts = match blocking(context.pool(), move |conn| {
        PostQueryBuilder::create(conn)
 -        .listing_type(type_)
 +        .listing_type(&type_)
          .sort(&sort)
          .show_nsfw(show_nsfw)
          .for_community_id(community_id)
@@@ -839,9 -839,9 +839,9 @@@ impl Perform for ResolvePostReport 
      let resolved = data.resolved;
      let resolve_fun = move |conn: &'_ _| {
        if resolved {
-         PostReport::resolve(conn, report_id.clone(), user_id)
+         PostReport::resolve(conn, report_id, user_id)
        } else {
-         PostReport::unresolve(conn, report_id.clone(), user_id)
+         PostReport::unresolve(conn, report_id, user_id)
        }
      };