From 65829094c94f4097c0b6d6d275e8f252f7b118c2 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:40:51 +0900 Subject: [PATCH 01/13] Add test for blog slug validation --- src/routes/blogs.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/routes/blogs.rs b/src/routes/blogs.rs index 7359779a..99c63bf3 100644 --- a/src/routes/blogs.rs +++ b/src/routes/blogs.rs @@ -379,6 +379,7 @@ pub fn atom_feed(name: String, conn: DbConn) -> Option> { #[cfg(test)] mod tests { + use super::valid_slug; use crate::init_rocket; use diesel::Connection; use plume_common::utils::random_hex; @@ -524,4 +525,10 @@ mod tests { .finish(), ); } + + #[test] + fn test_valid_slug() { + assert!(valid_slug("Blog Title").is_ok()); + assert!(valid_slug("ブログ タイトル").is_ok()); + } } From 4dfe300ee3405d07f8c06fa9951dc6fc724b0a1c Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:50:51 +0900 Subject: [PATCH 02/13] Define Blog::slug() --- plume-models/src/blogs.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plume-models/src/blogs.rs b/plume-models/src/blogs.rs index ac20ee86..fb20be48 100644 --- a/plume-models/src/blogs.rs +++ b/plume-models/src/blogs.rs @@ -95,6 +95,10 @@ impl Blog { find_by!(blogs, find_by_ap_url, ap_url as &str); find_by!(blogs, find_by_name, actor_id as &str, instance_id as i32); + pub fn slug(title: &str) -> &str { + title + } + pub fn get_instance(&self, conn: &Connection) -> Result { Instance::get(conn, self.instance_id) } From 393f8e5e0cc4e66138e342a131ac68a85e56d786 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:51:16 +0900 Subject: [PATCH 03/13] Use Blog::slug() to determine blog's slug --- src/routes/blogs.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/blogs.rs b/src/routes/blogs.rs index 99c63bf3..1e2c9636 100644 --- a/src/routes/blogs.rs +++ b/src/routes/blogs.rs @@ -79,7 +79,7 @@ pub struct NewBlogForm { } fn valid_slug(title: &str) -> Result<(), ValidationError> { - let slug = utils::make_actor_id(title); + let slug = Blog::slug(title); if slug.is_empty() { Err(ValidationError::new("empty_slug")) } else { @@ -93,7 +93,7 @@ pub fn create( conn: DbConn, rockets: PlumeRocket, ) -> RespondOrRedirect { - let slug = utils::make_actor_id(&form.title); + let slug = Blog::slug(&form.title); let intl = &rockets.intl.catalog; let user = rockets.user.clone().unwrap(); @@ -122,7 +122,7 @@ pub fn create( let blog = Blog::insert( &conn, NewBlog::new_local( - slug.clone(), + slug.into(), form.title.to_string(), String::from(""), Instance::get_local() From abf352b957978b9d6576dec602eed0029438f888 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:51:53 +0900 Subject: [PATCH 04/13] Remove unused function --- plume-common/src/utils.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plume-common/src/utils.rs b/plume-common/src/utils.rs index 17912a02..efce6f2b 100644 --- a/plume-common/src/utils.rs +++ b/plume-common/src/utils.rs @@ -16,14 +16,6 @@ pub fn random_hex() -> String { .fold(String::new(), |res, byte| format!("{}{:x}", res, byte)) } -/// Remove non alphanumeric characters and CamelCase a string -pub fn make_actor_id(name: &str) -> String { - name.to_upper_camel_case() - .chars() - .filter(|c| c.is_alphanumeric()) - .collect() -} - /** * Percent-encode characters which are not allowed in IRI path segments. * From a1f958ee7a2452977b9669c79be885bad3ac545c Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:52:26 +0900 Subject: [PATCH 05/13] Remove unused import --- plume-common/src/utils.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/plume-common/src/utils.rs b/plume-common/src/utils.rs index efce6f2b..b4c3dce5 100644 --- a/plume-common/src/utils.rs +++ b/plume-common/src/utils.rs @@ -1,4 +1,3 @@ -use heck::ToUpperCamelCase; use openssl::rand::rand_bytes; use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, LinkType, Options, Parser, Tag}; use regex_syntax::is_word_character; From 248ed265c4292c8615275bca499829ce75d9d6da Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:53:16 +0900 Subject: [PATCH 06/13] Remove unsed heck from dependencies --- plume-common/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 52dbefdd..2e12a013 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [dependencies] array_tool = "1.0" base64 = "0.13" -heck = "0.4.0" hex = "0.4" openssl = "0.10.40" rocket = "0.4.6" From d6ee49b8806eb3092fa9536c00eacaf3ae60822b Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 01:55:12 +0900 Subject: [PATCH 07/13] Update Cargo.lock --- Cargo.lock | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58073d52..cea7e8ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1703,12 +1703,6 @@ dependencies = [ "ahash 0.7.6", ] -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - [[package]] name = "hermit-abi" version = "0.1.19" @@ -3265,7 +3259,6 @@ dependencies = [ "chrono", "flume", "futures 0.3.21", - "heck", "hex", "once_cell", "openssl", From 29055d195734dfe935da1ac2b84a27072fbca7d3 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Fri, 20 May 2022 02:13:23 +0900 Subject: [PATCH 08/13] Follow clippy --- src/routes/blogs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/blogs.rs b/src/routes/blogs.rs index 1e2c9636..b8f28959 100644 --- a/src/routes/blogs.rs +++ b/src/routes/blogs.rs @@ -101,7 +101,7 @@ pub fn create( Ok(_) => ValidationErrors::new(), Err(e) => e, }; - if Blog::find_by_fqn(&conn, &slug).is_ok() { + if Blog::find_by_fqn(&conn, slug).is_ok() { errors.add( "title", ValidationError { From c302d842e000065bf206cfe08d6bee4e7d5b9228 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 19:36:52 +0000 Subject: [PATCH 09/13] Bump once_cell from 1.10.0 to 1.11.0 Bumps [once_cell](https://github.com/matklad/once_cell) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/matklad/once_cell/releases) - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.10.0...v1.11.0) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- plume-common/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cea7e8ae..2cd7ffd3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2890,9 +2890,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "7b10983b38c53aebdf33f542c6275b0f58a238129d00c4ae0e6fb59738d783ca" [[package]] name = "onig" diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 2e12a013..17685af9 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -37,6 +37,6 @@ branch = "bidi-plume" [dev-dependencies] assert-json-diff = "2.0.1" -once_cell = "1.10.0" +once_cell = "1.11.0" [features] diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index ed542680..0d3971cb 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -31,7 +31,7 @@ glob = "0.3.0" lindera-tantivy = { version = "0.7.1", optional = true } tracing = "0.1.34" riker = "0.4.2" -once_cell = "1.10.0" +once_cell = "1.11.0" lettre = "0.9.6" native-tls = "0.2.10" activitystreams = "0.7.0-alpha.18" From 69eba69528a1fc35a7cecedda73d4792aa995919 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 19:26:36 +0000 Subject: [PATCH 10/13] Bump regex-syntax from 0.6.25 to 0.6.26 Bumps [regex-syntax](https://github.com/rust-lang/regex) from 0.6.25 to 0.6.26. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/commits) --- updated-dependencies: - dependency-name: regex-syntax dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- plume-common/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cea7e8ae..050f7964 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3263,7 +3263,7 @@ dependencies = [ "once_cell", "openssl", "pulldown-cmark", - "regex-syntax 0.6.25", + "regex-syntax 0.6.26", "reqwest 0.11.10", "rocket", "serde 1.0.137", @@ -3769,7 +3769,7 @@ checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.6.25", + "regex-syntax 0.6.26", ] [[package]] @@ -3780,9 +3780,9 @@ checksum = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "remove_dir_all" @@ -4547,7 +4547,7 @@ dependencies = [ "lazycell", "onig", "plist", - "regex-syntax 0.6.25", + "regex-syntax 0.6.26", "serde 1.0.137", "serde_derive", "serde_json", diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 2e12a013..825cb0fe 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -16,7 +16,7 @@ serde_derive = "1.0" serde_json = "1.0.81" shrinkwraprs = "0.3.0" syntect = "4.5.0" -regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] } +regex-syntax = { version = "0.6.26", default-features = false, features = ["unicode-perl"] } tracing = "0.1.34" askama_escape = "0.10.3" activitystreams = "0.7.0-alpha.18" From c47921bb252b39f6c5d0e1174bcc28148bed89c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 19:24:07 +0000 Subject: [PATCH 11/13] Bump once_cell from 1.11.0 to 1.12.0 Bumps [once_cell](https://github.com/matklad/once_cell) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/matklad/once_cell/releases) - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.11.0...v1.12.0) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- plume-common/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 786302ec..125336cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2890,9 +2890,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b10983b38c53aebdf33f542c6275b0f58a238129d00c4ae0e6fb59738d783ca" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "onig" diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 8c73293d..192642be 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -37,6 +37,6 @@ branch = "bidi-plume" [dev-dependencies] assert-json-diff = "2.0.1" -once_cell = "1.11.0" +once_cell = "1.12.0" [features] diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index 0d3971cb..ee281589 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -31,7 +31,7 @@ glob = "0.3.0" lindera-tantivy = { version = "0.7.1", optional = true } tracing = "0.1.34" riker = "0.4.2" -once_cell = "1.11.0" +once_cell = "1.12.0" lettre = "0.9.6" native-tls = "0.2.10" activitystreams = "0.7.0-alpha.18" From eccfbd3fbc82a0740189b28da17bf36ac6fa1909 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 19:33:24 +0000 Subject: [PATCH 12/13] Bump rocket from 0.4.10 to 0.4.11 Bumps [rocket](https://github.com/SergioBenitez/Rocket) from 0.4.10 to 0.4.11. - [Release notes](https://github.com/SergioBenitez/Rocket/releases) - [Changelog](https://github.com/SergioBenitez/Rocket/blob/master/CHANGELOG.md) - [Commits](https://github.com/SergioBenitez/Rocket/commits) --- updated-dependencies: - dependency-name: rocket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 2 +- plume-common/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 125336cd..61600313 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -992,9 +992,9 @@ dependencies = [ [[package]] name = "devise" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e04ba2d03c5fa0d954c061fc8c9c288badadffc272ebb87679a89846de3ed3" +checksum = "dd716c4a507adc5a2aa7c2a372d06c7497727e0892b243d3036bc7478a13e526" dependencies = [ "devise_codegen", "devise_core", @@ -1002,9 +1002,9 @@ dependencies = [ [[package]] name = "devise_codegen" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066ceb7928ca93a9bedc6d0e612a8a0424048b0ab1f75971b203d01420c055d7" +checksum = "ea7b8290d118127c08e3669da20b331bed56b09f20be5945b7da6c116d8fab53" dependencies = [ "devise_core", "quote 0.6.13", @@ -1012,9 +1012,9 @@ dependencies = [ [[package]] name = "devise_core" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf41c59b22b5e3ec0ea55c7847e5f358d340f3a8d6d53a5cf4f1564967f96487" +checksum = "d1053e9d5d5aade9bcedb5ab53b78df2b56ff9408a3138ce77eaaef87f932373" dependencies = [ "bitflags 1.3.2", "proc-macro2 0.4.30", @@ -3061,9 +3061,9 @@ dependencies = [ [[package]] name = "pear" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5320f212db967792b67cfe12bd469d08afd6318a249bd917d5c19bc92200ab8a" +checksum = "32dfa7458144c6af7f9ce6a137ef975466aa68ffa44d4d816ee5934018ba960a" dependencies = [ "pear_codegen", ] @@ -3945,9 +3945,9 @@ dependencies = [ [[package]] name = "rocket" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7ab1dfdc75bb8bd2be381f37796b1b300c45a3c9145b34d86715e8dd90bf28" +checksum = "83b9d9dc08c5dcc1d8126a9dd615545e6a358f8c13c883c8dfed8c0376fa355e" dependencies = [ "atty", "base64 0.13.0", @@ -3966,9 +3966,9 @@ dependencies = [ [[package]] name = "rocket_codegen" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729e687d6d2cf434d174da84fb948f7fef4fac22d20ce94ca61c28b72dbcf9f" +checksum = "2810037b5820098af97bd4fdd309e76a8101ceb178147de775c835a2537284fe" dependencies = [ "devise", "glob", @@ -4006,9 +4006,9 @@ dependencies = [ [[package]] name = "rocket_http" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6131e6e6d38a9817f4a494ff5da95971451c2eb56a53915579fc9c80f6ef0117" +checksum = "2bf9cbd128e1f321a2d0bebd2b7cf0aafd89ca43edf69e49b56a5c46e48eb19f" dependencies = [ "cookie 0.11.4", "hyper 0.10.16", diff --git a/Cargo.toml b/Cargo.toml index 7303cb69..db9938fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ gettext-utils = "0.1.0" guid-create = "0.2" lettre_email = "0.9.2" num_cpus = "1.10" -rocket = "0.4.6" +rocket = "0.4.11" rocket_contrib = { version = "0.4.5", features = ["json"] } rocket_i18n = "0.4.1" scheduled-thread-pool = "0.2.2" diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 192642be..3126b67b 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -9,7 +9,7 @@ array_tool = "1.0" base64 = "0.13" hex = "0.4" openssl = "0.10.40" -rocket = "0.4.6" +rocket = "0.4.11" reqwest = { version = "0.11.10", features = ["blocking", "json", "socks"] } serde = "1.0" serde_derive = "1.0" diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index ee281589..28d57f23 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -13,7 +13,7 @@ lazy_static = "1.0" ldap3 = "0.10.5" migrations_internals= "1.4.0" openssl = "0.10.40" -rocket = "0.4.6" +rocket = "0.4.11" rocket_i18n = "0.4.1" reqwest = "0.11.10" scheduled-thread-pool = "0.2.2" From 4e2ca515ce706861df9fee06e85edce6ee4bcb52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 19:33:42 +0000 Subject: [PATCH 13/13] Bump rocket_contrib from 0.4.10 to 0.4.11 Bumps [rocket_contrib](https://github.com/SergioBenitez/Rocket) from 0.4.10 to 0.4.11. - [Release notes](https://github.com/SergioBenitez/Rocket/releases) - [Changelog](https://github.com/SergioBenitez/Rocket/blob/master/CHANGELOG.md) - [Commits](https://github.com/SergioBenitez/Rocket/commits) --- updated-dependencies: - dependency-name: rocket_contrib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 32 ++++++++++++++++---------------- Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 125336cd..37fc5de9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -992,9 +992,9 @@ dependencies = [ [[package]] name = "devise" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e04ba2d03c5fa0d954c061fc8c9c288badadffc272ebb87679a89846de3ed3" +checksum = "dd716c4a507adc5a2aa7c2a372d06c7497727e0892b243d3036bc7478a13e526" dependencies = [ "devise_codegen", "devise_core", @@ -1002,9 +1002,9 @@ dependencies = [ [[package]] name = "devise_codegen" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066ceb7928ca93a9bedc6d0e612a8a0424048b0ab1f75971b203d01420c055d7" +checksum = "ea7b8290d118127c08e3669da20b331bed56b09f20be5945b7da6c116d8fab53" dependencies = [ "devise_core", "quote 0.6.13", @@ -1012,9 +1012,9 @@ dependencies = [ [[package]] name = "devise_core" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf41c59b22b5e3ec0ea55c7847e5f358d340f3a8d6d53a5cf4f1564967f96487" +checksum = "d1053e9d5d5aade9bcedb5ab53b78df2b56ff9408a3138ce77eaaef87f932373" dependencies = [ "bitflags 1.3.2", "proc-macro2 0.4.30", @@ -3061,9 +3061,9 @@ dependencies = [ [[package]] name = "pear" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5320f212db967792b67cfe12bd469d08afd6318a249bd917d5c19bc92200ab8a" +checksum = "32dfa7458144c6af7f9ce6a137ef975466aa68ffa44d4d816ee5934018ba960a" dependencies = [ "pear_codegen", ] @@ -3945,9 +3945,9 @@ dependencies = [ [[package]] name = "rocket" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7ab1dfdc75bb8bd2be381f37796b1b300c45a3c9145b34d86715e8dd90bf28" +checksum = "83b9d9dc08c5dcc1d8126a9dd615545e6a358f8c13c883c8dfed8c0376fa355e" dependencies = [ "atty", "base64 0.13.0", @@ -3966,9 +3966,9 @@ dependencies = [ [[package]] name = "rocket_codegen" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729e687d6d2cf434d174da84fb948f7fef4fac22d20ce94ca61c28b72dbcf9f" +checksum = "2810037b5820098af97bd4fdd309e76a8101ceb178147de775c835a2537284fe" dependencies = [ "devise", "glob", @@ -3981,9 +3981,9 @@ dependencies = [ [[package]] name = "rocket_contrib" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6303dccab46dce6c7ac26c9b9d8d8cde1b19614b027c3f913be6611bff6d9b" +checksum = "e20efbc6a211cb3df5375accf532d4186f224b623f39eca650b19b96240c596b" dependencies = [ "log 0.4.17", "notify", @@ -4006,9 +4006,9 @@ dependencies = [ [[package]] name = "rocket_http" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6131e6e6d38a9817f4a494ff5da95971451c2eb56a53915579fc9c80f6ef0117" +checksum = "2bf9cbd128e1f321a2d0bebd2b7cf0aafd89ca43edf69e49b56a5c46e48eb19f" dependencies = [ "cookie 0.11.4", "hyper 0.10.16", diff --git a/Cargo.toml b/Cargo.toml index 7303cb69..41a5bd50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ guid-create = "0.2" lettre_email = "0.9.2" num_cpus = "1.10" rocket = "0.4.6" -rocket_contrib = { version = "0.4.5", features = ["json"] } +rocket_contrib = { version = "0.4.11", features = ["json"] } rocket_i18n = "0.4.1" scheduled-thread-pool = "0.2.2" serde = "1.0"