mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-22 19:01:32 +00:00
Run cargo upgrade (#2176)
* Run cargo upgrade and cargo update * Fixing validation (#2179) Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
This commit is contained in:
GitHub
parent
bfae246734
commit
c7f5337099
17 changed files with 807 additions and 848 deletions
1316
Cargo.lock
generated
1316
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
40
Cargo.toml
40
Cargo.toml
|
|
@ -50,29 +50,29 @@ lemmy_routes = { version = "=0.16.2", path = "./crates/routes" }
|
|||
diesel = "1.4.8"
|
||||
diesel_migrations = "1.4.0"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
actix = "0.13.0"
|
||||
actix-web = { version = "4.0.0", default-features = false, features = ["macros", "rustls"] }
|
||||
tracing = "0.1.29"
|
||||
tracing-actix-web = { version = "0.5.0", default-features = false }
|
||||
actix-web = { version = "4.0.1", default-features = false, features = ["macros", "rustls"] }
|
||||
tracing = "0.1.32"
|
||||
tracing-actix-web = { version = "0.5.1", default-features = false }
|
||||
tracing-error = "0.2.0"
|
||||
tracing-log = "0.1.2"
|
||||
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
|
||||
console-subscriber = { version = "0.1.0", optional = true }
|
||||
strum = "0.23.0"
|
||||
tracing-subscriber = { version = "0.3.9", features = ["env-filter"] }
|
||||
console-subscriber = { version = "0.1.3", optional = true }
|
||||
strum = "0.24.0"
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
openssl = "0.10.38"
|
||||
http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] }
|
||||
tokio = { version = "1.14.0", features = ["sync", "tracing"] }
|
||||
anyhow = "1.0.51"
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
reqwest-middleware = "0.1.3"
|
||||
reqwest-tracing = { version = "0.2.0", features = ["opentelemetry_0_16"] }
|
||||
actix-rt = { version = "2.5.0", default-features = false }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["sha-2"] }
|
||||
tokio = { version = "1.17.0", features = ["sync", "tracing"] }
|
||||
anyhow = "1.0.56"
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
reqwest-middleware = "0.1.5"
|
||||
reqwest-tracing = { version = "0.2.1", features = ["opentelemetry_0_16"] }
|
||||
actix-rt = { version = "2.7.0", default-features = false }
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
clokwerk = "0.3.5"
|
||||
doku = "0.10.2"
|
||||
opentelemetry = { version = "0.16", features = ["rt-tokio"] }
|
||||
opentelemetry-otlp = "0.9"
|
||||
tracing-opentelemetry = "0.16"
|
||||
parking_lot = "0.12"
|
||||
doku = "0.11.0"
|
||||
opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
|
||||
opentelemetry-otlp = "0.10.0"
|
||||
tracing-opentelemetry = "0.17.2"
|
||||
parking_lot = "0.12.0"
|
||||
|
|
|
|||
|
|
@ -23,30 +23,30 @@ lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" }
|
|||
lemmy_api_common = { version = "=0.16.2", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.16.2", path = "../websocket" }
|
||||
diesel = "1.4.8"
|
||||
bcrypt = "0.10.1"
|
||||
bcrypt = "0.12.1"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
actix = "0.13.0"
|
||||
actix-web = { version = "4.0.0", default-features = false }
|
||||
actix-rt = { version = "2.5.0", default-features = false }
|
||||
rand = "0.8.4"
|
||||
strum = "0.23.0"
|
||||
strum_macros = "0.23.1"
|
||||
actix-web = { version = "4.0.1", default-features = false }
|
||||
actix-rt = { version = "2.7.0", default-features = false }
|
||||
rand = "0.8.5"
|
||||
strum = "0.24.0"
|
||||
strum_macros = "0.24.0"
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
openssl = "0.10.38"
|
||||
http = "0.2.5"
|
||||
http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] }
|
||||
http = "0.2.6"
|
||||
http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["sha-2"] }
|
||||
base64 = "0.13.0"
|
||||
tokio = "1.14.0"
|
||||
futures = "0.3.17"
|
||||
tokio = "1.17.0"
|
||||
futures = "0.3.21"
|
||||
itertools = "0.10.3"
|
||||
uuid = { version = "0.8.2", features = ["serde", "v4"] }
|
||||
sha2 = "0.10.0"
|
||||
async-trait = "0.1.52"
|
||||
sha2 = "0.10.2"
|
||||
async-trait = "0.1.53"
|
||||
captcha = "0.0.8"
|
||||
anyhow = "1.0.51"
|
||||
anyhow = "1.0.56"
|
||||
thiserror = "1.0.30"
|
||||
tracing = "0.1.29"
|
||||
background-jobs = "0.11.0"
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
tracing = "0.1.32"
|
||||
background-jobs = "0.12.0"
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@ lemmy_db_views_moderator = { version = "=0.16.2", path = "../db_views_moderator"
|
|||
lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" }
|
||||
lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" }
|
||||
lemmy_utils = { version = "=0.16.2", path = "../utils" }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
diesel = "1.4.8"
|
||||
actix-web = { version = "4.0.0", default-features = false, features = ["cookies"] }
|
||||
actix-web = { version = "4.0.1", default-features = false, features = ["cookies"] }
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
tracing = "0.1.29"
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
tracing = "0.1.32"
|
||||
url = "2.2.2"
|
||||
itertools = "0.10.3"
|
||||
rosetta-i18n = "0.1"
|
||||
rosetta-i18n = "0.1.2"
|
||||
|
|
|
|||
|
|
@ -18,30 +18,30 @@ lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" }
|
|||
lemmy_api_common = { version = "=0.16.2", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.16.2", path = "../websocket" }
|
||||
diesel = "1.4.8"
|
||||
bcrypt = "0.10.1"
|
||||
bcrypt = "0.12.1"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
actix = "0.13.0"
|
||||
actix-web = { version = "4.0.0", default-features = false }
|
||||
actix-rt = { version = "2.5.0", default-features = false }
|
||||
tracing = "0.1.29"
|
||||
rand = "0.8.4"
|
||||
strum = "0.23.0"
|
||||
strum_macros = "0.23.1"
|
||||
actix-web = { version = "4.0.1", default-features = false }
|
||||
actix-rt = { version = "2.7.0", default-features = false }
|
||||
tracing = "0.1.32"
|
||||
rand = "0.8.5"
|
||||
strum = "0.24.0"
|
||||
strum_macros = "0.24.0"
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
openssl = "0.10.38"
|
||||
http = "0.2.5"
|
||||
http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] }
|
||||
http = "0.2.6"
|
||||
http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["sha-2"] }
|
||||
base64 = "0.13.0"
|
||||
tokio = "1.14.0"
|
||||
futures = "0.3.17"
|
||||
tokio = "1.17.0"
|
||||
futures = "0.3.21"
|
||||
itertools = "0.10.3"
|
||||
uuid = { version = "0.8.2", features = ["serde", "v4"] }
|
||||
sha2 = "0.10.0"
|
||||
async-trait = "0.1.52"
|
||||
anyhow = "1.0.51"
|
||||
sha2 = "0.10.2"
|
||||
async-trait = "0.1.53"
|
||||
anyhow = "1.0.56"
|
||||
thiserror = "1.0.30"
|
||||
background-jobs = "0.11.0"
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
background-jobs = "0.12.0"
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
webmention = "0.4.0"
|
||||
|
|
|
|||
|
|
@ -22,37 +22,37 @@ lemmy_api_common = { version = "=0.16.2", path = "../api_common" }
|
|||
lemmy_websocket = { version = "=0.16.2", path = "../websocket" }
|
||||
diesel = "1.4.8"
|
||||
activitystreams-kinds = "0.2.1"
|
||||
bcrypt = "0.10.1"
|
||||
bcrypt = "0.12.1"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde_with = "1.11.0"
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
serde_with = "1.12.0"
|
||||
actix = "0.13.0"
|
||||
actix-web = { version = "4.0.0", default-features = false }
|
||||
actix-rt = { version = "2.5.0", default-features = false }
|
||||
tracing = "0.1.29"
|
||||
rand = "0.8.4"
|
||||
strum = "0.23.0"
|
||||
strum_macros = "0.23.1"
|
||||
actix-web = { version = "4.0.1", default-features = false }
|
||||
actix-rt = { version = "2.7.0", default-features = false }
|
||||
tracing = "0.1.32"
|
||||
rand = "0.8.5"
|
||||
strum = "0.24.0"
|
||||
strum_macros = "0.24.0"
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
percent-encoding = "2.1.0"
|
||||
http = "0.2.5"
|
||||
http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["server", "sha-2"] }
|
||||
tokio = "1.14.0"
|
||||
futures = "0.3.17"
|
||||
http = "0.2.6"
|
||||
http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["server", "sha-2"] }
|
||||
tokio = "1.17.0"
|
||||
futures = "0.3.21"
|
||||
itertools = "0.10.3"
|
||||
uuid = { version = "0.8.2", features = ["serde", "v4"] }
|
||||
sha2 = "0.10.0"
|
||||
async-trait = "0.1.52"
|
||||
anyhow = "1.0.51"
|
||||
sha2 = "0.10.2"
|
||||
async-trait = "0.1.53"
|
||||
anyhow = "1.0.56"
|
||||
thiserror = "1.0.30"
|
||||
background-jobs = "0.11.0"
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
background-jobs = "0.12.0"
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
html2md = "0.2.13"
|
||||
once_cell = "1.8.0"
|
||||
parking_lot = "0.12"
|
||||
once_cell = "1.10.0"
|
||||
parking_lot = "0.12.0"
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "0.5.1"
|
||||
serial_test = "0.6.0"
|
||||
assert-json-diff = "2.0.1"
|
||||
reqwest-middleware = "0.1.3"
|
||||
reqwest-middleware = "0.1.5"
|
||||
|
|
|
|||
|
|
@ -11,21 +11,21 @@ documentation = "https://join-lemmy.org/docs/en/index.html"
|
|||
lemmy_utils = { version = "=0.16.2", path = "../utils" }
|
||||
lemmy_apub_lib_derive = { version = "=0.16.2", path = "../apub_lib_derive" }
|
||||
chrono = "0.4.19"
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
async-trait = "0.1.52"
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
async-trait = "0.1.53"
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
anyhow = "1.0.51"
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
reqwest-middleware = "0.1.3"
|
||||
tracing = "0.1.29"
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
anyhow = "1.0.56"
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
reqwest-middleware = "0.1.5"
|
||||
tracing = "0.1.32"
|
||||
base64 = "0.13.0"
|
||||
openssl = "0.10.38"
|
||||
once_cell = "1.8.0"
|
||||
http = "0.2.5"
|
||||
sha2 = "0.10.0"
|
||||
actix-web = { version = "4.0.0", default-features = false }
|
||||
http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["server", "sha-2"] }
|
||||
http-signature-normalization-reqwest = { version = "0.4.0", default-features = false, features = ["sha-2", "middleware"] }
|
||||
background-jobs = "0.11.0"
|
||||
once_cell = "1.10.0"
|
||||
http = "0.2.6"
|
||||
sha2 = "0.10.2"
|
||||
actix-web = { version = "4.0.1", default-features = false }
|
||||
http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["server", "sha-2"] }
|
||||
http-signature-normalization-reqwest = { version = "0.5.0", default-features = false, features = ["sha-2", "middleware"] }
|
||||
background-jobs = "0.12.0"
|
||||
diesel = "1.4.8"
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ documentation = "https://join-lemmy.org/docs/en/index.html"
|
|||
proc-macro = true
|
||||
|
||||
[dev-dependencies]
|
||||
trybuild = { version = "1.0.53", features = ["diff"] }
|
||||
trybuild = { version = "1.0.57", features = ["diff"] }
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "1.0.33"
|
||||
syn = "1.0.82"
|
||||
quote = "1.0.10"
|
||||
proc-macro2 = "1.0.36"
|
||||
syn = "1.0.90"
|
||||
quote = "1.0.17"
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@ lemmy_apub_lib = { version = "=0.16.2", path = "../apub_lib" }
|
|||
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
diesel_migrations = "1.4.0"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
diesel-derive-newtype = "0.1.2"
|
||||
regex = "1.5.4"
|
||||
once_cell = "1.8.0"
|
||||
strum = "0.23.0"
|
||||
strum_macros = "0.23.1"
|
||||
sha2 = "0.10.0"
|
||||
bcrypt = "0.10.1"
|
||||
regex = "1.5.5"
|
||||
once_cell = "1.10.0"
|
||||
strum = "0.24.0"
|
||||
strum_macros = "0.24.0"
|
||||
sha2 = "0.10.2"
|
||||
bcrypt = "0.12.1"
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "0.5.1"
|
||||
serial_test = "0.6.0"
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ doctest = false
|
|||
[dependencies]
|
||||
lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" }
|
||||
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
tracing = "0.1.29"
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
tracing = "0.1.32"
|
||||
url = "2.2.2"
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "0.5.1"
|
||||
serial_test = "0.6.0"
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ doctest = false
|
|||
[dependencies]
|
||||
lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" }
|
||||
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ doctest = false
|
|||
[dependencies]
|
||||
lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" }
|
||||
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
|
|
|
|||
|
|
@ -20,18 +20,18 @@ lemmy_api_common = { version = "=0.16.2", path = "../api_common" }
|
|||
lemmy_apub = { version = "=0.16.2", path = "../apub" }
|
||||
diesel = "1.4.8"
|
||||
actix = "0.13.0"
|
||||
actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] }
|
||||
actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] }
|
||||
actix-web-actors = { version = "4.1.0", default-features = false }
|
||||
sha2 = "0.10.0"
|
||||
anyhow = "1.0.51"
|
||||
sha2 = "0.10.2"
|
||||
anyhow = "1.0.56"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
futures = "0.3.17"
|
||||
reqwest = { version = "0.11.7", features = ["stream"] }
|
||||
reqwest-middleware = "0.1.3"
|
||||
futures = "0.3.21"
|
||||
reqwest = { version = "0.11.10", features = ["stream"] }
|
||||
reqwest-middleware = "0.1.5"
|
||||
rss = "2.0.0"
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
strum = "0.23.0"
|
||||
once_cell = "1.8.0"
|
||||
tracing = "0.1.29"
|
||||
tokio = { version = "1.14.0", features = ["sync"] }
|
||||
strum = "0.24.0"
|
||||
once_cell = "1.10.0"
|
||||
tracing = "0.1.32"
|
||||
tokio = { version = "1.17.0", features = ["sync"] }
|
||||
|
|
|
|||
|
|
@ -13,42 +13,42 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
regex = "1.5.4"
|
||||
regex = "1.5.5"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
lettre = "0.10.0-rc.4"
|
||||
tracing = "0.1.29"
|
||||
tracing = "0.1.32"
|
||||
tracing-error = "0.2.0"
|
||||
itertools = "0.10.3"
|
||||
rand = "0.8.4"
|
||||
rand = "0.8.5"
|
||||
percent-encoding = "2.1.0"
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
thiserror = "1.0.30"
|
||||
comrak = { version = "0.12.1", default-features = false }
|
||||
once_cell = "1.8.0"
|
||||
once_cell = "1.10.0"
|
||||
openssl = "0.10.38"
|
||||
url = { version = "2.2.2", features = ["serde"] }
|
||||
actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] }
|
||||
actix-rt = { version = "2.5.0", default-features = false }
|
||||
anyhow = "1.0.51"
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
reqwest-middleware = "0.1.3"
|
||||
tokio = { version = "1.14.0", features = ["sync"] }
|
||||
strum = "0.23.0"
|
||||
strum_macros = "0.23.1"
|
||||
futures = "0.3.17"
|
||||
actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] }
|
||||
actix-rt = { version = "2.7.0", default-features = false }
|
||||
anyhow = "1.0.56"
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
reqwest-middleware = "0.1.5"
|
||||
tokio = { version = "1.17.0", features = ["sync"] }
|
||||
strum = "0.24.0"
|
||||
strum_macros = "0.24.0"
|
||||
futures = "0.3.21"
|
||||
diesel = "1.4.8"
|
||||
http = "0.2.5"
|
||||
http = "0.2.6"
|
||||
deser-hjson = "1.0.2"
|
||||
smart-default = "0.6.0"
|
||||
webpage = { version = "1.4.0", default-features = false, features = ["serde"] }
|
||||
jsonwebtoken = "7.2.0"
|
||||
doku = "0.10.2"
|
||||
jsonwebtoken = "8.0.1"
|
||||
doku = "0.11.0"
|
||||
uuid = { version = "0.8.2", features = ["serde", "v4"] }
|
||||
encoding = "0.2.33"
|
||||
html2text = "0.2.1"
|
||||
rosetta-i18n = "0.1"
|
||||
parking_lot = "0.12"
|
||||
html2text = "0.3.1"
|
||||
rosetta-i18n = "0.1.2"
|
||||
parking_lot = "0.12.0"
|
||||
|
||||
[build-dependencies]
|
||||
rosetta-build = "0.1"
|
||||
rosetta-build = "0.1.2"
|
||||
|
|
|
|||
|
|
@ -16,12 +16,11 @@ pub struct Claims {
|
|||
|
||||
impl Claims {
|
||||
pub fn decode(jwt: &str, jwt_secret: &str) -> Result<TokenData<Claims>, LemmyError> {
|
||||
let v = Validation {
|
||||
validate_exp: false,
|
||||
..Validation::default()
|
||||
};
|
||||
let mut validation = Validation::default();
|
||||
validation.validate_exp = false;
|
||||
validation.required_spec_claims.remove("exp");
|
||||
let key = DecodingKey::from_secret(jwt_secret.as_ref());
|
||||
Ok(decode::<Claims>(jwt, &key, &v)?)
|
||||
Ok(decode::<Claims>(jwt, &key, &validation)?)
|
||||
}
|
||||
|
||||
pub fn jwt(local_user_id: i32, jwt_secret: &str, hostname: &str) -> Result<Jwt, LemmyError> {
|
||||
|
|
|
|||
|
|
@ -18,22 +18,22 @@ lemmy_api_common = { version = "=0.16.2", path = "../api_common" }
|
|||
lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.16.2", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" }
|
||||
reqwest = { version = "0.11.7", features = ["json"] }
|
||||
reqwest-middleware = "0.1.3"
|
||||
tracing = "0.1.29"
|
||||
rand = "0.8.4"
|
||||
serde = { version = "1.0.131", features = ["derive"] }
|
||||
serde_json = { version = "1.0.72", features = ["preserve_order"] }
|
||||
reqwest = { version = "0.11.10", features = ["json"] }
|
||||
reqwest-middleware = "0.1.5"
|
||||
tracing = "0.1.32"
|
||||
rand = "0.8.5"
|
||||
serde = { version = "1.0.136", features = ["derive"] }
|
||||
serde_json = { version = "1.0.79", features = ["preserve_order"] }
|
||||
actix = "0.13.0"
|
||||
anyhow = "1.0.51"
|
||||
anyhow = "1.0.56"
|
||||
diesel = "1.4.8"
|
||||
background-jobs = "0.11.0"
|
||||
tokio = "1.14.0"
|
||||
strum = "0.23.0"
|
||||
strum_macros = "0.23.1"
|
||||
background-jobs = "0.12.0"
|
||||
tokio = "1.17.0"
|
||||
strum = "0.24.0"
|
||||
strum_macros = "0.24.0"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] }
|
||||
actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] }
|
||||
actix-web-actors = { version = "4.1.0", default-features = false }
|
||||
opentelemetry = "0.16"
|
||||
tracing-opentelemetry = "0.16"
|
||||
parking_lot = "0.12"
|
||||
opentelemetry = "0.17.0"
|
||||
tracing-opentelemetry = "0.17.2"
|
||||
parking_lot = "0.12.0"
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ fn root_span() -> tracing::Span {
|
|||
trace_id = tracing::field::Empty,
|
||||
);
|
||||
{
|
||||
let trace_id = span.context().span().span_context().trace_id().to_hex();
|
||||
let trace_id = span.context().span().span_context().trace_id().to_string();
|
||||
span.record("trace_id", &tracing::field::display(trace_id));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue