mirror of
https://github.com/LemmyNet/lemmy
synced 2024-10-30 15:21:20 +00:00
Split code into cargo workspaces (#67)
More fixes - fixed docker builds - fixed mentions regex test - fixed DATABASE_URL stuff - change schema path in diesel.toml Address review comments - add jsonb column back into activity table - remove authors field from cargo.toml - adjust LEMMY_DATABASE_URL env var usage - rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL Decouple utils and db Split code into cargo workspaces Co-authored-by: Felix Ableitner <me@nutomic.com> Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
This commit is contained in:
parent
debbd316c2
commit
80aef61aed
9
docker/dev/Dockerfile
vendored
9
docker/dev/Dockerfile
vendored
@ -17,13 +17,20 @@ WORKDIR /app
|
|||||||
RUN sudo chown -R rust:rust .
|
RUN sudo chown -R rust:rust .
|
||||||
RUN USER=root cargo new server
|
RUN USER=root cargo new server
|
||||||
WORKDIR /app/server
|
WORKDIR /app/server
|
||||||
|
RUN mkdir -p lemmy_db/src/ lemmy_utils/src/
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
COPY server/Cargo.toml server/Cargo.lock ./
|
||||||
|
COPY server/lemmy_db/Cargo.toml ./lemmy_db/
|
||||||
|
COPY server/lemmy_utils/Cargo.toml ./lemmy_utils/
|
||||||
RUN sudo chown -R rust:rust .
|
RUN sudo chown -R rust:rust .
|
||||||
RUN mkdir -p ./src/bin \
|
RUN mkdir -p ./src/bin \
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs \
|
||||||
|
&& cp ./src/bin/main.rs ./lemmy_db/src/main.rs \
|
||||||
|
&& cp ./src/bin/main.rs ./lemmy_utils/src/main.rs
|
||||||
RUN cargo build
|
RUN cargo build
|
||||||
RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server*
|
RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server*
|
||||||
COPY server/src ./src/
|
COPY server/src ./src/
|
||||||
|
COPY server/lemmy_db ./lemmy_db/
|
||||||
|
COPY server/lemmy_utils ./lemmy_utils/
|
||||||
COPY server/migrations ./migrations/
|
COPY server/migrations ./migrations/
|
||||||
|
|
||||||
# Build for debug
|
# Build for debug
|
||||||
|
10
docker/prod/Dockerfile
vendored
10
docker/prod/Dockerfile
vendored
@ -10,13 +10,19 @@ WORKDIR /app
|
|||||||
RUN sudo chown -R rust:rust .
|
RUN sudo chown -R rust:rust .
|
||||||
RUN USER=root cargo new server
|
RUN USER=root cargo new server
|
||||||
WORKDIR /app/server
|
WORKDIR /app/server
|
||||||
|
RUN mkdir -p lemmy_db/src/ lemmy_utils/src/
|
||||||
COPY --chown=rust:rust server/Cargo.toml server/Cargo.lock ./
|
COPY --chown=rust:rust server/Cargo.toml server/Cargo.lock ./
|
||||||
#RUN sudo chown -R rust:rust .
|
COPY --chown=rust:rust server/lemmy_db/Cargo.toml ./lemmy_db/
|
||||||
|
COPY --chown=rust:rust server/lemmy_utils/Cargo.toml ./lemmy_utils/
|
||||||
RUN mkdir -p ./src/bin \
|
RUN mkdir -p ./src/bin \
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs \
|
||||||
|
&& cp ./src/bin/main.rs ./lemmy_db/src/main.rs \
|
||||||
|
&& cp ./src/bin/main.rs ./lemmy_utils/src/main.rs
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
|
RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
|
||||||
COPY --chown=rust:rust server/src ./src/
|
COPY --chown=rust:rust server/src ./src/
|
||||||
|
COPY --chown=rust:rust server/lemmy_db ./lemmy_db/
|
||||||
|
COPY --chown=rust:rust server/lemmy_utils ./lemmy_utils/
|
||||||
COPY --chown=rust:rust server/migrations ./migrations/
|
COPY --chown=rust:rust server/migrations ./migrations/
|
||||||
|
|
||||||
# build for release
|
# build for release
|
||||||
|
2
docs/src/contributing_tests.md
vendored
2
docs/src/contributing_tests.md
vendored
@ -9,7 +9,7 @@ following commands in the `server` subfolder:
|
|||||||
psql -U lemmy -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
|
psql -U lemmy -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
|
||||||
export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
|
export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
|
||||||
diesel migration run
|
diesel migration run
|
||||||
RUST_TEST_THREADS=1 cargo test
|
RUST_TEST_THREADS=1 cargo test --workspace
|
||||||
```
|
```
|
||||||
|
|
||||||
### Federation
|
### Federation
|
||||||
|
2
install.sh
vendored
2
install.sh
vendored
@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Set the database variable to the default first.
|
# Set the database variable to the default first.
|
||||||
|
49
server/Cargo.lock
generated
vendored
49
server/Cargo.lock
generated
vendored
@ -1399,12 +1399,6 @@ dependencies = [
|
|||||||
"winapi 0.3.9",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "htmlescape"
|
|
||||||
version = "0.3.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "http"
|
name = "http"
|
||||||
version = "0.2.1"
|
version = "0.2.1"
|
||||||
@ -1572,6 +1566,21 @@ version = "1.4.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lemmy_db"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"bcrypt",
|
||||||
|
"chrono",
|
||||||
|
"diesel",
|
||||||
|
"log",
|
||||||
|
"serde 1.0.114",
|
||||||
|
"serde_json",
|
||||||
|
"sha2",
|
||||||
|
"strum",
|
||||||
|
"strum_macros",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lemmy_server"
|
name = "lemmy_server"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
@ -1589,27 +1598,23 @@ dependencies = [
|
|||||||
"base64 0.12.3",
|
"base64 0.12.3",
|
||||||
"bcrypt",
|
"bcrypt",
|
||||||
"chrono",
|
"chrono",
|
||||||
"comrak",
|
|
||||||
"config",
|
|
||||||
"diesel",
|
"diesel",
|
||||||
"diesel_migrations",
|
"diesel_migrations",
|
||||||
"dotenv",
|
"dotenv",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"failure",
|
"failure",
|
||||||
"futures",
|
"futures",
|
||||||
"htmlescape",
|
|
||||||
"http",
|
"http",
|
||||||
"http-signature-normalization-actix",
|
"http-signature-normalization-actix",
|
||||||
"itertools",
|
"itertools",
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"lettre",
|
"lemmy_db",
|
||||||
"lettre_email",
|
"lemmy_utils",
|
||||||
"log",
|
"log",
|
||||||
"openssl",
|
"openssl",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
"regex",
|
|
||||||
"rss",
|
"rss",
|
||||||
"serde 1.0.114",
|
"serde 1.0.114",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@ -1621,6 +1626,26 @@ dependencies = [
|
|||||||
"uuid 0.8.1",
|
"uuid 0.8.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lemmy_utils"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
|
"comrak",
|
||||||
|
"config",
|
||||||
|
"itertools",
|
||||||
|
"lazy_static",
|
||||||
|
"lettre",
|
||||||
|
"lettre_email",
|
||||||
|
"log",
|
||||||
|
"openssl",
|
||||||
|
"rand 0.7.3",
|
||||||
|
"regex",
|
||||||
|
"serde 1.0.114",
|
||||||
|
"serde_json",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lettre"
|
name = "lettre"
|
||||||
version = "0.9.3"
|
version = "0.9.3"
|
||||||
|
17
server/Cargo.toml
vendored
17
server/Cargo.toml
vendored
@ -1,14 +1,21 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lemmy_server"
|
name = "lemmy_server"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
authors = ["Dessalines <tyhou13@gmx.com>"]
|
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = true
|
lto = true
|
||||||
|
|
||||||
|
[workspace]
|
||||||
|
members = [
|
||||||
|
"lemmy_utils",
|
||||||
|
"lemmy_db"
|
||||||
|
]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
diesel = { version = "1.4.4", features = ["postgres","chrono","r2d2","64-column-tables","serde_json"] }
|
lemmy_utils = { path = "./lemmy_utils" }
|
||||||
|
lemmy_db = { path = "./lemmy_db" }
|
||||||
|
diesel = "1.4.4"
|
||||||
diesel_migrations = "1.4.0"
|
diesel_migrations = "1.4.0"
|
||||||
dotenv = "0.15.0"
|
dotenv = "0.15.0"
|
||||||
activitystreams = "0.6.2"
|
activitystreams = "0.6.2"
|
||||||
@ -31,16 +38,10 @@ rand = "0.7.3"
|
|||||||
strum = "0.18.0"
|
strum = "0.18.0"
|
||||||
strum_macros = "0.18.0"
|
strum_macros = "0.18.0"
|
||||||
jsonwebtoken = "7.0.1"
|
jsonwebtoken = "7.0.1"
|
||||||
regex = "1.3.5"
|
|
||||||
lazy_static = "1.3.0"
|
lazy_static = "1.3.0"
|
||||||
lettre = "0.9.3"
|
|
||||||
lettre_email = "0.9.4"
|
|
||||||
rss = "1.9.0"
|
rss = "1.9.0"
|
||||||
htmlescape = "0.3.1"
|
|
||||||
url = { version = "2.1.1", features = ["serde"] }
|
url = { version = "2.1.1", features = ["serde"] }
|
||||||
config = {version = "0.10.1", default-features = false, features = ["hjson"] }
|
|
||||||
percent-encoding = "2.1.0"
|
percent-encoding = "2.1.0"
|
||||||
comrak = "0.7"
|
|
||||||
openssl = "0.10"
|
openssl = "0.10"
|
||||||
http = "0.2.1"
|
http = "0.2.1"
|
||||||
http-signature-normalization-actix = { version = "0.4.0-alpha.0", default-features = false, features = ["sha-2"] }
|
http-signature-normalization-actix = { version = "0.4.0-alpha.0", default-features = false, features = ["sha-2"] }
|
||||||
|
3
server/db-init.sh
vendored
3
server/db-init.sh
vendored
@ -1,4 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
# Default configurations
|
# Default configurations
|
||||||
username=lemmy
|
username=lemmy
|
||||||
|
2
server/diesel.toml
vendored
2
server/diesel.toml
vendored
@ -2,4 +2,4 @@
|
|||||||
# see diesel.rs/guides/configuring-diesel-cli
|
# see diesel.rs/guides/configuring-diesel-cli
|
||||||
|
|
||||||
[print_schema]
|
[print_schema]
|
||||||
file = "src/schema.rs"
|
file = "lemmy_db/src/schema.rs"
|
||||||
|
15
server/lemmy_db/Cargo.toml
vendored
Normal file
15
server/lemmy_db/Cargo.toml
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
[package]
|
||||||
|
name = "lemmy_db"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2018"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
diesel = { version = "1.4.4", features = ["postgres","chrono","r2d2","64-column-tables","serde_json"] }
|
||||||
|
chrono = { version = "0.4.7", features = ["serde"] }
|
||||||
|
serde = { version = "1.0.105", features = ["derive"] }
|
||||||
|
serde_json = { version = "1.0.52", features = ["preserve_order"]}
|
||||||
|
strum = "0.18.0"
|
||||||
|
strum_macros = "0.18.0"
|
||||||
|
log = "0.4.0"
|
||||||
|
sha2 = "0.9"
|
||||||
|
bcrypt = "0.8.0"
|
@ -1,9 +1,12 @@
|
|||||||
use crate::{blocking, db::Crud, schema::activity, DbPool, LemmyError};
|
use crate::{schema::activity, Crud};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::fmt::Debug;
|
use std::{
|
||||||
|
fmt::Debug,
|
||||||
|
io::{Error as IoError, ErrorKind},
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
||||||
#[table_name = "activity"]
|
#[table_name = "activity"]
|
||||||
@ -55,46 +58,43 @@ impl Crud<ActivityForm> for Activity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn insert_activity<T>(
|
pub fn do_insert_activity<T>(
|
||||||
user_id: i32,
|
|
||||||
data: T,
|
|
||||||
local: bool,
|
|
||||||
pool: &DbPool,
|
|
||||||
) -> Result<(), LemmyError>
|
|
||||||
where
|
|
||||||
T: Serialize + Debug + Send + 'static,
|
|
||||||
{
|
|
||||||
blocking(pool, move |conn| {
|
|
||||||
do_insert_activity(conn, user_id, &data, local)
|
|
||||||
})
|
|
||||||
.await??;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn do_insert_activity<T>(
|
|
||||||
conn: &PgConnection,
|
conn: &PgConnection,
|
||||||
user_id: i32,
|
user_id: i32,
|
||||||
data: &T,
|
data: &T,
|
||||||
local: bool,
|
local: bool,
|
||||||
) -> Result<(), LemmyError>
|
) -> Result<Activity, IoError>
|
||||||
where
|
where
|
||||||
T: Serialize + Debug,
|
T: Serialize + Debug,
|
||||||
{
|
{
|
||||||
|
debug!("inserting activity for user {}, data {:?}", user_id, &data);
|
||||||
let activity_form = ActivityForm {
|
let activity_form = ActivityForm {
|
||||||
user_id,
|
user_id,
|
||||||
data: serde_json::to_value(&data)?,
|
data: serde_json::to_value(&data)?,
|
||||||
local,
|
local,
|
||||||
updated: None,
|
updated: None,
|
||||||
};
|
};
|
||||||
debug!("inserting activity for user {}, data {:?}", user_id, data);
|
let result = Activity::create(&conn, &activity_form);
|
||||||
Activity::create(&conn, &activity_form)?;
|
match result {
|
||||||
Ok(())
|
Ok(s) => Ok(s),
|
||||||
|
Err(e) => Err(IoError::new(
|
||||||
|
ErrorKind::Other,
|
||||||
|
format!("Failed to insert activity into database: {}", e),
|
||||||
|
)),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{super::user::*, *};
|
use crate::{
|
||||||
use crate::db::{establish_unpooled_connection, Crud, ListingType, SortType};
|
activity::{Activity, ActivityForm},
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::{UserForm, User_},
|
||||||
|
Crud,
|
||||||
|
ListingType,
|
||||||
|
SortType,
|
||||||
|
};
|
||||||
|
use serde_json::Value;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,6 +1,6 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
db::Crud,
|
|
||||||
schema::{category, category::dsl::*},
|
schema::{category, category::dsl::*},
|
||||||
|
Crud,
|
||||||
};
|
};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -52,8 +52,7 @@ impl Category {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use crate::{category::Category, tests::establish_unpooled_connection};
|
||||||
use crate::db::establish_unpooled_connection;
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,9 +1,5 @@
|
|||||||
use super::{post::Post, *};
|
use super::{post::Post, *};
|
||||||
use crate::{
|
use crate::schema::{comment, comment_like, comment_saved};
|
||||||
apub::{make_apub_endpoint, EndpointType},
|
|
||||||
naive_now,
|
|
||||||
schema::{comment, comment_like, comment_saved},
|
|
||||||
};
|
|
||||||
|
|
||||||
// WITH RECURSIVE MyTree AS (
|
// WITH RECURSIVE MyTree AS (
|
||||||
// SELECT * FROM comment WHERE parent_id IS NULL
|
// SELECT * FROM comment WHERE parent_id IS NULL
|
||||||
@ -77,12 +73,15 @@ impl Crud<CommentForm> for Comment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Comment {
|
impl Comment {
|
||||||
pub fn update_ap_id(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
|
pub fn update_ap_id(
|
||||||
|
conn: &PgConnection,
|
||||||
|
comment_id: i32,
|
||||||
|
apub_id: String,
|
||||||
|
) -> Result<Self, Error> {
|
||||||
use crate::schema::comment::dsl::*;
|
use crate::schema::comment::dsl::*;
|
||||||
|
|
||||||
let apid = make_apub_endpoint(EndpointType::Comment, &comment_id.to_string()).to_string();
|
|
||||||
diesel::update(comment.find(comment_id))
|
diesel::update(comment.find(comment_id))
|
||||||
.set(ap_id.eq(apid))
|
.set(ap_id.eq(apub_id))
|
||||||
.get_result::<Self>(conn)
|
.get_result::<Self>(conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,10 +203,8 @@ impl Saveable<CommentSavedForm> for CommentSaved {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use crate::{comment::*, community::*, post::*, tests::establish_unpooled_connection, user::*};
|
||||||
super::{community::*, post::*, user::*},
|
|
||||||
*,
|
|
||||||
};
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
||||||
let conn = establish_unpooled_connection();
|
let conn = establish_unpooled_connection();
|
@ -1,5 +1,5 @@
|
|||||||
// TODO, remove the cross join here, just join to user directly
|
// TODO, remove the cross join here, just join to user directly
|
||||||
use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
use crate::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
||||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@ -460,11 +460,17 @@ impl<'a> ReplyQueryBuilder<'a> {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use crate::{
|
||||||
super::{comment::*, community::*, post::*, user::*},
|
comment::*,
|
||||||
|
comment_view::*,
|
||||||
|
community::*,
|
||||||
|
post::*,
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::*,
|
||||||
|
Crud,
|
||||||
|
Likeable,
|
||||||
*,
|
*,
|
||||||
};
|
};
|
||||||
use crate::db::{establish_unpooled_connection, Crud, Likeable};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,6 +1,9 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
db::{Bannable, Crud, Followable, Joinable},
|
|
||||||
schema::{community, community_follower, community_moderator, community_user_ban},
|
schema::{community, community_follower, community_moderator, community_user_ban},
|
||||||
|
Bannable,
|
||||||
|
Crud,
|
||||||
|
Followable,
|
||||||
|
Joinable,
|
||||||
};
|
};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -232,8 +235,7 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{super::user::*, *};
|
use crate::{community::*, tests::establish_unpooled_connection, user::*, ListingType, SortType};
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,5 +1,5 @@
|
|||||||
use super::community_view::community_fast_view::BoxedQuery;
|
use super::community_view::community_fast_view::BoxedQuery;
|
||||||
use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
|
use crate::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
|
||||||
use diesel::{pg::Pg, result::Error, *};
|
use diesel::{pg::Pg, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
@ -1,10 +1,22 @@
|
|||||||
use crate::settings::Settings;
|
#[macro_use]
|
||||||
|
pub extern crate diesel;
|
||||||
|
#[macro_use]
|
||||||
|
pub extern crate strum_macros;
|
||||||
|
pub extern crate bcrypt;
|
||||||
|
pub extern crate chrono;
|
||||||
|
pub extern crate log;
|
||||||
|
pub extern crate serde;
|
||||||
|
pub extern crate serde_json;
|
||||||
|
pub extern crate sha2;
|
||||||
|
pub extern crate strum;
|
||||||
|
|
||||||
|
use chrono::NaiveDateTime;
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::{env, env::VarError};
|
||||||
|
|
||||||
pub mod activity;
|
pub mod activity;
|
||||||
pub mod category;
|
pub mod category;
|
||||||
pub mod code_migrations;
|
|
||||||
pub mod comment;
|
pub mod comment;
|
||||||
pub mod comment_view;
|
pub mod comment_view;
|
||||||
pub mod community;
|
pub mod community;
|
||||||
@ -16,6 +28,7 @@ pub mod post;
|
|||||||
pub mod post_view;
|
pub mod post_view;
|
||||||
pub mod private_message;
|
pub mod private_message;
|
||||||
pub mod private_message_view;
|
pub mod private_message_view;
|
||||||
|
pub mod schema;
|
||||||
pub mod site;
|
pub mod site;
|
||||||
pub mod site_view;
|
pub mod site_view;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
@ -111,9 +124,8 @@ impl<T> MaybeOptional<T> for Option<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn establish_unpooled_connection() -> PgConnection {
|
pub fn get_database_url_from_env() -> Result<String, VarError> {
|
||||||
let db_url = Settings::get().get_database_url();
|
env::var("LEMMY_DATABASE_URL")
|
||||||
PgConnection::establish(&db_url).unwrap_or_else(|_| panic!("Error connecting to {}", db_url))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(EnumString, ToString, Debug, Serialize, Deserialize)]
|
#[derive(EnumString, ToString, Debug, Serialize, Deserialize)]
|
||||||
@ -155,9 +167,25 @@ pub fn limit_and_offset(page: Option<i64>, limit: Option<i64>) -> (i64, i64) {
|
|||||||
let offset = limit * (page - 1);
|
let offset = limit * (page - 1);
|
||||||
(limit, offset)
|
(limit, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn naive_now() -> NaiveDateTime {
|
||||||
|
chrono::prelude::Utc::now().naive_utc()
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::fuzzy_search;
|
use super::fuzzy_search;
|
||||||
|
use crate::get_database_url_from_env;
|
||||||
|
use diesel::{Connection, PgConnection};
|
||||||
|
|
||||||
|
pub fn establish_unpooled_connection() -> PgConnection {
|
||||||
|
let db_url = match get_database_url_from_env() {
|
||||||
|
Ok(url) => url,
|
||||||
|
Err(_) => panic!("Failed to read database URL from env var LEMMY_DATABASE_URL"),
|
||||||
|
};
|
||||||
|
PgConnection::establish(&db_url).unwrap_or_else(|_| panic!("Error connecting to {}", db_url))
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_fuzzy_search() {
|
fn test_fuzzy_search() {
|
||||||
let test = "This is a fuzzy search";
|
let test = "This is a fuzzy search";
|
@ -1,5 +1,4 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
db::Crud,
|
|
||||||
schema::{
|
schema::{
|
||||||
mod_add,
|
mod_add,
|
||||||
mod_add_community,
|
mod_add_community,
|
||||||
@ -11,6 +10,7 @@ use crate::{
|
|||||||
mod_remove_post,
|
mod_remove_post,
|
||||||
mod_sticky_post,
|
mod_sticky_post,
|
||||||
},
|
},
|
||||||
|
Crud,
|
||||||
};
|
};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -437,11 +437,16 @@ impl Crud<ModAddForm> for ModAdd {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use crate::{
|
||||||
super::{comment::*, community::*, post::*, user::*},
|
comment::*,
|
||||||
*,
|
community::*,
|
||||||
|
moderator::*,
|
||||||
|
post::*,
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::*,
|
||||||
|
ListingType,
|
||||||
|
SortType,
|
||||||
};
|
};
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
|
||||||
|
|
||||||
// use Crud;
|
// use Crud;
|
||||||
#[test]
|
#[test]
|
@ -1,4 +1,4 @@
|
|||||||
use crate::db::limit_and_offset;
|
use crate::limit_and_offset;
|
||||||
use diesel::{result::Error, *};
|
use diesel::{result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
db::Crud,
|
|
||||||
schema::{password_reset_request, password_reset_request::dsl::*},
|
schema::{password_reset_request, password_reset_request::dsl::*},
|
||||||
|
Crud,
|
||||||
};
|
};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use sha2::{Digest, Sha256};
|
use sha2::{Digest, Sha256};
|
||||||
@ -82,7 +82,7 @@ impl PasswordResetRequest {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{super::user::*, *};
|
use super::{super::user::*, *};
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
use crate::{tests::establish_unpooled_connection, ListingType, SortType};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,8 +1,10 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
apub::{make_apub_endpoint, EndpointType},
|
|
||||||
db::{Crud, Likeable, Readable, Saveable},
|
|
||||||
naive_now,
|
naive_now,
|
||||||
schema::{post, post_like, post_read, post_saved},
|
schema::{post, post_like, post_read, post_saved},
|
||||||
|
Crud,
|
||||||
|
Likeable,
|
||||||
|
Readable,
|
||||||
|
Saveable,
|
||||||
};
|
};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -75,12 +77,11 @@ impl Post {
|
|||||||
post.filter(ap_id.eq(object_id)).first::<Self>(conn)
|
post.filter(ap_id.eq(object_id)).first::<Self>(conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_ap_id(conn: &PgConnection, post_id: i32) -> Result<Self, Error> {
|
pub fn update_ap_id(conn: &PgConnection, post_id: i32, apub_id: String) -> Result<Self, Error> {
|
||||||
use crate::schema::post::dsl::*;
|
use crate::schema::post::dsl::*;
|
||||||
|
|
||||||
let apid = make_apub_endpoint(EndpointType::Post, &post_id.to_string()).to_string();
|
|
||||||
diesel::update(post.find(post_id))
|
diesel::update(post.find(post_id))
|
||||||
.set(ap_id.eq(apid))
|
.set(ap_id.eq(apub_id))
|
||||||
.get_result::<Self>(conn)
|
.get_result::<Self>(conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -241,11 +242,14 @@ impl Readable<PostReadForm> for PostRead {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use crate::{
|
||||||
super::{community::*, user::*},
|
community::*,
|
||||||
*,
|
post::*,
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::*,
|
||||||
|
ListingType,
|
||||||
|
SortType,
|
||||||
};
|
};
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,5 +1,5 @@
|
|||||||
use super::post_view::post_fast_view::BoxedQuery;
|
use super::post_view::post_fast_view::BoxedQuery;
|
||||||
use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
use crate::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType};
|
||||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@ -367,11 +367,16 @@ impl PostView {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use crate::{
|
||||||
super::{community::*, post::*, user::*},
|
community::*,
|
||||||
|
post::*,
|
||||||
|
post_view::*,
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::*,
|
||||||
|
Crud,
|
||||||
|
Likeable,
|
||||||
*,
|
*,
|
||||||
};
|
};
|
||||||
use crate::db::{establish_unpooled_connection, Crud, Likeable};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,8 +1,4 @@
|
|||||||
use crate::{
|
use crate::{schema::private_message, Crud};
|
||||||
apub::{make_apub_endpoint, EndpointType},
|
|
||||||
db::Crud,
|
|
||||||
schema::private_message,
|
|
||||||
};
|
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@ -66,16 +62,15 @@ impl Crud<PrivateMessageForm> for PrivateMessage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl PrivateMessage {
|
impl PrivateMessage {
|
||||||
pub fn update_ap_id(conn: &PgConnection, private_message_id: i32) -> Result<Self, Error> {
|
pub fn update_ap_id(
|
||||||
|
conn: &PgConnection,
|
||||||
|
private_message_id: i32,
|
||||||
|
apub_id: String,
|
||||||
|
) -> Result<Self, Error> {
|
||||||
use crate::schema::private_message::dsl::*;
|
use crate::schema::private_message::dsl::*;
|
||||||
|
|
||||||
let apid = make_apub_endpoint(
|
|
||||||
EndpointType::PrivateMessage,
|
|
||||||
&private_message_id.to_string(),
|
|
||||||
)
|
|
||||||
.to_string();
|
|
||||||
diesel::update(private_message.find(private_message_id))
|
diesel::update(private_message.find(private_message_id))
|
||||||
.set(ap_id.eq(apid))
|
.set(ap_id.eq(apub_id))
|
||||||
.get_result::<Self>(conn)
|
.get_result::<Self>(conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,8 +84,13 @@ impl PrivateMessage {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{super::user::*, *};
|
use crate::{
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
private_message::*,
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::*,
|
||||||
|
ListingType,
|
||||||
|
SortType,
|
||||||
|
};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,4 +1,4 @@
|
|||||||
use crate::db::{limit_and_offset, MaybeOptional};
|
use crate::{limit_and_offset, MaybeOptional};
|
||||||
use diesel::{pg::Pg, result::Error, *};
|
use diesel::{pg::Pg, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
use crate::{db::Crud, schema::site};
|
use crate::{schema::site, Crud};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
@ -1,14 +1,10 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
db::Crud,
|
|
||||||
is_email_regex,
|
|
||||||
naive_now,
|
naive_now,
|
||||||
schema::{user_, user_::dsl::*},
|
schema::{user_, user_::dsl::*},
|
||||||
settings::Settings,
|
Crud,
|
||||||
};
|
};
|
||||||
use bcrypt::{hash, DEFAULT_COST};
|
use bcrypt::{hash, DEFAULT_COST};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug)]
|
#[derive(Clone, Queryable, Identifiable, PartialEq, Debug)]
|
||||||
#[table_name = "user_"]
|
#[table_name = "user_"]
|
||||||
@ -131,90 +127,23 @@ impl User_ {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
|
||||||
pub struct Claims {
|
|
||||||
pub id: i32,
|
|
||||||
pub username: String,
|
|
||||||
pub iss: String,
|
|
||||||
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 show_avatars: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Claims {
|
|
||||||
pub fn decode(jwt: &str) -> Result<TokenData<Claims>, jsonwebtoken::errors::Error> {
|
|
||||||
let v = Validation {
|
|
||||||
validate_exp: false,
|
|
||||||
..Validation::default()
|
|
||||||
};
|
|
||||||
decode::<Claims>(
|
|
||||||
&jwt,
|
|
||||||
&DecodingKey::from_secret(Settings::get().jwt_secret.as_ref()),
|
|
||||||
&v,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type Jwt = String;
|
|
||||||
impl User_ {
|
impl User_ {
|
||||||
pub fn jwt(&self) -> Jwt {
|
pub fn find_by_username(conn: &PgConnection, username: &str) -> Result<User_, Error> {
|
||||||
let my_claims = Claims {
|
|
||||||
id: self.id,
|
|
||||||
username: self.name.to_owned(),
|
|
||||||
iss: Settings::get().hostname,
|
|
||||||
show_nsfw: self.show_nsfw,
|
|
||||||
theme: self.theme.to_owned(),
|
|
||||||
default_sort_type: self.default_sort_type,
|
|
||||||
default_listing_type: self.default_listing_type,
|
|
||||||
lang: self.lang.to_owned(),
|
|
||||||
avatar: self.avatar.to_owned(),
|
|
||||||
show_avatars: self.show_avatars.to_owned(),
|
|
||||||
};
|
|
||||||
encode(
|
|
||||||
&Header::default(),
|
|
||||||
&my_claims,
|
|
||||||
&EncodingKey::from_secret(Settings::get().jwt_secret.as_ref()),
|
|
||||||
)
|
|
||||||
.unwrap()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn find_by_username(conn: &PgConnection, username: &str) -> Result<Self, Error> {
|
|
||||||
user_.filter(name.eq(username)).first::<User_>(conn)
|
user_.filter(name.eq(username)).first::<User_>(conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
|
pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<User_, Error> {
|
||||||
user_.filter(email.eq(from_email)).first::<User_>(conn)
|
user_.filter(email.eq(from_email)).first::<User_>(conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_by_email_or_username(
|
pub fn get_profile_url(&self, hostname: &str) -> String {
|
||||||
conn: &PgConnection,
|
format!("https://{}/u/{}", hostname, self.name)
|
||||||
username_or_email: &str,
|
|
||||||
) -> Result<Self, Error> {
|
|
||||||
if is_email_regex(username_or_email) {
|
|
||||||
User_::find_by_email(conn, username_or_email)
|
|
||||||
} else {
|
|
||||||
User_::find_by_username(conn, username_or_email)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_profile_url(&self) -> String {
|
|
||||||
format!("https://{}/u/{}", Settings::get().hostname, self.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn find_by_jwt(conn: &PgConnection, jwt: &str) -> Result<Self, Error> {
|
|
||||||
let claims: Claims = Claims::decode(&jwt).expect("Invalid token").claims;
|
|
||||||
Self::read(&conn, claims.id)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{User_, *};
|
use crate::{tests::establish_unpooled_connection, user::*, ListingType, SortType};
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,5 +1,5 @@
|
|||||||
use super::comment::Comment;
|
use super::comment::Comment;
|
||||||
use crate::{db::Crud, schema::user_mention};
|
use crate::{schema::user_mention, Crud};
|
||||||
use diesel::{dsl::*, result::Error, *};
|
use diesel::{dsl::*, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@ -54,11 +54,16 @@ impl Crud<UserMentionForm> for UserMention {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use crate::{
|
||||||
super::{comment::*, community::*, post::*, user::*},
|
comment::*,
|
||||||
*,
|
community::*,
|
||||||
|
post::*,
|
||||||
|
tests::establish_unpooled_connection,
|
||||||
|
user::*,
|
||||||
|
user_mention::*,
|
||||||
|
ListingType,
|
||||||
|
SortType,
|
||||||
};
|
};
|
||||||
use crate::db::{establish_unpooled_connection, ListingType, SortType};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_crud() {
|
fn test_crud() {
|
@ -1,4 +1,4 @@
|
|||||||
use crate::db::{limit_and_offset, MaybeOptional, SortType};
|
use crate::{limit_and_offset, MaybeOptional, SortType};
|
||||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
use super::user_view::user_fast::BoxedQuery;
|
use super::user_view::user_fast::BoxedQuery;
|
||||||
use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
|
use crate::{fuzzy_search, limit_and_offset, MaybeOptional, SortType};
|
||||||
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
use diesel::{dsl::*, pg::Pg, result::Error, *};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
22
server/lemmy_utils/Cargo.toml
vendored
Normal file
22
server/lemmy_utils/Cargo.toml
vendored
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
[package]
|
||||||
|
name = "lemmy_utils"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2018"
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
regex = "1.3.5"
|
||||||
|
config = { version = "0.10.1", default-features = false, features = ["hjson"] }
|
||||||
|
chrono = { version = "0.4.7", features = ["serde"] }
|
||||||
|
lettre = "0.9.3"
|
||||||
|
lettre_email = "0.9.4"
|
||||||
|
log = "0.4.0"
|
||||||
|
itertools = "0.9.0"
|
||||||
|
rand = "0.7.3"
|
||||||
|
serde = { version = "1.0.105", features = ["derive"] }
|
||||||
|
serde_json = { version = "1.0.52", features = ["preserve_order"]}
|
||||||
|
comrak = "0.7"
|
||||||
|
lazy_static = "1.3.0"
|
||||||
|
openssl = "0.10"
|
||||||
|
url = { version = "2.1.1", features = ["serde"] }
|
324
server/lemmy_utils/src/lib.rs
Normal file
324
server/lemmy_utils/src/lib.rs
Normal file
@ -0,0 +1,324 @@
|
|||||||
|
#[macro_use]
|
||||||
|
pub extern crate lazy_static;
|
||||||
|
pub extern crate comrak;
|
||||||
|
pub extern crate lettre;
|
||||||
|
pub extern crate lettre_email;
|
||||||
|
pub extern crate openssl;
|
||||||
|
pub extern crate rand;
|
||||||
|
pub extern crate regex;
|
||||||
|
pub extern crate serde_json;
|
||||||
|
pub extern crate url;
|
||||||
|
|
||||||
|
pub mod settings;
|
||||||
|
|
||||||
|
use crate::settings::Settings;
|
||||||
|
use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, Utc};
|
||||||
|
use itertools::Itertools;
|
||||||
|
use lettre::{
|
||||||
|
smtp::{
|
||||||
|
authentication::{Credentials, Mechanism},
|
||||||
|
extension::ClientId,
|
||||||
|
ConnectionReuseParameters,
|
||||||
|
},
|
||||||
|
ClientSecurity,
|
||||||
|
SmtpClient,
|
||||||
|
Transport,
|
||||||
|
};
|
||||||
|
use lettre_email::Email;
|
||||||
|
use openssl::{pkey::PKey, rsa::Rsa};
|
||||||
|
use rand::{distributions::Alphanumeric, thread_rng, Rng};
|
||||||
|
use regex::{Regex, RegexBuilder};
|
||||||
|
use std::io::{Error, ErrorKind};
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
pub fn to_datetime_utc(ndt: NaiveDateTime) -> DateTime<Utc> {
|
||||||
|
DateTime::<Utc>::from_utc(ndt, Utc)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn naive_from_unix(time: i64) -> NaiveDateTime {
|
||||||
|
NaiveDateTime::from_timestamp(time, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn convert_datetime(datetime: NaiveDateTime) -> DateTime<FixedOffset> {
|
||||||
|
let now = Local::now();
|
||||||
|
DateTime::<FixedOffset>::from_utc(datetime, *now.offset())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_email_regex(test: &str) -> bool {
|
||||||
|
EMAIL_REGEX.is_match(test)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn remove_slurs(test: &str) -> String {
|
||||||
|
SLUR_REGEX.replace_all(test, "*removed*").to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn slur_check(test: &str) -> Result<(), Vec<&str>> {
|
||||||
|
let mut matches: Vec<&str> = SLUR_REGEX.find_iter(test).map(|mat| mat.as_str()).collect();
|
||||||
|
|
||||||
|
// Unique
|
||||||
|
matches.sort_unstable();
|
||||||
|
matches.dedup();
|
||||||
|
|
||||||
|
if matches.is_empty() {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(matches)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn slurs_vec_to_str(slurs: Vec<&str>) -> String {
|
||||||
|
let start = "No slurs - ";
|
||||||
|
let combined = &slurs.join(", ");
|
||||||
|
[start, combined].concat()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn generate_random_string() -> String {
|
||||||
|
thread_rng().sample_iter(&Alphanumeric).take(30).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn send_email(
|
||||||
|
subject: &str,
|
||||||
|
to_email: &str,
|
||||||
|
to_username: &str,
|
||||||
|
html: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let email_config = Settings::get().email.ok_or("no_email_setup")?;
|
||||||
|
|
||||||
|
let email = Email::builder()
|
||||||
|
.to((to_email, to_username))
|
||||||
|
.from(email_config.smtp_from_address.to_owned())
|
||||||
|
.subject(subject)
|
||||||
|
.html(html)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let mailer = if email_config.use_tls {
|
||||||
|
SmtpClient::new_simple(&email_config.smtp_server).unwrap()
|
||||||
|
} else {
|
||||||
|
SmtpClient::new(&email_config.smtp_server, ClientSecurity::None).unwrap()
|
||||||
|
}
|
||||||
|
.hello_name(ClientId::Domain(Settings::get().hostname))
|
||||||
|
.smtp_utf8(true)
|
||||||
|
.authentication_mechanism(Mechanism::Plain)
|
||||||
|
.connection_reuse(ConnectionReuseParameters::ReuseUnlimited);
|
||||||
|
let mailer = if let (Some(login), Some(password)) =
|
||||||
|
(&email_config.smtp_login, &email_config.smtp_password)
|
||||||
|
{
|
||||||
|
mailer.credentials(Credentials::new(login.to_owned(), password.to_owned()))
|
||||||
|
} else {
|
||||||
|
mailer
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut transport = mailer.transport();
|
||||||
|
let result = transport.send(email.into());
|
||||||
|
transport.close();
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(_) => Ok(()),
|
||||||
|
Err(e) => Err(e.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn markdown_to_html(text: &str) -> String {
|
||||||
|
comrak::markdown_to_html(text, &comrak::ComrakOptions::default())
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO nothing is done with community / group webfingers yet, so just ignore those for now
|
||||||
|
#[derive(Clone, PartialEq, Eq, Hash)]
|
||||||
|
pub struct MentionData {
|
||||||
|
pub name: String,
|
||||||
|
pub domain: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MentionData {
|
||||||
|
pub fn is_local(&self) -> bool {
|
||||||
|
Settings::get().hostname.eq(&self.domain)
|
||||||
|
}
|
||||||
|
pub fn full_name(&self) -> String {
|
||||||
|
format!("@{}@{}", &self.name, &self.domain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn scrape_text_for_mentions(text: &str) -> Vec<MentionData> {
|
||||||
|
let mut out: Vec<MentionData> = Vec::new();
|
||||||
|
for caps in MENTIONS_REGEX.captures_iter(text) {
|
||||||
|
out.push(MentionData {
|
||||||
|
name: caps["name"].to_string(),
|
||||||
|
domain: caps["domain"].to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
out.into_iter().unique().collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_valid_username(name: &str) -> bool {
|
||||||
|
VALID_USERNAME_REGEX.is_match(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_valid_community_name(name: &str) -> bool {
|
||||||
|
VALID_COMMUNITY_NAME_REGEX.is_match(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use crate::{
|
||||||
|
is_email_regex,
|
||||||
|
is_valid_community_name,
|
||||||
|
is_valid_username,
|
||||||
|
remove_slurs,
|
||||||
|
scrape_text_for_mentions,
|
||||||
|
slur_check,
|
||||||
|
slurs_vec_to_str,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_mentions_regex() {
|
||||||
|
let text = "Just read a great blog post by [@tedu@honk.teduangst.com](/u/test). And another by !test_community@fish.teduangst.com . Another [@lemmy@lemmy-alpha:8540](/u/fish)";
|
||||||
|
let mentions = scrape_text_for_mentions(text);
|
||||||
|
|
||||||
|
assert_eq!(mentions[0].name, "tedu".to_string());
|
||||||
|
assert_eq!(mentions[0].domain, "honk.teduangst.com".to_string());
|
||||||
|
assert_eq!(mentions[1].domain, "lemmy-alpha:8540".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_email() {
|
||||||
|
assert!(is_email_regex("gush@gmail.com"));
|
||||||
|
assert!(!is_email_regex("nada_neutho"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_valid_register_username() {
|
||||||
|
assert!(is_valid_username("Hello_98"));
|
||||||
|
assert!(is_valid_username("ten"));
|
||||||
|
assert!(!is_valid_username("Hello-98"));
|
||||||
|
assert!(!is_valid_username("a"));
|
||||||
|
assert!(!is_valid_username(""));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_valid_community_name() {
|
||||||
|
assert!(is_valid_community_name("example"));
|
||||||
|
assert!(is_valid_community_name("example_community"));
|
||||||
|
assert!(!is_valid_community_name("Example"));
|
||||||
|
assert!(!is_valid_community_name("Ex"));
|
||||||
|
assert!(!is_valid_community_name(""));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_slur_filter() {
|
||||||
|
let test =
|
||||||
|
"coons test dindu ladyboy tranny retardeds. Capitalized Niggerz. This is a bunch of other safe text.";
|
||||||
|
let slur_free = "No slurs here";
|
||||||
|
assert_eq!(
|
||||||
|
remove_slurs(&test),
|
||||||
|
"*removed* test *removed* *removed* *removed* *removed*. Capitalized *removed*. This is a bunch of other safe text."
|
||||||
|
.to_string()
|
||||||
|
);
|
||||||
|
|
||||||
|
let has_slurs_vec = vec![
|
||||||
|
"Niggerz",
|
||||||
|
"coons",
|
||||||
|
"dindu",
|
||||||
|
"ladyboy",
|
||||||
|
"retardeds",
|
||||||
|
"tranny",
|
||||||
|
];
|
||||||
|
let has_slurs_err_str = "No slurs - Niggerz, coons, dindu, ladyboy, retardeds, tranny";
|
||||||
|
|
||||||
|
assert_eq!(slur_check(test), Err(has_slurs_vec));
|
||||||
|
assert_eq!(slur_check(slur_free), Ok(()));
|
||||||
|
if let Err(slur_vec) = slur_check(test) {
|
||||||
|
assert_eq!(&slurs_vec_to_str(slur_vec), has_slurs_err_str);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// These helped with testing
|
||||||
|
// #[test]
|
||||||
|
// fn test_send_email() {
|
||||||
|
// let result = send_email("not a subject", "test_email@gmail.com", "ur user", "<h1>HI there</h1>");
|
||||||
|
// assert!(result.is_ok());
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref EMAIL_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$").unwrap();
|
||||||
|
static ref SLUR_REGEX: Regex = RegexBuilder::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|\bn(i|1)g(\b|g?(a|er)?(s|z)?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btr(a|@)nn?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").case_insensitive(true).build().unwrap();
|
||||||
|
static ref USERNAME_MATCHES_REGEX: Regex = Regex::new(r"/u/[a-zA-Z][0-9a-zA-Z_]*").unwrap();
|
||||||
|
// TODO keep this old one, it didn't work with port well tho
|
||||||
|
// static ref MENTIONS_REGEX: Regex = Regex::new(r"@(?P<name>[\w.]+)@(?P<domain>[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)").unwrap();
|
||||||
|
static ref MENTIONS_REGEX: Regex = Regex::new(r"@(?P<name>[\w.]+)@(?P<domain>[a-zA-Z0-9._:-]+)").unwrap();
|
||||||
|
static ref VALID_USERNAME_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9_]{3,20}$").unwrap();
|
||||||
|
static ref VALID_COMMUNITY_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_]{3,20}$").unwrap();
|
||||||
|
pub static ref WEBFINGER_COMMUNITY_REGEX: Regex = Regex::new(&format!(
|
||||||
|
"^group:([a-z0-9_]{{3, 20}})@{}$",
|
||||||
|
Settings::get().hostname
|
||||||
|
))
|
||||||
|
.unwrap();
|
||||||
|
pub static ref WEBFINGER_USER_REGEX: Regex = Regex::new(&format!(
|
||||||
|
"^acct:([a-z0-9_]{{3, 20}})@{}$",
|
||||||
|
Settings::get().hostname
|
||||||
|
))
|
||||||
|
.unwrap();
|
||||||
|
pub static ref CACHE_CONTROL_REGEX: Regex =
|
||||||
|
Regex::new("^((text|image)/.+|application/javascript)$").unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Keypair {
|
||||||
|
pub private_key: String,
|
||||||
|
pub public_key: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Generate the asymmetric keypair for ActivityPub HTTP signatures.
|
||||||
|
pub fn generate_actor_keypair() -> Result<Keypair, Error> {
|
||||||
|
let rsa = Rsa::generate(2048)?;
|
||||||
|
let pkey = PKey::from_rsa(rsa)?;
|
||||||
|
let public_key = pkey.public_key_to_pem()?;
|
||||||
|
let private_key = pkey.private_key_to_pem_pkcs8()?;
|
||||||
|
let key_to_string = |key| match String::from_utf8(key) {
|
||||||
|
Ok(s) => Ok(s),
|
||||||
|
Err(e) => Err(Error::new(
|
||||||
|
ErrorKind::Other,
|
||||||
|
format!("Failed converting key to string: {}", e),
|
||||||
|
)),
|
||||||
|
};
|
||||||
|
Ok(Keypair {
|
||||||
|
private_key: key_to_string(private_key)?,
|
||||||
|
public_key: key_to_string(public_key)?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum EndpointType {
|
||||||
|
Community,
|
||||||
|
User,
|
||||||
|
Post,
|
||||||
|
Comment,
|
||||||
|
PrivateMessage,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_apub_protocol_string() -> &'static str {
|
||||||
|
if Settings::get().federation.tls_enabled {
|
||||||
|
"https"
|
||||||
|
} else {
|
||||||
|
"http"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Generates the ActivityPub ID for a given object type and ID.
|
||||||
|
pub fn make_apub_endpoint(endpoint_type: EndpointType, name: &str) -> Url {
|
||||||
|
let point = match endpoint_type {
|
||||||
|
EndpointType::Community => "c",
|
||||||
|
EndpointType::User => "u",
|
||||||
|
EndpointType::Post => "post",
|
||||||
|
EndpointType::Comment => "comment",
|
||||||
|
EndpointType::PrivateMessage => "private_message",
|
||||||
|
};
|
||||||
|
|
||||||
|
Url::parse(&format!(
|
||||||
|
"{}://{}/{}/{}",
|
||||||
|
get_apub_protocol_string(),
|
||||||
|
Settings::get().hostname,
|
||||||
|
point,
|
||||||
|
name
|
||||||
|
))
|
||||||
|
.unwrap()
|
||||||
|
}
|
@ -1,7 +1,6 @@
|
|||||||
use crate::LemmyError;
|
|
||||||
use config::{Config, ConfigError, Environment, File};
|
use config::{Config, ConfigError, Environment, File};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::{env, fs, net::IpAddr, sync::RwLock};
|
use std::{fs, io::Error, net::IpAddr, sync::RwLock};
|
||||||
|
|
||||||
static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson";
|
static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson";
|
||||||
static CONFIG_FILE: &str = "config/config.hjson";
|
static CONFIG_FILE: &str = "config/config.hjson";
|
||||||
@ -76,6 +75,9 @@ impl Settings {
|
|||||||
/// First, defaults are loaded from CONFIG_FILE_DEFAULTS, then these values can be overwritten
|
/// First, defaults are loaded from CONFIG_FILE_DEFAULTS, then these values can be overwritten
|
||||||
/// from CONFIG_FILE (optional). Finally, values from the environment (with prefix LEMMY) are
|
/// from CONFIG_FILE (optional). Finally, values from the environment (with prefix LEMMY) are
|
||||||
/// added to the config.
|
/// added to the config.
|
||||||
|
///
|
||||||
|
/// Note: The env var `LEMMY_DATABASE_URL` is parsed in
|
||||||
|
/// `server/lemmy_db/src/lib.rs::get_database_url_from_env()`
|
||||||
fn init() -> Result<Self, ConfigError> {
|
fn init() -> Result<Self, ConfigError> {
|
||||||
let mut s = Config::new();
|
let mut s = Config::new();
|
||||||
|
|
||||||
@ -98,31 +100,26 @@ impl Settings {
|
|||||||
SETTINGS.read().unwrap().to_owned()
|
SETTINGS.read().unwrap().to_owned()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the postgres connection url. If LEMMY_DATABASE_URL is set, that is used,
|
|
||||||
/// otherwise the connection url is generated from the config.
|
|
||||||
pub fn get_database_url(&self) -> String {
|
pub fn get_database_url(&self) -> String {
|
||||||
match env::var("LEMMY_DATABASE_URL") {
|
format!(
|
||||||
Ok(url) => url,
|
"postgres://{}:{}@{}:{}/{}",
|
||||||
Err(_) => format!(
|
self.database.user,
|
||||||
"postgres://{}:{}@{}:{}/{}",
|
self.database.password,
|
||||||
self.database.user,
|
self.database.host,
|
||||||
self.database.password,
|
self.database.port,
|
||||||
self.database.host,
|
self.database.database
|
||||||
self.database.port,
|
)
|
||||||
self.database.database
|
|
||||||
),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn api_endpoint(&self) -> String {
|
pub fn api_endpoint(&self) -> String {
|
||||||
format!("{}/api/v1", self.hostname)
|
format!("{}/api/v1", self.hostname)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_config_file() -> Result<String, LemmyError> {
|
pub fn read_config_file() -> Result<String, Error> {
|
||||||
Ok(fs::read_to_string(CONFIG_FILE)?)
|
fs::read_to_string(CONFIG_FILE)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn save_config_file(data: &str) -> Result<String, LemmyError> {
|
pub fn save_config_file(data: &str) -> Result<String, Error> {
|
||||||
fs::write(CONFIG_FILE, data)?;
|
fs::write(CONFIG_FILE, data)?;
|
||||||
|
|
||||||
// Reload the new settings
|
// Reload the new settings
|
73
server/src/api/claims.rs
Normal file
73
server/src/api/claims.rs
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
use diesel::{result::Error, PgConnection};
|
||||||
|
use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, TokenData, Validation};
|
||||||
|
use lemmy_db::{user::User_, Crud};
|
||||||
|
use lemmy_utils::{is_email_regex, settings::Settings};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
type Jwt = String;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
pub struct Claims {
|
||||||
|
pub id: i32,
|
||||||
|
pub username: String,
|
||||||
|
pub iss: String,
|
||||||
|
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 show_avatars: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Claims {
|
||||||
|
pub fn decode(jwt: &str) -> Result<TokenData<Claims>, jsonwebtoken::errors::Error> {
|
||||||
|
let v = Validation {
|
||||||
|
validate_exp: false,
|
||||||
|
..Validation::default()
|
||||||
|
};
|
||||||
|
decode::<Claims>(
|
||||||
|
&jwt,
|
||||||
|
&DecodingKey::from_secret(Settings::get().jwt_secret.as_ref()),
|
||||||
|
&v,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn jwt(user: User_, hostname: String) -> Jwt {
|
||||||
|
let my_claims = Claims {
|
||||||
|
id: user.id,
|
||||||
|
username: user.name.to_owned(),
|
||||||
|
iss: hostname,
|
||||||
|
show_nsfw: user.show_nsfw,
|
||||||
|
theme: user.theme.to_owned(),
|
||||||
|
default_sort_type: user.default_sort_type,
|
||||||
|
default_listing_type: user.default_listing_type,
|
||||||
|
lang: user.lang.to_owned(),
|
||||||
|
avatar: user.avatar.to_owned(),
|
||||||
|
show_avatars: user.show_avatars.to_owned(),
|
||||||
|
};
|
||||||
|
encode(
|
||||||
|
&Header::default(),
|
||||||
|
&my_claims,
|
||||||
|
&EncodingKey::from_secret(Settings::get().jwt_secret.as_ref()),
|
||||||
|
)
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: move these into user?
|
||||||
|
pub fn find_by_email_or_username(
|
||||||
|
conn: &PgConnection,
|
||||||
|
username_or_email: &str,
|
||||||
|
) -> Result<User_, Error> {
|
||||||
|
if is_email_regex(username_or_email) {
|
||||||
|
User_::find_by_email(conn, username_or_email)
|
||||||
|
} else {
|
||||||
|
User_::find_by_username(conn, username_or_email)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn find_by_jwt(conn: &PgConnection, jwt: &str) -> Result<User_, Error> {
|
||||||
|
let claims: Claims = Claims::decode(&jwt).expect("Invalid token").claims;
|
||||||
|
User_::read(&conn, claims.id)
|
||||||
|
}
|
||||||
|
}
|
@ -1,28 +1,7 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
api::{APIError, Oper, Perform},
|
api::{claims::Claims, APIError, Oper, Perform},
|
||||||
apub::{ApubLikeableType, ApubObjectType},
|
apub::{ApubLikeableType, ApubObjectType},
|
||||||
blocking,
|
blocking,
|
||||||
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::{
|
websocket::{
|
||||||
server::{JoinCommunityRoom, SendComment},
|
server::{JoinCommunityRoom, SendComment},
|
||||||
UserOperation,
|
UserOperation,
|
||||||
@ -30,6 +9,31 @@ use crate::{
|
|||||||
},
|
},
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
|
};
|
||||||
|
use lemmy_db::{
|
||||||
|
comment::*,
|
||||||
|
comment_view::*,
|
||||||
|
community_view::*,
|
||||||
|
moderator::*,
|
||||||
|
naive_now,
|
||||||
|
post::*,
|
||||||
|
site_view::*,
|
||||||
|
user::*,
|
||||||
|
user_mention::*,
|
||||||
|
user_view::*,
|
||||||
|
Crud,
|
||||||
|
Likeable,
|
||||||
|
ListingType,
|
||||||
|
Saveable,
|
||||||
|
SortType,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{
|
||||||
|
make_apub_endpoint,
|
||||||
|
remove_slurs,
|
||||||
|
scrape_text_for_mentions,
|
||||||
|
send_email,
|
||||||
|
settings::Settings,
|
||||||
|
EndpointType,
|
||||||
MentionData,
|
MentionData,
|
||||||
};
|
};
|
||||||
use log::error;
|
use log::error;
|
||||||
@ -155,7 +159,9 @@ impl Perform for Oper<CreateComment> {
|
|||||||
|
|
||||||
let inserted_comment_id = inserted_comment.id;
|
let inserted_comment_id = inserted_comment.id;
|
||||||
let updated_comment: Comment = match blocking(pool, move |conn| {
|
let updated_comment: Comment = match blocking(pool, move |conn| {
|
||||||
Comment::update_ap_id(&conn, inserted_comment_id)
|
let apub_id =
|
||||||
|
make_apub_endpoint(EndpointType::Comment, &inserted_comment_id.to_string()).to_string();
|
||||||
|
Comment::update_ap_id(&conn, inserted_comment_id, apub_id)
|
||||||
})
|
})
|
||||||
.await?
|
.await?
|
||||||
{
|
{
|
||||||
|
@ -1,26 +1,24 @@
|
|||||||
use super::*;
|
use super::*;
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{APIError, Oper, Perform},
|
api::{claims::Claims, APIError, Oper, Perform},
|
||||||
apub::{
|
apub::ActorType,
|
||||||
extensions::signatures::generate_actor_keypair,
|
|
||||||
make_apub_endpoint,
|
|
||||||
ActorType,
|
|
||||||
EndpointType,
|
|
||||||
},
|
|
||||||
blocking,
|
blocking,
|
||||||
db::{Bannable, Crud, Followable, Joinable, SortType},
|
|
||||||
is_valid_community_name,
|
|
||||||
naive_from_unix,
|
|
||||||
naive_now,
|
|
||||||
slur_check,
|
|
||||||
slurs_vec_to_str,
|
|
||||||
websocket::{
|
websocket::{
|
||||||
server::{JoinCommunityRoom, SendCommunityRoomMessage},
|
server::{JoinCommunityRoom, SendCommunityRoomMessage},
|
||||||
UserOperation,
|
UserOperation,
|
||||||
WebsocketInfo,
|
WebsocketInfo,
|
||||||
},
|
},
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
};
|
||||||
|
use lemmy_db::{naive_now, Bannable, Crud, Followable, Joinable, SortType};
|
||||||
|
use lemmy_utils::{
|
||||||
|
generate_actor_keypair,
|
||||||
|
is_valid_community_name,
|
||||||
|
make_apub_endpoint,
|
||||||
|
naive_from_unix,
|
||||||
|
slur_check,
|
||||||
|
slurs_vec_to_str,
|
||||||
|
EndpointType,
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
use crate::{
|
use crate::{websocket::WebsocketInfo, DbPool, LemmyError};
|
||||||
db::{community::*, community_view::*, moderator::*, site::*, user::*, user_view::*},
|
|
||||||
websocket::WebsocketInfo,
|
|
||||||
DbPool,
|
|
||||||
LemmyError,
|
|
||||||
};
|
|
||||||
use actix_web::client::Client;
|
use actix_web::client::Client;
|
||||||
|
use lemmy_db::{community::*, community_view::*, moderator::*, site::*, user::*, user_view::*};
|
||||||
|
|
||||||
|
pub mod claims;
|
||||||
pub mod comment;
|
pub mod comment;
|
||||||
pub mod community;
|
pub mod community;
|
||||||
pub mod post;
|
pub mod post;
|
||||||
|
@ -1,27 +1,8 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
api::{APIError, Oper, Perform},
|
api::{claims::Claims, APIError, Oper, Perform},
|
||||||
apub::{ApubLikeableType, ApubObjectType},
|
apub::{ApubLikeableType, ApubObjectType},
|
||||||
blocking,
|
blocking,
|
||||||
db::{
|
|
||||||
comment_view::*,
|
|
||||||
community_view::*,
|
|
||||||
moderator::*,
|
|
||||||
post::*,
|
|
||||||
post_view::*,
|
|
||||||
site::*,
|
|
||||||
site_view::*,
|
|
||||||
user::*,
|
|
||||||
user_view::*,
|
|
||||||
Crud,
|
|
||||||
Likeable,
|
|
||||||
ListingType,
|
|
||||||
Saveable,
|
|
||||||
SortType,
|
|
||||||
},
|
|
||||||
fetch_iframely_and_pictrs_data,
|
fetch_iframely_and_pictrs_data,
|
||||||
naive_now,
|
|
||||||
slur_check,
|
|
||||||
slurs_vec_to_str,
|
|
||||||
websocket::{
|
websocket::{
|
||||||
server::{JoinCommunityRoom, JoinPostRoom, SendPost},
|
server::{JoinCommunityRoom, JoinPostRoom, SendPost},
|
||||||
UserOperation,
|
UserOperation,
|
||||||
@ -30,6 +11,24 @@ use crate::{
|
|||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
|
use lemmy_db::{
|
||||||
|
comment_view::*,
|
||||||
|
community_view::*,
|
||||||
|
moderator::*,
|
||||||
|
naive_now,
|
||||||
|
post::*,
|
||||||
|
post_view::*,
|
||||||
|
site::*,
|
||||||
|
site_view::*,
|
||||||
|
user::*,
|
||||||
|
user_view::*,
|
||||||
|
Crud,
|
||||||
|
Likeable,
|
||||||
|
ListingType,
|
||||||
|
Saveable,
|
||||||
|
SortType,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{make_apub_endpoint, slur_check, slurs_vec_to_str, EndpointType};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
@ -191,11 +190,16 @@ impl Perform for Oper<CreatePost> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let inserted_post_id = inserted_post.id;
|
let inserted_post_id = inserted_post.id;
|
||||||
let updated_post =
|
let updated_post = match blocking(pool, move |conn| {
|
||||||
match blocking(pool, move |conn| Post::update_ap_id(conn, inserted_post_id)).await? {
|
let apub_id =
|
||||||
Ok(post) => post,
|
make_apub_endpoint(EndpointType::Post, &inserted_post_id.to_string()).to_string();
|
||||||
Err(_e) => return Err(APIError::err("couldnt_create_post").into()),
|
Post::update_ap_id(conn, inserted_post_id, apub_id)
|
||||||
};
|
})
|
||||||
|
.await?
|
||||||
|
{
|
||||||
|
Ok(post) => post,
|
||||||
|
Err(_e) => return Err(APIError::err("couldnt_create_post").into()),
|
||||||
|
};
|
||||||
|
|
||||||
updated_post.send_create(&user, &self.client, pool).await?;
|
updated_post.send_create(&user, &self.client, pool).await?;
|
||||||
|
|
||||||
|
@ -1,31 +1,28 @@
|
|||||||
use super::user::Register;
|
use super::user::Register;
|
||||||
use crate::{
|
use crate::{
|
||||||
api::{APIError, Oper, Perform},
|
api::{claims::Claims, APIError, Oper, Perform},
|
||||||
apub::fetcher::search_by_apub_id,
|
apub::fetcher::search_by_apub_id,
|
||||||
blocking,
|
blocking,
|
||||||
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},
|
websocket::{server::SendAllMessage, UserOperation, WebsocketInfo},
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
|
use lemmy_db::{
|
||||||
|
category::*,
|
||||||
|
comment_view::*,
|
||||||
|
community_view::*,
|
||||||
|
moderator::*,
|
||||||
|
moderator_views::*,
|
||||||
|
naive_now,
|
||||||
|
post_view::*,
|
||||||
|
site::*,
|
||||||
|
site_view::*,
|
||||||
|
user_view::*,
|
||||||
|
Crud,
|
||||||
|
SearchType,
|
||||||
|
SortType,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{settings::Settings, slur_check, slurs_vec_to_str};
|
||||||
use log::{debug, info};
|
use log::{debug, info};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
@ -1,44 +1,7 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
api::{APIError, Oper, Perform},
|
api::{claims::Claims, APIError, Oper, Perform},
|
||||||
apub::{
|
apub::ApubObjectType,
|
||||||
extensions::signatures::generate_actor_keypair,
|
|
||||||
make_apub_endpoint,
|
|
||||||
ApubObjectType,
|
|
||||||
EndpointType,
|
|
||||||
},
|
|
||||||
blocking,
|
blocking,
|
||||||
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,
|
|
||||||
is_valid_username,
|
|
||||||
naive_from_unix,
|
|
||||||
naive_now,
|
|
||||||
remove_slurs,
|
|
||||||
send_email,
|
|
||||||
settings::Settings,
|
|
||||||
slur_check,
|
|
||||||
slurs_vec_to_str,
|
|
||||||
websocket::{
|
websocket::{
|
||||||
server::{JoinUserRoom, SendAllMessage, SendUserRoomMessage},
|
server::{JoinUserRoom, SendAllMessage, SendUserRoomMessage},
|
||||||
UserOperation,
|
UserOperation,
|
||||||
@ -48,6 +11,43 @@ use crate::{
|
|||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
use bcrypt::verify;
|
use bcrypt::verify;
|
||||||
|
use lemmy_db::{
|
||||||
|
comment::*,
|
||||||
|
comment_view::*,
|
||||||
|
community::*,
|
||||||
|
community_view::*,
|
||||||
|
moderator::*,
|
||||||
|
naive_now,
|
||||||
|
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,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{
|
||||||
|
generate_actor_keypair,
|
||||||
|
generate_random_string,
|
||||||
|
is_valid_username,
|
||||||
|
make_apub_endpoint,
|
||||||
|
naive_from_unix,
|
||||||
|
remove_slurs,
|
||||||
|
send_email,
|
||||||
|
settings::Settings,
|
||||||
|
slur_check,
|
||||||
|
slurs_vec_to_str,
|
||||||
|
EndpointType,
|
||||||
|
};
|
||||||
use log::error;
|
use log::error;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
@ -264,7 +264,7 @@ impl Perform for Oper<Login> {
|
|||||||
// Fetch that username / email
|
// Fetch that username / email
|
||||||
let username_or_email = data.username_or_email.clone();
|
let username_or_email = data.username_or_email.clone();
|
||||||
let user = match blocking(pool, move |conn| {
|
let user = match blocking(pool, move |conn| {
|
||||||
User_::find_by_email_or_username(conn, &username_or_email)
|
Claims::find_by_email_or_username(conn, &username_or_email)
|
||||||
})
|
})
|
||||||
.await?
|
.await?
|
||||||
{
|
{
|
||||||
@ -279,7 +279,9 @@ impl Perform for Oper<Login> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Return the jwt
|
// Return the jwt
|
||||||
Ok(LoginResponse { jwt: user.jwt() })
|
Ok(LoginResponse {
|
||||||
|
jwt: Claims::jwt(user, Settings::get().hostname),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -421,7 +423,7 @@ impl Perform for Oper<Register> {
|
|||||||
|
|
||||||
// Return the jwt
|
// Return the jwt
|
||||||
Ok(LoginResponse {
|
Ok(LoginResponse {
|
||||||
jwt: inserted_user.jwt(),
|
jwt: Claims::jwt(inserted_user, Settings::get().hostname),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -532,7 +534,7 @@ impl Perform for Oper<SaveUserSettings> {
|
|||||||
|
|
||||||
// Return the jwt
|
// Return the jwt
|
||||||
Ok(LoginResponse {
|
Ok(LoginResponse {
|
||||||
jwt: updated_user.jwt(),
|
jwt: Claims::jwt(updated_user, Settings::get().hostname),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1155,7 +1157,7 @@ impl Perform for Oper<PasswordChange> {
|
|||||||
|
|
||||||
// Return the jwt
|
// Return the jwt
|
||||||
Ok(LoginResponse {
|
Ok(LoginResponse {
|
||||||
jwt: updated_user.jwt(),
|
jwt: Claims::jwt(updated_user, Settings::get().hostname),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1213,7 +1215,12 @@ impl Perform for Oper<CreatePrivateMessage> {
|
|||||||
|
|
||||||
let inserted_private_message_id = inserted_private_message.id;
|
let inserted_private_message_id = inserted_private_message.id;
|
||||||
let updated_private_message = match blocking(pool, move |conn| {
|
let updated_private_message = match blocking(pool, move |conn| {
|
||||||
PrivateMessage::update_ap_id(&conn, inserted_private_message_id)
|
let apub_id = make_apub_endpoint(
|
||||||
|
EndpointType::PrivateMessage,
|
||||||
|
&inserted_private_message_id.to_string(),
|
||||||
|
)
|
||||||
|
.to_string();
|
||||||
|
PrivateMessage::update_ap_id(&conn, inserted_private_message_id, apub_id)
|
||||||
})
|
})
|
||||||
.await?
|
.await?
|
||||||
{
|
{
|
||||||
|
@ -1,12 +1,18 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
apub::{extensions::signatures::sign, is_apub_id_valid, ActorType},
|
apub::{
|
||||||
db::{activity::insert_activity, community::Community, user::User_},
|
community::do_announce,
|
||||||
|
extensions::signatures::sign,
|
||||||
|
insert_activity,
|
||||||
|
is_apub_id_valid,
|
||||||
|
ActorType,
|
||||||
|
},
|
||||||
request::retry_custom,
|
request::retry_custom,
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
use activitystreams::{context, object::properties::ObjectProperties, public, Activity, Base};
|
use activitystreams::{context, object::properties::ObjectProperties, public, Activity, Base};
|
||||||
use actix_web::client::Client;
|
use actix_web::client::Client;
|
||||||
|
use lemmy_db::{community::Community, user::User_};
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
@ -43,7 +49,7 @@ where
|
|||||||
|
|
||||||
// if this is a local community, we need to do an announce from the community instead
|
// if this is a local community, we need to do an announce from the community instead
|
||||||
if community.local {
|
if community.local {
|
||||||
Community::do_announce(activity, &community, creator, client, pool).await?;
|
do_announce(activity, &community, creator, client, pool).await?;
|
||||||
} else {
|
} else {
|
||||||
send_activity(client, &activity, creator, to).await?;
|
send_activity(client, &activity, creator, to).await?;
|
||||||
}
|
}
|
||||||
|
@ -17,19 +17,9 @@ use crate::{
|
|||||||
ToApub,
|
ToApub,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
convert_datetime,
|
|
||||||
db::{
|
|
||||||
comment::{Comment, CommentForm},
|
|
||||||
community::Community,
|
|
||||||
post::Post,
|
|
||||||
user::User_,
|
|
||||||
Crud,
|
|
||||||
},
|
|
||||||
routes::DbPoolParam,
|
routes::DbPoolParam,
|
||||||
scrape_text_for_mentions,
|
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
MentionData,
|
|
||||||
};
|
};
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
||||||
@ -40,6 +30,14 @@ use activitystreams::{
|
|||||||
use activitystreams_new::object::Tombstone;
|
use activitystreams_new::object::Tombstone;
|
||||||
use actix_web::{body::Body, client::Client, web::Path, HttpResponse};
|
use actix_web::{body::Body, client::Client, web::Path, HttpResponse};
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
|
use lemmy_db::{
|
||||||
|
comment::{Comment, CommentForm},
|
||||||
|
community::Community,
|
||||||
|
post::Post,
|
||||||
|
user::User_,
|
||||||
|
Crud,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{convert_datetime, scrape_text_for_mentions, MentionData};
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
@ -7,20 +7,13 @@ use crate::{
|
|||||||
extensions::group_extensions::GroupExtension,
|
extensions::group_extensions::GroupExtension,
|
||||||
fetcher::get_or_fetch_and_upsert_remote_user,
|
fetcher::get_or_fetch_and_upsert_remote_user,
|
||||||
get_shared_inbox,
|
get_shared_inbox,
|
||||||
|
insert_activity,
|
||||||
ActorType,
|
ActorType,
|
||||||
FromApub,
|
FromApub,
|
||||||
GroupExt,
|
GroupExt,
|
||||||
ToApub,
|
ToApub,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
convert_datetime,
|
|
||||||
db::{
|
|
||||||
activity::insert_activity,
|
|
||||||
community::{Community, CommunityForm},
|
|
||||||
community_view::{CommunityFollowerView, CommunityModeratorView},
|
|
||||||
user::User_,
|
|
||||||
},
|
|
||||||
naive_now,
|
|
||||||
routes::DbPoolParam,
|
routes::DbPoolParam,
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
@ -44,6 +37,13 @@ use activitystreams_new::{
|
|||||||
};
|
};
|
||||||
use actix_web::{body::Body, client::Client, web, HttpResponse};
|
use actix_web::{body::Body, client::Client, web, HttpResponse};
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
|
use lemmy_db::{
|
||||||
|
community::{Community, CommunityForm},
|
||||||
|
community_view::{CommunityFollowerView, CommunityModeratorView},
|
||||||
|
naive_now,
|
||||||
|
user::User_,
|
||||||
|
};
|
||||||
|
use lemmy_utils::convert_datetime;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{fmt::Debug, str::FromStr};
|
use std::{fmt::Debug, str::FromStr};
|
||||||
|
|
||||||
@ -462,39 +462,37 @@ pub async fn get_apub_community_followers(
|
|||||||
Ok(create_apub_response(&collection))
|
Ok(create_apub_response(&collection))
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Community {
|
pub async fn do_announce<A>(
|
||||||
pub async fn do_announce<A>(
|
activity: A,
|
||||||
activity: A,
|
community: &Community,
|
||||||
community: &Community,
|
sender: &dyn ActorType,
|
||||||
sender: &dyn ActorType,
|
client: &Client,
|
||||||
client: &Client,
|
pool: &DbPool,
|
||||||
pool: &DbPool,
|
) -> Result<HttpResponse, LemmyError>
|
||||||
) -> Result<HttpResponse, LemmyError>
|
where
|
||||||
where
|
A: Activity + Base + Serialize + Debug,
|
||||||
A: Activity + Base + Serialize + Debug,
|
{
|
||||||
{
|
let mut announce = Announce::default();
|
||||||
let mut announce = Announce::default();
|
populate_object_props(
|
||||||
populate_object_props(
|
&mut announce.object_props,
|
||||||
&mut announce.object_props,
|
vec![community.get_followers_url()],
|
||||||
vec![community.get_followers_url()],
|
&format!("{}/announce/{}", community.actor_id, uuid::Uuid::new_v4()),
|
||||||
&format!("{}/announce/{}", community.actor_id, uuid::Uuid::new_v4()),
|
)?;
|
||||||
)?;
|
announce
|
||||||
announce
|
.announce_props
|
||||||
.announce_props
|
.set_actor_xsd_any_uri(community.actor_id.to_owned())?
|
||||||
.set_actor_xsd_any_uri(community.actor_id.to_owned())?
|
.set_object_base_box(BaseBox::from_concrete(activity)?)?;
|
||||||
.set_object_base_box(BaseBox::from_concrete(activity)?)?;
|
|
||||||
|
|
||||||
insert_activity(community.creator_id, announce.clone(), true, pool).await?;
|
insert_activity(community.creator_id, announce.clone(), true, pool).await?;
|
||||||
|
|
||||||
// dont send to the instance where the activity originally came from, because that would result
|
// dont send to the instance where the activity originally came from, because that would result
|
||||||
// in a database error (same data inserted twice)
|
// in a database error (same data inserted twice)
|
||||||
let mut to = community.get_follower_inboxes(pool).await?;
|
let mut to = community.get_follower_inboxes(pool).await?;
|
||||||
|
|
||||||
// this seems to be the "easiest" stable alternative for remove_item()
|
// this seems to be the "easiest" stable alternative for remove_item()
|
||||||
to.retain(|x| *x != sender.get_shared_inbox_url());
|
to.retain(|x| *x != sender.get_shared_inbox_url());
|
||||||
|
|
||||||
send_activity(client, &announce, community, to).await?;
|
send_activity(client, &announce, community, to).await?;
|
||||||
|
|
||||||
Ok(HttpResponse::Ok().finish())
|
Ok(HttpResponse::Ok().finish())
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -2,21 +2,21 @@ use crate::{
|
|||||||
apub::{
|
apub::{
|
||||||
extensions::signatures::verify,
|
extensions::signatures::verify,
|
||||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||||
|
insert_activity,
|
||||||
ActorType,
|
ActorType,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
db::{
|
|
||||||
activity::insert_activity,
|
|
||||||
community::{Community, CommunityFollower, CommunityFollowerForm},
|
|
||||||
user::User_,
|
|
||||||
Followable,
|
|
||||||
},
|
|
||||||
routes::{ChatServerParam, DbPoolParam},
|
routes::{ChatServerParam, DbPoolParam},
|
||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
use activitystreams::activity::Undo;
|
use activitystreams::activity::Undo;
|
||||||
use activitystreams_new::activity::Follow;
|
use activitystreams_new::activity::Follow;
|
||||||
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
|
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
|
||||||
|
use lemmy_db::{
|
||||||
|
community::{Community, CommunityFollower, CommunityFollowerForm},
|
||||||
|
user::User_,
|
||||||
|
Followable,
|
||||||
|
};
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
use crate::{
|
use crate::LemmyError;
|
||||||
db::{category::Category, Crud},
|
|
||||||
LemmyError,
|
|
||||||
};
|
|
||||||
use activitystreams::{ext::Extension, Actor};
|
use activitystreams::{ext::Extension, Actor};
|
||||||
use diesel::PgConnection;
|
use diesel::PgConnection;
|
||||||
|
use lemmy_db::{category::Category, Crud};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
|
@ -9,7 +9,6 @@ use log::debug;
|
|||||||
use openssl::{
|
use openssl::{
|
||||||
hash::MessageDigest,
|
hash::MessageDigest,
|
||||||
pkey::PKey,
|
pkey::PKey,
|
||||||
rsa::Rsa,
|
|
||||||
sign::{Signer, Verifier},
|
sign::{Signer, Verifier},
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -19,23 +18,6 @@ lazy_static! {
|
|||||||
static ref HTTP_SIG_CONFIG: Config = Config::new();
|
static ref HTTP_SIG_CONFIG: Config = Config::new();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Keypair {
|
|
||||||
pub private_key: String,
|
|
||||||
pub public_key: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Generate the asymmetric keypair for ActivityPub HTTP signatures.
|
|
||||||
pub fn generate_actor_keypair() -> Result<Keypair, LemmyError> {
|
|
||||||
let rsa = Rsa::generate(2048)?;
|
|
||||||
let pkey = PKey::from_rsa(rsa)?;
|
|
||||||
let public_key = pkey.public_key_to_pem()?;
|
|
||||||
let private_key = pkey.private_key_to_pem_pkcs8()?;
|
|
||||||
Ok(Keypair {
|
|
||||||
private_key: String::from_utf8(private_key)?,
|
|
||||||
public_key: String::from_utf8(public_key)?,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Signs request headers with the given keypair.
|
/// Signs request headers with the given keypair.
|
||||||
pub async fn sign(
|
pub async fn sign(
|
||||||
request: ClientRequest,
|
request: ClientRequest,
|
||||||
|
@ -1,29 +1,7 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
api::site::SearchResponse,
|
api::site::SearchResponse,
|
||||||
apub::{
|
apub::{is_apub_id_valid, FromApub, GroupExt, PageExt, PersonExt, APUB_JSON_CONTENT_TYPE},
|
||||||
get_apub_protocol_string,
|
|
||||||
is_apub_id_valid,
|
|
||||||
FromApub,
|
|
||||||
GroupExt,
|
|
||||||
PageExt,
|
|
||||||
PersonExt,
|
|
||||||
APUB_JSON_CONTENT_TYPE,
|
|
||||||
},
|
|
||||||
blocking,
|
blocking,
|
||||||
db::{
|
|
||||||
comment::{Comment, CommentForm},
|
|
||||||
comment_view::CommentView,
|
|
||||||
community::{Community, CommunityForm, CommunityModerator, CommunityModeratorForm},
|
|
||||||
community_view::CommunityView,
|
|
||||||
post::{Post, PostForm},
|
|
||||||
post_view::PostView,
|
|
||||||
user::{UserForm, User_},
|
|
||||||
user_view::UserView,
|
|
||||||
Crud,
|
|
||||||
Joinable,
|
|
||||||
SearchType,
|
|
||||||
},
|
|
||||||
naive_now,
|
|
||||||
request::{retry, RecvError},
|
request::{retry, RecvError},
|
||||||
routes::nodeinfo::{NodeInfo, NodeInfoWellKnown},
|
routes::nodeinfo::{NodeInfo, NodeInfoWellKnown},
|
||||||
DbPool,
|
DbPool,
|
||||||
@ -34,6 +12,21 @@ use activitystreams_new::{base::BaseExt, prelude::*, primitives::XsdAnyUri};
|
|||||||
use actix_web::client::Client;
|
use actix_web::client::Client;
|
||||||
use chrono::NaiveDateTime;
|
use chrono::NaiveDateTime;
|
||||||
use diesel::{result::Error::NotFound, PgConnection};
|
use diesel::{result::Error::NotFound, PgConnection};
|
||||||
|
use lemmy_db::{
|
||||||
|
comment::{Comment, CommentForm},
|
||||||
|
comment_view::CommentView,
|
||||||
|
community::{Community, CommunityForm, CommunityModerator, CommunityModeratorForm},
|
||||||
|
community_view::CommunityView,
|
||||||
|
naive_now,
|
||||||
|
post::{Post, PostForm},
|
||||||
|
post_view::PostView,
|
||||||
|
user::{UserForm, User_},
|
||||||
|
user_view::UserView,
|
||||||
|
Crud,
|
||||||
|
Joinable,
|
||||||
|
SearchType,
|
||||||
|
};
|
||||||
|
use lemmy_utils::get_apub_protocol_string;
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::{fmt::Debug, time::Duration};
|
use std::{fmt::Debug, time::Duration};
|
||||||
|
@ -16,14 +16,11 @@ use crate::{
|
|||||||
page_extension::PageExtension,
|
page_extension::PageExtension,
|
||||||
signatures::{PublicKey, PublicKeyExtension},
|
signatures::{PublicKey, PublicKeyExtension},
|
||||||
},
|
},
|
||||||
convert_datetime,
|
blocking,
|
||||||
db::user::User_,
|
|
||||||
request::{retry, RecvError},
|
request::{retry, RecvError},
|
||||||
routes::webfinger::WebFingerResponse,
|
routes::webfinger::WebFingerResponse,
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
MentionData,
|
|
||||||
Settings,
|
|
||||||
};
|
};
|
||||||
use activitystreams::object::Page;
|
use activitystreams::object::Page;
|
||||||
use activitystreams_ext::{Ext1, Ext2};
|
use activitystreams_ext::{Ext1, Ext2};
|
||||||
@ -35,6 +32,9 @@ use activitystreams_new::{
|
|||||||
};
|
};
|
||||||
use actix_web::{body::Body, client::Client, HttpResponse};
|
use actix_web::{body::Body, client::Client, HttpResponse};
|
||||||
use chrono::NaiveDateTime;
|
use chrono::NaiveDateTime;
|
||||||
|
use failure::_core::fmt::Debug;
|
||||||
|
use lemmy_db::{activity::do_insert_activity, user::User_};
|
||||||
|
use lemmy_utils::{convert_datetime, get_apub_protocol_string, settings::Settings, MentionData};
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
@ -45,14 +45,6 @@ type PageExt = Ext1<Page, PageExtension>;
|
|||||||
|
|
||||||
pub static APUB_JSON_CONTENT_TYPE: &str = "application/activity+json";
|
pub static APUB_JSON_CONTENT_TYPE: &str = "application/activity+json";
|
||||||
|
|
||||||
pub enum EndpointType {
|
|
||||||
Community,
|
|
||||||
User,
|
|
||||||
Post,
|
|
||||||
Comment,
|
|
||||||
PrivateMessage,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Convert the data to json and turn it into an HTTP Response with the correct ActivityPub
|
/// Convert the data to json and turn it into an HTTP Response with the correct ActivityPub
|
||||||
/// headers.
|
/// headers.
|
||||||
fn create_apub_response<T>(data: &T) -> HttpResponse<Body>
|
fn create_apub_response<T>(data: &T) -> HttpResponse<Body>
|
||||||
@ -73,34 +65,6 @@ where
|
|||||||
.json(data)
|
.json(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Generates the ActivityPub ID for a given object type and ID.
|
|
||||||
pub fn make_apub_endpoint(endpoint_type: EndpointType, name: &str) -> Url {
|
|
||||||
let point = match endpoint_type {
|
|
||||||
EndpointType::Community => "c",
|
|
||||||
EndpointType::User => "u",
|
|
||||||
EndpointType::Post => "post",
|
|
||||||
EndpointType::Comment => "comment",
|
|
||||||
EndpointType::PrivateMessage => "private_message",
|
|
||||||
};
|
|
||||||
|
|
||||||
Url::parse(&format!(
|
|
||||||
"{}://{}/{}/{}",
|
|
||||||
get_apub_protocol_string(),
|
|
||||||
Settings::get().hostname,
|
|
||||||
point,
|
|
||||||
name
|
|
||||||
))
|
|
||||||
.unwrap()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_apub_protocol_string() -> &'static str {
|
|
||||||
if Settings::get().federation.tls_enabled {
|
|
||||||
"https"
|
|
||||||
} else {
|
|
||||||
"http"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks if the ID has a valid format, correct scheme, and is in the allowed instance list.
|
// Checks if the ID has a valid format, correct scheme, and is in the allowed instance list.
|
||||||
fn is_apub_id_valid(apub_id: &Url) -> bool {
|
fn is_apub_id_valid(apub_id: &Url) -> bool {
|
||||||
debug!("Checking {}", apub_id);
|
debug!("Checking {}", apub_id);
|
||||||
@ -374,3 +338,19 @@ pub async fn fetch_webfinger_url(
|
|||||||
.to_owned()
|
.to_owned()
|
||||||
.ok_or_else(|| format_err!("No href found.").into())
|
.ok_or_else(|| format_err!("No href found.").into())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn insert_activity<T>(
|
||||||
|
user_id: i32,
|
||||||
|
data: T,
|
||||||
|
local: bool,
|
||||||
|
pool: &DbPool,
|
||||||
|
) -> Result<(), LemmyError>
|
||||||
|
where
|
||||||
|
T: Serialize + Debug + Send + 'static,
|
||||||
|
{
|
||||||
|
blocking(pool, move |conn| {
|
||||||
|
do_insert_activity(conn, user_id, &data, local)
|
||||||
|
})
|
||||||
|
.await??;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
@ -6,7 +6,6 @@ use crate::{
|
|||||||
create_tombstone,
|
create_tombstone,
|
||||||
extensions::page_extension::PageExtension,
|
extensions::page_extension::PageExtension,
|
||||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||||
get_apub_protocol_string,
|
|
||||||
ActorType,
|
ActorType,
|
||||||
ApubLikeableType,
|
ApubLikeableType,
|
||||||
ApubObjectType,
|
ApubObjectType,
|
||||||
@ -15,17 +14,9 @@ use crate::{
|
|||||||
ToApub,
|
ToApub,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
convert_datetime,
|
|
||||||
db::{
|
|
||||||
community::Community,
|
|
||||||
post::{Post, PostForm},
|
|
||||||
user::User_,
|
|
||||||
Crud,
|
|
||||||
},
|
|
||||||
routes::DbPoolParam,
|
routes::DbPoolParam,
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
Settings,
|
|
||||||
};
|
};
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
|
||||||
@ -36,6 +27,13 @@ use activitystreams::{
|
|||||||
use activitystreams_ext::Ext1;
|
use activitystreams_ext::Ext1;
|
||||||
use activitystreams_new::object::Tombstone;
|
use activitystreams_new::object::Tombstone;
|
||||||
use actix_web::{body::Body, client::Client, web, HttpResponse};
|
use actix_web::{body::Body, client::Client, web, HttpResponse};
|
||||||
|
use lemmy_db::{
|
||||||
|
community::Community,
|
||||||
|
post::{Post, PostForm},
|
||||||
|
user::User_,
|
||||||
|
Crud,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{convert_datetime, get_apub_protocol_string, settings::Settings};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
|
@ -3,18 +3,12 @@ use crate::{
|
|||||||
activities::send_activity,
|
activities::send_activity,
|
||||||
create_tombstone,
|
create_tombstone,
|
||||||
fetcher::get_or_fetch_and_upsert_remote_user,
|
fetcher::get_or_fetch_and_upsert_remote_user,
|
||||||
|
insert_activity,
|
||||||
ApubObjectType,
|
ApubObjectType,
|
||||||
FromApub,
|
FromApub,
|
||||||
ToApub,
|
ToApub,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
convert_datetime,
|
|
||||||
db::{
|
|
||||||
activity::insert_activity,
|
|
||||||
private_message::{PrivateMessage, PrivateMessageForm},
|
|
||||||
user::User_,
|
|
||||||
Crud,
|
|
||||||
},
|
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
@ -25,6 +19,12 @@ use activitystreams::{
|
|||||||
};
|
};
|
||||||
use activitystreams_new::object::Tombstone;
|
use activitystreams_new::object::Tombstone;
|
||||||
use actix_web::client::Client;
|
use actix_web::client::Client;
|
||||||
|
use lemmy_db::{
|
||||||
|
private_message::{PrivateMessage, PrivateMessageForm},
|
||||||
|
user::User_,
|
||||||
|
Crud,
|
||||||
|
};
|
||||||
|
use lemmy_utils::convert_datetime;
|
||||||
|
|
||||||
#[async_trait::async_trait(?Send)]
|
#[async_trait::async_trait(?Send)]
|
||||||
impl ToApub for PrivateMessage {
|
impl ToApub for PrivateMessage {
|
||||||
|
@ -5,6 +5,7 @@ use crate::{
|
|||||||
post::PostResponse,
|
post::PostResponse,
|
||||||
},
|
},
|
||||||
apub::{
|
apub::{
|
||||||
|
community::do_announce,
|
||||||
extensions::signatures::verify,
|
extensions::signatures::verify,
|
||||||
fetcher::{
|
fetcher::{
|
||||||
get_or_fetch_and_insert_remote_comment,
|
get_or_fetch_and_insert_remote_comment,
|
||||||
@ -12,25 +13,13 @@ use crate::{
|
|||||||
get_or_fetch_and_upsert_remote_community,
|
get_or_fetch_and_upsert_remote_community,
|
||||||
get_or_fetch_and_upsert_remote_user,
|
get_or_fetch_and_upsert_remote_user,
|
||||||
},
|
},
|
||||||
|
insert_activity,
|
||||||
FromApub,
|
FromApub,
|
||||||
GroupExt,
|
GroupExt,
|
||||||
PageExt,
|
PageExt,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
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},
|
routes::{ChatServerParam, DbPoolParam},
|
||||||
scrape_text_for_mentions,
|
|
||||||
websocket::{
|
websocket::{
|
||||||
server::{SendComment, SendCommunityRoomMessage, SendPost},
|
server::{SendComment, SendCommunityRoomMessage, SendPost},
|
||||||
UserOperation,
|
UserOperation,
|
||||||
@ -46,6 +35,18 @@ use activitystreams::{
|
|||||||
BaseBox,
|
BaseBox,
|
||||||
};
|
};
|
||||||
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
|
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
|
||||||
|
use lemmy_db::{
|
||||||
|
comment::{Comment, CommentForm, CommentLike, CommentLikeForm},
|
||||||
|
comment_view::CommentView,
|
||||||
|
community::{Community, CommunityForm},
|
||||||
|
community_view::CommunityView,
|
||||||
|
naive_now,
|
||||||
|
post::{Post, PostForm, PostLike, PostLikeForm},
|
||||||
|
post_view::PostView,
|
||||||
|
Crud,
|
||||||
|
Likeable,
|
||||||
|
};
|
||||||
|
use lemmy_utils::scrape_text_for_mentions;
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
@ -234,7 +235,7 @@ where
|
|||||||
if community.local {
|
if community.local {
|
||||||
let sending_user = get_or_fetch_and_upsert_remote_user(sender, client, pool).await?;
|
let sending_user = get_or_fetch_and_upsert_remote_user(sender, client, pool).await?;
|
||||||
|
|
||||||
Community::do_announce(activity, &community, &sending_user, client, pool).await
|
do_announce(activity, &community, &sending_user, client, pool).await
|
||||||
} else {
|
} else {
|
||||||
Ok(HttpResponse::NotFound().finish())
|
Ok(HttpResponse::NotFound().finish())
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,15 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
apub::{activities::send_activity, create_apub_response, ActorType, FromApub, PersonExt, ToApub},
|
api::claims::Claims,
|
||||||
blocking,
|
apub::{
|
||||||
convert_datetime,
|
activities::send_activity,
|
||||||
db::{
|
create_apub_response,
|
||||||
activity::insert_activity,
|
insert_activity,
|
||||||
user::{UserForm, User_},
|
ActorType,
|
||||||
|
FromApub,
|
||||||
|
PersonExt,
|
||||||
|
ToApub,
|
||||||
},
|
},
|
||||||
naive_now,
|
blocking,
|
||||||
routes::DbPoolParam,
|
routes::DbPoolParam,
|
||||||
DbPool,
|
DbPool,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
@ -22,6 +25,11 @@ use activitystreams_new::{
|
|||||||
};
|
};
|
||||||
use actix_web::{body::Body, client::Client, web, HttpResponse};
|
use actix_web::{body::Body, client::Client, web, HttpResponse};
|
||||||
use failure::_core::str::FromStr;
|
use failure::_core::str::FromStr;
|
||||||
|
use lemmy_db::{
|
||||||
|
naive_now,
|
||||||
|
user::{UserForm, User_},
|
||||||
|
};
|
||||||
|
use lemmy_utils::convert_datetime;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@ -240,7 +248,7 @@ pub async fn get_apub_user_http(
|
|||||||
) -> Result<HttpResponse<Body>, LemmyError> {
|
) -> Result<HttpResponse<Body>, LemmyError> {
|
||||||
let user_name = info.into_inner().user_name;
|
let user_name = info.into_inner().user_name;
|
||||||
let user = blocking(&db, move |conn| {
|
let user = blocking(&db, move |conn| {
|
||||||
User_::find_by_email_or_username(conn, &user_name)
|
Claims::find_by_email_or_username(conn, &user_name)
|
||||||
})
|
})
|
||||||
.await??;
|
.await??;
|
||||||
let u = user.to_apub(&db).await?;
|
let u = user.to_apub(&db).await?;
|
||||||
|
@ -3,19 +3,10 @@ use crate::{
|
|||||||
apub::{
|
apub::{
|
||||||
extensions::signatures::verify,
|
extensions::signatures::verify,
|
||||||
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
fetcher::{get_or_fetch_and_upsert_remote_community, get_or_fetch_and_upsert_remote_user},
|
||||||
|
insert_activity,
|
||||||
FromApub,
|
FromApub,
|
||||||
},
|
},
|
||||||
blocking,
|
blocking,
|
||||||
db::{
|
|
||||||
activity::insert_activity,
|
|
||||||
community::{CommunityFollower, CommunityFollowerForm},
|
|
||||||
private_message::{PrivateMessage, PrivateMessageForm},
|
|
||||||
private_message_view::PrivateMessageView,
|
|
||||||
user::User_,
|
|
||||||
Crud,
|
|
||||||
Followable,
|
|
||||||
},
|
|
||||||
naive_now,
|
|
||||||
routes::{ChatServerParam, DbPoolParam},
|
routes::{ChatServerParam, DbPoolParam},
|
||||||
websocket::{server::SendUserRoomMessage, UserOperation},
|
websocket::{server::SendUserRoomMessage, UserOperation},
|
||||||
DbPool,
|
DbPool,
|
||||||
@ -26,6 +17,15 @@ use activitystreams::{
|
|||||||
object::Note,
|
object::Note,
|
||||||
};
|
};
|
||||||
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
|
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
|
||||||
|
use lemmy_db::{
|
||||||
|
community::{CommunityFollower, CommunityFollowerForm},
|
||||||
|
naive_now,
|
||||||
|
private_message::{PrivateMessage, PrivateMessageForm},
|
||||||
|
private_message_view::PrivateMessageView,
|
||||||
|
user::User_,
|
||||||
|
Crud,
|
||||||
|
Followable,
|
||||||
|
};
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
|
@ -1,18 +1,16 @@
|
|||||||
// This is for db migrations that require code
|
// This is for db migrations that require code
|
||||||
use super::{
|
use crate::LemmyError;
|
||||||
|
use diesel::*;
|
||||||
|
use lemmy_db::{
|
||||||
comment::Comment,
|
comment::Comment,
|
||||||
community::{Community, CommunityForm},
|
community::{Community, CommunityForm},
|
||||||
|
naive_now,
|
||||||
post::Post,
|
post::Post,
|
||||||
private_message::PrivateMessage,
|
private_message::PrivateMessage,
|
||||||
user::{UserForm, User_},
|
user::{UserForm, User_},
|
||||||
|
Crud,
|
||||||
};
|
};
|
||||||
use crate::{
|
use lemmy_utils::{generate_actor_keypair, make_apub_endpoint, EndpointType};
|
||||||
apub::{extensions::signatures::generate_actor_keypair, make_apub_endpoint, EndpointType},
|
|
||||||
db::Crud,
|
|
||||||
naive_now,
|
|
||||||
LemmyError,
|
|
||||||
};
|
|
||||||
use diesel::*;
|
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
pub fn run_advanced_migrations(conn: &PgConnection) -> Result<(), LemmyError> {
|
pub fn run_advanced_migrations(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||||
@ -26,7 +24,7 @@ pub fn run_advanced_migrations(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn user_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
|
fn user_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||||
use crate::schema::user_::dsl::*;
|
use lemmy_db::schema::user_::dsl::*;
|
||||||
|
|
||||||
info!("Running user_updates_2020_04_02");
|
info!("Running user_updates_2020_04_02");
|
||||||
|
|
||||||
@ -77,7 +75,7 @@ fn user_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn community_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
|
fn community_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||||
use crate::schema::community::dsl::*;
|
use lemmy_db::schema::community::dsl::*;
|
||||||
|
|
||||||
info!("Running community_updates_2020_04_02");
|
info!("Running community_updates_2020_04_02");
|
||||||
|
|
||||||
@ -121,7 +119,7 @@ fn community_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn post_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
fn post_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||||
use crate::schema::post::dsl::*;
|
use lemmy_db::schema::post::dsl::*;
|
||||||
|
|
||||||
info!("Running post_updates_2020_04_03");
|
info!("Running post_updates_2020_04_03");
|
||||||
|
|
||||||
@ -134,7 +132,8 @@ fn post_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
sql_query("alter table post disable trigger refresh_post").execute(conn)?;
|
sql_query("alter table post disable trigger refresh_post").execute(conn)?;
|
||||||
|
|
||||||
for cpost in &incorrect_posts {
|
for cpost in &incorrect_posts {
|
||||||
Post::update_ap_id(&conn, cpost.id)?;
|
let apub_id = make_apub_endpoint(EndpointType::Post, &cpost.id.to_string()).to_string();
|
||||||
|
Post::update_ap_id(&conn, cpost.id, apub_id)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("{} post rows updated.", incorrect_posts.len());
|
info!("{} post rows updated.", incorrect_posts.len());
|
||||||
@ -145,7 +144,7 @@ fn post_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn comment_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
fn comment_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||||
use crate::schema::comment::dsl::*;
|
use lemmy_db::schema::comment::dsl::*;
|
||||||
|
|
||||||
info!("Running comment_updates_2020_04_03");
|
info!("Running comment_updates_2020_04_03");
|
||||||
|
|
||||||
@ -158,7 +157,8 @@ fn comment_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
sql_query("alter table comment disable trigger refresh_comment").execute(conn)?;
|
sql_query("alter table comment disable trigger refresh_comment").execute(conn)?;
|
||||||
|
|
||||||
for ccomment in &incorrect_comments {
|
for ccomment in &incorrect_comments {
|
||||||
Comment::update_ap_id(&conn, ccomment.id)?;
|
let apub_id = make_apub_endpoint(EndpointType::Comment, &ccomment.id.to_string()).to_string();
|
||||||
|
Comment::update_ap_id(&conn, ccomment.id, apub_id)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
sql_query("alter table comment enable trigger refresh_comment").execute(conn)?;
|
sql_query("alter table comment enable trigger refresh_comment").execute(conn)?;
|
||||||
@ -169,7 +169,7 @@ fn comment_updates_2020_04_03(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn private_message_updates_2020_05_05(conn: &PgConnection) -> Result<(), LemmyError> {
|
fn private_message_updates_2020_05_05(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||||
use crate::schema::private_message::dsl::*;
|
use lemmy_db::schema::private_message::dsl::*;
|
||||||
|
|
||||||
info!("Running private_message_updates_2020_05_05");
|
info!("Running private_message_updates_2020_05_05");
|
||||||
|
|
||||||
@ -180,7 +180,8 @@ fn private_message_updates_2020_05_05(conn: &PgConnection) -> Result<(), LemmyEr
|
|||||||
.load::<PrivateMessage>(conn)?;
|
.load::<PrivateMessage>(conn)?;
|
||||||
|
|
||||||
for cpm in &incorrect_pms {
|
for cpm in &incorrect_pms {
|
||||||
PrivateMessage::update_ap_id(&conn, cpm.id)?;
|
let apub_id = make_apub_endpoint(EndpointType::PrivateMessage, &cpm.id.to_string()).to_string();
|
||||||
|
PrivateMessage::update_ap_id(&conn, cpm.id, apub_id)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("{} private message rows updated.", incorrect_pms.len());
|
info!("{} private message rows updated.", incorrect_pms.len());
|
@ -5,76 +5,34 @@ pub extern crate strum_macros;
|
|||||||
pub extern crate lazy_static;
|
pub extern crate lazy_static;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
pub extern crate failure;
|
pub extern crate failure;
|
||||||
#[macro_use]
|
|
||||||
pub extern crate diesel;
|
|
||||||
pub extern crate actix;
|
pub extern crate actix;
|
||||||
pub extern crate actix_web;
|
pub extern crate actix_web;
|
||||||
pub extern crate bcrypt;
|
pub extern crate bcrypt;
|
||||||
pub extern crate chrono;
|
pub extern crate chrono;
|
||||||
pub extern crate comrak;
|
pub extern crate diesel;
|
||||||
pub extern crate dotenv;
|
pub extern crate dotenv;
|
||||||
pub extern crate jsonwebtoken;
|
pub extern crate jsonwebtoken;
|
||||||
pub extern crate lettre;
|
|
||||||
pub extern crate lettre_email;
|
|
||||||
extern crate log;
|
extern crate log;
|
||||||
pub extern crate openssl;
|
pub extern crate openssl;
|
||||||
pub extern crate rand;
|
|
||||||
pub extern crate regex;
|
|
||||||
pub extern crate rss;
|
pub extern crate rss;
|
||||||
pub extern crate serde;
|
pub extern crate serde;
|
||||||
pub extern crate serde_json;
|
pub extern crate serde_json;
|
||||||
pub extern crate sha2;
|
pub extern crate sha2;
|
||||||
pub extern crate strum;
|
pub extern crate strum;
|
||||||
|
|
||||||
pub async fn blocking<F, T>(pool: &DbPool, f: F) -> Result<T, LemmyError>
|
|
||||||
where
|
|
||||||
F: FnOnce(&diesel::PgConnection) -> T + Send + 'static,
|
|
||||||
T: Send + 'static,
|
|
||||||
{
|
|
||||||
let pool = pool.clone();
|
|
||||||
let res = actix_web::web::block(move || {
|
|
||||||
let conn = pool.get()?;
|
|
||||||
let res = (f)(&conn);
|
|
||||||
Ok(res) as Result<_, LemmyError>
|
|
||||||
})
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(res)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub mod api;
|
pub mod api;
|
||||||
pub mod apub;
|
pub mod apub;
|
||||||
pub mod db;
|
pub mod code_migrations;
|
||||||
pub mod rate_limit;
|
pub mod rate_limit;
|
||||||
pub mod request;
|
pub mod request;
|
||||||
pub mod routes;
|
pub mod routes;
|
||||||
pub mod schema;
|
|
||||||
pub mod settings;
|
|
||||||
pub mod version;
|
pub mod version;
|
||||||
pub mod websocket;
|
pub mod websocket;
|
||||||
|
|
||||||
use crate::{
|
use crate::request::{retry, RecvError};
|
||||||
request::{retry, RecvError},
|
|
||||||
settings::Settings,
|
|
||||||
};
|
|
||||||
use actix_web::{client::Client, dev::ConnectionInfo};
|
use actix_web::{client::Client, dev::ConnectionInfo};
|
||||||
use chrono::{DateTime, FixedOffset, Local, NaiveDateTime, Utc};
|
|
||||||
use itertools::Itertools;
|
|
||||||
use lettre::{
|
|
||||||
smtp::{
|
|
||||||
authentication::{Credentials, Mechanism},
|
|
||||||
extension::ClientId,
|
|
||||||
ConnectionReuseParameters,
|
|
||||||
},
|
|
||||||
ClientSecurity,
|
|
||||||
SmtpClient,
|
|
||||||
Transport,
|
|
||||||
};
|
|
||||||
use lettre_email::Email;
|
|
||||||
use log::error;
|
use log::error;
|
||||||
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
|
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
|
||||||
use rand::{distributions::Alphanumeric, thread_rng, Rng};
|
|
||||||
use regex::{Regex, RegexBuilder};
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
pub type DbPool = diesel::r2d2::Pool<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
|
pub type DbPool = diesel::r2d2::Pool<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
|
||||||
@ -89,14 +47,6 @@ pub struct LemmyError {
|
|||||||
inner: failure::Error,
|
inner: failure::Error,
|
||||||
}
|
}
|
||||||
|
|
||||||
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 {}
|
|
||||||
|
|
||||||
impl<T> From<T> for LemmyError
|
impl<T> From<T> for LemmyError
|
||||||
where
|
where
|
||||||
T: Into<failure::Error>,
|
T: Into<failure::Error>,
|
||||||
@ -106,113 +56,13 @@ where
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn to_datetime_utc(ndt: NaiveDateTime) -> DateTime<Utc> {
|
impl std::fmt::Display for LemmyError {
|
||||||
DateTime::<Utc>::from_utc(ndt, Utc)
|
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||||
}
|
self.inner.fmt(f)
|
||||||
|
|
||||||
pub fn naive_now() -> NaiveDateTime {
|
|
||||||
chrono::prelude::Utc::now().naive_utc()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn naive_from_unix(time: i64) -> NaiveDateTime {
|
|
||||||
NaiveDateTime::from_timestamp(time, 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn convert_datetime(datetime: NaiveDateTime) -> DateTime<FixedOffset> {
|
|
||||||
let now = Local::now();
|
|
||||||
DateTime::<FixedOffset>::from_utc(datetime, *now.offset())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_email_regex(test: &str) -> bool {
|
|
||||||
EMAIL_REGEX.is_match(test)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn is_image_content_type(client: &Client, test: &str) -> Result<(), LemmyError> {
|
|
||||||
let response = retry(|| client.get(test).send()).await?;
|
|
||||||
|
|
||||||
if response
|
|
||||||
.headers()
|
|
||||||
.get("Content-Type")
|
|
||||||
.ok_or_else(|| format_err!("No Content-Type header"))?
|
|
||||||
.to_str()?
|
|
||||||
.starts_with("image/")
|
|
||||||
{
|
|
||||||
Ok(())
|
|
||||||
} else {
|
|
||||||
Err(format_err!("Not an image type.").into())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn remove_slurs(test: &str) -> String {
|
impl actix_web::error::ResponseError for LemmyError {}
|
||||||
SLUR_REGEX.replace_all(test, "*removed*").to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn slur_check(test: &str) -> Result<(), Vec<&str>> {
|
|
||||||
let mut matches: Vec<&str> = SLUR_REGEX.find_iter(test).map(|mat| mat.as_str()).collect();
|
|
||||||
|
|
||||||
// Unique
|
|
||||||
matches.sort_unstable();
|
|
||||||
matches.dedup();
|
|
||||||
|
|
||||||
if matches.is_empty() {
|
|
||||||
Ok(())
|
|
||||||
} else {
|
|
||||||
Err(matches)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn slurs_vec_to_str(slurs: Vec<&str>) -> String {
|
|
||||||
let start = "No slurs - ";
|
|
||||||
let combined = &slurs.join(", ");
|
|
||||||
[start, combined].concat()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn generate_random_string() -> String {
|
|
||||||
thread_rng().sample_iter(&Alphanumeric).take(30).collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn send_email(
|
|
||||||
subject: &str,
|
|
||||||
to_email: &str,
|
|
||||||
to_username: &str,
|
|
||||||
html: &str,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
let email_config = Settings::get().email.ok_or("no_email_setup")?;
|
|
||||||
|
|
||||||
let email = Email::builder()
|
|
||||||
.to((to_email, to_username))
|
|
||||||
.from(email_config.smtp_from_address.to_owned())
|
|
||||||
.subject(subject)
|
|
||||||
.html(html)
|
|
||||||
.build()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let mailer = if email_config.use_tls {
|
|
||||||
SmtpClient::new_simple(&email_config.smtp_server).unwrap()
|
|
||||||
} else {
|
|
||||||
SmtpClient::new(&email_config.smtp_server, ClientSecurity::None).unwrap()
|
|
||||||
}
|
|
||||||
.hello_name(ClientId::Domain(Settings::get().hostname))
|
|
||||||
.smtp_utf8(true)
|
|
||||||
.authentication_mechanism(Mechanism::Plain)
|
|
||||||
.connection_reuse(ConnectionReuseParameters::ReuseUnlimited);
|
|
||||||
let mailer = if let (Some(login), Some(password)) =
|
|
||||||
(&email_config.smtp_login, &email_config.smtp_password)
|
|
||||||
{
|
|
||||||
mailer.credentials(Credentials::new(login.to_owned(), password.to_owned()))
|
|
||||||
} else {
|
|
||||||
mailer
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut transport = mailer.transport();
|
|
||||||
let result = transport.send(email.into());
|
|
||||||
transport.close();
|
|
||||||
|
|
||||||
match result {
|
|
||||||
Ok(_) => Ok(()),
|
|
||||||
Err(e) => Err(e.to_string()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub struct IframelyResponse {
|
pub struct IframelyResponse {
|
||||||
@ -319,8 +169,20 @@ async fn fetch_iframely_and_pictrs_data(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn markdown_to_html(text: &str) -> String {
|
pub async fn is_image_content_type(client: &Client, test: &str) -> Result<(), LemmyError> {
|
||||||
comrak::markdown_to_html(text, &comrak::ComrakOptions::default())
|
let response = retry(|| client.get(test).send()).await?;
|
||||||
|
|
||||||
|
if response
|
||||||
|
.headers()
|
||||||
|
.get("Content-Type")
|
||||||
|
.ok_or_else(|| format_err!("No Content-Type header"))?
|
||||||
|
.to_str()?
|
||||||
|
.starts_with("image/")
|
||||||
|
{
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(format_err!("Not an image type.").into())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_ip(conn_info: &ConnectionInfo) -> String {
|
pub fn get_ip(conn_info: &ConnectionInfo) -> String {
|
||||||
@ -333,127 +195,37 @@ pub fn get_ip(conn_info: &ConnectionInfo) -> String {
|
|||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO nothing is done with community / group webfingers yet, so just ignore those for now
|
pub async fn blocking<F, T>(pool: &DbPool, f: F) -> Result<T, LemmyError>
|
||||||
#[derive(Clone, PartialEq, Eq, Hash)]
|
where
|
||||||
pub struct MentionData {
|
F: FnOnce(&diesel::PgConnection) -> T + Send + 'static,
|
||||||
pub name: String,
|
T: Send + 'static,
|
||||||
pub domain: String,
|
{
|
||||||
}
|
let pool = pool.clone();
|
||||||
|
let res = actix_web::web::block(move || {
|
||||||
|
let conn = pool.get()?;
|
||||||
|
let res = (f)(&conn);
|
||||||
|
Ok(res) as Result<_, LemmyError>
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
impl MentionData {
|
Ok(res)
|
||||||
pub fn is_local(&self) -> bool {
|
|
||||||
Settings::get().hostname.eq(&self.domain)
|
|
||||||
}
|
|
||||||
pub fn full_name(&self) -> String {
|
|
||||||
format!("@{}@{}", &self.name, &self.domain)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn scrape_text_for_mentions(text: &str) -> Vec<MentionData> {
|
|
||||||
let mut out: Vec<MentionData> = Vec::new();
|
|
||||||
for caps in WEBFINGER_USER_REGEX.captures_iter(text) {
|
|
||||||
out.push(MentionData {
|
|
||||||
name: caps["name"].to_string(),
|
|
||||||
domain: caps["domain"].to_string(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
out.into_iter().unique().collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_valid_username(name: &str) -> bool {
|
|
||||||
VALID_USERNAME_REGEX.is_match(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_valid_community_name(name: &str) -> bool {
|
|
||||||
VALID_COMMUNITY_NAME_REGEX.is_match(name)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use crate::{
|
use crate::is_image_content_type;
|
||||||
is_email_regex,
|
|
||||||
is_image_content_type,
|
|
||||||
is_valid_community_name,
|
|
||||||
is_valid_username,
|
|
||||||
remove_slurs,
|
|
||||||
scrape_text_for_mentions,
|
|
||||||
slur_check,
|
|
||||||
slurs_vec_to_str,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_mentions_regex() {
|
|
||||||
let text = "Just read a great blog post by [@tedu@honk.teduangst.com](/u/test). And another by !test_community@fish.teduangst.com . Another [@lemmy@lemmy-alpha:8540](/u/fish)";
|
|
||||||
let mentions = scrape_text_for_mentions(text);
|
|
||||||
|
|
||||||
assert_eq!(mentions[0].name, "tedu".to_string());
|
|
||||||
assert_eq!(mentions[0].domain, "honk.teduangst.com".to_string());
|
|
||||||
assert_eq!(mentions[1].domain, "lemmy-alpha:8540".to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_image() {
|
fn test_image() {
|
||||||
actix_rt::System::new("tset_image").block_on(async move {
|
actix_rt::System::new("tset_image").block_on(async move {
|
||||||
let client = actix_web::client::Client::default();
|
let client = actix_web::client::Client::default();
|
||||||
assert!(is_image_content_type(&client, "https://1734811051.rsc.cdn77.org/data/images/full/365645/as-virus-kills-navajos-in-their-homes-tribal-women-provide-lifeline.jpg?w=600?w=650").await.is_ok());
|
assert!(is_image_content_type(&client, "https://1734811051.rsc.cdn77.org/data/images/full/365645/as-virus-kills-navajos-in-their-homes-tribal-women-provide-lifeline.jpg?w=600?w=650").await.is_ok());
|
||||||
assert!(is_image_content_type(&client,
|
assert!(is_image_content_type(&client,
|
||||||
"https://twitter.com/BenjaminNorton/status/1259922424272957440?s=20"
|
"https://twitter.com/BenjaminNorton/status/1259922424272957440?s=20"
|
||||||
)
|
)
|
||||||
.await.is_err()
|
.await.is_err()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_email() {
|
|
||||||
assert!(is_email_regex("gush@gmail.com"));
|
|
||||||
assert!(!is_email_regex("nada_neutho"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_valid_register_username() {
|
|
||||||
assert!(is_valid_username("Hello_98"));
|
|
||||||
assert!(is_valid_username("ten"));
|
|
||||||
assert!(!is_valid_username("Hello-98"));
|
|
||||||
assert!(!is_valid_username("a"));
|
|
||||||
assert!(!is_valid_username(""));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_valid_community_name() {
|
|
||||||
assert!(is_valid_community_name("example"));
|
|
||||||
assert!(is_valid_community_name("example_community"));
|
|
||||||
assert!(!is_valid_community_name("Example"));
|
|
||||||
assert!(!is_valid_community_name("Ex"));
|
|
||||||
assert!(!is_valid_community_name(""));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_slur_filter() {
|
|
||||||
let test =
|
|
||||||
"coons test dindu ladyboy tranny retardeds. Capitalized Niggerz. This is a bunch of other safe text.";
|
|
||||||
let slur_free = "No slurs here";
|
|
||||||
assert_eq!(
|
|
||||||
remove_slurs(&test),
|
|
||||||
"*removed* test *removed* *removed* *removed* *removed*. Capitalized *removed*. This is a bunch of other safe text."
|
|
||||||
.to_string()
|
|
||||||
);
|
|
||||||
|
|
||||||
let has_slurs_vec = vec![
|
|
||||||
"Niggerz",
|
|
||||||
"coons",
|
|
||||||
"dindu",
|
|
||||||
"ladyboy",
|
|
||||||
"retardeds",
|
|
||||||
"tranny",
|
|
||||||
];
|
|
||||||
let has_slurs_err_str = "No slurs - Niggerz, coons, dindu, ladyboy, retardeds, tranny";
|
|
||||||
|
|
||||||
assert_eq!(slur_check(test), Err(has_slurs_vec));
|
|
||||||
assert_eq!(slur_check(slur_free), Ok(()));
|
|
||||||
if let Err(slur_vec) = slur_check(test) {
|
|
||||||
assert_eq!(&slurs_vec_to_str(slur_vec), has_slurs_err_str);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// These helped with testing
|
// These helped with testing
|
||||||
@ -470,21 +242,4 @@ mod tests {
|
|||||||
// let res_other = fetch_pictshare("https://upload.wikimedia.org/wikipedia/en/2/27/The_Mandalorian_logo.jpgaoeu");
|
// let res_other = fetch_pictshare("https://upload.wikimedia.org/wikipedia/en/2/27/The_Mandalorian_logo.jpgaoeu");
|
||||||
// assert!(res_other.is_err());
|
// assert!(res_other.is_err());
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// #[test]
|
|
||||||
// fn test_send_email() {
|
|
||||||
// let result = send_email("not a subject", "test_email@gmail.com", "ur user", "<h1>HI there</h1>");
|
|
||||||
// assert!(result.is_ok());
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
lazy_static! {
|
|
||||||
static ref EMAIL_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$").unwrap();
|
|
||||||
static ref SLUR_REGEX: Regex = RegexBuilder::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|\bn(i|1)g(\b|g?(a|er)?(s|z)?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btr(a|@)nn?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").case_insensitive(true).build().unwrap();
|
|
||||||
static ref USERNAME_MATCHES_REGEX: Regex = Regex::new(r"/u/[a-zA-Z][0-9a-zA-Z_]*").unwrap();
|
|
||||||
// TODO keep this old one, it didn't work with port well tho
|
|
||||||
// static ref WEBFINGER_USER_REGEX: Regex = Regex::new(r"@(?P<name>[\w.]+)@(?P<domain>[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)").unwrap();
|
|
||||||
static ref WEBFINGER_USER_REGEX: Regex = Regex::new(r"@(?P<name>[\w.]+)@(?P<domain>[a-zA-Z0-9._:-]+)").unwrap();
|
|
||||||
static ref VALID_USERNAME_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9_]{3,20}$").unwrap();
|
|
||||||
static ref VALID_COMMUNITY_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_]{3,20}$").unwrap();
|
|
||||||
}
|
}
|
||||||
|
@ -22,22 +22,20 @@ use diesel::{
|
|||||||
r2d2::{ConnectionManager, Pool},
|
r2d2::{ConnectionManager, Pool},
|
||||||
PgConnection,
|
PgConnection,
|
||||||
};
|
};
|
||||||
|
use lemmy_db::get_database_url_from_env;
|
||||||
use lemmy_server::{
|
use lemmy_server::{
|
||||||
blocking,
|
blocking,
|
||||||
db::code_migrations::run_advanced_migrations,
|
code_migrations::run_advanced_migrations,
|
||||||
rate_limit::{rate_limiter::RateLimiter, RateLimit},
|
rate_limit::{rate_limiter::RateLimiter, RateLimit},
|
||||||
routes::{api, federation, feeds, index, nodeinfo, webfinger},
|
routes::{api, federation, feeds, index, nodeinfo, webfinger},
|
||||||
settings::Settings,
|
|
||||||
websocket::server::*,
|
websocket::server::*,
|
||||||
LemmyError,
|
LemmyError,
|
||||||
};
|
};
|
||||||
use regex::Regex;
|
use lemmy_utils::{settings::Settings, CACHE_CONTROL_REGEX};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tokio::sync::Mutex;
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
static ref CACHE_CONTROL_REGEX: Regex =
|
|
||||||
Regex::new("^((text|image)/.+|application/javascript)$").unwrap();
|
|
||||||
// static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 365 * 24 * 60 * 60);
|
// static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 365 * 24 * 60 * 60);
|
||||||
// Test out 1 hour here, this is breaking some things
|
// Test out 1 hour here, this is breaking some things
|
||||||
static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 60 * 60);
|
static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 60 * 60);
|
||||||
@ -51,11 +49,15 @@ async fn main() -> Result<(), LemmyError> {
|
|||||||
let settings = Settings::get();
|
let settings = Settings::get();
|
||||||
|
|
||||||
// Set up the r2d2 connection pool
|
// Set up the r2d2 connection pool
|
||||||
let manager = ConnectionManager::<PgConnection>::new(&settings.get_database_url());
|
let db_url = match get_database_url_from_env() {
|
||||||
|
Ok(url) => url,
|
||||||
|
Err(_) => settings.get_database_url(),
|
||||||
|
};
|
||||||
|
let manager = ConnectionManager::<PgConnection>::new(&db_url);
|
||||||
let pool = Pool::builder()
|
let pool = Pool::builder()
|
||||||
.max_size(settings.database.pool_size)
|
.max_size(settings.database.pool_size)
|
||||||
.build(manager)
|
.build(manager)
|
||||||
.unwrap_or_else(|_| panic!("Error connecting to {}", settings.get_database_url()));
|
.unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
|
||||||
|
|
||||||
// Run the migrations from code
|
// Run the migrations from code
|
||||||
blocking(&pool, move |conn| {
|
blocking(&pool, move |conn| {
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
use super::{IPAddr, Settings};
|
use super::IPAddr;
|
||||||
use crate::{get_ip, settings::RateLimitConfig, LemmyError};
|
use crate::{get_ip, LemmyError};
|
||||||
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
|
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
|
||||||
use futures::future::{ok, Ready};
|
use futures::future::{ok, Ready};
|
||||||
|
use lemmy_utils::settings::{RateLimitConfig, Settings};
|
||||||
use rate_limiter::{RateLimitType, RateLimiter};
|
use rate_limiter::{RateLimitType, RateLimiter};
|
||||||
use std::{
|
use std::{
|
||||||
future::Future,
|
future::Future,
|
||||||
|
@ -1,17 +1,15 @@
|
|||||||
use crate::{
|
use crate::apub::{
|
||||||
apub::{
|
comment::get_apub_comment,
|
||||||
comment::get_apub_comment,
|
community::*,
|
||||||
community::*,
|
community_inbox::community_inbox,
|
||||||
community_inbox::community_inbox,
|
post::get_apub_post,
|
||||||
post::get_apub_post,
|
shared_inbox::shared_inbox,
|
||||||
shared_inbox::shared_inbox,
|
user::*,
|
||||||
user::*,
|
user_inbox::user_inbox,
|
||||||
user_inbox::user_inbox,
|
APUB_JSON_CONTENT_TYPE,
|
||||||
APUB_JSON_CONTENT_TYPE,
|
|
||||||
},
|
|
||||||
settings::Settings,
|
|
||||||
};
|
};
|
||||||
use actix_web::*;
|
use actix_web::*;
|
||||||
|
use lemmy_utils::settings::Settings;
|
||||||
|
|
||||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
if Settings::get().federation.enabled {
|
if Settings::get().federation.enabled {
|
||||||
|
@ -1,26 +1,21 @@
|
|||||||
use crate::{
|
use crate::{api::claims::Claims, blocking, routes::DbPoolParam, LemmyError};
|
||||||
blocking,
|
|
||||||
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,
|
|
||||||
LemmyError,
|
|
||||||
};
|
|
||||||
use actix_web::{error::ErrorBadRequest, *};
|
use actix_web::{error::ErrorBadRequest, *};
|
||||||
use chrono::{DateTime, NaiveDateTime, Utc};
|
use chrono::{DateTime, NaiveDateTime, Utc};
|
||||||
use diesel::{
|
use diesel::{
|
||||||
r2d2::{ConnectionManager, Pool},
|
r2d2::{ConnectionManager, Pool},
|
||||||
PgConnection,
|
PgConnection,
|
||||||
};
|
};
|
||||||
|
use lemmy_db::{
|
||||||
|
comment_view::{ReplyQueryBuilder, ReplyView},
|
||||||
|
community::Community,
|
||||||
|
post_view::{PostQueryBuilder, PostView},
|
||||||
|
site_view::SiteView,
|
||||||
|
user::User_,
|
||||||
|
user_mention_view::{UserMentionQueryBuilder, UserMentionView},
|
||||||
|
ListingType,
|
||||||
|
SortType,
|
||||||
|
};
|
||||||
|
use lemmy_utils::{markdown_to_html, settings::Settings};
|
||||||
use rss::{CategoryBuilder, ChannelBuilder, GuidBuilder, Item, ItemBuilder};
|
use rss::{CategoryBuilder, ChannelBuilder, GuidBuilder, Item, ItemBuilder};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
@ -131,7 +126,7 @@ fn get_feed_user(
|
|||||||
) -> Result<ChannelBuilder, LemmyError> {
|
) -> Result<ChannelBuilder, LemmyError> {
|
||||||
let site_view = SiteView::read(&conn)?;
|
let site_view = SiteView::read(&conn)?;
|
||||||
let user = User_::find_by_username(&conn, &user_name)?;
|
let user = User_::find_by_username(&conn, &user_name)?;
|
||||||
let user_url = user.get_profile_url();
|
let user_url = user.get_profile_url(&Settings::get().hostname);
|
||||||
|
|
||||||
let posts = PostQueryBuilder::create(&conn)
|
let posts = PostQueryBuilder::create(&conn)
|
||||||
.listing_type(ListingType::All)
|
.listing_type(ListingType::All)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use crate::settings::Settings;
|
|
||||||
use actix_files::NamedFile;
|
use actix_files::NamedFile;
|
||||||
use actix_web::*;
|
use actix_web::*;
|
||||||
|
use lemmy_utils::settings::Settings;
|
||||||
|
|
||||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
cfg
|
cfg
|
||||||
|
@ -1,13 +1,7 @@
|
|||||||
use crate::{
|
use crate::{blocking, routes::DbPoolParam, version, LemmyError};
|
||||||
apub::get_apub_protocol_string,
|
|
||||||
blocking,
|
|
||||||
db::site_view::SiteView,
|
|
||||||
routes::DbPoolParam,
|
|
||||||
version,
|
|
||||||
LemmyError,
|
|
||||||
Settings,
|
|
||||||
};
|
|
||||||
use actix_web::{body::Body, error::ErrorBadRequest, *};
|
use actix_web::{body::Body, error::ErrorBadRequest, *};
|
||||||
|
use lemmy_db::site_view::SiteView;
|
||||||
|
use lemmy_utils::{get_apub_protocol_string, settings::Settings};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
use crate::{
|
use crate::{blocking, routes::DbPoolParam, LemmyError};
|
||||||
blocking,
|
|
||||||
db::{community::Community, user::User_},
|
|
||||||
routes::DbPoolParam,
|
|
||||||
LemmyError,
|
|
||||||
Settings,
|
|
||||||
};
|
|
||||||
use actix_web::{error::ErrorBadRequest, web::Query, *};
|
use actix_web::{error::ErrorBadRequest, web::Query, *};
|
||||||
use regex::Regex;
|
use lemmy_db::{community::Community, user::User_};
|
||||||
|
use lemmy_utils::{settings::Settings, WEBFINGER_COMMUNITY_REGEX, WEBFINGER_USER_REGEX};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@ -40,19 +35,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lazy_static! {
|
|
||||||
static ref WEBFINGER_COMMUNITY_REGEX: Regex = Regex::new(&format!(
|
|
||||||
"^group:([a-z0-9_]{{3, 20}})@{}$",
|
|
||||||
Settings::get().hostname
|
|
||||||
))
|
|
||||||
.unwrap();
|
|
||||||
static ref WEBFINGER_USER_REGEX: Regex = Regex::new(&format!(
|
|
||||||
"^acct:([a-z0-9_]{{3, 20}})@{}$",
|
|
||||||
Settings::get().hostname
|
|
||||||
))
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Responds to webfinger requests of the following format. There isn't any real documentation for
|
/// Responds to webfinger requests of the following format. There isn't any real documentation for
|
||||||
/// this, but it described in this blog post:
|
/// this, but it described in this blog post:
|
||||||
/// https://mastodon.social/.well-known/webfinger?resource=acct:gargron@mastodon.social
|
/// https://mastodon.social/.well-known/webfinger?resource=acct:gargron@mastodon.social
|
||||||
|
2
ui/package.json
vendored
2
ui/package.json
vendored
@ -70,7 +70,7 @@
|
|||||||
"engineStrict": true,
|
"engineStrict": true,
|
||||||
"husky": {
|
"husky": {
|
||||||
"hooks": {
|
"hooks": {
|
||||||
"pre-commit": "cargo clippy --manifest-path ../server/Cargo.toml --all-targets --all-features -- -D warnings && lint-staged"
|
"pre-commit": "cargo clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
|
Loading…
Reference in New Issue
Block a user