grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' into published_user_time

Browse source
This commit is contained in:
Dessalines 2020-09-17 13:37:40 -05:00
commit 36b4705d2b
6 changed files with 158 additions and 250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

261
Cargo.lock generated
View file

@ -8,7 +8,7 @@ checksum = "261b423734cca2a170d7a76936f1f0f9e6c6fc297d36cfc5ea6aa15f9017f996"
dependencies = [ dependencies = [
"chrono", "chrono",
"mime", "mime",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"thiserror", "thiserror",
"url", "url",
@ -21,7 +21,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e" checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e"
dependencies = [ dependencies = [
"activitystreams", "activitystreams",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
] ]
@ -45,26 +45,11 @@ dependencies = [
"pin-project", "pin-project",
"smallvec", "smallvec",
"tokio", "tokio",
"tokio-util 0.3.1", "tokio-util",
"trust-dns-proto", "trust-dns-proto",
"trust-dns-resolver", "trust-dns-resolver",
] ]
[[package]]
name = "actix-codec"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380"
dependencies = [
"bitflags 1.2.1",
"bytes",
"futures-core",
"futures-sink",
"log",
"tokio",
"tokio-util 0.2.0",
]
[[package]] [[package]]
name = "actix-codec" name = "actix-codec"
version = "0.3.0" version = "0.3.0"
@ -78,7 +63,7 @@ dependencies = [
"log", "log",
"pin-project", "pin-project",
"tokio", "tokio",
"tokio-util 0.3.1", "tokio-util",
] ]
[[package]] [[package]]
@ -87,20 +72,17 @@ 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 = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-utils 2.0.0", "actix-utils",
"derive_more", "derive_more",
"either", "either",
"futures-util", "futures-util",
"http", "http",
"log", "log",
"rustls",
"tokio-rustls",
"trust-dns-proto", "trust-dns-proto",
"trust-dns-resolver", "trust-dns-resolver",
"webpki",
] ]
[[package]] [[package]]
@ -130,13 +112,12 @@ 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 = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab" checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-connect", "actix-connect",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-threadpool", "actix-threadpool",
"actix-tls", "actix-utils",
"actix-utils 2.0.0",
"base64 0.12.3", "base64 0.12.3",
"bitflags 1.2.1", "bitflags 1.2.1",
"brotli2", "brotli2",
@ -164,12 +145,12 @@ dependencies = [
"pin-project", "pin-project",
"rand 0.7.3", "rand 0.7.3",
"regex", "regex",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"sha-1 0.9.1", "sha-1 0.9.1",
"slab", "slab",
"time 0.2.18", "time 0.2.19",
] ]
[[package]] [[package]]
@ -192,7 +173,7 @@ dependencies = [
"http", "http",
"log", "log",
"regex", "regex",
"serde 1.0.115", "serde 1.0.116",
] ]
[[package]] [[package]]
@ -212,14 +193,14 @@ dependencies = [
[[package]] [[package]]
name = "actix-server" name = "actix-server"
version = "1.0.3" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6d74b464215a473c973a2d7d03a69cc10f4ce1f4b38a7659c5193dc5c675630" checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e"
dependencies = [ dependencies = [
"actix-codec 0.2.0", "actix-codec",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-utils 1.0.6", "actix-utils",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"log", "log",
@ -275,32 +256,10 @@ 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 = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-service", "actix-service",
"actix-utils 2.0.0", "actix-utils",
"futures-util", "futures-util",
"rustls",
"tokio-rustls",
"webpki",
"webpki-roots",
]
[[package]]
name = "actix-utils"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e"
dependencies = [
"actix-codec 0.2.0",
"actix-rt",
"actix-service",
"bitflags 1.2.1",
"bytes",
"either",
"futures",
"log",
"pin-project",
"slab",
] ]
[[package]] [[package]]
@ -309,7 +268,7 @@ 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 = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"bitflags 1.2.1", "bitflags 1.2.1",
@ -325,11 +284,11 @@ dependencies = [
[[package]] [[package]]
name = "actix-web" name = "actix-web"
version = "3.0.1" version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd7fc56022da91a4dc00ccae7d7bb82e539749ca36df181695f4efdf5d413b2e" checksum = "36de80175eb1f0a5c518024ce0d23646b54a23008279e090ca1848f6f1448bf4"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-http", "actix-http",
"actix-macros", "actix-macros",
"actix-router", "actix-router",
@ -339,7 +298,7 @@ dependencies = [
"actix-testing", "actix-testing",
"actix-threadpool", "actix-threadpool",
"actix-tls", "actix-tls",
"actix-utils 2.0.0", "actix-utils",
"actix-web-codegen", "actix-web-codegen",
"awc", "awc",
"bytes", "bytes",
@ -353,12 +312,11 @@ dependencies = [
"mime", "mime",
"pin-project", "pin-project",
"regex", "regex",
"rustls", "serde 1.0.116",
"serde 1.0.115",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"socket2", "socket2",
"time 0.2.18", "time 0.2.19",
"tinyvec", "tinyvec",
"url", "url",
] ]
@ -370,7 +328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6edf3c2693e2a8c422800c87ee89a6a4eac7dd01109bc172a1093ce1f4f001" checksum = "7f6edf3c2693e2a8c422800c87ee89a6a4eac7dd01109bc172a1093ce1f4f001"
dependencies = [ dependencies = [
"actix", "actix",
"actix-codec 0.3.0", "actix-codec",
"actix-http", "actix-http",
"actix-web", "actix-web",
"bytes", "bytes",
@ -464,6 +422,15 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a"
[[package]]
name = "async-mutex"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66941c2577c4fa351e4ce5fdde8f86c69b88d623f3b955be1bc7362a23434632"
dependencies = [
"event-listener",
]
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.40" version = "0.1.40"
@ -504,7 +471,7 @@ 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 = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575" checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-http", "actix-http",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
@ -516,17 +483,16 @@ dependencies = [
"mime", "mime",
"percent-encoding", "percent-encoding",
"rand 0.7.3", "rand 0.7.3",
"rustls", "serde 1.0.116",
"serde 1.0.115",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
] ]
[[package]] [[package]]
name = "background-jobs" name = "background-jobs"
version = "0.8.0-alpha.2" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb38c4a5de33324650e9023829b0f4129eb5418b29f5dfe69a52100ff5bc50d7" checksum = "c445edc4c6f8329385507bddd65491bfa3293f0a46a785119a14e526710ab320"
dependencies = [ dependencies = [
"background-jobs-actix", "background-jobs-actix",
"background-jobs-core", "background-jobs-core",
@ -534,19 +500,20 @@ dependencies = [
[[package]] [[package]]
name = "background-jobs-actix" name = "background-jobs-actix"
version = "0.8.0-alpha.2" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d012b9293806c777f806b537e04b5eec34ecd6eaf876c52792017695ce53262f" checksum = "d9696729d7b14c1682af423381744f317f7180136b4a2c8e4eca3a46e242f5fc"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"anyhow", "anyhow",
"async-mutex",
"async-trait", "async-trait",
"background-jobs-core", "background-jobs-core",
"chrono", "chrono",
"log", "log",
"num_cpus", "num_cpus",
"rand 0.7.3", "rand 0.7.3",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"thiserror", "thiserror",
"tokio", "tokio",
@ -555,17 +522,17 @@ dependencies = [
[[package]] [[package]]
name = "background-jobs-core" name = "background-jobs-core"
version = "0.8.0-alpha.2" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd5efe91c019d7780d5a2fc2f92a15e1f95b84a761428e1d1972b7428634ebc7" checksum = "b68ae77ec4330e8ac4ea643ce2f25d1e8d81509eb659e671b18f68d91939d72d"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"anyhow", "anyhow",
"async-mutex",
"async-trait", "async-trait",
"chrono", "chrono",
"futures",
"log", "log",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"thiserror", "thiserror",
"tokio", "tokio",
@ -820,7 +787,7 @@ checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
dependencies = [ dependencies = [
"num-integer", "num-integer",
"num-traits 0.2.12", "num-traits 0.2.12",
"serde 1.0.115", "serde 1.0.116",
"time 0.1.44", "time 0.1.44",
] ]
@ -890,7 +857,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"nom 5.1.2", "nom 5.1.2",
"serde 1.0.115", "serde 1.0.116",
"serde-hjson", "serde-hjson",
] ]
@ -907,7 +874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0" checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
dependencies = [ dependencies = [
"percent-encoding", "percent-encoding",
"time 0.2.18", "time 0.2.19",
"version_check 0.9.2", "version_check 0.9.2",
] ]
@ -1067,9 +1034,9 @@ dependencies = [
[[package]] [[package]]
name = "derive_more" name = "derive_more"
version = "0.99.9" version = "0.99.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" checksum = "1dcfabdab475c16a93d669dddfc393027803e347d09663f524447f642fbb84ba"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1282,6 +1249,12 @@ dependencies = [
"termcolor", "termcolor",
] ]
[[package]]
name = "event-listener"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1cd41440ae7e4734bbd42302f63eaba892afc93a3912dad84006247f0dedb0e"
[[package]] [[package]]
name = "fake-simd" name = "fake-simd"
version = "0.1.2" version = "0.1.2"
@ -1517,7 +1490,7 @@ dependencies = [
"indexmap", "indexmap",
"slab", "slab",
"tokio", "tokio",
"tokio-util 0.3.1", "tokio-util",
"tracing", "tracing",
] ]
@ -1793,7 +1766,7 @@ dependencies = [
"base64 0.12.3", "base64 0.12.3",
"pem", "pem",
"ring", "ring",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"simple_asn1", "simple_asn1",
] ]
@ -1830,7 +1803,7 @@ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
"regex", "regex",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"sha2", "sha2",
"strum", "strum",
@ -1891,10 +1864,11 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"reqwest", "reqwest",
"rss", "rss",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"sha2", "sha2",
"strum", "strum",
"strum_macros",
"thiserror", "thiserror",
"tokio", "tokio",
"url", "url",
@ -1912,7 +1886,7 @@ dependencies = [
"lemmy_db", "lemmy_db",
"lemmy_utils", "lemmy_utils",
"log", "log",
"serde 1.0.115", "serde 1.0.116",
"strum", "strum",
"strum_macros", "strum_macros",
] ]
@ -1934,7 +1908,7 @@ dependencies = [
"openssl", "openssl",
"rand 0.7.3", "rand 0.7.3",
"regex", "regex",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"thiserror", "thiserror",
"url", "url",
@ -1953,7 +1927,7 @@ dependencies = [
"log", "log",
"native-tls", "native-tls",
"nom 4.2.3", "nom 4.2.3",
"serde 1.0.115", "serde 1.0.116",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
] ]
@ -2130,11 +2104,12 @@ dependencies = [
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.4.1" version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
dependencies = [ dependencies = [
"adler", "adler",
"autocfg 1.0.1",
] ]
[[package]] [[package]]
@ -2825,7 +2800,7 @@ dependencies = [
"native-tls", "native-tls",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"tokio", "tokio",
@ -2896,19 +2871,6 @@ dependencies = [
"semver", "semver",
] ]
[[package]]
name = "rustls"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
dependencies = [
"base64 0.12.3",
"log",
"ring",
"sct",
"webpki",
]
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.5" version = "1.0.5"
@ -2952,16 +2914,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "sct"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "0.4.4" version = "0.4.4"
@ -3008,9 +2960,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.115" version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -3030,9 +2982,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.115" version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3048,7 +3000,7 @@ dependencies = [
"indexmap", "indexmap",
"itoa", "itoa",
"ryu", "ryu",
"serde 1.0.115", "serde 1.0.116",
] ]
[[package]] [[package]]
@ -3068,7 +3020,7 @@ checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
dependencies = [ dependencies = [
"dtoa", "dtoa",
"itoa", "itoa",
"serde 1.0.115", "serde 1.0.116",
"url", "url",
] ]
@ -3210,7 +3162,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde 1.0.115", "serde 1.0.116",
"serde_derive", "serde_derive",
"syn", "syn",
] ]
@ -3224,7 +3176,7 @@ dependencies = [
"base-x", "base-x",
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde 1.0.115", "serde 1.0.116",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"sha1", "sha1",
@ -3269,9 +3221,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.40" version = "1.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3361,9 +3313,9 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.2.18" version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12785163ae8a1cbb52a5db39af4a5baabd3fe49f07f76f952f89d7e89e5ce531" checksum = "80c1a1fd93112fc50b11c43a1def21f926be3c18884fad676ea879572da070a1"
dependencies = [ dependencies = [
"const_fn", "const_fn",
"libc", "libc",
@ -3424,18 +3376,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "tokio-rustls"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
dependencies = [
"futures-core",
"rustls",
"tokio",
"webpki",
]
[[package]] [[package]]
name = "tokio-tls" name = "tokio-tls"
version = "0.3.1" version = "0.3.1"
@ -3446,20 +3386,6 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-util"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
"tokio",
]
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.3.1" version = "0.3.1"
@ -3647,7 +3573,7 @@ dependencies = [
"idna", "idna",
"matches", "matches",
"percent-encoding", "percent-encoding",
"serde 1.0.115", "serde 1.0.116",
] ]
[[package]] [[package]]
@ -3666,7 +3592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
dependencies = [ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"serde 1.0.115", "serde 1.0.116",
] ]
[[package]] [[package]]
@ -3754,7 +3680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"serde 1.0.115", "serde 1.0.116",
"serde_json", "serde_json",
"wasm-bindgen-macro", "wasm-bindgen-macro",
] ]
@ -3825,25 +3751,6 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "webpki"
version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "webpki-roots"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
dependencies = [
"webpki",
]
[[package]] [[package]]
name = "widestring" name = "widestring"
version = "0.4.2" version = "0.4.2"

