Merge remote-tracking branch 'yerba/main' into main

diff --git a/Cargo.lock b/Cargo.lock
index c8c79d873ccd348eb1e12020ef610e78fd207057..cefc4970580a957753aa58851c522de903fd9e5e 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,8 +81,11 @@ dependencies = [
  "futures-util",
  "http",
  "log",
+ "rustls",
+ "tokio-rustls",
  "trust-dns-proto",
  "trust-dns-resolver",
+ "webpki",
 ]
 
 [[package]]
@@ -117,6 +120,7 @@ dependencies = [
  "actix-rt",
  "actix-service",
  "actix-threadpool",
+ "actix-tls",
  "actix-utils",
  "base64 0.12.3",
  "bitflags 1.2.1",
@@ -150,7 +154,7 @@ dependencies = [
  "serde_urlencoded",
  "sha-1 0.9.1",
  "slab",
- "time 0.2.19",
+ "time 0.2.20",
 ]
 
 [[package]]
@@ -260,6 +264,10 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "futures-util",
+ "rustls",
+ "tokio-rustls",
+ "webpki",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -312,11 +320,12 @@ dependencies = [
  "mime",
  "pin-project",
  "regex",
+ "rustls",
  "serde 1.0.116",
  "serde_json",
  "serde_urlencoded",
  "socket2",
- "time 0.2.19",
+ "time 0.2.20",
  "tinyvec",
  "url",
 ]
@@ -483,6 +492,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "rand 0.7.3",
+ "rustls",
  "serde 1.0.116",
  "serde_json",
  "serde_urlencoded",
@@ -769,9 +779,9 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad"
 
 [[package]]
 name = "cc"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
+checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
 
 [[package]]
 name = "cfg-if"
@@ -874,7 +884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
 dependencies = [
  "percent-encoding",
- "time 0.2.19",
+ "time 0.2.20",
  "version_check 0.9.2",
 ]
 
@@ -1117,9 +1127,9 @@ checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
 
 [[package]]
 name = "either"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "email"
@@ -1594,6 +1604,12 @@ version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 
+[[package]]
+name = "httpdate"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+
 [[package]]
 name = "humantime"
 version = "1.3.0"
@@ -1605,9 +1621,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.13.7"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
+checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1617,10 +1633,10 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project",
  "socket2",
- "time 0.1.44",
  "tokio",
  "tower-service",
  "tracing",
@@ -2723,9 +2739,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0"
+checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -2871,6 +2887,19 @@ dependencies = [
  "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]]
 name = "ryu"
 version = "1.0.5"
@@ -2914,6 +2943,16 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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]]
 name = "security-framework"
 version = "0.4.4"
@@ -3313,9 +3352,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c1a1fd93112fc50b11c43a1def21f926be3c18884fad676ea879572da070a1"
+checksum = "0d4953c513c9bf1b97e9cdd83f11d60c4b0a83462880a360d80d96953a953fee"
 dependencies = [
  "const_fn",
  "libc",
@@ -3376,6 +3415,18 @@ dependencies = [
  "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]]
 name = "tokio-tls"
 version = "0.3.1"
@@ -3751,6 +3802,25 @@ dependencies = [
  "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]]
 name = "widestring"
 version = "0.4.2"

diff --git a/Cargo.toml b/Cargo.toml
index f0486684737640d27827f2bdc72db243bda06e5c..2545e268e9d0853e5695921f4541c651cde756a0 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ chrono = { version = "0.4", features = ["serde"] }
 serde_json = { version = "1.0", features = ["preserve_order"]}
 serde = { version = "1.0", features = ["derive"] }
 actix = "0.10"
-actix-web = { version = "3.0", default-features = false }
+actix-web = { version = "3.0", default-features = false, features = ["rustls"] }
 actix-files = { version = "0.3", default-features = false }
 actix-web-actors = { version = "3.0", default-features = false }
 actix-rt = { version = "1.1", default-features = false }

diff --git a/api_tests/src/user.spec.ts b/api_tests/src/user.spec.ts
index a1f8c119a5c2580e015f7bf1f9840e729d61536f..bfd56fcbd750a67862e605f141fa2babc568522b 100644 (file)
--- a/api_tests/src/user.spec.ts
+++ b/api_tests/src/user.spec.ts
@@ -25,6 +25,7 @@ function assertUserFederation(
   expect(userOne.actor_id).toBe(userTwo.actor_id);
   expect(userOne.avatar).toBe(userTwo.avatar);
   expect(userOne.banner).toBe(userTwo.banner);
+  expect(userOne.published).toBe(userTwo.published);
 }
 
 test('Create user', async () => {
@@ -74,4 +75,4 @@ test('Set avatar and banner, check that they are federated', async () => {
   let searchBeta = await searchForUser(beta, apShortname);
   let userOnBeta = searchBeta.users[0];
   assertUserFederation(userOnAlpha, userOnBeta);
-});
\ No newline at end of file
+});

diff --git a/lemmy_db/src/activity.rs b/lemmy_db/src/activity.rs
index 79b185fb74fa225aaf259faac255854a7cfcdd5b..c3f0ab679728a084720228527198460686c78f06 100644 (file)
--- a/lemmy_db/src/activity.rs
+++ b/lemmy_db/src/activity.rs
@@ -105,6 +105,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/comment.rs b/lemmy_db/src/comment.rs
index bc2a574ec821a1dc68b97c4bf84de4a0283b7b66..398ea78bf40c624e60af1939d2ce526d31a1240a 100644 (file)
--- a/lemmy_db/src/comment.rs
+++ b/lemmy_db/src/comment.rs
@@ -281,6 +281,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/comment_view.rs b/lemmy_db/src/comment_view.rs
index a5eb8e6d4fd11533c2e9de92c222c341a39b925c..a3358ac43ce5519fcaab1e3d54b65257302f6ff7 100644 (file)
--- a/lemmy_db/src/comment_view.rs
+++ b/lemmy_db/src/comment_view.rs
@@ -520,6 +520,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/community.rs b/lemmy_db/src/community.rs
index 918d44f1519aa94e1bbbc6f19bb6c2136bf4a4e6..25cb272a73b42efd6a448be06ad3a7c0ea7efe73 100644 (file)
--- a/lemmy_db/src/community.rs
+++ b/lemmy_db/src/community.rs
@@ -321,6 +321,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/moderator.rs b/lemmy_db/src/moderator.rs
index aaed1314d7d33083820c8f81afb156dc2b2ebb67..3edd4350f3732cdd4dd95ebb806a832e278103ad 100644 (file)
--- a/lemmy_db/src/moderator.rs
+++ b/lemmy_db/src/moderator.rs
@@ -417,6 +417,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),
@@ -445,6 +446,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/password_reset_request.rs b/lemmy_db/src/password_reset_request.rs
index fde47c98e99361ae9314d01bd3d9ce2f2a6f2de2..8a831a8db9f8ce95d94078f151763a3a18dee9e7 100644 (file)
--- a/lemmy_db/src/password_reset_request.rs
+++ b/lemmy_db/src/password_reset_request.rs
@@ -101,6 +101,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/post.rs b/lemmy_db/src/post.rs
index 7d13eb806801d28a3bd54ba2cef3c810bc562c0e..724c342c67c4aeefa686e4665090697e9bf2ecd6 100644 (file)
--- a/lemmy_db/src/post.rs
+++ b/lemmy_db/src/post.rs
@@ -350,6 +350,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/post_view.rs b/lemmy_db/src/post_view.rs
index e88a80e306445c70c19004af875106bf59458af9..8f606b2263b496808594d0276048393ca36078ee 100644 (file)
--- a/lemmy_db/src/post_view.rs
+++ b/lemmy_db/src/post_view.rs
@@ -413,6 +413,7 @@ mod tests {
       matrix_user_id: None,
       avatar: None,
       banner: None,
+      published: None,
       updated: None,
       admin: false,
       banned: false,

diff --git a/lemmy_db/src/private_message.rs b/lemmy_db/src/private_message.rs
index 2484ebeabd13b9f0c6b6f5c7db63a77cc10d6991..988d97d3b69b8b139b91e6ab4b751db05082219d 100644 (file)
--- a/lemmy_db/src/private_message.rs
+++ b/lemmy_db/src/private_message.rs
@@ -158,6 +158,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),
@@ -186,6 +187,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/user.rs b/lemmy_db/src/user.rs
index 986701c4387be6b655abea066ca84000d8bf5271..f2c20e9474455683a85543e5717c6770acfda325 100644 (file)
--- a/lemmy_db/src/user.rs
+++ b/lemmy_db/src/user.rs
@@ -48,6 +48,7 @@ pub struct UserForm {
   pub banned: bool,
   pub email: Option<Option<String>>,
   pub avatar: Option<Option<String>>,
+  pub published: Option<chrono::NaiveDateTime>,
   pub updated: Option<chrono::NaiveDateTime>,
   pub show_nsfw: bool,
   pub theme: String,
@@ -181,6 +182,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_db/src/user_mention.rs b/lemmy_db/src/user_mention.rs
index bcb3a1437bd06f51c26c5875e716143d925c69d7..f35722cf9c098538164b9cf05051af20aace4c82 100644 (file)
--- a/lemmy_db/src/user_mention.rs
+++ b/lemmy_db/src/user_mention.rs
@@ -97,6 +97,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),
@@ -125,6 +126,7 @@ mod tests {
       banner: None,
       admin: false,
       banned: false,
+      published: None,
       updated: None,
       show_nsfw: false,
       theme: "darkly".into(),

diff --git a/lemmy_rate_limit/Cargo.toml b/lemmy_rate_limit/Cargo.toml
index c3b1067a6805c2e51d945d0a3dd48ebb0281cbf4..a58ffe187d5591ead48e964fedf5819510bc6e77 100644 (file)
--- a/lemmy_rate_limit/Cargo.toml
+++ b/lemmy_rate_limit/Cargo.toml
@@ -14,5 +14,5 @@ tokio = "0.2"
 strum = "0.19"
 strum_macros = "0.19"
 futures = "0.3.5"
-actix-web = { version = "3.0", default-features = false }
+actix-web = { version = "3.0", default-features = false, features = ["rustls"] }
 log = "0.4"

diff --git a/lemmy_utils/Cargo.toml b/lemmy_utils/Cargo.toml
index 7cb227dc4bb7c2e577c8c2855709660466a454bc..9ff9d7d3443545cabb54b107cd05c6888d24d143 100644 (file)
--- a/lemmy_utils/Cargo.toml
+++ b/lemmy_utils/Cargo.toml
@@ -25,5 +25,5 @@ comrak = "0.8"
 lazy_static = "1.3"
 openssl = "0.10"
 url = { version = "2.1", features = ["serde"] }
-actix-web = {version = "3.0", default-features = false }
+actix-web = { version = "3.0", default-features = false, features = ["rustls"] }
 anyhow = "1.0"

diff --git a/src/api/user.rs b/src/api/user.rs
index 630f816deaa3e3bc94862e99b9de073cebaf2306..977250d34fdf2db8ff0847c7002b1601569dbb91 100644 (file)
--- a/src/api/user.rs
+++ b/src/api/user.rs
@@ -170,6 +170,7 @@ impl Perform for Register {
       banner: None,
       password_encrypted: data.password.to_owned(),
       preferred_username: None,
+      published: None,
       updated: None,
       admin: data.admin,
       banned: false,
@@ -404,6 +405,7 @@ impl Perform for SaveUserSettings {
       banner,
       password_encrypted,
       preferred_username,
+      published: Some(read_user.published),
       updated: Some(naive_now()),
       admin: read_user.admin,
       banned: read_user.banned,

diff --git a/src/apub/user.rs b/src/apub/user.rs
index fb650632e9cd6f4bb7f90758c14335ca09cd6d01..47b6a58a71ade4f555c6973a527ddbf976996a49 100644 (file)
--- a/src/apub/user.rs
+++ b/src/apub/user.rs
@@ -262,6 +262,7 @@ impl FromApub for UserForm {
       email: None,
       avatar,
       banner,
+      published: person.inner.published().map(|u| u.to_owned().naive_local()),
       updated: person.updated().map(|u| u.to_owned().naive_local()),
       show_nsfw: false,
       theme: "".to_string(),

diff --git a/src/code_migrations.rs b/src/code_migrations.rs
index 47d046696130c9052e248c128c13b5dc5befc39b..6a69035daba9972ab09773432107a6429f07c312 100644 (file)
--- a/src/code_migrations.rs
+++ b/src/code_migrations.rs
@@ -54,6 +54,7 @@ fn user_updates_2020_04_02(conn: &PgConnection) -> Result<(), LemmyError> {
       banner: Some(cuser.banner.to_owned()),
       password_encrypted: cuser.password_encrypted.to_owned(),
       preferred_username: cuser.preferred_username.to_owned(),
+      published: Some(cuser.published),
       updated: None,
       admin: cuser.admin,
       banned: cuser.banned,