gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into restore_content_on_unban

restore_content_on_unban
Dessalines 2024-06-18 13:36:43 -04:00
parent 3770ad9ecf fa143f72eb
commit 61cc0635e7
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Cargo.lock generated
View File

@ -2871,7 +2871,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lemmy_api"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2900,7 +2900,7 @@ dependencies = [
[[package]]
name = "lemmy_api_common"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2938,7 +2938,7 @@ dependencies = [
[[package]]
name = "lemmy_api_crud"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"accept-language",
"activitypub_federation",
@ -2961,7 +2961,7 @@ dependencies = [
[[package]]
name = "lemmy_apub"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2999,7 +2999,7 @@ dependencies = [
[[package]]
name = "lemmy_db_perf"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"anyhow",
"clap",
@ -3014,7 +3014,7 @@ dependencies = [
[[package]]
name = "lemmy_db_schema"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"anyhow",
@ -3055,7 +3055,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"actix-web",
"chrono",
@ -3077,7 +3077,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_actor"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"chrono",
"diesel",
@ -3098,7 +3098,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_moderator"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"diesel",
"diesel-async",
@ -3110,7 +3110,7 @@ dependencies = [
[[package]]
name = "lemmy_federate"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"anyhow",
@ -3135,7 +3135,7 @@ dependencies = [
[[package]]
name = "lemmy_routes"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"actix-web",
@ -3160,7 +3160,7 @@ dependencies = [
[[package]]
name = "lemmy_server"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"activitypub_federation",
"actix-cors",
@ -3203,7 +3203,7 @@ dependencies = [
[[package]]
name = "lemmy_utils"
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
dependencies = [
"actix-web",
"anyhow",

24
Cargo.toml
View File

@ -1,5 +1,5 @@
[workspace.package]
version = "0.19.5-alpha.2"
version = "0.19.5-alpha.3"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -88,17 +88,17 @@ unused_self = "deny"
unwrap_used = "deny"
[workspace.dependencies]
lemmy_api = { version = "=0.19.5-alpha.2", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.5-alpha.2", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.5-alpha.2", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.5-alpha.2", path = "./crates/utils", default-features = false }
lemmy_db_schema = { version = "=0.19.5-alpha.2", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.5-alpha.2", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.5-alpha.2", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.5-alpha.2", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.5-alpha.2", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.5-alpha.2", path = "./crates/db_views_moderator" }
lemmy_federate = { version = "=0.19.5-alpha.2", path = "./crates/federate" }
lemmy_api = { version = "=0.19.5-alpha.3", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.5-alpha.3", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.5-alpha.3", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.5-alpha.3", path = "./crates/utils", default-features = false }
lemmy_db_schema = { version = "=0.19.5-alpha.3", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.5-alpha.3", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.5-alpha.3", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.5-alpha.3", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.5-alpha.3", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.5-alpha.3", path = "./crates/db_views_moderator" }
lemmy_federate = { version = "=0.19.5-alpha.3", path = "./crates/federate" }
activitypub_federation = { version = "0.5.6", default-features = false, features = [
"actix-web",
] }

4
crates/db_schema/src/utils.rs
View File

@ -332,6 +332,10 @@ pub fn diesel_url_create(opt: Option<&str>) -> LemmyResult<Option<DbUrl>> {
fn establish_connection(config: &str) -> BoxFuture<ConnectionResult<AsyncPgConnection>> {
let fut = async {
rustls::crypto::ring::default_provider()
.install_default()
.expect("Failed to install rustls crypto provider");
let rustls_config = DangerousClientConfigBuilder {
cfg: ClientConfig::builder(),
}