67
Cargo.toml
View file

@ -19,44 +19,45 @@ lemmy_utils = { path = "./lemmy_utils" }
lemmy_db = { path = "./lemmy_db" } lemmy_db = { path = "./lemmy_db" }
lemmy_structs = { path = "./lemmy_structs" } lemmy_structs = { path = "./lemmy_structs" }
lemmy_rate_limit = { path = "./lemmy_rate_limit" } lemmy_rate_limit = { path = "./lemmy_rate_limit" }
diesel = "1.4.4" diesel = "1.4"
diesel_migrations = "1.4.0" diesel_migrations = "1.4"
dotenv = "0.15.0" dotenv = "0.15"
activitystreams = "0.7.0-alpha.4" activitystreams = "0.7.0-alpha.4"
activitystreams-ext = "0.1.0-alpha.2" activitystreams-ext = "0.1.0-alpha.2"
bcrypt = "0.8.0" bcrypt = "0.8"
chrono = { version = "0.4.7", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
serde_json = { version = "1.0.52", features = ["preserve_order"]} serde_json = { version = "1.0", features = ["preserve_order"]}
serde = { version = "1.0.105", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
actix = "0.10.0" actix = "0.10"
actix-web = { version = "3.0.0", default-features = false, features = ["rustls"] } actix-web = { version = "3.0", default-features = false }
actix-files = { version = "0.3.0", default-features = false } actix-files = { version = "0.3", default-features = false }
actix-web-actors = { version = "3.0.0", default-features = false } actix-web-actors = { version = "3.0", default-features = false }
actix-rt = { version = "1.1.1", default-features = false } actix-rt = { version = "1.1", default-features = false }
awc = { version = "2.0.0", default-features = false } awc = { version = "2.0", default-features = false }
log = "0.4.0" log = "0.4"
env_logger = "0.7.1" env_logger = "0.7"
rand = "0.7.3" rand = "0.7"
strum = "0.19.2" strum = "0.19"
jsonwebtoken = "7.0.1" strum_macros = "0.19"
lazy_static = "1.3.0" jsonwebtoken = "7.0"
rss = "1.9.0" lazy_static = "1.3"
url = { version = "2.1.1", features = ["serde"] } rss = "1.9"
percent-encoding = "2.1.0" url = { version = "2.1", features = ["serde"] }
percent-encoding = "2.1"
openssl = "0.10" openssl = "0.10"
http = "0.2.1" http = "0.2"
http-signature-normalization-actix = { version = "0.4.0", default-features = false, features = ["sha-2"] } http-signature-normalization-actix = { version = "0.4", default-features = false, features = ["sha-2"] }
base64 = "0.12.1" base64 = "0.12"
tokio = "0.2.21" tokio = "0.2"
futures = "0.3.5" futures = "0.3"
itertools = "0.9.0" itertools = "0.9"
uuid = { version = "0.8", features = ["serde", "v4"] } uuid = { version = "0.8", features = ["serde", "v4"] }
sha2 = "0.9" sha2 = "0.9"
async-trait = "0.1.40" async-trait = "0.1"
captcha = "0.0.7" captcha = "0.0"
anyhow = "1.0.32" anyhow = "1.0"
thiserror = "1.0.20" thiserror = "1.0"
background-jobs = " 0.8.0-alpha.2" background-jobs = " 0.8"
reqwest = { version = "0.10", features = ["json"] } reqwest = { version = "0.10", features = ["json"] }
[dev-dependencies.cargo-husky] [dev-dependencies.cargo-husky]

22
lemmy_db/Cargo.toml
View file

@ -8,15 +8,15 @@ name = "lemmy_db"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
diesel = { version = "1.4.4", features = ["postgres","chrono","r2d2","64-column-tables","serde_json"] } diesel = { version = "1.4", features = ["postgres","chrono","r2d2","64-column-tables","serde_json"] }
chrono = { version = "0.4.7", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
serde = { version = "1.0.105", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0.52", features = ["preserve_order"]} serde_json = { version = "1.0", features = ["preserve_order"]}
strum = "0.19.2" strum = "0.19"
strum_macros = "0.19.2" strum_macros = "0.19"
log = "0.4.0" log = "0.4"
sha2 = "0.9" sha2 = "0.9"
bcrypt = "0.8.2" bcrypt = "0.8"
url = { version = "2.1.1", features = ["serde"] } url = { version = "2.1", features = ["serde"] }
lazy_static = "1.3.0" lazy_static = "1.3"
regex = "1.3.5" regex = "1.3"

10
lemmy_rate_limit/Cargo.toml
View file

@ -10,9 +10,9 @@ path = "src/lib.rs"
[dependencies] [dependencies]
lemmy_utils = { path = "../lemmy_utils" } lemmy_utils = { path = "../lemmy_utils" }
tokio = "0.2.21" tokio = "0.2"
strum = "0.19.2" strum = "0.19"
strum_macros = "0.19.2" strum_macros = "0.19"
futures = "0.3.5" futures = "0.3.5"
actix-web = { version = "3.0.0", default-features = false, features = ["rustls"] } actix-web = { version = "3.0", default-features = false }
log = "0.4.0" log = "0.4"

16
lemmy_structs/Cargo.toml
View file

@ -11,11 +11,11 @@ path = "src/lib.rs"
[dependencies] [dependencies]
lemmy_db = { path = "../lemmy_db" } lemmy_db = { path = "../lemmy_db" }
lemmy_utils = { path = "../lemmy_utils" } lemmy_utils = { path = "../lemmy_utils" }
serde = { version = "1.0.105", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
log = "0.4.0" log = "0.4"
diesel = "1.4.4" diesel = "1.4"
actix-web = { version = "3.0.0-beta.3", features = ["rustls"] } actix = "0.10"
actix = "0.10.0" actix-web = { version = "3.0" }
strum = "0.19.2" strum = "0.19"
strum_macros = "0.19.2" strum_macros = "0.19"
chrono = { version = "0.4.7", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }

32
lemmy_utils/Cargo.toml
View file

@ -10,20 +10,20 @@ path = "src/lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
regex = "1.3.5" regex = "1.3"
config = { version = "0.10.1", default-features = false, features = ["hjson"] } config = { version = "0.10", default-features = false, features = ["hjson"] }
chrono = { version = "0.4.15", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
lettre = "0.9.3" lettre = "0.9"
lettre_email = "0.9.4" lettre_email = "0.9"
log = "0.4.0" log = "0.4"
itertools = "0.9.0" itertools = "0.9"
rand = "0.7.3" rand = "0.7"
serde = { version = "1.0.115", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0.52", features = ["preserve_order"]} serde_json = { version = "1.0", features = ["preserve_order"]}
thiserror = "1.0.20" thiserror = "1.0"
comrak = "0.8.2" comrak = "0.8"
lazy_static = "1.3.0" lazy_static = "1.3"
openssl = "0.10" openssl = "0.10"
url = { version = "2.1.1", features = ["serde"] } url = { version = "2.1", features = ["serde"] }
actix-web = {version = "3.0.0", default-features = false } actix-web = {version = "3.0", default-features = false }
anyhow = "1.0.32" anyhow = "1.0"