mirror of https://github.com/LemmyNet/lemmy
Merge remote-tracking branch 'origin/split-db-workspace2' into move_views_to_diesel_split_2
commit
4c681eb48b
@ -1,17 +0,0 @@
|
||||
pub mod comment_report_view;
|
||||
pub mod comment_view;
|
||||
pub mod community;
|
||||
pub mod moderator;
|
||||
pub mod post_report_view;
|
||||
pub mod post_view;
|
||||
pub mod private_message_view;
|
||||
pub mod site_view;
|
||||
pub mod user_mention_view;
|
||||
pub mod user_view;
|
||||
|
||||
pub(crate) trait ViewToVec {
|
||||
type DbTuple;
|
||||
fn from_tuple_to_vec(tuple: Vec<Self::DbTuple>) -> Vec<Self>
|
||||
where
|
||||
Self: Sized;
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
[package]
|
||||
name = "lemmy_db"
|
||||
name = "lemmy_db_queries"
|
||||
version = "0.1.0"
|
||||
edition = "2018"
|
||||
|
||||
[lib]
|
||||
name = "lemmy_db"
|
||||
name = "lemmy_db_queries"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
@ -0,0 +1,10 @@
|
||||
[package]
|
||||
name = "lemmy_db_views"
|
||||
version = "0.1.0"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { path = "../lemmy_db_queries" }
|
||||
lemmy_db_schema = { path = "../lemmy_db_schema" }
|
||||
diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.118", features = ["derive"] }
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, MaybeOptional, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, MaybeOptional, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{comment, comment_report, community, post, user_, user_alias_1, user_alias_2},
|
||||
source::{
|
@ -0,0 +1,6 @@
|
||||
pub mod comment_report_view;
|
||||
pub mod comment_view;
|
||||
pub mod post_report_view;
|
||||
pub mod post_view;
|
||||
pub mod private_message_view;
|
||||
pub mod site_view;
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, MaybeOptional, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, MaybeOptional, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, post, post_report, user_, user_alias_1, user_alias_2},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, MaybeOptional, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, MaybeOptional, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{private_message, user_, user_alias_1},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{aggregates::site_aggregates::SiteAggregates, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{aggregates::site_aggregates::SiteAggregates, ToSafe};
|
||||
use lemmy_db_schema::{
|
||||
schema::{site, site_aggregates, user_},
|
||||
source::{
|
@ -0,0 +1,10 @@
|
||||
[package]
|
||||
name = "lemmy_db_views_actor"
|
||||
version = "0.1.0"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { path = "../lemmy_db_queries" }
|
||||
lemmy_db_schema = { path = "../lemmy_db_schema" }
|
||||
diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.118", features = ["derive"] }
|
@ -1,5 +1,5 @@
|
||||
use crate::{views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, community_follower, user_},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, community_moderator, user_},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::ToSafe;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::ToSafe;
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, community_user_ban, user_},
|
||||
source::{
|
@ -1,13 +1,13 @@
|
||||
use crate::{
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{
|
||||
aggregates::comment_aggregates::CommentAggregates,
|
||||
functions::hot_rank,
|
||||
limit_and_offset,
|
||||
views::ViewToVec,
|
||||
MaybeOptional,
|
||||
SortType,
|
||||
ToSafe,
|
||||
ViewToVec,
|
||||
};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_schema::{
|
||||
schema::{
|
||||
comment,
|
@ -1,13 +1,13 @@
|
||||
use crate::{
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use lemmy_db_queries::{
|
||||
aggregates::user_aggregates::UserAggregates,
|
||||
fuzzy_search,
|
||||
limit_and_offset,
|
||||
views::ViewToVec,
|
||||
MaybeOptional,
|
||||
SortType,
|
||||
ToSafe,
|
||||
ViewToVec,
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use lemmy_db_schema::{
|
||||
schema::{user_, user_aggregates},
|
||||
source::user::{UserSafe, User_},
|
@ -0,0 +1,10 @@
|
||||
[package]
|
||||
name = "lemmy_db_views_moderator"
|
||||
version = "0.1.0"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { path = "../lemmy_db_queries" }
|
||||
lemmy_db_schema = { path = "../lemmy_db_schema" }
|
||||
diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.118", features = ["derive"] }
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_add_community, user_, user_alias_1},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{mod_add, user_, user_alias_1},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_ban_from_community, user_, user_alias_1},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{mod_ban, user_, user_alias_1},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_lock_post, post, user_},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{comment, community, mod_remove_comment, post, user_, user_alias_1},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_remove_community, user_},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_remove_post, post, user_},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use crate::{limit_and_offset, views::ViewToVec, ToSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_sticky_post, post, user_},
|
||||
source::{
|
@ -1,18 +0,0 @@
|
||||
[package]
|
||||
name = "lemmy_rate_limit"
|
||||
version = "0.1.0"
|
||||
authors = ["Felix Ableitner <me@nutomic.com>"]
|
||||
edition = "2018"
|
||||
|
||||
[lib]
|
||||
name = "lemmy_rate_limit"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
lemmy_utils = { path = "../lemmy_utils" }
|
||||
tokio = { version = "0.3.6", features = ["sync"] }
|
||||
strum = "0.20.0"
|
||||
strum_macros = "0.20.1"
|
||||
futures = "0.3.8"
|
||||
actix-web = { version = "3.3.2", default-features = false, features = ["rustls"] }
|
||||
log = "0.4.11"
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue