Browse Source

Move api structs and rate limit into separate workspaces

feature/settings-cleanup
Felix Ableitner 2 years ago
parent
commit
dd86c6a560
  1. 27
      server/Cargo.lock
  2. 5
      server/Cargo.toml
  3. 10
      server/lemmy_api_structs/Cargo.toml
  4. 77
      server/lemmy_api_structs/src/comment.rs
  5. 131
      server/lemmy_api_structs/src/community.rs
  6. 24
      server/lemmy_api_structs/src/lib.rs
  7. 105
      server/lemmy_api_structs/src/post.rs
  8. 127
      server/lemmy_api_structs/src/site.rs
  9. 239
      server/lemmy_api_structs/src/user.rs
  10. 15
      server/lemmy_rate_limit/Cargo.toml
  11. 11
      server/lemmy_rate_limit/src/lib.rs
  12. 7
      server/lemmy_rate_limit/src/rate_limiter.rs
  13. 2
      server/lemmy_utils/Cargo.toml
  14. 41
      server/lemmy_utils/src/lib.rs
  15. 82
      server/src/api/comment.rs
  16. 133
      server/src/api/community.rs
  17. 20
      server/src/api/mod.rs
  18. 112
      server/src/api/post.rs
  19. 125
      server/src/api/site.rs
  20. 246
      server/src/api/user.rs
  21. 3
      server/src/apub/activities.rs
  22. 7
      server/src/apub/activity_queue.rs
  23. 2
      server/src/apub/comment.rs
  24. 3
      server/src/apub/community.rs
  25. 2
      server/src/apub/extensions/group_extensions.rs
  26. 4
      server/src/apub/extensions/signatures.rs
  27. 5
      server/src/apub/fetcher.rs
  28. 3
      server/src/apub/inbox/activities/announce.rs
  29. 9
      server/src/apub/inbox/activities/create.rs
  30. 9
      server/src/apub/inbox/activities/delete.rs
  31. 5
      server/src/apub/inbox/activities/dislike.rs
  32. 5
      server/src/apub/inbox/activities/like.rs
  33. 9
      server/src/apub/inbox/activities/remove.rs
  34. 9
      server/src/apub/inbox/activities/undo.rs
  35. 9
      server/src/apub/inbox/activities/update.rs
  36. 3
      server/src/apub/inbox/community_inbox.rs
  37. 3
      server/src/apub/inbox/shared_inbox.rs
  38. 5
      server/src/apub/inbox/user_inbox.rs
  39. 2
      server/src/apub/mod.rs
  40. 3
      server/src/apub/post.rs
  41. 3
      server/src/apub/private_message.rs
  42. 3
      server/src/apub/user.rs
  43. 2
      server/src/code_migrations.rs
  44. 48
      server/src/lib.rs
  45. 5
      server/src/main.rs
  46. 2
      server/src/request.rs
  47. 8
      server/src/routes/api.rs
  48. 4
      server/src/routes/feeds.rs
  49. 2
      server/src/routes/images.rs
  50. 4
      server/src/routes/nodeinfo.rs
  51. 9
      server/src/routes/webfinger.rs
  52. 2
      server/src/routes/websocket.rs
  53. 12
      server/src/websocket/chat_server.rs
  54. 6
      server/src/websocket/handlers.rs
  55. 12
      server/src/websocket/messages.rs

27
server/Cargo.lock

