From a9441a8804c47fb1801450e84820f62d0f916e92 Mon Sep 17 00:00:00 2001 From: fdb-hiroshima <35889323+fdb-hiroshima@users.noreply.github.com> Date: Mon, 16 Dec 2019 20:22:46 +0100 Subject: [PATCH] Fix lettre (#706) * Use lettre from crates.io instead of git * fix previous migration they were failing on some versions of sqlite and postgres --- Cargo.lock | 34 ++++++++----------- Cargo.toml | 4 +-- .../2019-12-10-104935_fill_timelines/up.sql | 3 +- .../2019-12-10-104935_fill_timelines/up.sql | 2 +- script/run_browser_test.sh | 1 + 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c17369f9..d024fdcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -756,8 +756,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "email" -version = "0.0.19" -source = "git+https://github.com/lettre/rust-email#3086d7bcda2c3b3fa4b1297cba216151ce4a3efc" +version = "0.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1342,13 +1342,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lettre" -version = "0.9.0" -source = "git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49#c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1361,14 +1359,12 @@ dependencies = [ [[package]] name = "lettre_email" -version = "0.9.0" -source = "git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49#c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "email 0.0.19 (git+https://github.com/lettre/rust-email)", - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49)", + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", + "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1966,8 +1962,8 @@ dependencies = [ "gettext-utils 0.1.0 (git+https://github.com/Plume-org/gettext-macros/?rev=a7c605f7edd6bfbfbfe7778026bfefd88d82db10)", "guid-create 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49)", - "lettre_email 0.9.0 (git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49)", + "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "multipart 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "plume-api 0.3.0", @@ -3785,7 +3781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" "checksum either 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a39bffec1e2015c5d8a6773cb0cf48d0d758c842398f624c34969071f5499ea7" "checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" -"checksum email 0.0.19 (git+https://github.com/lettre/rust-email)" = "" +"checksum email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "91549a51bb0241165f13d57fc4c72cef063b4088fb078b019ecbf464a45f22e4" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" @@ -3851,8 +3847,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49)" = "" -"checksum lettre_email 0.9.0 (git+https://github.com/lettre/lettre?rev=c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49)" = "" +"checksum lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c66afaa5dfadbb81d4e00fd1d1ab057c7cd4c799c5a44e0009386d553587e728" +"checksum lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bbb68ca999042d965476e47bbdbacd52db0927348b6f8062c44dd04a3b1fd43b" "checksum levenshtein_automata 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73a004f877f468548d8d0ac4977456a249d8fabbdb8416c36db163dfc8f2e8ca" "checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" "checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1" diff --git a/Cargo.toml b/Cargo.toml index 0254f681..2406075f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,8 @@ gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = " gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" } guid-create = "0.1" heck = "0.3.0" -lettre = { git = "https://github.com/lettre/lettre", rev = "c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" } -lettre_email = { git = "https://github.com/lettre/lettre", rev = "c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" } +lettre = "0.9.2" +lettre_email = "0.9.2" num_cpus = "1.10" rocket = "0.4.0" rocket_contrib = { version = "0.4.0", features = ["json"] } diff --git a/migrations/postgres/2019-12-10-104935_fill_timelines/up.sql b/migrations/postgres/2019-12-10-104935_fill_timelines/up.sql index cfe780f0..f6b22996 100644 --- a/migrations/postgres/2019-12-10-104935_fill_timelines/up.sql +++ b/migrations/postgres/2019-12-10-104935_fill_timelines/up.sql @@ -3,7 +3,8 @@ INSERT INTO timeline (post_id, timeline_id) WHERE timeline_definition.query = 'all'; INSERT INTO timeline (post_id, timeline_id) - SELECT posts.id,timeline_definition.id FROM posts,timeline_definition + SELECT posts.id,timeline_definition.id FROM posts + CROSS JOIN timeline_definition INNER JOIN blogs ON posts.blog_id = blogs.id INNER JOIN instances ON blogs.instance_id = instances.id WHERE timeline_definition.query = 'local' and instances.local = true; diff --git a/migrations/sqlite/2019-12-10-104935_fill_timelines/up.sql b/migrations/sqlite/2019-12-10-104935_fill_timelines/up.sql index cfe780f0..49f4eba7 100644 --- a/migrations/sqlite/2019-12-10-104935_fill_timelines/up.sql +++ b/migrations/sqlite/2019-12-10-104935_fill_timelines/up.sql @@ -6,7 +6,7 @@ INSERT INTO timeline (post_id, timeline_id) SELECT posts.id,timeline_definition.id FROM posts,timeline_definition INNER JOIN blogs ON posts.blog_id = blogs.id INNER JOIN instances ON blogs.instance_id = instances.id - WHERE timeline_definition.query = 'local' and instances.local = true; + WHERE timeline_definition.query = 'local' and instances.local = 1; INSERT INTO timeline (post_id, timeline_id) SELECT posts.id,timeline_definition.id FROM posts diff --git a/script/run_browser_test.sh b/script/run_browser_test.sh index b3df8adc..8861b6b3 100755 --- a/script/run_browser_test.sh +++ b/script/run_browser_test.sh @@ -5,6 +5,7 @@ export ROCKET_SECRET_KEY="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" plm migration run plm migration redo +plm search init plm instance new -d plume-test.local -n plume-test plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password'