]> Untitled Git - lemmy.git/commitdiff
Merge remote-tracking branch 'origin/split-db-workspace2' into move_views_to_diesel_s...
authorDessalines <tyhou13@gmx.com>
Thu, 24 Dec 2020 00:09:41 +0000 (19:09 -0500)
committerDessalines <tyhou13@gmx.com>
Thu, 24 Dec 2020 00:09:41 +0000 (19:09 -0500)
22 files changed:
1  2 
lemmy_api/src/post.rs
lemmy_db_queries/src/lib.rs
lemmy_db_views/src/comment_report_view.rs
lemmy_db_views/src/comment_view.rs
lemmy_db_views/src/post_report_view.rs
lemmy_db_views/src/post_view.rs
lemmy_db_views/src/private_message_view.rs
lemmy_db_views_actor/src/community_follower_view.rs
lemmy_db_views_actor/src/community_moderator_view.rs
lemmy_db_views_actor/src/community_view.rs
lemmy_db_views_actor/src/user_mention_view.rs
lemmy_db_views_actor/src/user_view.rs
lemmy_db_views_moderator/src/mod_add_community_view.rs
lemmy_db_views_moderator/src/mod_add_view.rs
lemmy_db_views_moderator/src/mod_ban_from_community_view.rs
lemmy_db_views_moderator/src/mod_ban_view.rs
lemmy_db_views_moderator/src/mod_lock_post_view.rs
lemmy_db_views_moderator/src/mod_remove_comment_view.rs
lemmy_db_views_moderator/src/mod_remove_community_view.rs
lemmy_db_views_moderator/src/mod_remove_post_view.rs
lemmy_db_views_moderator/src/mod_sticky_post_view.rs
lemmy_structs/src/post.rs

index f358946263e09df84a349e8d96a687a8779f185f,07a39732d3bbda0f11877bd20805b198f6472f3f..4630918be245824905d3d3a1b5c3333baea809ba
@@@ -33,6 -27,12 +27,15 @@@ use lemmy_db_schema::
      post_report::{PostReport, PostReportForm},
    },
  };
 -use lemmy_db_views_actor::community_moderator_view::CommunityModeratorView;
+ use lemmy_db_views::{
+   comment_view::CommentQueryBuilder,
+   post_report_view::{PostReportQueryBuilder, PostReportView},
+   post_view::{PostQueryBuilder, PostView},
+ };
++use lemmy_db_views_actor::{
++  community_moderator_view::CommunityModeratorView,
++  community_view::CommunityView,
++};
  use lemmy_structs::{blocking, post::*};
  use lemmy_utils::{
    apub::{make_apub_endpoint, EndpointType},
index 8e3521478dcdf9eacb42149c5c286b9f451d6073,b9dbc09d52b5da22f6fed0d40de199b51c212b52..44ea66c733a623057054b2274be8e32724533c8e
@@@ -138,6 -137,13 +137,13 @@@ pub trait ToSafe 
    fn safe_columns_tuple() -> Self::SafeColumns;
  }
  
 -  fn to_vec(tuple: Vec<Self::DbTuple>) -> Vec<Self>
+ pub trait ViewToVec {
+   type DbTuple;
++  fn from_tuple_to_vec(tuple: Vec<Self::DbTuple>) -> Vec<Self>
+   where
+     Self: Sized;
+ }
  pub fn get_database_url_from_env() -> Result<String, VarError> {
    env::var("LEMMY_DATABASE_URL")
  }
Simple merge
Simple merge
Simple merge
index 0c6c23d7bf1afe8fb9656e47caa53d4aa8b43bcb,0410b1b82c32c0990083f2faf82235b3b7a94d73..02dcf28afd77b2f22c40ec8542049c93094d130e
@@@ -3,7 -3,7 +3,10 @@@ use lemmy_db_views::
    post_report_view::PostReportView,
    post_view::PostView,
  };
 -use lemmy_db_views_actor::community_moderator_view::CommunityModeratorView;
++use lemmy_db_views_actor::{
++  community_moderator_view::CommunityModeratorView,
++  community_view::CommunityView,
++};
  use serde::{Deserialize, Serialize};
  
  #[derive(Deserialize, Debug)]