@ -1794,6 +1794,15 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lemmy_api_structs"
version = "0.1.0"
dependencies = [
"lemmy_db",
"serde 1.0.114",
"thiserror",
]
[[package]]
name = "lemmy_db"
version = "0.1.0"
@ -1812,6 +1821,20 @@ dependencies = [
"url",
]
[[package]]
name = "lemmy_rate_limit"
version = "0.1.0"
dependencies = [
"actix-web",
"futures",
"lemmy_api_structs",
"lemmy_utils",
"log",
"strum",
"strum_macros",
"tokio",
]
[[package]]
name = "lemmy_server"
version = "0.0.1"
@ -1841,7 +1864,9 @@ dependencies = [
"itertools",
"jsonwebtoken",
"lazy_static",
"lemmy_api_structs",
"lemmy_db",
"lemmy_rate_limit",
"lemmy_utils",
"log",
"openssl",
@ -1864,6 +1889,8 @@ dependencies = [
name = "lemmy_utils"
version = "0.1.0"
dependencies = [
"actix-web",
"anyhow",
"chrono",
"comrak",
"config",

5
server/Cargo.toml

@ -9,12 +9,15 @@ lto = true
[workspace]
members = [
"lemmy_utils",
"lemmy_db"
"lemmy_db",
"lemmy_api_structs",
]
[dependencies]
lemmy_utils = { path = "./lemmy_utils" }
lemmy_db = { path = "./lemmy_db" }
lemmy_api_structs = { path = "./lemmy_api_structs" }
lemmy_rate_limit = { path = "./lemmy_rate_limit" }
diesel = "1.4.4"
diesel_migrations = "1.4.0"
dotenv = "0.15.0"

10
server/lemmy_api_structs/Cargo.toml

@ -0,0 +1,10 @@
[package]
name = "lemmy_api_structs"
version = "0.1.0"
authors = ["Felix Ableitner <[email protected]>"]
edition = "2018"
[dependencies]
lemmy_db = { path = "../lemmy_db" }
serde = { version = "1.0.105", features = ["derive"] }
thiserror = "1.0.20"

77
server/lemmy_api_structs/src/comment.rs

@ -0,0 +1,77 @@
use lemmy_db::comment_view::CommentView;
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize)]
pub struct CreateComment {
pub content: String,
pub parent_id: Option<i32>,
pub post_id: i32,
pub form_id: Option<String>,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditComment {
pub content: String,
pub edit_id: i32,
pub form_id: Option<String>,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeleteComment {
pub edit_id: i32,
pub deleted: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct RemoveComment {
pub edit_id: i32,
pub removed: bool,
pub reason: Option<String>,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct MarkCommentAsRead {
pub edit_id: i32,
pub read: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct SaveComment {
pub comment_id: i32,
pub save: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct CommentResponse {
pub comment: CommentView,
pub recipient_ids: Vec<i32>,
pub form_id: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct CreateCommentLike {
pub comment_id: i32,
pub score: i16,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetComments {
pub type_: String,
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub community_id: Option<i32>,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetCommentsResponse {
pub comments: Vec<CommentView>,
}

131
server/lemmy_api_structs/src/community.rs

@ -0,0 +1,131 @@
use lemmy_db::{
community_view::{CommunityFollowerView, CommunityModeratorView, CommunityView},
user_view::UserView,
};
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize)]
pub struct GetCommunity {
pub id: Option<i32>,
pub name: Option<String>,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetCommunityResponse {
pub community: CommunityView,
pub moderators: Vec<CommunityModeratorView>,
pub online: usize,
}
#[derive(Serialize, Deserialize)]
pub struct CreateCommunity {
pub name: String,
pub title: String,
pub description: Option<String>,
pub icon: Option<String>,
pub banner: Option<String>,
pub category_id: i32,
pub nsfw: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct CommunityResponse {
pub community: CommunityView,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct ListCommunities {
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct ListCommunitiesResponse {
pub communities: Vec<CommunityView>,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct BanFromCommunity {
pub community_id: i32,
pub user_id: i32,
pub ban: bool,
pub remove_data: Option<bool>,
pub reason: Option<String>,
pub expires: Option<i64>,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct BanFromCommunityResponse {
pub user: UserView,
pub banned: bool,
}
#[derive(Serialize, Deserialize)]
pub struct AddModToCommunity {
pub community_id: i32,
pub user_id: i32,
pub added: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct AddModToCommunityResponse {
pub moderators: Vec<CommunityModeratorView>,
}
#[derive(Serialize, Deserialize)]
pub struct EditCommunity {
pub edit_id: i32,
pub title: String,
pub description: Option<String>,
pub icon: Option<String>,
pub banner: Option<String>,
pub category_id: i32,
pub nsfw: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeleteCommunity {
pub edit_id: i32,
pub deleted: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct RemoveCommunity {
pub edit_id: i32,
pub removed: bool,
pub reason: Option<String>,
pub expires: Option<i64>,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct FollowCommunity {
pub community_id: i32,
pub follow: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetFollowedCommunities {
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetFollowedCommunitiesResponse {
pub communities: Vec<CommunityFollowerView>,
}
#[derive(Serialize, Deserialize)]
pub struct TransferCommunity {
pub community_id: i32,
pub user_id: i32,
pub auth: String,
}

24
server/lemmy_api_structs/src/lib.rs

@ -0,0 +1,24 @@
pub extern crate serde;
pub extern crate thiserror;
pub mod comment;
pub mod community;
pub mod post;
pub mod site;
pub mod user;
use thiserror::Error;
#[derive(Debug, Error)]
#[error("{{\"error\":\"{message}\"}}")]
pub struct APIError {
pub message: String,
}
impl APIError {
pub fn err(msg: &str) -> Self {
APIError {
message: msg.to_string(),
}
}
}

105
server/lemmy_api_structs/src/post.rs

@ -0,0 +1,105 @@
use lemmy_db::{
comment_view::CommentView,
community_view::{CommunityModeratorView, CommunityView},
post_view::PostView,
};
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize, Debug)]
pub struct CreatePost {
pub name: String,
pub url: Option<String>,
pub body: Option<String>,
pub nsfw: bool,
pub community_id: i32,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct PostResponse {
pub post: PostView,
}
#[derive(Serialize, Deserialize)]
pub struct GetPost {
pub id: i32,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetPostResponse {
pub post: PostView,
pub comments: Vec<CommentView>,
pub community: CommunityView,
pub moderators: Vec<CommunityModeratorView>,
pub online: usize,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct GetPosts {
pub type_: String,
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub community_id: Option<i32>,
pub community_name: Option<String>,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct GetPostsResponse {
pub posts: Vec<PostView>,
}
#[derive(Serialize, Deserialize)]
pub struct CreatePostLike {
pub post_id: i32,
pub score: i16,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditPost {
pub edit_id: i32,
pub name: String,
pub url: Option<String>,
pub body: Option<String>,
pub nsfw: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeletePost {
pub edit_id: i32,
pub deleted: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct RemovePost {
pub edit_id: i32,
pub removed: bool,
pub reason: Option<String>,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct LockPost {
pub edit_id: i32,
pub locked: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct StickyPost {
pub edit_id: i32,
pub stickied: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct SavePost {
pub post_id: i32,
pub save: bool,
pub auth: String,
}

127
server/lemmy_api_structs/src/site.rs

@ -0,0 +1,127 @@
use lemmy_db::{
category::*,
comment_view::*,
community_view::*,
moderator_views::*,
post_view::*,
site_view::*,
user::*,
user_view::*,
};
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize)]
pub struct ListCategories {}
#[derive(Serialize, Deserialize)]
pub struct ListCategoriesResponse {
pub categories: Vec<Category>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct Search {
pub q: String,
pub type_: String,
pub community_id: Option<i32>,
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct SearchResponse {
pub type_: String,
pub comments: Vec<CommentView>,
pub posts: Vec<PostView>,
pub communities: Vec<CommunityView>,
pub users: Vec<UserView>,
}
#[derive(Serialize, Deserialize)]
pub struct GetModlog {
pub mod_user_id: Option<i32>,
pub community_id: Option<i32>,
pub page: Option<i64>,
pub limit: Option<i64>,
}
#[derive(Serialize, Deserialize)]
pub struct GetModlogResponse {
pub removed_posts: Vec<ModRemovePostView>,
pub locked_posts: Vec<ModLockPostView>,
pub stickied_posts: Vec<ModStickyPostView>,
pub removed_comments: Vec<ModRemoveCommentView>,
pub removed_communities: Vec<ModRemoveCommunityView>,
pub banned_from_community: Vec<ModBanFromCommunityView>,
pub banned: Vec<ModBanView>,
pub added_to_community: Vec<ModAddCommunityView>,
pub added: Vec<ModAddView>,
}
#[derive(Serialize, Deserialize)]
pub struct CreateSite {
pub name: String,
pub description: Option<String>,
pub icon: Option<String>,
pub banner: Option<String>,
pub enable_downvotes: bool,
pub open_registration: bool,
pub enable_nsfw: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditSite {
pub name: String,
pub description: Option<String>,
pub icon: Option<String>,
pub banner: Option<String>,
pub enable_downvotes: bool,
pub open_registration: bool,
pub enable_nsfw: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetSite {
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct SiteResponse {
pub site: SiteView,
}
#[derive(Serialize, Deserialize)]
pub struct GetSiteResponse {
pub site: Option<SiteView>,
pub admins: Vec<UserView>,
pub banned: Vec<UserView>,
pub online: usize,
pub version: String,
pub my_user: Option<User_>,
pub federated_instances: Vec<String>,
}
#[derive(Serialize, Deserialize)]
pub struct TransferSite {
pub user_id: i32,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetSiteConfig {
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetSiteConfigResponse {
pub config_hjson: String,
}
#[derive(Serialize, Deserialize)]
pub struct SaveSiteConfig {
pub config_hjson: String,
pub auth: String,
}

239
server/lemmy_api_structs/src/user.rs

@ -0,0 +1,239 @@
use lemmy_db::{
comment_view::{CommentView, ReplyView},
community_view::{CommunityFollowerView, CommunityModeratorView},
post_view::PostView,
private_message_view::PrivateMessageView,
user_mention_view::UserMentionView,
user_view::UserView,
};
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize, Debug)]
pub struct Login {
pub username_or_email: String,
pub password: String,
}
#[derive(Serialize, Deserialize)]
pub struct Register {
pub username: String,
pub email: Option<String>,
pub password: String,
pub password_verify: String,
pub admin: bool,
pub show_nsfw: bool,
pub captcha_uuid: Option<String>,
pub captcha_answer: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetCaptcha {}
#[derive(Serialize, Deserialize)]
pub struct GetCaptchaResponse {
pub ok: Option<CaptchaResponse>,
}
#[derive(Serialize, Deserialize)]
pub struct CaptchaResponse {
pub png: String, // A Base64 encoded png
pub wav: Option<String>, // A Base64 encoded wav audio
pub uuid: String,
}
#[derive(Serialize, Deserialize)]
pub struct SaveUserSettings {
pub show_nsfw: bool,
pub theme: String,
pub default_sort_type: i16,
pub default_listing_type: i16,
pub lang: String,
pub avatar: Option<String>,
pub banner: Option<String>,
pub preferred_username: Option<String>,
pub email: Option<String>,
pub bio: Option<String>,
pub matrix_user_id: Option<String>,
pub new_password: Option<String>,
pub new_password_verify: Option<String>,
pub old_password: Option<String>,
pub show_avatars: bool,
pub send_notifications_to_email: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct LoginResponse {
pub jwt: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetUserDetails {
pub user_id: Option<i32>,
pub username: Option<String>,
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub community_id: Option<i32>,
pub saved_only: bool,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetUserDetailsResponse {
pub user: UserView,
pub follows: Vec<CommunityFollowerView>,
pub moderates: Vec<CommunityModeratorView>,
pub comments: Vec<CommentView>,
pub posts: Vec<PostView>,
}
#[derive(Serialize, Deserialize)]
pub struct GetRepliesResponse {
pub replies: Vec<ReplyView>,
}
#[derive(Serialize, Deserialize)]
pub struct GetUserMentionsResponse {
pub mentions: Vec<UserMentionView>,
}
#[derive(Serialize, Deserialize)]
pub struct MarkAllAsRead {
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct AddAdmin {
pub user_id: i32,
pub added: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct AddAdminResponse {
pub admins: Vec<UserView>,
}
#[derive(Serialize, Deserialize)]
pub struct BanUser {
pub user_id: i32,
pub ban: bool,
pub remove_data: Option<bool>,
pub reason: Option<String>,
pub expires: Option<i64>,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct BanUserResponse {
pub user: UserView,
pub banned: bool,
}
#[derive(Serialize, Deserialize)]
pub struct GetReplies {
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub unread_only: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetUserMentions {
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub unread_only: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct MarkUserMentionAsRead {
pub user_mention_id: i32,
pub read: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct UserMentionResponse {
pub mention: UserMentionView,
}
#[derive(Serialize, Deserialize)]
pub struct DeleteAccount {
pub password: String,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct PasswordReset {
pub email: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct PasswordResetResponse {}
#[derive(Serialize, Deserialize)]
pub struct PasswordChange {
pub token: String,
pub password: String,
pub password_verify: String,
}
#[derive(Serialize, Deserialize)]
pub struct CreatePrivateMessage {
pub content: String,
pub recipient_id: i32,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditPrivateMessage {
pub edit_id: i32,
pub content: String,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeletePrivateMessage {
pub edit_id: i32,
pub deleted: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct MarkPrivateMessageAsRead {
pub edit_id: i32,
pub read: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetPrivateMessages {
pub unread_only: bool,
pub page: Option<i64>,
pub limit: Option<i64>,
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct PrivateMessagesResponse {
pub messages: Vec<PrivateMessageView>,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct PrivateMessageResponse {
pub message: PrivateMessageView,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct UserJoin {
pub auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct UserJoinResponse {
pub user_id: i32,
}

15
server/lemmy_rate_limit/Cargo.toml

@ -0,0 +1,15 @@
[package]
name = "lemmy_rate_limit"
version = "0.1.0"
authors = ["Felix Ableitner <[email protected]>"]
edition = "2018"
[dependencies]
lemmy_utils = { path = "../lemmy_utils" }
lemmy_api_structs = { path = "../lemmy_api_structs" }
tokio = "0.2.21"
strum = "0.18.0"
strum_macros = "0.18.0"
futures = "0.3.5"
actix-web = { version = "3.0.0-alpha.3", features = ["rustls"] }
log = "0.4.0"

server/src/rate_limit/mod.rs → server/lemmy_rate_limit/src/lib.rs

server/src/rate_limit/rate_limiter.rs → server/lemmy_rate_limit/src/rate_limiter.rs

2
server/lemmy_utils/Cargo.toml

@ -20,3 +20,5 @@ comrak = "0.7"
lazy_static = "1.3.0"
openssl = "0.10"
url = { version = "2.1.1", features = ["serde"] }
actix-web = "3.0.0-alpha.3"
anyhow = "1.0.32"

41
server/lemmy_utils/src/lib.rs

@ -8,6 +8,8 @@ pub extern crate rand;
pub extern crate regex;
pub extern crate serde_json;
pub extern crate url;
pub extern crate actix_web;
pub extern crate anyhow;
pub mod settings;
@ -30,6 +32,13 @@ use rand::{distributions::Alphanumeric, thread_rng, Rng};
use regex::{Regex, RegexBuilder};
use std::io::{Error, ErrorKind};
use url::Url;
use actix_web::dev::ConnectionInfo;
pub type ConnectionId = usize;
pub type PostId = i32;
pub type CommunityId = i32;
pub type UserId = i32;
pub type IPAddr = String;
#[macro_export]
macro_rules! location_info {
@ -43,6 +52,28 @@ macro_rules! location_info {
};
}
#[derive(Debug)]
pub struct LemmyError {
inner: anyhow::Error,
}
impl<T> From<T> for LemmyError
where
T: Into<anyhow::Error>,
{
fn from(t: T) -> Self {
LemmyError { inner: t.into() }
}
}
impl std::fmt::Display for LemmyError {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
self.inner.fmt(f)
}
}
impl actix_web::error::ResponseError for LemmyError {}
pub fn naive_from_unix(time: i64) -> NaiveDateTime {
NaiveDateTime::from_timestamp(time, 0)
}
@ -346,3 +377,13 @@ pub fn make_apub_endpoint(endpoint_type: EndpointType, name: &str) -> Url {
))
.unwrap()
}
pub fn get_ip(conn_info: &ConnectionInfo) -> String {
conn_info
.realip_remote_addr()
.unwrap_or("127.0.0.1:12345")
.split(':')
.next()
.unwrap_or("127.0.0.1")
.to_string()
}

82
server/src/api/comment.rs

@ -5,7 +5,6 @@ use crate::{
get_user_from_jwt,
get_user_from_jwt_opt,
is_mod_or_admin,
APIError,
Perform,
},
apub::{ApubLikeableType, ApubObjectType},
@ -14,12 +13,11 @@ use crate::{
messages::{JoinCommunityRoom, SendComment},
UserOperation,
},
ConnectionId,
DbPool,
LemmyContext,
LemmyError,
};
use actix_web::web::Data;
use lemmy_api_structs::{comment::*, APIError};
use lemmy_db::{
comment::*,
comment_view::*,
@ -40,88 +38,14 @@ use lemmy_utils::{
scrape_text_for_mentions,
send_email,
settings::Settings,
ConnectionId,
EndpointType,
LemmyError,
MentionData,
};
use log::error;
use serde::{Deserialize, Serialize};
use std::str::FromStr;
#[derive(Serialize, Deserialize)]
pub struct CreateComment {
content: String,
parent_id: Option<i32>,
pub post_id: i32,
form_id: Option<String>,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditComment {
content: String,
edit_id: i32,
form_id: Option<String>,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeleteComment {
edit_id: i32,
deleted: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct RemoveComment {
edit_id: i32,
removed: bool,
reason: Option<String>,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct MarkCommentAsRead {
edit_id: i32,
read: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct SaveComment {
comment_id: i32,
save: bool,
auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct CommentResponse {
pub comment: CommentView,
pub recipient_ids: Vec<i32>,
pub form_id: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct CreateCommentLike {
comment_id: i32,
score: i16,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetComments {
type_: String,
sort: String,
page: Option<i64>,
limit: Option<i64>,
pub community_id: Option<i32>,
auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetCommentsResponse {
comments: Vec<CommentView>,
}
#[async_trait::async_trait(?Send)]
impl Perform for CreateComment {
type Response = CommentResponse;

133
server/src/api/community.rs

@ -6,7 +6,6 @@ use crate::{
get_user_from_jwt_opt,
is_admin,
is_mod_or_admin,
APIError,
Perform,
},
apub::ActorType,
@ -15,12 +14,11 @@ use crate::{
messages::{GetCommunityUsersOnline, JoinCommunityRoom, SendCommunityRoomMessage},
UserOperation,
},
ConnectionId,
LemmyContext,
LemmyError,
};
use actix_web::web::Data;
use anyhow::Context;
use lemmy_api_structs::{community::*, APIError};
use lemmy_db::{
comment::Comment,
comment_view::CommentQueryBuilder,
@ -44,137 +42,12 @@ use lemmy_utils::{
location_info,
make_apub_endpoint,
naive_from_unix,
ConnectionId,
EndpointType,
LemmyError,
};
use serde::{Deserialize, Serialize};
use std::str::FromStr;
#[derive(Serialize, Deserialize)]
pub struct GetCommunity {
id: Option<i32>,
pub name: Option<String>,
auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetCommunityResponse {
pub community: CommunityView,
pub moderators: Vec<CommunityModeratorView>,
pub online: usize,
}
#[derive(Serialize, Deserialize)]
pub struct CreateCommunity {
name: String,
title: String,
description: Option<String>,
icon: Option<String>,
banner: Option<String>,
category_id: i32,
nsfw: bool,
auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct CommunityResponse {
pub community: CommunityView,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct ListCommunities {
pub sort: String,
pub page: Option<i64>,
pub limit: Option<i64>,
pub auth: Option<String>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct ListCommunitiesResponse {
pub communities: Vec<CommunityView>,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct BanFromCommunity {
pub community_id: i32,
user_id: i32,
ban: bool,
remove_data: Option<bool>,
reason: Option<String>,
expires: Option<i64>,
auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct BanFromCommunityResponse {
user: UserView,
banned: bool,
}
#[derive(Serialize, Deserialize)]
pub struct AddModToCommunity {
pub community_id: i32,
user_id: i32,
added: bool,
auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct AddModToCommunityResponse {
moderators: Vec<CommunityModeratorView>,
}
#[derive(Serialize, Deserialize)]
pub struct EditCommunity {
pub edit_id: i32,
title: String,
description: Option<String>,
icon: Option<String>,
banner: Option<String>,
category_id: i32,
nsfw: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeleteCommunity {
pub edit_id: i32,
deleted: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct RemoveCommunity {
pub edit_id: i32,
removed: bool,
reason: Option<String>,
expires: Option<i64>,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct FollowCommunity {
community_id: i32,
follow: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetFollowedCommunities {
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetFollowedCommunitiesResponse {
communities: Vec<CommunityFollowerView>,
}
#[derive(Serialize, Deserialize)]
pub struct TransferCommunity {
community_id: i32,
user_id: i32,
auth: String,
}
#[async_trait::async_trait(?Send)]
impl Perform for GetCommunity {
type Response = GetCommunityResponse;

20
server/src/api/mod.rs

@ -1,5 +1,6 @@
use crate::{api::claims::Claims, blocking, ConnectionId, DbPool, LemmyContext, LemmyError};
use crate::{api::claims::Claims, blocking, DbPool, LemmyContext};
use actix_web::web::Data;
use lemmy_api_structs::APIError;
use lemmy_db::{
community::Community,
community_view::CommunityUserBanView,
@ -7,8 +8,7 @@ use lemmy_db::{
user::User_,
Crud,
};
use lemmy_utils::{slur_check, slurs_vec_to_str};
use thiserror::Error;
use lemmy_utils::{slur_check, slurs_vec_to_str, ConnectionId, LemmyError};
pub mod claims;
pub mod comment;
@ -17,20 +17,6 @@ pub mod post;
pub mod site;
pub mod user;
#[derive(Debug, Error)]
#[error("{{\"error\":\"{message}\"}}")]
pub struct APIError {
pub message: String,
}
impl APIError {
pub fn err(msg: &str) -> Self {
APIError {
message: msg.to_string(),
}
}
}
#[async_trait::async_trait(?Send)]
pub trait Perform {
type Response: serde::ser::Serialize + Send;

112
server/src/api/post.rs

@ -6,7 +6,6 @@ use crate::{
get_user_from_jwt,
get_user_from_jwt_opt,
is_mod_or_admin,
APIError,
Perform,
},
apub::{ApubLikeableType, ApubObjectType},
@ -16,11 +15,10 @@ use crate::{
messages::{GetPostUsersOnline, JoinCommunityRoom, JoinPostRoom, SendPost},
UserOperation,
},
ConnectionId,
LemmyContext,
LemmyError,
};
use actix_web::web::Data;
use lemmy_api_structs::{post::*, APIError};
use lemmy_db::{
comment_view::*,
community_view::*,
@ -35,110 +33,16 @@ use lemmy_db::{
Saveable,
SortType,
};
use lemmy_utils::{is_valid_post_title, make_apub_endpoint, EndpointType};
use serde::{Deserialize, Serialize};
use lemmy_utils::{
is_valid_post_title,
make_apub_endpoint,
ConnectionId,
EndpointType,
LemmyError,
};
use std::str::FromStr;
use url::Url;
#[derive(Serialize, Deserialize, Debug)]
pub struct CreatePost {
name: String,
url: Option<String>,
body: Option<String>,
nsfw: bool,
pub community_id: i32,
auth: String,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct PostResponse {
pub post: PostView,
}
#[derive(Serialize, Deserialize)]
pub struct GetPost {
pub id: i32,
auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
pub struct GetPostResponse {
post: PostView,
comments: Vec<CommentView>,
community: CommunityView,
moderators: Vec<CommunityModeratorView>,
pub online: usize,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct GetPosts {
type_: String,
sort: String,
page: Option<i64>,
limit: Option<i64>,
pub community_id: Option<i32>,
pub community_name: Option<String>,
auth: Option<String>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct GetPostsResponse {
pub posts: Vec<PostView>,
}
#[derive(Serialize, Deserialize)]
pub struct CreatePostLike {
post_id: i32,
score: i16,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditPost {
pub edit_id: i32,
name: String,
url: Option<String>,
body: Option<String>,
nsfw: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct DeletePost {
pub edit_id: i32,
deleted: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct RemovePost {
pub edit_id: i32,
removed: bool,
reason: Option<String>,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct LockPost {
pub edit_id: i32,
locked: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct StickyPost {
pub edit_id: i32,
stickied: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct SavePost {
post_id: i32,
save: bool,
auth: String,
}
#[async_trait::async_trait(?Send)]
impl Perform for CreatePost {
type Response = PostResponse;

125
server/src/api/site.rs

@ -1,4 +1,3 @@
use super::user::Register;
use crate::{
api::{
check_slurs,
@ -6,7 +5,6 @@ use crate::{
get_user_from_jwt,
get_user_from_jwt_opt,
is_admin,
APIError,
Perform,
},
apub::fetcher::search_by_apub_id,
@ -16,12 +14,11 @@ use crate::{
messages::{GetUsersOnline, SendAllMessage},
UserOperation,
},
ConnectionId,
LemmyContext,
LemmyError,
};
use actix_web::web::Data;
use anyhow::Context;
use lemmy_api_structs::{site::*, user::Register, APIError};
use lemmy_db::{
category::*,
comment_view::*,
@ -33,133 +30,15 @@ use lemmy_db::{
post_view::*,
site::*,
site_view::*,
user::*,
user_view::*,
Crud,
SearchType,
SortType,
};
use lemmy_utils::{location_info, settings::Settings};
use lemmy_utils::{location_info, settings::Settings, ConnectionId, LemmyError};
use log::{debug, info};
use serde::{Deserialize, Serialize};
use std::str::FromStr;
#[derive(Serialize, Deserialize)]
pub struct ListCategories {}
#[derive(Serialize, Deserialize)]
pub struct ListCategoriesResponse {
categories: Vec<Category>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct Search {
q: String,
type_: String,
community_id: Option<i32>,
sort: String,
page: Option<i64>,
limit: Option<i64>,
auth: Option<String>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct SearchResponse {
pub type_: String,
pub comments: Vec<CommentView>,
pub posts: Vec<PostView>,
pub communities: Vec<CommunityView>,
pub users: Vec<UserView>,
}
#[derive(Serialize, Deserialize)]
pub struct GetModlog {
mod_user_id: Option<i32>,
community_id: Option<i32>,
page: Option<i64>,
limit: Option<i64>,
}
#[derive(Serialize, Deserialize)]
pub struct GetModlogResponse {
removed_posts: Vec<ModRemovePostView>,
locked_posts: Vec<ModLockPostView>,
stickied_posts: Vec<ModStickyPostView>,
removed_comments: Vec<ModRemoveCommentView>,
removed_communities: Vec<ModRemoveCommunityView>,
banned_from_community: Vec<ModBanFromCommunityView>,
banned: Vec<ModBanView>,
added_to_community: Vec<ModAddCommunityView>,
added: Vec<ModAddView>,
}
#[derive(Serialize, Deserialize)]
pub struct CreateSite {
pub name: String,
pub description: Option<String>,
pub icon: Option<String>,
pub banner: Option<String>,
pub enable_downvotes: bool,
pub open_registration: bool,
pub enable_nsfw: bool,
pub auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct EditSite {
name: String,
description: Option<String>,
icon: Option<String>,
banner: Option<String>,
enable_downvotes: bool,
open_registration: bool,
enable_nsfw: bool,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetSite {
auth: Option<String>,
}
#[derive(Serialize, Deserialize, Clone)]
pub struct SiteResponse {
site: SiteView,
}
#[derive(Serialize, Deserialize)]
pub struct GetSiteResponse {
site: Option<SiteView>,
admins: Vec<UserView>,
banned: Vec<UserView>,
pub online: usize,
version: String,
my_user: Option<User_>,
federated_instances: Vec<String>,
}
#[derive(Serialize, Deserialize)]
pub struct TransferSite {
user_id: i32,
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetSiteConfig {
auth: String,
}
#[derive(Serialize, Deserialize)]
pub struct GetSiteConfigResponse {
config_hjson: String,
}
#[derive(Serialize, Deserialize)]
pub struct SaveSiteConfig {
config_hjson: String,
auth: String,
}
#[async_trait::async_trait(?Send)]
impl Perform for ListCategories {
<