Merge branch 'yerba_rework-imports' into federation
This commit is contained in:
commit
f15c3b4e1e
59 changed files with 889 additions and 341 deletions
5
server/.rustfmt.toml
vendored
5
server/.rustfmt.toml
vendored
|
|
@ -1,2 +1,5 @@
|
|||
tab_spaces = 2
|
||||
edition="2018"
|
||||
edition="2018"
|
||||
imports_layout="HorizontalVertical"
|
||||
merge_imports=true
|
||||
reorder_imports=true
|
||||
|
|
|
|||
54
server/Cargo.lock
generated
vendored
54
server/Cargo.lock
generated
vendored
|
|
@ -2,9 +2,9 @@
|
|||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "activitystreams"
|
||||
version = "0.6.1"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edf0082191df1d6d39577b28b5daa7b8318b812038d0f7a83f05331f17580934"
|
||||
checksum = "464cb473bfb402b857cc15b1153974c203a43f1485da4dda15cd17a738548958"
|
||||
dependencies = [
|
||||
"activitystreams-derive",
|
||||
"chrono",
|
||||
|
|
@ -26,6 +26,17 @@ dependencies = [
|
|||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "activitystreams-new"
|
||||
version = "0.1.0"
|
||||
source = "git+https://git.asonix.dog/asonix/activitystreams-sketch#2fb52d32bbce9716c76e08579cf5c716366945fe"
|
||||
dependencies = [
|
||||
"activitystreams",
|
||||
"serde 1.0.110",
|
||||
"serde_json 1.0.53",
|
||||
"typed-builder",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "actix"
|
||||
version = "0.9.0"
|
||||
|
|
@ -864,9 +875,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
version = "0.99.6"
|
||||
version = "0.99.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46b046a346c374c6c3c84d2070bfe33904504686bdf949c2d8eb22edad3f270c"
|
||||
checksum = "2127768764f1556535c01b5326ef94bd60ff08dcfbdc544d53e69ed155610f5d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1325,9 +1336,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.12"
|
||||
version = "0.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
|
||||
checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
|
@ -1554,6 +1565,7 @@ name = "lemmy_server"
|
|||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"activitystreams",
|
||||
"activitystreams-new",
|
||||
"actix",
|
||||
"actix-files",
|
||||
"actix-rt",
|
||||
|
|
@ -2119,9 +2131,9 @@ checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
|
|||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.6"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
|
||||
checksum = "d1e4df3c96bec4c7ce0e32fe5960c98ffc869443ec9592a0411ca1ee96e5e2f0"
|
||||
|
||||
[[package]]
|
||||
name = "pq-sys"
|
||||
|
|
@ -2146,9 +2158,9 @@ checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.12"
|
||||
version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319"
|
||||
checksum = "53f5ffe53a6b28e37c9c1ce74893477864d64f74778a93a4beb43c8fa167f639"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
|
@ -2781,9 +2793,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.21"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4696caa4048ac7ce2bcd2e484b3cef88c1004e41b8e945a277e2c25dc0b72060"
|
||||
checksum = "1425de3c33b0941002740a420b1a906a350b88d08b82b2c8a01035a3f9447bac"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -2836,18 +2848,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "467e5ff447618a916519a4e0d62772ab14f434897f3d63f05d8700ef1e9b22c1"
|
||||
checksum = "5976891d6950b4f68477850b5b9e5aa64d955961466f9e174363f573e54e8ca7"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e63c1091225b9834089b429bc4a2e01223470e3183e891582909e9d1c4cb55d9"
|
||||
checksum = "ab81dbd1cd69cd2ce22ecfbdd3bdb73334ba25350649408cc6c085f46d89573d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -3014,6 +3026,16 @@ version = "1.7.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
|
||||
|
||||
[[package]]
|
||||
name = "typed-builder"
|
||||
version = "0.5.1"
|
||||
source = "git+https://git.asonix.dog/asonix/typed-builder#3dadcaaa6184ef720093c8f0632a7d423d2537b0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.12.0"
|
||||
|
|
|
|||
6
server/Cargo.toml
vendored
6
server/Cargo.toml
vendored
|
|
@ -4,11 +4,15 @@ version = "0.0.1"
|
|||
authors = ["Dessalines <happydooby@gmail.com>"]
|
||||
edition = "2018"
|
||||
|
||||
[patch.crates-io]
|
||||
typed-builder = { git = "https://git.asonix.dog/asonix/typed-builder" }
|
||||
|
||||
[dependencies]
|
||||
diesel = { version = "1.4.4", features = ["postgres","chrono","r2d2","64-column-tables","serde_json"] }
|
||||
diesel_migrations = "1.4.0"
|
||||
dotenv = "0.15.0"
|
||||
activitystreams = "0.6.1"
|
||||
activitystreams = "0.6.2"
|
||||
activitystreams-new = { version = "0.1.0", git = "https://git.asonix.dog/asonix/activitystreams-sketch" }
|
||||
bcrypt = "0.8.0"
|
||||
chrono = { version = "0.4.7", features = ["serde"] }
|
||||
failure = "0.1.8"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,42 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
api::{APIError, Oper, Perform},
|
||||
apub::{ApubLikeableType, ApubObjectType},
|
||||
db::{
|
||||
comment::*,
|
||||
comment_view::*,
|
||||
community_view::*,
|
||||
moderator::*,
|
||||
post::*,
|
||||
site_view::*,
|
||||
user::*,
|
||||
user_mention::*,
|
||||
user_view::*,
|
||||
Crud,
|
||||
Likeable,
|
||||
ListingType,
|
||||
Saveable,
|
||||
SortType,
|
||||
},
|
||||
naive_now,
|
||||
remove_slurs,
|
||||
scrape_text_for_mentions,
|
||||
send_email,
|
||||
settings::Settings,
|
||||
websocket::{
|
||||
server::{JoinCommunityRoom, SendComment},
|
||||
UserOperation,
|
||||
WebsocketInfo,
|
||||
},
|
||||
MentionData,
|
||||
};
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use log::error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct CreateComment {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,41 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
api::{APIError, Oper, Perform},
|
||||
apub::{
|
||||
extensions::signatures::generate_actor_keypair,
|
||||
make_apub_endpoint,
|
||||
ActorType,
|
||||
EndpointType,
|
||||
},
|
||||
db::{
|
||||
community::*,
|
||||
community_view::*,
|
||||
moderator::*,
|
||||
site::*,
|
||||
user::*,
|
||||
user_view::*,
|
||||
Bannable,
|
||||
Crud,
|
||||
Followable,
|
||||
Joinable,
|
||||
SortType,
|
||||
},
|
||||
naive_from_unix,
|
||||
naive_now,
|
||||
slur_check,
|
||||
slurs_vec_to_str,
|
||||
websocket::{
|
||||
server::{JoinCommunityRoom, SendCommunityRoomMessage},
|
||||
UserOperation,
|
||||
WebsocketInfo,
|
||||
},
|
||||
};
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct GetCommunity {
|
||||
|
|
|
|||
|
|
@ -1,46 +1,9 @@
|
|||
use crate::db::category::*;
|
||||
use crate::db::comment::*;
|
||||
use crate::db::comment_view::*;
|
||||
use crate::db::community::*;
|
||||
use crate::db::community_view::*;
|
||||
use crate::db::moderator::*;
|
||||
use crate::db::moderator_views::*;
|
||||
use crate::db::password_reset_request::*;
|
||||
use crate::db::post::*;
|
||||
use crate::db::post_view::*;
|
||||
use crate::db::private_message::*;
|
||||
use crate::db::private_message_view::*;
|
||||
use crate::db::site::*;
|
||||
use crate::db::site_view::*;
|
||||
use crate::db::user::*;
|
||||
use crate::db::user_mention::*;
|
||||
use crate::db::user_mention_view::*;
|
||||
use crate::db::user_view::*;
|
||||
use crate::db::*;
|
||||
use crate::{
|
||||
fetch_iframely_and_pictshare_data, generate_random_string, naive_from_unix, naive_now,
|
||||
remove_slurs, scrape_text_for_mentions, send_email, slur_check, slurs_vec_to_str, MentionData,
|
||||
use crate::websocket::WebsocketInfo;
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
|
||||
use crate::apub::{
|
||||
extensions::signatures::generate_actor_keypair,
|
||||
fetcher::search_by_apub_id,
|
||||
{make_apub_endpoint, ActorType, ApubLikeableType, ApubObjectType, EndpointType},
|
||||
};
|
||||
use crate::settings::Settings;
|
||||
use crate::websocket::{
|
||||
server::{
|
||||
JoinCommunityRoom, JoinPostRoom, JoinUserRoom, SendAllMessage, SendComment,
|
||||
SendCommunityRoomMessage, SendPost, SendUserRoomMessage,
|
||||
},
|
||||
UserOperation, WebsocketInfo,
|
||||
};
|
||||
use diesel::r2d2::{ConnectionManager, Pool};
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use log::{debug, error, info};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
|
||||
pub mod comment;
|
||||
pub mod community;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,39 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
api::{APIError, Oper, Perform},
|
||||
apub::{ApubLikeableType, ApubObjectType},
|
||||
db::{
|
||||
comment_view::*,
|
||||
community_view::*,
|
||||
moderator::*,
|
||||
post::*,
|
||||
post_view::*,
|
||||
site::*,
|
||||
site_view::*,
|
||||
user::*,
|
||||
user_view::*,
|
||||
Crud,
|
||||
Likeable,
|
||||
ListingType,
|
||||
Saveable,
|
||||
SortType,
|
||||
},
|
||||
fetch_iframely_and_pictshare_data,
|
||||
naive_now,
|
||||
slur_check,
|
||||
slurs_vec_to_str,
|
||||
websocket::{
|
||||
server::{JoinCommunityRoom, JoinPostRoom, SendPost},
|
||||
UserOperation,
|
||||
WebsocketInfo,
|
||||
},
|
||||
};
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct CreatePost {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,36 @@
|
|||
use super::user::Register;
|
||||
use super::*;
|
||||
use crate::{
|
||||
api::{APIError, Oper, Perform},
|
||||
apub::fetcher::search_by_apub_id,
|
||||
db::{
|
||||
category::*,
|
||||
comment_view::*,
|
||||
community_view::*,
|
||||
moderator::*,
|
||||
moderator_views::*,
|
||||
post_view::*,
|
||||
site::*,
|
||||
site_view::*,
|
||||
user::*,
|
||||
user_view::*,
|
||||
Crud,
|
||||
SearchType,
|
||||
SortType,
|
||||
},
|
||||
naive_now,
|
||||
settings::Settings,
|
||||
slur_check,
|
||||
slurs_vec_to_str,
|
||||
websocket::{server::SendAllMessage, UserOperation, WebsocketInfo},
|
||||
};
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use log::{debug, info};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct ListCategories {}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,57 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
api::{APIError, Oper, Perform},
|
||||
apub::{
|
||||
extensions::signatures::generate_actor_keypair,
|
||||
make_apub_endpoint,
|
||||
ApubObjectType,
|
||||
EndpointType,
|
||||
},
|
||||
db::{
|
||||
comment::*,
|
||||
comment_view::*,
|
||||
community::*,
|
||||
community_view::*,
|
||||
moderator::*,
|
||||
password_reset_request::*,
|
||||
post::*,
|
||||
post_view::*,
|
||||
private_message::*,
|
||||
private_message_view::*,
|
||||
site::*,
|
||||
site_view::*,
|
||||
user::*,
|
||||
user_mention::*,
|
||||
user_mention_view::*,
|
||||
user_view::*,
|
||||
Crud,
|
||||
Followable,
|
||||
Joinable,
|
||||
ListingType,
|
||||
SortType,
|
||||
},
|
||||
generate_random_string,
|
||||
naive_from_unix,
|
||||
naive_now,
|
||||
remove_slurs,
|
||||
send_email,
|
||||
settings::Settings,
|
||||
slur_check,
|
||||
slurs_vec_to_str,
|
||||
websocket::{
|
||||
server::{JoinUserRoom, SendAllMessage, SendUserRoomMessage},
|
||||
UserOperation,
|
||||
WebsocketInfo,
|
||||
},
|
||||
};
|
||||
use bcrypt::verify;
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use log::error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct Login {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
use super::*;
|
||||
use crate::apub::{extensions::signatures::sign, is_apub_id_valid, ActorType};
|
||||
use activitystreams::{context, object::properties::ObjectProperties, public};
|
||||
use failure::{Error, _core::fmt::Debug};
|
||||
use isahc::prelude::*;
|
||||
use log::debug;
|
||||
use serde::Serialize;
|
||||
use url::Url;
|
||||
|
||||
pub fn populate_object_props(
|
||||
props: &mut ObjectProperties,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,42 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::{
|
||||
activities::{populate_object_props, send_activity},
|
||||
create_apub_response,
|
||||
create_apub_tombstone_response,
|
||||
create_tombstone,
|
||||
fetch_webfinger_url,
|
||||
fetcher::get_or_fetch_and_upsert_remote_user,
|
||||
ActorType,
|
||||
ApubLikeableType,
|
||||
ApubObjectType,
|
||||
FromApub,
|
||||
ToApub,
|
||||
},
|
||||
convert_datetime,
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
comment::{Comment, CommentForm},
|
||||
community::Community,
|
||||
post::Post,
|
||||
user::User_,
|
||||
Crud,
|
||||
},
|
||||
routes::DbPoolParam,
|
||||
scrape_text_for_mentions,
|
||||
MentionData,
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
||||
context,
|
||||
link::Mention,
|
||||
object::{kind::NoteType, properties::ObjectProperties, Note, Tombstone},
|
||||
};
|
||||
use actix_web::{body::Body, web::Path, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use itertools::Itertools;
|
||||
use log::debug;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct CommentQuery {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,42 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::{
|
||||
activities::{populate_object_props, send_activity},
|
||||
create_apub_response,
|
||||
create_apub_tombstone_response,
|
||||
create_tombstone,
|
||||
extensions::{group_extensions::GroupExtension, signatures::PublicKey},
|
||||
fetcher::get_or_fetch_and_upsert_remote_user,
|
||||
get_shared_inbox,
|
||||
ActorType,
|
||||
FromApub,
|
||||
GroupExt,
|
||||
ToApub,
|
||||
},
|
||||
convert_datetime,
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
community::{Community, CommunityForm},
|
||||
community_view::{CommunityFollowerView, CommunityModeratorView},
|
||||
user::User_,
|
||||
},
|
||||
naive_now,
|
||||
routes::DbPoolParam,
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Accept, Delete, Follow, Remove, Undo},
|
||||
actor::{kind::GroupType, properties::ApActorProperties, Group},
|
||||
collection::UnorderedCollection,
|
||||
context,
|
||||
endpoint::EndpointProperties,
|
||||
ext::Extensible,
|
||||
object::{properties::ObjectProperties, Tombstone},
|
||||
BaseBox,
|
||||
};
|
||||
use actix_web::{body::Body, web::Path, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use itertools::Itertools;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct CommunityQuery {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,23 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::{
|
||||
extensions::signatures::verify,
|
||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||
ActorType,
|
||||
},
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
community::{Community, CommunityFollower, CommunityFollowerForm},
|
||||
user::User_,
|
||||
Followable,
|
||||
},
|
||||
routes::{ChatServerParam, DbPoolParam},
|
||||
};
|
||||
use activitystreams::activity::{Follow, Undo};
|
||||
use actix_web::{web, HttpRequest, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::{Error, _core::fmt::Debug};
|
||||
use log::debug;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[serde(untagged)]
|
||||
#[derive(Deserialize, Debug)]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
use crate::db::category::Category;
|
||||
use crate::db::Crud;
|
||||
use activitystreams::ext::Extension;
|
||||
use activitystreams::Actor;
|
||||
use crate::db::{category::Category, Crud};
|
||||
use activitystreams::{ext::Extension, Actor};
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
use activitystreams::ext::Extension;
|
||||
use activitystreams::Base;
|
||||
use activitystreams::{ext::Extension, Base};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||
|
|
|
|||
|
|
@ -5,9 +5,12 @@ use failure::Error;
|
|||
use http::request::Builder;
|
||||
use http_signature_normalization::Config;
|
||||
use log::debug;
|
||||
use openssl::hash::MessageDigest;
|
||||
use openssl::sign::{Signer, Verifier};
|
||||
use openssl::{pkey::PKey, rsa::Rsa};
|
||||
use openssl::{
|
||||
hash::MessageDigest,
|
||||
pkey::PKey,
|
||||
rsa::Rsa,
|
||||
sign::{Signer, Verifier},
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,43 @@
|
|||
use super::*;
|
||||
use activitystreams::object::Note;
|
||||
use actix_web::Result;
|
||||
use diesel::{result::Error::NotFound, PgConnection};
|
||||
use failure::{Error, _core::fmt::Debug};
|
||||
use isahc::prelude::*;
|
||||
use log::debug;
|
||||
use serde::Deserialize;
|
||||
use std::time::Duration;
|
||||
use url::Url;
|
||||
|
||||
use crate::{
|
||||
api::site::SearchResponse,
|
||||
db::{
|
||||
comment::{Comment, CommentForm},
|
||||
comment_view::CommentView,
|
||||
community::{Community, CommunityForm, CommunityModerator, CommunityModeratorForm},
|
||||
community_view::CommunityView,
|
||||
post::{Post, PostForm},
|
||||
post_view::PostView,
|
||||
user::{UserForm, User_},
|
||||
Crud,
|
||||
Joinable,
|
||||
SearchType,
|
||||
},
|
||||
naive_now,
|
||||
routes::nodeinfo::{NodeInfo, NodeInfoWellKnown},
|
||||
};
|
||||
|
||||
use crate::{
|
||||
apub::{
|
||||
get_apub_protocol_string,
|
||||
is_apub_id_valid,
|
||||
FromApub,
|
||||
GroupExt,
|
||||
PageExt,
|
||||
PersonExt,
|
||||
APUB_JSON_CONTENT_TYPE,
|
||||
},
|
||||
db::user_view::UserView,
|
||||
};
|
||||
|
||||
// Fetch nodeinfo metadata from a remote instance.
|
||||
fn _fetch_node_info(domain: &str) -> Result<NodeInfo, Error> {
|
||||
|
|
|
|||
|
|
@ -9,70 +9,34 @@ pub mod private_message;
|
|||
pub mod shared_inbox;
|
||||
pub mod user;
|
||||
pub mod user_inbox;
|
||||
use crate::api::community::CommunityResponse;
|
||||
use crate::db::activity::insert_activity;
|
||||
use crate::websocket::server::SendCommunityRoomMessage;
|
||||
use activitystreams::object::kind::{NoteType, PageType};
|
||||
use activitystreams::{
|
||||
activity::{Accept, Create, Delete, Dislike, Follow, Like, Remove, Undo, Update},
|
||||
actor::{kind::GroupType, properties::ApActorProperties, Group, Person},
|
||||
collection::UnorderedCollection,
|
||||
context,
|
||||
endpoint::EndpointProperties,
|
||||
ext::{Ext, Extensible},
|
||||
link::Mention,
|
||||
object::{properties::ObjectProperties, Note, Page, Tombstone},
|
||||
public, BaseBox,
|
||||
|
||||
use crate::{
|
||||
apub::extensions::{
|
||||
group_extensions::GroupExtension,
|
||||
page_extension::PageExtension,
|
||||
signatures::{PublicKey, PublicKeyExtension},
|
||||
},
|
||||
convert_datetime,
|
||||
db::user::User_,
|
||||
routes::webfinger::WebFingerResponse,
|
||||
MentionData,
|
||||
Settings,
|
||||
};
|
||||
use actix_web::body::Body;
|
||||
use actix_web::web::Path;
|
||||
use actix_web::{web, HttpRequest, HttpResponse, Result};
|
||||
use diesel::result::Error::NotFound;
|
||||
use activitystreams::{
|
||||
activity::Follow,
|
||||
actor::{properties::ApActorProperties, Group, Person},
|
||||
ext::Ext,
|
||||
object::{Page, Tombstone},
|
||||
};
|
||||
use actix_web::{body::Body, HttpResponse, Result};
|
||||
use chrono::NaiveDateTime;
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use failure::_core::fmt::Debug;
|
||||
use isahc::prelude::*;
|
||||
use itertools::Itertools;
|
||||
use log::debug;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::time::Duration;
|
||||
use serde::Serialize;
|
||||
use url::Url;
|
||||
|
||||
use crate::api::comment::{send_local_notifs, CommentResponse};
|
||||
use crate::api::post::PostResponse;
|
||||
use crate::api::site::SearchResponse;
|
||||
use crate::api::user::PrivateMessageResponse;
|
||||
use crate::db::comment::{Comment, CommentForm, CommentLike, CommentLikeForm};
|
||||
use crate::db::comment_view::CommentView;
|
||||
use crate::db::community::{
|
||||
Community, CommunityFollower, CommunityFollowerForm, CommunityForm, CommunityModerator,
|
||||
CommunityModeratorForm,
|
||||
};
|
||||
use crate::db::community_view::{CommunityFollowerView, CommunityModeratorView, CommunityView};
|
||||
use crate::db::post::{Post, PostForm, PostLike, PostLikeForm};
|
||||
use crate::db::post_view::PostView;
|
||||
use crate::db::private_message::{PrivateMessage, PrivateMessageForm};
|
||||
use crate::db::private_message_view::PrivateMessageView;
|
||||
use crate::db::user::{UserForm, User_};
|
||||
use crate::db::user_view::UserView;
|
||||
use crate::db::{Crud, Followable, Joinable, Likeable, SearchType};
|
||||
use crate::routes::nodeinfo::{NodeInfo, NodeInfoWellKnown};
|
||||
use crate::routes::webfinger::WebFingerResponse;
|
||||
use crate::routes::{ChatServerParam, DbPoolParam};
|
||||
use crate::websocket::{
|
||||
server::{SendComment, SendPost, SendUserRoomMessage},
|
||||
UserOperation,
|
||||
};
|
||||
use crate::{convert_datetime, naive_now, scrape_text_for_mentions, MentionData, Settings};
|
||||
|
||||
use crate::apub::extensions::group_extensions::GroupExtension;
|
||||
use crate::apub::extensions::page_extension::PageExtension;
|
||||
use activities::{populate_object_props, send_activity};
|
||||
use chrono::NaiveDateTime;
|
||||
use extensions::signatures::verify;
|
||||
use extensions::signatures::{sign, PublicKey, PublicKeyExtension};
|
||||
use fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user};
|
||||
|
||||
type GroupExt = Ext<Ext<Ext<Group, GroupExtension>, ApActorProperties>, PublicKeyExtension>;
|
||||
type PersonExt = Ext<Ext<Person, ApActorProperties>, PublicKeyExtension>;
|
||||
type PageExt = Ext<Page, PageExtension>;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,38 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::{
|
||||
activities::{populate_object_props, send_activity},
|
||||
create_apub_response,
|
||||
create_apub_tombstone_response,
|
||||
create_tombstone,
|
||||
extensions::page_extension::PageExtension,
|
||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||
ActorType,
|
||||
ApubLikeableType,
|
||||
ApubObjectType,
|
||||
FromApub,
|
||||
PageExt,
|
||||
ToApub,
|
||||
},
|
||||
convert_datetime,
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
community::Community,
|
||||
post::{Post, PostForm},
|
||||
user::User_,
|
||||
Crud,
|
||||
},
|
||||
routes::DbPoolParam,
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
||||
context,
|
||||
ext::Extensible,
|
||||
object::{kind::PageType, properties::ObjectProperties, Page, Tombstone},
|
||||
};
|
||||
use actix_web::{body::Body, web::Path, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct PostQuery {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,28 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::{
|
||||
activities::send_activity,
|
||||
create_tombstone,
|
||||
fetcher::get_or_fetch_and_upsert_remote_user,
|
||||
ApubObjectType,
|
||||
FromApub,
|
||||
ToApub,
|
||||
},
|
||||
convert_datetime,
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
private_message::{PrivateMessage, PrivateMessageForm},
|
||||
user::User_,
|
||||
Crud,
|
||||
},
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Create, Delete, Undo, Update},
|
||||
context,
|
||||
object::{kind::NoteType, properties::ObjectProperties, Note, Tombstone},
|
||||
};
|
||||
use actix_web::Result;
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
|
||||
impl ToApub for PrivateMessage {
|
||||
type Response = Note;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,45 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
api::{
|
||||
comment::{send_local_notifs, CommentResponse},
|
||||
community::CommunityResponse,
|
||||
post::PostResponse,
|
||||
},
|
||||
apub::{
|
||||
extensions::signatures::verify,
|
||||
fetcher::get_or_fetch_and_upsert_remote_user,
|
||||
FromApub,
|
||||
GroupExt,
|
||||
PageExt,
|
||||
},
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
comment::{Comment, CommentForm, CommentLike, CommentLikeForm},
|
||||
comment_view::CommentView,
|
||||
community::{Community, CommunityForm},
|
||||
community_view::CommunityView,
|
||||
post::{Post, PostForm, PostLike, PostLikeForm},
|
||||
post_view::PostView,
|
||||
Crud,
|
||||
Likeable,
|
||||
},
|
||||
naive_now,
|
||||
routes::{ChatServerParam, DbPoolParam},
|
||||
scrape_text_for_mentions,
|
||||
websocket::{
|
||||
server::{SendComment, SendCommunityRoomMessage, SendPost},
|
||||
UserOperation,
|
||||
},
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
||||
object::Note,
|
||||
BaseBox,
|
||||
};
|
||||
use actix_web::{web, HttpRequest, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::{Error, _core::fmt::Debug};
|
||||
use log::debug;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[serde(untagged)]
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,33 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::{
|
||||
activities::send_activity,
|
||||
create_apub_response,
|
||||
extensions::signatures::PublicKey,
|
||||
ActorType,
|
||||
FromApub,
|
||||
PersonExt,
|
||||
ToApub,
|
||||
},
|
||||
convert_datetime,
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
user::{UserForm, User_},
|
||||
},
|
||||
naive_now,
|
||||
routes::DbPoolParam,
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Follow, Undo},
|
||||
actor::{properties::ApActorProperties, Person},
|
||||
context,
|
||||
endpoint::EndpointProperties,
|
||||
ext::Extensible,
|
||||
object::{properties::ObjectProperties, Tombstone},
|
||||
};
|
||||
use actix_web::{body::Body, web::Path, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::Error;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct UserQuery {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,32 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
api::user::PrivateMessageResponse,
|
||||
apub::{
|
||||
extensions::signatures::verify,
|
||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||
FromApub,
|
||||
},
|
||||
db::{
|
||||
activity::insert_activity,
|
||||
community::{CommunityFollower, CommunityFollowerForm},
|
||||
private_message::{PrivateMessage, PrivateMessageForm},
|
||||
private_message_view::PrivateMessageView,
|
||||
user::User_,
|
||||
Crud,
|
||||
Followable,
|
||||
},
|
||||
naive_now,
|
||||
routes::{ChatServerParam, DbPoolParam},
|
||||
websocket::{server::SendUserRoomMessage, UserOperation},
|
||||
};
|
||||
use activitystreams::{
|
||||
activity::{Accept, Create, Delete, Undo, Update},
|
||||
object::Note,
|
||||
};
|
||||
use actix_web::{web, HttpRequest, HttpResponse, Result};
|
||||
use diesel::PgConnection;
|
||||
use failure::{Error, _core::fmt::Debug};
|
||||
use log::debug;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[serde(untagged)]
|
||||
#[derive(Deserialize, Debug)]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use super::*;
|
||||
use crate::schema::activity;
|
||||
use crate::{db::Crud, schema::activity};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
|
|
@ -72,8 +73,8 @@ where
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{super::user::*, *};
|
||||
use crate::db::{establish_unpooled_connection, Crud, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
use super::*;
|
||||
use crate::schema::category;
|
||||
use crate::schema::category::dsl::*;
|
||||
use crate::{
|
||||
db::Crud,
|
||||
schema::{category, category::dsl::*},
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[table_name = "category"]
|
||||
|
|
@ -50,6 +53,8 @@ impl Category {
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::db::establish_unpooled_connection;
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
// This is for db migrations that require code
|
||||
use super::comment::Comment;
|
||||
use super::community::{Community, CommunityForm};
|
||||
use super::post::Post;
|
||||
use super::private_message::PrivateMessage;
|
||||
use super::user::{UserForm, User_};
|
||||
use super::*;
|
||||
use crate::apub::extensions::signatures::generate_actor_keypair;
|
||||
use crate::apub::{make_apub_endpoint, EndpointType};
|
||||
use crate::naive_now;
|
||||
use super::{
|
||||
comment::Comment,
|
||||
community::{Community, CommunityForm},
|
||||
post::Post,
|
||||
private_message::PrivateMessage,
|
||||
user::{UserForm, User_},
|
||||
};
|
||||
use crate::{
|
||||
apub::{extensions::signatures::generate_actor_keypair, make_apub_endpoint, EndpointType},
|
||||
db::Crud,
|
||||
naive_now,
|
||||
};
|
||||
use diesel::*;
|
||||
use failure::Error;
|
||||
use log::info;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
use super::post::Post;
|
||||
use super::*;
|
||||
use crate::apub::{make_apub_endpoint, EndpointType};
|
||||
use crate::naive_now;
|
||||
use crate::schema::{comment, comment_like, comment_saved};
|
||||
use super::{post::Post, *};
|
||||
use crate::{
|
||||
apub::{make_apub_endpoint, EndpointType},
|
||||
naive_now,
|
||||
schema::{comment, comment_like, comment_saved},
|
||||
};
|
||||
|
||||
// WITH RECURSIVE MyTree AS (
|
||||
// SELECT * FROM comment WHERE parent_id IS NULL
|
||||
|
|
@ -203,10 +204,10 @@ impl Saveable<CommentSavedForm> for CommentSaved {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::community::*;
|
||||
use super::super::post::*;
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{
|
||||
super::{community::*, post::*, user::*},
|
||||
*,
|
||||
};
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use super::*;
|
||||
use diesel::pg::Pg;
|
||||
use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
// The faked schema since diesel doesn't do views
|
||||
table! {
|
||||
|
|
@ -453,11 +454,12 @@ impl<'a> ReplyQueryBuilder<'a> {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::comment::*;
|
||||
use super::super::community::*;
|
||||
use super::super::post::*;
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{
|
||||
super::{comment::*, community::*, post::*, user::*},
|
||||
*,
|
||||
};
|
||||
use crate::db::{establish_unpooled_connection, Crud, Likeable};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
use super::*;
|
||||
use crate::schema::{community, community_follower, community_moderator, community_user_ban};
|
||||
use crate::{
|
||||
db::{Bannable, Crud, Followable, Joinable},
|
||||
schema::{community, community_follower, community_moderator, community_user_ban},
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[table_name = "community"]
|
||||
|
|
@ -228,8 +232,9 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{super::user::*, *};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
use super::community_view::community_mview::BoxedQuery;
|
||||
use super::*;
|
||||
use diesel::pg::Pg;
|
||||
use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
|
||||
use diesel::{pg::Pg, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
table! {
|
||||
community_view (id) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
use crate::settings::Settings;
|
||||
use diesel::dsl::*;
|
||||
use diesel::result::Error;
|
||||
use diesel::*;
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
pub mod activity;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,19 @@
|
|||
use super::*;
|
||||
use crate::schema::{
|
||||
mod_add, mod_add_community, mod_ban, mod_ban_from_community, mod_lock_post, mod_remove_comment,
|
||||
mod_remove_community, mod_remove_post, mod_sticky_post,
|
||||
use crate::{
|
||||
db::Crud,
|
||||
schema::{
|
||||
mod_add,
|
||||
mod_add_community,
|
||||
mod_ban,
|
||||
mod_ban_from_community,
|
||||
mod_lock_post,
|
||||
mod_remove_comment,
|
||||
mod_remove_community,
|
||||
mod_remove_post,
|
||||
mod_sticky_post,
|
||||
},
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[table_name = "mod_remove_post"]
|
||||
|
|
@ -426,11 +437,12 @@ impl Crud<ModAddForm> for ModAdd {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::comment::*;
|
||||
use super::super::community::*;
|
||||
use super::super::post::*;
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{
|
||||
super::{comment::*, community::*, post::*, user::*},
|
||||
*,
|
||||
};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
// use Crud;
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
use super::*;
|
||||
use crate::db::limit_and_offset;
|
||||
use diesel::{result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
table! {
|
||||
mod_remove_post_view (id) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
use super::*;
|
||||
use crate::schema::password_reset_request;
|
||||
use crate::schema::password_reset_request::dsl::*;
|
||||
use crate::{
|
||||
db::Crud,
|
||||
schema::{password_reset_request, password_reset_request::dsl::*},
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug)]
|
||||
|
|
@ -79,8 +81,8 @@ impl PasswordResetRequest {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{super::user::*, *};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
use super::*;
|
||||
use crate::apub::{make_apub_endpoint, EndpointType};
|
||||
use crate::naive_now;
|
||||
use crate::schema::{post, post_like, post_read, post_saved};
|
||||
use crate::{
|
||||
apub::{make_apub_endpoint, EndpointType},
|
||||
db::{Crud, Likeable, Readable, Saveable},
|
||||
naive_now,
|
||||
schema::{post, post_like, post_read, post_saved},
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[table_name = "post"]
|
||||
|
|
@ -237,9 +241,12 @@ impl Readable<PostReadForm> for PostRead {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::community::*;
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{
|
||||
super::{community::*, user::*},
|
||||
*,
|
||||
};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
use super::post_view::post_mview::BoxedQuery;
|
||||
use super::*;
|
||||
use diesel::pg::Pg;
|
||||
use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
// The faked schema since diesel doesn't do views
|
||||
table! {
|
||||
|
|
@ -363,10 +364,12 @@ impl PostView {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::community::*;
|
||||
use super::super::post::*;
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{
|
||||
super::{community::*, post::*, user::*},
|
||||
*,
|
||||
};
|
||||
use crate::db::{establish_unpooled_connection, Crud, Likeable};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
use super::*;
|
||||
use crate::apub::{make_apub_endpoint, EndpointType};
|
||||
use crate::schema::private_message;
|
||||
use crate::{
|
||||
apub::{make_apub_endpoint, EndpointType},
|
||||
db::Crud,
|
||||
schema::private_message,
|
||||
};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[table_name = "private_message"]
|
||||
|
|
@ -85,8 +89,9 @@ impl PrivateMessage {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{super::user::*, *};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use super::*;
|
||||
use diesel::pg::Pg;
|
||||
use crate::db::{limit_and_offset, MaybeOptional};
|
||||
use diesel::{pg::Pg, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
// The faked schema since diesel doesn't do views
|
||||
table! {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use super::*;
|
||||
use crate::schema::site;
|
||||
use crate::{db::Crud, schema::site};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[table_name = "site"]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
use super::*;
|
||||
use diesel::{result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
table! {
|
||||
site_view (id) {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
use super::*;
|
||||
use crate::schema::user_;
|
||||
use crate::schema::user_::dsl::*;
|
||||
use crate::{is_email_regex, naive_now, Settings};
|
||||
use crate::{
|
||||
db::Crud,
|
||||
is_email_regex,
|
||||
naive_now,
|
||||
schema::{user_, user_::dsl::*},
|
||||
settings::Settings,
|
||||
};
|
||||
use bcrypt::{hash, DEFAULT_COST};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug)]
|
||||
#[table_name = "user_"]
|
||||
|
|
@ -208,8 +213,8 @@ impl User_ {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::User_;
|
||||
use super::*;
|
||||
use super::{User_, *};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
use super::comment::Comment;
|
||||
use super::*;
|
||||
use crate::schema::user_mention;
|
||||
use crate::{db::Crud, schema::user_mention};
|
||||
use diesel::{dsl::*, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||
#[belongs_to(Comment)]
|
||||
|
|
@ -53,11 +54,12 @@ impl Crud<UserMentionForm> for UserMention {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::super::comment::*;
|
||||
use super::super::community::*;
|
||||
use super::super::post::*;
|
||||
use super::super::user::*;
|
||||
use super::*;
|
||||
use super::{
|
||||
super::{comment::*, community::*, post::*, user::*},
|
||||
*,
|
||||
};
|
||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
||||
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_unpooled_connection();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use super::*;
|
||||
use diesel::pg::Pg;
|
||||
use crate::db::{limit_and_offset, MaybeOptional, SortType};
|
||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
// The faked schema since diesel doesn't do views
|
||||
table! {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
use super::user_view::user_mview::BoxedQuery;
|
||||
use super::*;
|
||||
use diesel::pg::Pg;
|
||||
use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
|
||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
table! {
|
||||
user_view (id) {
|
||||
|
|
|
|||
|
|
@ -41,15 +41,20 @@ use actix_web::dev::ConnectionInfo;
|
|||
use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, Utc};
|
||||
use isahc::prelude::*;
|
||||
use itertools::Itertools;
|
||||
use lettre::smtp::authentication::{Credentials, Mechanism};
|
||||
use lettre::smtp::extension::ClientId;
|
||||
use lettre::smtp::ConnectionReuseParameters;
|
||||
use lettre::{ClientSecurity, SmtpClient, Transport};
|
||||
use lettre::{
|
||||
smtp::{
|
||||
authentication::{Credentials, Mechanism},
|
||||
extension::ClientId,
|
||||
ConnectionReuseParameters,
|
||||
},
|
||||
ClientSecurity,
|
||||
SmtpClient,
|
||||
Transport,
|
||||
};
|
||||
use lettre_email::Email;
|
||||
use log::error;
|
||||
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
|
||||
use rand::distributions::Alphanumeric;
|
||||
use rand::{thread_rng, Rng};
|
||||
use rand::{distributions::Alphanumeric, thread_rng, Rng};
|
||||
use regex::{Regex, RegexBuilder};
|
||||
use serde::Deserialize;
|
||||
|
||||
|
|
@ -266,7 +271,11 @@ pub fn scrape_text_for_mentions(text: &str) -> Vec<MentionData> {
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::{
|
||||
is_email_regex, remove_slurs, scrape_text_for_mentions, slur_check, slurs_vec_to_str,
|
||||
is_email_regex,
|
||||
remove_slurs,
|
||||
scrape_text_for_mentions,
|
||||
slur_check,
|
||||
slurs_vec_to_str,
|
||||
};
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
|
|
@ -4,8 +4,10 @@ extern crate diesel_migrations;
|
|||
|
||||
use actix::prelude::*;
|
||||
use actix_web::*;
|
||||
use diesel::r2d2::{ConnectionManager, Pool};
|
||||
use diesel::PgConnection;
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use lemmy_server::{
|
||||
db::code_migrations::run_advanced_migrations,
|
||||
|
|
|
|||
|
|
@ -1,23 +1,18 @@
|
|||
pub mod rate_limiter;
|
||||
|
||||
use super::{IPAddr, Settings};
|
||||
use crate::api::APIError;
|
||||
use crate::get_ip;
|
||||
use crate::settings::RateLimitConfig;
|
||||
use crate::{api::APIError, get_ip, settings::RateLimitConfig};
|
||||
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
|
||||
use failure::Error;
|
||||
use futures::future::{ok, Ready};
|
||||
use log::debug;
|
||||
use rate_limiter::{RateLimitType, RateLimiter};
|
||||
use std::collections::HashMap;
|
||||
use std::future::Future;
|
||||
use std::pin::Pin;
|
||||
use std::sync::Arc;
|
||||
use std::task::{Context, Poll};
|
||||
use std::time::SystemTime;
|
||||
use strum::IntoEnumIterator;
|
||||
use std::{
|
||||
future::Future,
|
||||
pin::Pin,
|
||||
sync::Arc,
|
||||
task::{Context, Poll},
|
||||
};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
pub mod rate_limiter;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct RateLimit {
|
||||
pub rate_limiter: Arc<Mutex<RateLimiter>>,
|
||||
|
|
@ -92,7 +87,7 @@ impl RateLimited {
|
|||
}
|
||||
RateLimitType::Post => {
|
||||
limiter.check_rate_limit_full(
|
||||
self.type_.clone(),
|
||||
self.type_,
|
||||
&ip_addr,
|
||||
rate_limit.post,
|
||||
rate_limit.post_per_second,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
use super::*;
|
||||
use super::IPAddr;
|
||||
use crate::api::APIError;
|
||||
use failure::Error;
|
||||
use log::debug;
|
||||
use std::{collections::HashMap, time::SystemTime};
|
||||
use strum::IntoEnumIterator;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct RateLimitBucket {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
use super::*;
|
||||
use crate::api::comment::*;
|
||||
use crate::api::community::*;
|
||||
use crate::api::post::*;
|
||||
use crate::api::site::*;
|
||||
use crate::api::user::*;
|
||||
use crate::rate_limit::RateLimit;
|
||||
use crate::{
|
||||
api::{comment::*, community::*, post::*, site::*, user::*, Oper, Perform},
|
||||
rate_limit::RateLimit,
|
||||
routes::{ChatServerParam, DbPoolParam},
|
||||
websocket::WebsocketInfo,
|
||||
};
|
||||
use actix_web::{error::ErrorBadRequest, *};
|
||||
use serde::Serialize;
|
||||
|
||||
pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
|
||||
cfg.service(
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
use super::*;
|
||||
use crate::apub::comment::get_apub_comment;
|
||||
use crate::apub::community::*;
|
||||
use crate::apub::community_inbox::community_inbox;
|
||||
use crate::apub::post::get_apub_post;
|
||||
use crate::apub::shared_inbox::shared_inbox;
|
||||
use crate::apub::user::*;
|
||||
use crate::apub::user_inbox::user_inbox;
|
||||
use crate::apub::APUB_JSON_CONTENT_TYPE;
|
||||
use crate::{
|
||||
apub::{
|
||||
comment::get_apub_comment,
|
||||
community::*,
|
||||
community_inbox::community_inbox,
|
||||
post::get_apub_post,
|
||||
shared_inbox::shared_inbox,
|
||||
user::*,
|
||||
user_inbox::user_inbox,
|
||||
APUB_JSON_CONTENT_TYPE,
|
||||
},
|
||||
settings::Settings,
|
||||
};
|
||||
use actix_web::*;
|
||||
|
||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
if Settings::get().federation.enabled {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,28 @@
|
|||
use super::*;
|
||||
use crate::db::comment_view::{ReplyQueryBuilder, ReplyView};
|
||||
use crate::db::community::Community;
|
||||
use crate::db::post_view::{PostQueryBuilder, PostView};
|
||||
use crate::db::site_view::SiteView;
|
||||
use crate::db::user::{Claims, User_};
|
||||
use crate::db::user_mention_view::{UserMentionQueryBuilder, UserMentionView};
|
||||
use crate::db::{ListingType, SortType};
|
||||
use crate::{
|
||||
db::{
|
||||
comment_view::{ReplyQueryBuilder, ReplyView},
|
||||
community::Community,
|
||||
post_view::{PostQueryBuilder, PostView},
|
||||
site_view::SiteView,
|
||||
user::{Claims, User_},
|
||||
user_mention_view::{UserMentionQueryBuilder, UserMentionView},
|
||||
ListingType,
|
||||
SortType,
|
||||
},
|
||||
markdown_to_html,
|
||||
routes::DbPoolParam,
|
||||
settings::Settings,
|
||||
};
|
||||
use actix_web::{error::ErrorBadRequest, *};
|
||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use rss::{CategoryBuilder, ChannelBuilder, GuidBuilder, Item, ItemBuilder};
|
||||
use serde::Deserialize;
|
||||
use std::str::FromStr;
|
||||
use strum::ParseError;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct Params {
|
||||
|
|
@ -21,8 +38,8 @@ enum RequestType {
|
|||
|
||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
cfg
|
||||
.route("/feeds/{type}/{name}.xml", web::get().to(feeds::get_feed))
|
||||
.route("/feeds/all.xml", web::get().to(feeds::get_all_feed));
|
||||
.route("/feeds/{type}/{name}.xml", web::get().to(get_feed))
|
||||
.route("/feeds/all.xml", web::get().to(get_all_feed));
|
||||
}
|
||||
|
||||
async fn get_all_feed(info: web::Query<Params>, db: DbPoolParam) -> Result<HttpResponse, Error> {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
use super::*;
|
||||
use crate::settings::Settings;
|
||||
use actix_files::NamedFile;
|
||||
use actix_web::*;
|
||||
|
||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
cfg
|
||||
|
|
|
|||
|
|
@ -1,34 +1,3 @@
|
|||
use crate::api::{Oper, Perform};
|
||||
use crate::apub::get_apub_protocol_string;
|
||||
use crate::db::community::Community;
|
||||
use crate::db::site_view::SiteView;
|
||||
use crate::db::user::User_;
|
||||
use crate::rate_limit::rate_limiter::RateLimiter;
|
||||
use crate::websocket::{server::ChatServer, WebsocketInfo};
|
||||
use crate::{get_ip, markdown_to_html, version, Settings};
|
||||
use actix::prelude::*;
|
||||
use actix_files::NamedFile;
|
||||
use actix_web::{body::Body, error::ErrorBadRequest, web::Query, *};
|
||||
use actix_web_actors::ws;
|
||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use log::{debug, error, info};
|
||||
use regex::Regex;
|
||||
use rss::{CategoryBuilder, ChannelBuilder, GuidBuilder, Item, ItemBuilder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::str::FromStr;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
use strum::ParseError;
|
||||
use url::Url;
|
||||
|
||||
pub type DbPoolParam = web::Data<Pool<ConnectionManager<PgConnection>>>;
|
||||
pub type RateLimitParam = web::Data<Arc<Mutex<RateLimiter>>>;
|
||||
pub type ChatServerParam = web::Data<Addr<ChatServer>>;
|
||||
|
||||
pub mod api;
|
||||
pub mod federation;
|
||||
pub mod feeds;
|
||||
|
|
@ -36,3 +5,16 @@ pub mod index;
|
|||
pub mod nodeinfo;
|
||||
pub mod webfinger;
|
||||
pub mod websocket;
|
||||
|
||||
use crate::{rate_limit::rate_limiter::RateLimiter, websocket::server::ChatServer};
|
||||
use actix::prelude::*;
|
||||
use actix_web::*;
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
pub type DbPoolParam = web::Data<Pool<ConnectionManager<PgConnection>>>;
|
||||
pub type RateLimitParam = web::Data<Arc<Mutex<RateLimiter>>>;
|
||||
pub type ChatServerParam = web::Data<Addr<ChatServer>>;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,13 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
apub::get_apub_protocol_string,
|
||||
db::site_view::SiteView,
|
||||
routes::DbPoolParam,
|
||||
version,
|
||||
Settings,
|
||||
};
|
||||
use actix_web::{body::Body, error::ErrorBadRequest, *};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
|
||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
cfg
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
use super::*;
|
||||
use crate::{
|
||||
db::{community::Community, user::User_},
|
||||
routes::DbPoolParam,
|
||||
Settings,
|
||||
};
|
||||
use actix_web::{error::ErrorBadRequest, web::Query, *};
|
||||
use regex::Regex;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct Params {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
use super::*;
|
||||
use crate::websocket::server::*;
|
||||
use crate::{
|
||||
get_ip,
|
||||
websocket::server::{ChatServer, *},
|
||||
};
|
||||
use actix::prelude::*;
|
||||
use actix_web::*;
|
||||
use actix_web_actors::ws;
|
||||
use log::{debug, error, info};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
/// How often heartbeat pings are sent
|
||||
const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
use config::{Config, ConfigError, Environment, File};
|
||||
use failure::Error;
|
||||
use serde::Deserialize;
|
||||
use std::env;
|
||||
use std::fs;
|
||||
use std::net::IpAddr;
|
||||
use std::sync::RwLock;
|
||||
use std::{env, fs, net::IpAddr, sync::RwLock};
|
||||
|
||||
static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson";
|
||||
static CONFIG_FILE: &str = "config/config.hjson";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,20 @@ pub mod server;
|
|||
|
||||
use crate::ConnectionId;
|
||||
use actix::prelude::*;
|
||||
use diesel::r2d2::{ConnectionManager, Pool};
|
||||
use diesel::PgConnection;
|
||||
use diesel::{
|
||||
r2d2::{ConnectionManager, Pool},
|
||||
PgConnection,
|
||||
};
|
||||
use failure::Error;
|
||||
use log::{error, info};
|
||||
use rand::{rngs::ThreadRng, Rng};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use server::ChatServer;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::str::FromStr;
|
||||
use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
#[derive(EnumString, ToString, Debug, Clone)]
|
||||
pub enum UserOperation {
|
||||
|
|
|
|||
|
|
@ -3,15 +3,16 @@
|
|||
//! room through `ChatServer`.
|
||||
|
||||
use super::*;
|
||||
use crate::api::comment::*;
|
||||
use crate::api::community::*;
|
||||
use crate::api::post::*;
|
||||
use crate::api::site::*;
|
||||
use crate::api::user::*;
|
||||
use crate::api::*;
|
||||
use crate::rate_limit::RateLimit;
|
||||
use crate::websocket::UserOperation;
|
||||
use crate::{CommunityId, ConnectionId, IPAddr, PostId, UserId};
|
||||
use crate::{
|
||||
api::{comment::*, community::*, post::*, site::*, user::*, *},
|
||||
rate_limit::RateLimit,
|
||||
websocket::UserOperation,
|
||||
CommunityId,
|
||||
ConnectionId,
|
||||
IPAddr,
|
||||
PostId,
|
||||
UserId,
|
||||
};
|
||||
|
||||
/// Chat server sends this messages to session
|
||||
#[derive(Message)]
|
||||
|
|
@ -940,7 +941,7 @@ impl Handler<Connect> for ChatServer {
|
|||
id,
|
||||
SessionInfo {
|
||||
addr: msg.addr,
|
||||
ip: msg.ip.to_owned(),
|
||||
ip: msg.ip,
|
||||
},
|
||||
);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue