mirror of
https://github.com/LemmyNet/lemmy
synced 2024-10-30 15:21:20 +00:00
parent
b2ae69f96c
commit
c7ee53026f
454
Cargo.lock
generated
454
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
21
Cargo.toml
21
Cargo.toml
@ -94,7 +94,7 @@ lemmy_routes = { version = "=0.19.0-rc.13", path = "./crates/routes" }
|
|||||||
lemmy_db_views = { version = "=0.19.0-rc.13", path = "./crates/db_views" }
|
lemmy_db_views = { version = "=0.19.0-rc.13", path = "./crates/db_views" }
|
||||||
lemmy_db_views_actor = { version = "=0.19.0-rc.13", path = "./crates/db_views_actor" }
|
lemmy_db_views_actor = { version = "=0.19.0-rc.13", path = "./crates/db_views_actor" }
|
||||||
lemmy_db_views_moderator = { version = "=0.19.0-rc.13", path = "./crates/db_views_moderator" }
|
lemmy_db_views_moderator = { version = "=0.19.0-rc.13", path = "./crates/db_views_moderator" }
|
||||||
activitypub_federation = { version = "0.5.0-beta.5", default-features = false, features = [
|
activitypub_federation = { version = "0.5.0-beta.6", default-features = false, features = [
|
||||||
"actix-web",
|
"actix-web",
|
||||||
] }
|
] }
|
||||||
diesel = "2.1.4"
|
diesel = "2.1.4"
|
||||||
@ -113,7 +113,7 @@ actix-web = { version = "4.4.0", default-features = false, features = [
|
|||||||
tracing = "0.1.40"
|
tracing = "0.1.40"
|
||||||
tracing-actix-web = { version = "0.7.9", default-features = false }
|
tracing-actix-web = { version = "0.7.9", default-features = false }
|
||||||
tracing-error = "0.2.0"
|
tracing-error = "0.2.0"
|
||||||
tracing-log = "0.1.4"
|
tracing-log = "0.2.0"
|
||||||
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
|
||||||
url = { version = "2.5.0", features = ["serde"] }
|
url = { version = "2.5.0", features = ["serde"] }
|
||||||
reqwest = { version = "0.11.22", features = ["json", "blocking", "gzip"] }
|
reqwest = { version = "0.11.22", features = ["json", "blocking", "gzip"] }
|
||||||
@ -132,16 +132,16 @@ anyhow = { version = "1.0.75", features = [
|
|||||||
"backtrace",
|
"backtrace",
|
||||||
] } # backtrace is on by default on nightly, but not stable rust
|
] } # backtrace is on by default on nightly, but not stable rust
|
||||||
diesel_ltree = "0.3.0"
|
diesel_ltree = "0.3.0"
|
||||||
typed-builder = "0.15.2"
|
typed-builder = "0.18.0"
|
||||||
serial_test = "2.0.0"
|
serial_test = "2.0.0"
|
||||||
tokio = { version = "1.34.0", features = ["full"] }
|
tokio = { version = "1.35.0", features = ["full"] }
|
||||||
regex = "1.10.2"
|
regex = "1.10.2"
|
||||||
once_cell = "1.18.0"
|
once_cell = "1.19.0"
|
||||||
diesel-derive-newtype = "2.1.0"
|
diesel-derive-newtype = "2.1.0"
|
||||||
diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
|
diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
|
||||||
strum = "0.25.0"
|
strum = "0.25.0"
|
||||||
strum_macros = "0.25.3"
|
strum_macros = "0.25.3"
|
||||||
itertools = "0.11.0"
|
itertools = "0.12.0"
|
||||||
futures = "0.3.29"
|
futures = "0.3.29"
|
||||||
http = "0.2.11"
|
http = "0.2.11"
|
||||||
percent-encoding = "2.3.1"
|
percent-encoding = "2.3.1"
|
||||||
@ -149,11 +149,12 @@ rosetta-i18n = "0.1.3"
|
|||||||
opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
|
opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
|
||||||
tracing-opentelemetry = { version = "0.19.0" }
|
tracing-opentelemetry = { version = "0.19.0" }
|
||||||
ts-rs = { version = "7.0.0", features = ["serde-compat", "chrono-impl"] }
|
ts-rs = { version = "7.0.0", features = ["serde-compat", "chrono-impl"] }
|
||||||
rustls = { version = "0.21.9", features = ["dangerous_configuration"] }
|
rustls = { version = "0.21.10", features = ["dangerous_configuration"] }
|
||||||
futures-util = "0.3.29"
|
futures-util = "0.3.29"
|
||||||
tokio-postgres = "0.7.10"
|
tokio-postgres = "0.7.10"
|
||||||
tokio-postgres-rustls = "0.10.0"
|
tokio-postgres-rustls = "0.10.0"
|
||||||
enum-map = "2.7"
|
enum-map = "2.7"
|
||||||
|
moka = { version = "0.12.1", features = ["future"] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
lemmy_api = { workspace = true }
|
lemmy_api = { workspace = true }
|
||||||
@ -183,12 +184,12 @@ tracing-opentelemetry = { workspace = true, optional = true }
|
|||||||
opentelemetry = { workspace = true, optional = true }
|
opentelemetry = { workspace = true, optional = true }
|
||||||
console-subscriber = { version = "0.1.10", optional = true }
|
console-subscriber = { version = "0.1.10", optional = true }
|
||||||
opentelemetry-otlp = { version = "0.12.0", optional = true }
|
opentelemetry-otlp = { version = "0.12.0", optional = true }
|
||||||
pict-rs = { version = "0.5.0-beta.2", optional = true }
|
pict-rs = { version = "0.5.0-rc.1", optional = true }
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
actix-cors = "0.6.4"
|
actix-cors = "0.6.5"
|
||||||
futures-util = { workspace = true }
|
futures-util = { workspace = true }
|
||||||
chrono = { workspace = true }
|
chrono = { workspace = true }
|
||||||
prometheus = { version = "0.13.3", features = ["process"] }
|
prometheus = { version = "0.13.3", features = ["process"] }
|
||||||
serial_test = { workspace = true }
|
serial_test = { workspace = true }
|
||||||
clap = { version = "4.4.10", features = ["derive"] }
|
clap = { version = "4.4.11", features = ["derive"] }
|
||||||
actix-web-prom = "0.7.0"
|
actix-web-prom = "0.7.0"
|
||||||
|
@ -40,12 +40,12 @@ async-trait = { workspace = true }
|
|||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
reqwest = { workspace = true }
|
reqwest = { workspace = true }
|
||||||
once_cell = { workspace = true }
|
once_cell = { workspace = true }
|
||||||
|
moka.workspace = true
|
||||||
|
serde_with.workspace = true
|
||||||
html2md = "0.2.14"
|
html2md = "0.2.14"
|
||||||
html2text = "0.6.0"
|
html2text = "0.6.0"
|
||||||
stringreader = "0.1.1"
|
stringreader = "0.1.1"
|
||||||
serde_with = { workspace = true }
|
|
||||||
enum_delegate = "0.2.0"
|
enum_delegate = "0.2.0"
|
||||||
moka = { version = "0.11", features = ["future"] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
serial_test = { workspace = true }
|
serial_test = { workspace = true }
|
||||||
|
@ -68,7 +68,7 @@ diesel_ltree = { workspace = true, optional = true }
|
|||||||
typed-builder = { workspace = true }
|
typed-builder = { workspace = true }
|
||||||
async-trait = { workspace = true }
|
async-trait = { workspace = true }
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
deadpool = { version = "0.9.5", features = ["rt_tokio_1"], optional = true }
|
deadpool = { version = "0.10.0", features = ["rt_tokio_1"], optional = true }
|
||||||
ts-rs = { workspace = true, optional = true }
|
ts-rs = { workspace = true, optional = true }
|
||||||
futures-util = { workspace = true }
|
futures-util = { workspace = true }
|
||||||
tokio = { workspace = true, optional = true }
|
tokio = { workspace = true, optional = true }
|
||||||
|
@ -30,5 +30,5 @@ reqwest.workspace = true
|
|||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
tokio = { workspace = true, features = ["full"] }
|
tokio = { workspace = true, features = ["full"] }
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
moka = { version = "0.11.3", features = ["future"] }
|
moka.workspace = true
|
||||||
tokio-util = "0.7.10"
|
tokio-util = "0.7.10"
|
||||||
|
@ -37,12 +37,11 @@ async fn get_webfinger_response(
|
|||||||
) -> Result<HttpResponse, LemmyError> {
|
) -> Result<HttpResponse, LemmyError> {
|
||||||
let name = extract_webfinger_name(&info.resource, &context)?;
|
let name = extract_webfinger_name(&info.resource, &context)?;
|
||||||
|
|
||||||
let name_ = name.clone();
|
let user_id: Option<Url> = Person::read_from_name(&mut context.pool(), name, false)
|
||||||
let user_id: Option<Url> = Person::read_from_name(&mut context.pool(), &name_, false)
|
|
||||||
.await
|
.await
|
||||||
.ok()
|
.ok()
|
||||||
.map(|c| c.actor_id.into());
|
.map(|c| c.actor_id.into());
|
||||||
let community_id: Option<Url> = Community::read_from_name(&mut context.pool(), &name, false)
|
let community_id: Option<Url> = Community::read_from_name(&mut context.pool(), name, false)
|
||||||
.await
|
.await
|
||||||
.ok()
|
.ok()
|
||||||
.map(|c| c.actor_id.into());
|
.map(|c| c.actor_id.into());
|
||||||
|
@ -41,12 +41,12 @@ uuid = { workspace = true, features = ["serde", "v4"] }
|
|||||||
rosetta-i18n = { workspace = true }
|
rosetta-i18n = { workspace = true }
|
||||||
percent-encoding = { workspace = true }
|
percent-encoding = { workspace = true }
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
openssl = "0.10.60"
|
openssl = "0.10.61"
|
||||||
html2text = "0.6.0"
|
html2text = "0.6.0"
|
||||||
deser-hjson = "1.2.0"
|
deser-hjson = "2.2.4"
|
||||||
smart-default = "0.7.1"
|
smart-default = "0.7.1"
|
||||||
lettre = { version = "0.10.4", features = ["tokio1", "tokio1-native-tls"] }
|
lettre = { version = "0.11.2", features = ["tokio1", "tokio1-native-tls"] }
|
||||||
markdown-it = "0.5.1"
|
markdown-it = "0.6.0"
|
||||||
ts-rs = { workspace = true, optional = true }
|
ts-rs = { workspace = true, optional = true }
|
||||||
enum-map = { workspace = true }
|
enum-map = { workspace = true }
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit b3343aef72e5a7e5df34cf328b910ed798027270
|
Subproject commit aa9438c4930deb23ae0dc54a061ed4b0b3824582
|
Loading…
Reference in New Issue
Block a user