mirror of https://github.com/LemmyNet/lemmy
Split up lemmy_db_views, put lemmy_rate_limit into lemmy_utils
parent
d5efebbf47
commit
95e30f0e08
@ -1,11 +1,10 @@
|
||||
[package]
|
||||
name = "lemmy_db_aggregates"
|
||||
name = "lemmy_db_views_actor"
|
||||
version = "0.1.0"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_schema = { path = "../lemmy_db_schema" }
|
||||
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"] }
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::ToSafe;
|
||||
use lemmy_db_queries::{ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, community_follower, user_},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::ToSafe;
|
||||
use lemmy_db_queries::{ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, community_moderator, user_},
|
||||
source::{
|
@ -1,5 +1,5 @@
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::ToSafe;
|
||||
use lemmy_db_queries::ToSafe;
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, community_user_ban, user_},
|
||||
source::{
|
@ -1,18 +1,15 @@
|
||||
use crate::{
|
||||
community::community_moderator_view::CommunityModeratorView,
|
||||
user_view::UserViewSafe,
|
||||
ViewToVec,
|
||||
};
|
||||
use crate::{community_moderator_view::CommunityModeratorView, user_view::UserViewSafe};
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{
|
||||
use lemmy_db_queries::{
|
||||
aggregates::community_aggregates::CommunityAggregates,
|
||||
functions::hot_rank,
|
||||
fuzzy_search,
|
||||
limit_and_offset,
|
||||
MaybeOptional,
|
||||
SortType,
|
||||
ToSafe,
|
||||
ViewToVec,
|
||||
};
|
||||
use lemmy_db_aggregates::community_aggregates::CommunityAggregates;
|
||||
use lemmy_db_schema::{
|
||||
schema::{category, community, community_aggregates, community_follower, user_},
|
||||
source::{
|
@ -1,7 +1,13 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{functions::hot_rank, limit_and_offset, MaybeOptional, SortType, ToSafe};
|
||||
use lemmy_db_aggregates::comment_aggregates::CommentAggregates;
|
||||
use lemmy_db_queries::{
|
||||
aggregates::comment_aggregates::CommentAggregates,
|
||||
functions::hot_rank,
|
||||
limit_and_offset,
|
||||
MaybeOptional,
|
||||
SortType,
|
||||
ToSafe,
|
||||
ViewToVec,
|
||||
};
|
||||
use lemmy_db_schema::{
|
||||
schema::{
|
||||
comment,
|
@ -1,7 +1,13 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use lemmy_db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType, ToSafe};
|
||||
use lemmy_db_aggregates::user_aggregates::UserAggregates;
|
||||
use lemmy_db_queries::{
|
||||
aggregates::user_aggregates::UserAggregates,
|
||||
fuzzy_search,
|
||||
limit_and_offset,
|
||||
MaybeOptional,
|
||||
SortType,
|
||||
ToSafe,
|
||||
ViewToVec,
|
||||
};
|
||||
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,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_add_community, user_, user_alias_1},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{mod_add, user_, user_alias_1},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
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,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{mod_ban, user_, user_alias_1},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_lock_post, post, user_},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
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,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_remove_community, user_},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
|
||||
use lemmy_db_schema::{
|
||||
schema::{community, mod_remove_post, post, user_},
|
||||
source::{
|
@ -1,6 +1,5 @@
|
||||
use crate::ViewToVec;
|
||||
use diesel::{result::Error, *};
|
||||
use lemmy_db::{limit_and_offset, ToSafe};
|
||||
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"
|
@ -1,13 +1,10 @@
|
||||
#[macro_use]
|
||||
extern crate strum_macros;
|
||||
|
||||
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
|
||||
use futures::future::{ok, Ready};
|
||||
use lemmy_utils::{
|
||||
use crate::{
|
||||
settings::{RateLimitConfig, Settings},
|
||||
utils::get_ip,
|
||||
LemmyError,
|
||||
};
|
||||
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
|
||||
use futures::future::{ok, Ready};
|
||||
use rate_limiter::{RateLimitType, RateLimiter};
|
||||
use std::{
|
||||
future::Future,
|
@ -1,4 +1,4 @@
|
||||
use lemmy_utils::{APIError, IPAddr, LemmyError};
|
||||
use crate::{APIError, IPAddr, LemmyError};
|
||||
use log::debug;
|
||||
use std::{collections::HashMap, time::SystemTime};
|
||||
use strum::IntoEnumIterator;
|
Loading…
Reference in New Issue