fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-30 01:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2111 from robjtede/aw4

Browse source 
Update `actix-*` dependencies to stable v4.
This commit is contained in:
Nutomic 2022-03-02 20:59:51 +00:00 committed by GitHub
parent 1b5037e92d e3153df74d
commit 0d957a2a27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 190 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
Cargo.lock generated
View file

@ -14,9 +14,9 @@ dependencies = [
[[package]] [[package]]
name = "actix" name = "actix"
version = "0.12.0" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3720d0064a0ce5c0de7bd93bdb0a6caebab2a9b5668746145d7b3b0c5da02914" checksum = "f728064aca1c318585bf4bb04ffcfac9e75e508ab4e8b1bd9ba5dfe04e2cbed5"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix_derive", "actix_derive",
@ -29,11 +29,11 @@ dependencies = [
"futures-util", "futures-util",
"log", "log",
"once_cell", "once_cell",
"parking_lot", "parking_lot 0.12.0",
"pin-project-lite", "pin-project-lite",
"smallvec", "smallvec",
"tokio", "tokio",
"tokio-util", "tokio-util 0.7.0",
] ]
[[package]] [[package]]
@ -50,16 +50,33 @@ dependencies = [
"memchr", "memchr",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
"tokio-util", "tokio-util 0.6.9",
]
[[package]]
name = "actix-codec"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe"
dependencies = [
"bitflags",
"bytes",
"futures-core",
"futures-sink",
"log",
"memchr",
"pin-project-lite",
"tokio",
"tokio-util 0.7.0",
] ]
[[package]] [[package]]
name = "actix-http" name = "actix-http"
version = "3.0.0-beta.17" version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dac76407e2be239b5e544c9d83bdac4a0d68ae188031ac0424aa3e4868a669be" checksum = "0f3fdd63b9cfeaf92eeeece719dabbddddb420a57d3fd171ce1490ecfb7086b1"
dependencies = [ dependencies = [
"actix-codec", "actix-codec 0.5.0",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-tls", "actix-tls",
@ -100,9 +117,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-router" name = "actix-router"
version = "0.5.0-beta.3" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddd9f117b910fbcce6e9f45092ffd4ff017785a346d09e2d4fd049f4e20384f4" checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80"
dependencies = [ dependencies = [
"bytestring", "bytestring",
"firestorm", "firestorm",
@ -114,9 +131,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-rt" name = "actix-rt"
version = "2.5.0" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05c2f80ce8d0c990941c7a7a931f69fd0701b76d521f8d36298edf59cd3fbf1f" checksum = "cdf3f2183be1241ed4dd22611850b85d38de0b08a09f1f7bcccbd0809084b359"
dependencies = [ dependencies = [
"actix-macros", "actix-macros",
"futures-core", "futures-core",
@ -125,9 +142,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-server" name = "actix-server"
version = "2.0.0-rc.2" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29b7894a5b47aa84e15fbe8d89ee953568296a3739c5f6e6b5858802a561390c" checksum = "d9e7472ac180abb0a8e592b653744345983a7a14f44691c8394a799d0df4dbbf"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix-service", "actix-service",
@ -158,7 +175,7 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5ef5760747cdfb108a1f35e6911a7a40939da893f95e035f9eee0c18b4b4025" checksum = "b5ef5760747cdfb108a1f35e6911a7a40939da893f95e035f9eee0c18b4b4025"
dependencies = [ dependencies = [
"actix-codec", "actix-codec 0.4.1",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-utils", "actix-utils",
@ -167,7 +184,7 @@ dependencies = [
"log", "log",
"pin-project-lite", "pin-project-lite",
"tokio-rustls", "tokio-rustls",
"tokio-util", "tokio-util 0.6.9",
"webpki-roots", "webpki-roots",
] ]
@ -183,11 +200,11 @@ dependencies = [
[[package]] [[package]]
name = "actix-web" name = "actix-web"
version = "4.0.0-beta.18" version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a542a92e385844d988b34f1af289dbb0ca927c23740076a56fdf770b1af69fbc" checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31"
dependencies = [ dependencies = [
"actix-codec", "actix-codec 0.5.0",
"actix-http", "actix-http",
"actix-macros", "actix-macros",
"actix-router", "actix-router",
@ -199,6 +216,7 @@ dependencies = [
"actix-web-codegen", "actix-web-codegen",
"ahash", "ahash",
"bytes", "bytes",
"bytestring",
"cfg-if", "cfg-if",
"cookie", "cookie",
"derive_more", "derive_more",
@ -223,12 +241,12 @@ dependencies = [
[[package]] [[package]]
name = "actix-web-actors" name = "actix-web-actors"
version = "4.0.0-beta.8" version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3852495307c5b7a314ccd414ca0cdcdd8db21c9a95001eea057d36e22d8da327" checksum = "31efe7896f3933ce03dd4710be560254272334bb321a18fd8ff62b1a557d9d19"
dependencies = [ dependencies = [
"actix", "actix",
"actix-codec", "actix-codec 0.5.0",
"actix-http", "actix-http",
"actix-web", "actix-web",
"bytes", "bytes",
@ -240,9 +258,9 @@ dependencies = [
[[package]] [[package]]
name = "actix-web-codegen" name = "actix-web-codegen"
version = "0.5.0-beta.6" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30a90b7f6c2fde9a1fe3df4da758c2c3c9d620dfa3eae4da0b6925dc0a13444a" checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc"
dependencies = [ dependencies = [
"actix-router", "actix-router",
"proc-macro2 1.0.33", "proc-macro2 1.0.33",
@ -1182,9 +1200,9 @@ dependencies = [
[[package]] [[package]]
name = "firestorm" name = "firestorm"
version = "0.4.6" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31586bda1b136406162e381a3185a506cdfc1631708dd40cba2f6628d8634499" checksum = "4d3d6188b8804df28032815ea256b6955c9625c24da7525f387a7af02fbb8f01"
[[package]] [[package]]
name = "fixedbitset" name = "fixedbitset"
@ -1418,7 +1436,7 @@ dependencies = [
"indexmap", "indexmap",
"slab", "slab",
"tokio", "tokio",
"tokio-util", "tokio-util 0.6.9",
"tracing", "tracing",
] ]
@ -1551,18 +1569,26 @@ dependencies = [
] ]
[[package]] [[package]]
name = "http-signature-normalization-actix" name = "http-signature-normalization"
version = "0.5.0-beta.14" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5aa97e6c2ee1450ccb3a6d8edbb91fb8423ea6d5650bc234245b5ff7a599084" checksum = "f8f45adbef81d7ea3bd7e9bcc6734b7245dad05a14abdcc7ddc0988791d63515"
dependencies = [
"httpdate",
]
[[package]]
name = "http-signature-normalization-actix"
version = "0.6.0-beta.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c9085c2915ee253d6cfc00a67de0dab8f43b37b2da1674a0b196740c54513d3"
dependencies = [ dependencies = [
"actix-http", "actix-http",
"actix-rt", "actix-rt",
"actix-web", "actix-web",
"base64 0.13.0", "base64 0.13.0",
"chrono",
"futures-util", "futures-util",
"http-signature-normalization", "http-signature-normalization 0.6.0",
"sha2", "sha2",
"thiserror", "thiserror",
"tokio", "tokio",
@ -1581,7 +1607,7 @@ dependencies = [
"bytes", "bytes",
"chrono", "chrono",
"http", "http",
"http-signature-normalization", "http-signature-normalization 0.5.4",
"reqwest", "reqwest",
"reqwest-middleware", "reqwest-middleware",
"sha2", "sha2",
@ -2047,7 +2073,6 @@ name = "lemmy_routes"
version = "0.16.0-rc.1" version = "0.16.0-rc.1"
dependencies = [ dependencies = [
"actix", "actix",
"actix-http",
"actix-web", "actix-web",
"actix-web-actors", "actix-web-actors",
"anyhow", "anyhow",
@ -2247,9 +2272,9 @@ checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.5" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
dependencies = [ dependencies = [
"scopeguard", "scopeguard",
] ]
@ -2672,7 +2697,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [ dependencies = [
"instant", "instant",
"lock_api", "lock_api",
"parking_lot_core", "parking_lot_core 0.8.5",
]
[[package]]
name = "parking_lot"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
dependencies = [
"lock_api",
"parking_lot_core 0.9.1",
] ]
[[package]] [[package]]
@ -2689,6 +2724,19 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "parking_lot_core"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-sys",
]
[[package]] [[package]]
name = "paste" name = "paste"
version = "1.0.6" version = "1.0.6"
@ -3047,7 +3095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
dependencies = [ dependencies = [
"log", "log",
"parking_lot", "parking_lot 0.11.2",
"scheduled-thread-pool", "scheduled-thread-pool",
] ]
@ -3256,7 +3304,7 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
"tokio", "tokio",
"tokio-native-tls", "tokio-native-tls",
"tokio-util", "tokio-util 0.6.9",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
@ -3390,7 +3438,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
dependencies = [ dependencies = [
"parking_lot", "parking_lot 0.11.2",
] ]
[[package]] [[package]]
@ -3529,7 +3577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d" checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"parking_lot", "parking_lot 0.11.2",
"serial_test_derive", "serial_test_derive",
] ]
@ -3672,7 +3720,7 @@ checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"new_debug_unreachable", "new_debug_unreachable",
"parking_lot", "parking_lot 0.11.2",
"phf_shared", "phf_shared",
"precomputed-hash", "precomputed-hash",
"serde", "serde",
@ -3881,7 +3929,7 @@ dependencies = [
"mio 0.7.14", "mio 0.7.14",
"num_cpus", "num_cpus",
"once_cell", "once_cell",
"parking_lot", "parking_lot 0.11.2",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"tokio-macros", "tokio-macros",
@ -3956,6 +4004,20 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-util"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
"tokio",
]
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.5.8" version = "0.5.8"
@ -3988,7 +4050,7 @@ dependencies = [
"prost-derive 0.8.0", "prost-derive 0.8.0",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util 0.6.9",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
@ -4019,7 +4081,7 @@ dependencies = [
"prost-derive 0.9.0", "prost-derive 0.9.0",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util 0.6.9",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
@ -4066,7 +4128,7 @@ dependencies = [
"slab", "slab",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util 0.6.9",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing", "tracing",
@ -4099,9 +4161,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-actix-web" name = "tracing-actix-web"
version = "0.5.0-beta.8" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da8e6a7393e9b680de78d876f8c1432aebf56f3e70346a4a821160c04677a272" checksum = "99bcebac55fba44eadf75a424ee403e756f9165596a613d125876388e5fb4c34"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"pin-project", "pin-project",
@ -4551,6 +4613,49 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
dependencies = [
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_msvc"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
[[package]]
name = "windows_i686_gnu"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
[[package]]
name = "windows_i686_msvc"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
[[package]]
name = "windows_x86_64_gnu"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
[[package]]
name = "windows_x86_64_msvc"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
[[package]] [[package]]
name = "winreg" name = "winreg"
version = "0.7.0" version = "0.7.0"

8
Cargo.toml
View file

@ -51,10 +51,10 @@ diesel = "1.4.8"
diesel_migrations = "1.4.0" diesel_migrations = "1.4.0"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.131", features = ["derive"] } serde = { version = "1.0.131", features = ["derive"] }
actix = "0.12.0" actix = "0.13.0"
actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["rustls"] } actix-web = { version = "4.0.0", default-features = false, features = ["macros", "rustls"] }
tracing = "0.1.29" tracing = "0.1.29"
tracing-actix-web = { version = "0.5.0-beta.8", default-features = false } tracing-actix-web = { version = "0.5.0", default-features = false }
tracing-error = "0.2.0" tracing-error = "0.2.0"
tracing-log = "0.1.2" tracing-log = "0.1.2"
tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
@ -62,7 +62,7 @@ console-subscriber = { version = "0.1.0", optional = true }
strum = "0.23.0" strum = "0.23.0"
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.38" openssl = "0.10.38"
http-signature-normalization-actix = { version = "0.5.0-beta.14", default-features = false, features = ["sha-2"] } http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] }
tokio = { version = "1.14.0", features = ["sync", "tracing"] } tokio = { version = "1.14.0", features = ["sync", "tracing"] }
anyhow = "1.0.51" anyhow = "1.0.51"
reqwest = { version = "0.11.7", features = ["json"] } reqwest = { version = "0.11.7", features = ["json"] }

6
crates/api/Cargo.toml
View file

@ -27,8 +27,8 @@ bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.72", features = ["preserve_order"] } serde_json = { version = "1.0.72", features = ["preserve_order"] }
serde = { version = "1.0.131", features = ["derive"] } serde = { version = "1.0.131", features = ["derive"] }
actix = "0.12.0" actix = "0.13.0"
actix-web = { version = "4.0.0-beta.18", default-features = false } actix-web = { version = "4.0.0", default-features = false }
actix-rt = { version = "2.5.0", default-features = false } actix-rt = { version = "2.5.0", default-features = false }
rand = "0.8.4" rand = "0.8.4"
strum = "0.23.0" strum = "0.23.0"
@ -36,7 +36,7 @@ strum_macros = "0.23.1"
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.38" openssl = "0.10.38"
http = "0.2.5" http = "0.2.5"
http-signature-normalization-actix = { version = "0.5.0-beta.14", default-features = false, features = ["sha-2"] } http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] }
base64 = "0.13.0" base64 = "0.13.0"
tokio = "1.14.0" tokio = "1.14.0"
futures = "0.3.17" futures = "0.3.17"

2
crates/api_common/Cargo.toml
View file

@ -20,7 +20,7 @@ lemmy_db_schema = { version = "=0.16.0-rc.1", path = "../db_schema" }
lemmy_utils = { version = "=0.16.0-rc.1", path = "../utils" } lemmy_utils = { version = "=0.16.0-rc.1", path = "../utils" }
serde = { version = "1.0.131", features = ["derive"] } serde = { version = "1.0.131", features = ["derive"] }
diesel = "1.4.8" diesel = "1.4.8"
actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["cookies"] } actix-web = { version = "4.0.0", default-features = false, features = ["cookies"] }
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.72", features = ["preserve_order"] } serde_json = { version = "1.0.72", features = ["preserve_order"] }
tracing = "0.1.29" tracing = "0.1.29"

6
crates/api_crud/Cargo.toml
View file

@ -22,8 +22,8 @@ bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.72", features = ["preserve_order"] } serde_json = { version = "1.0.72", features = ["preserve_order"] }
serde = { version = "1.0.131", features = ["derive"] } serde = { version = "1.0.131", features = ["derive"] }
actix = "0.12.0" actix = "0.13.0"
actix-web = { version = "4.0.0-beta.18", default-features = false } actix-web = { version = "4.0.0", default-features = false }
actix-rt = { version = "2.5.0", default-features = false } actix-rt = { version = "2.5.0", default-features = false }
tracing = "0.1.29" tracing = "0.1.29"
rand = "0.8.4" rand = "0.8.4"
@ -32,7 +32,7 @@ strum_macros = "0.23.1"
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
openssl = "0.10.38" openssl = "0.10.38"
http = "0.2.5" http = "0.2.5"
http-signature-normalization-actix = { version = "0.5.0-beta.14", default-features = false, features = ["sha-2"] } http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] }
base64 = "0.13.0" base64 = "0.13.0"
tokio = "1.14.0" tokio = "1.14.0"
futures = "0.3.17" futures = "0.3.17"

6
crates/apub/Cargo.toml
View file

@ -27,8 +27,8 @@ chrono = { version = "0.4.19", features = ["serde"] }
serde_json = { version = "1.0.72", features = ["preserve_order"] } serde_json = { version = "1.0.72", features = ["preserve_order"] }
serde = { version = "1.0.131", features = ["derive"] } serde = { version = "1.0.131", features = ["derive"] }
serde_with = "1.11.0" serde_with = "1.11.0"
actix = "0.12.0" actix = "0.13.0"
actix-web = { version = "4.0.0-beta.18", default-features = false } actix-web = { version = "4.0.0", default-features = false }
actix-rt = { version = "2.5.0", default-features = false } actix-rt = { version = "2.5.0", default-features = false }
tracing = "0.1.29" tracing = "0.1.29"
rand = "0.8.4" rand = "0.8.4"
@ -37,7 +37,7 @@ strum_macros = "0.23.1"
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
percent-encoding = "2.1.0" percent-encoding = "2.1.0"
http = "0.2.5" http = "0.2.5"
http-signature-normalization-actix = { version = "0.5.0-beta.14", default-features = false, features = ["server", "sha-2"] } http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["server", "sha-2"] }
tokio = "1.14.0" tokio = "1.14.0"
futures = "0.3.17" futures = "0.3.17"
itertools = "0.10.3" itertools = "0.10.3"

4
crates/apub_lib/Cargo.toml
View file

@ -24,8 +24,8 @@ openssl = "0.10.38"
once_cell = "1.8.0" once_cell = "1.8.0"
http = "0.2.5" http = "0.2.5"
sha2 = "0.10.0" sha2 = "0.10.0"
actix-web = { version = "4.0.0-beta.18", default-features = false } actix-web = { version = "4.0.0", default-features = false }
http-signature-normalization-actix = { version = "0.5.0-beta.14", default-features = false, features = ["server", "sha-2"] } 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"] } http-signature-normalization-reqwest = { version = "0.4.0", default-features = false, features = ["sha-2", "middleware"] }
background-jobs = "0.11.0" background-jobs = "0.11.0"
diesel = "1.4.8" diesel = "1.4.8"

7
crates/routes/Cargo.toml
View file

@ -19,10 +19,9 @@ lemmy_db_schema = { version = "=0.16.0-rc.1", path = "../db_schema" }
lemmy_api_common = { version = "=0.16.0-rc.1", path = "../api_common" } lemmy_api_common = { version = "=0.16.0-rc.1", path = "../api_common" }
lemmy_apub = { version = "=0.16.0-rc.1", path = "../apub" } lemmy_apub = { version = "=0.16.0-rc.1", path = "../apub" }
diesel = "1.4.8" diesel = "1.4.8"
actix = "0.12.0" actix = "0.13.0"
actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["rustls"] } actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] }
actix-web-actors = { version = "4.0.0-beta.8", default-features = false } actix-web-actors = { version = "4.1.0", default-features = false }
actix-http = "3.0.0-beta.15"
sha2 = "0.10.0" sha2 = "0.10.0"
anyhow = "1.0.51" anyhow = "1.0.51"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }

16
crates/routes/src/images.rs
View file

@ -1,5 +1,15 @@
use actix_http::header::{HeaderName, ACCEPT_ENCODING, HOST}; use actix_web::{
use actix_web::{body::BodyStream, http::StatusCode, web::Data, *}; body::BodyStream,
error,
http::{
header::{HeaderName, ACCEPT_ENCODING, HOST},
StatusCode,
},
web,
Error,
HttpRequest,
HttpResponse,
};
use anyhow::anyhow; use anyhow::anyhow;
use futures::stream::{Stream, StreamExt}; use futures::stream::{Stream, StreamExt};
use lemmy_utils::{claims::Claims, rate_limit::RateLimit, LemmyError}; use lemmy_utils::{claims::Claims, rate_limit::RateLimit, LemmyError};
@ -11,7 +21,7 @@ use std::time::Duration;
pub fn config(cfg: &mut web::ServiceConfig, client: ClientWithMiddleware, rate_limit: &RateLimit) { pub fn config(cfg: &mut web::ServiceConfig, client: ClientWithMiddleware, rate_limit: &RateLimit) {
cfg cfg
.app_data(Data::new(client)) .app_data(web::Data::new(client))
.service( .service(
web::resource("/pictrs/image") web::resource("/pictrs/image")
.wrap(rate_limit.image()) .wrap(rate_limit.image())

2
crates/utils/Cargo.toml
View file

@ -28,7 +28,7 @@ comrak = { version = "0.12.1", default-features = false }
once_cell = "1.8.0" once_cell = "1.8.0"
openssl = "0.10.38" openssl = "0.10.38"
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["rustls"] } actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] }
actix-rt = { version = "2.5.0", default-features = false } actix-rt = { version = "2.5.0", default-features = false }
anyhow = "1.0.51" anyhow = "1.0.51"
reqwest = { version = "0.11.7", features = ["json"] } reqwest = { version = "0.11.7", features = ["json"] }

6
crates/websocket/Cargo.toml
View file

@ -24,7 +24,7 @@ tracing = "0.1.29"
rand = "0.8.4" rand = "0.8.4"
serde = { version = "1.0.131", features = ["derive"] } serde = { version = "1.0.131", features = ["derive"] }
serde_json = { version = "1.0.72", features = ["preserve_order"] } serde_json = { version = "1.0.72", features = ["preserve_order"] }
actix = "0.12.0" actix = "0.13.0"
anyhow = "1.0.51" anyhow = "1.0.51"
diesel = "1.4.8" diesel = "1.4.8"
background-jobs = "0.11.0" background-jobs = "0.11.0"
@ -32,7 +32,7 @@ tokio = "1.14.0"
strum = "0.23.0" strum = "0.23.0"
strum_macros = "0.23.1" strum_macros = "0.23.1"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["rustls"] } actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] }
actix-web-actors = { version = "4.0.0-beta.8", default-features = false } actix-web-actors = { version = "4.1.0", default-features = false }
opentelemetry = "0.16" opentelemetry = "0.16"
tracing-opentelemetry = "0.16" tracing-opentelemetry = "0.16"