refactor code to use Shrinkwraprs and diesel-derive-newtype (#598)

* add shrinkwraprs and implement Id thru it

This also means we can automatically convert Id to String without using
.into()!

* cleanup with the help of clippy!

* cleanup with the help of cargo fmt!

* remove extra block

* Shrinkwrap Page, ContentLen and RemoteForm

* translations

Cargo.lock

@@ -679,6 +679,17 @@ dependencies = [
  "r2d2 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "diesel-derive-newtype"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "diesel_derives"
 version = "1.4.0"
@@ -1247,6 +1258,14 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itertools"
 version = "0.8.0"
@@ -1890,6 +1909,7 @@ dependencies = [
  "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_qs 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shrinkwraprs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "validator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "validator_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webfinger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1934,6 +1954,7 @@ dependencies = [
  "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shrinkwraprs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1967,6 +1988,7 @@ dependencies = [
  "bcrypt 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "diesel-derive-newtype 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
@@ -1984,6 +2006,7 @@ dependencies = [
  "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shrinkwraprs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tantivy 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "webfinger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2656,6 +2679,17 @@ name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "shrinkwraprs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.12.15 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "siphasher"
 version = "0.2.3"
@@ -2807,6 +2841,16 @@ dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "syn"
+version = "0.14.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "syn"
 version = "0.15.34"
@@ -3486,6 +3530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum devise_codegen 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "066ceb7928ca93a9bedc6d0e612a8a0424048b0ab1f75971b203d01420c055d7"
 "checksum devise_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf41c59b22b5e3ec0ea55c7847e5f358d340f3a8d6d53a5cf4f1564967f96487"
 "checksum diesel 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d24935ba50c4a8dc375a0fd1f8a2ba6bdbdc4125713126a74b965d6a01a06d7"
+"checksum diesel-derive-newtype 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e844e8e6f65dcf27aa0b97d4234f974d93dfbf56816033d71b5e0c7eb701709f"
 "checksum diesel_derives 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62a27666098617d52c487a41f70de23d44a1dc1f3aa5877ceba2790fb1f1cab4"
 "checksum diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
 "checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
@@ -3550,6 +3595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718"
 "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
+"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d"
 "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
@@ -3691,6 +3737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum serde_qs 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "35965fa1d2413717053d67c2df1f5c3e1763fbf77200ea7e767523707bd5a0af"
 "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+"checksum shrinkwraprs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5f047b90b2ca2d1526ff73d67cba61f86f4cf9a8afddc99dd96702ded8e684"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
@@ -3709,6 +3756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum syn 0.12.15 (registry+https://github.com/rust-lang/crates.io-index)" = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
+"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
 "checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"

Cargo.toml

@@ -27,6 +27,7 @@ scheduled-thread-pool = "0.2.0"
 serde = "1.0"
 serde_json = "1.0"
 serde_qs = "0.4"
+shrinkwraprs = "0.2.1"
 validator = "0.8"
 validator_derive = "0.8"
 webfinger = "0.3.1"

plume-common/Cargo.toml

@@ -18,6 +18,7 @@ reqwest = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
+shrinkwraprs = "0.2.1"
 
 [dependencies.chrono]
 features = ["serde"]

plume-common/src/activity_pub/mod.rs

@@ -163,18 +163,12 @@ where
     }
 }
 
-#[derive(Clone, Serialize, Deserialize)]
+#[derive(Shrinkwrap, Clone, Serialize, Deserialize)]
 pub struct Id(String);
 
 impl Id {
-    pub fn new<T: Into<String>>(id: T) -> Id {
+    pub fn new(id: impl ToString) -> Id {
-        Id(id.into())
+        Id(id.to_string())
-    }
-}
-
-impl Into<String> for Id {
-    fn into(self) -> String {
-        self.0.clone()
     }
 }
 

plume-common/src/lib.rs

@@ -15,6 +15,8 @@ extern crate reqwest;
 extern crate rocket;
 extern crate serde;
 #[macro_use]
+extern crate shrinkwraprs;
+#[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;

plume-models/Cargo.toml

@@ -25,6 +25,8 @@ tantivy = "0.9.1"
 url = "1.7"
 webfinger = "0.3.1"
 whatlang = "0.7.1"
+shrinkwraprs = "0.2.1"
+diesel-derive-newtype = "0.1.2"
 
 [dependencies.chrono]
 features = ["serde"]

plume-models/src/blogs.rs

@@ -332,7 +332,7 @@ impl FromId<PlumeRocket> for Blog {
             .icon_image()
             .ok()
             .and_then(|icon| {
-                let owner: String = icon.object_props.attributed_to_link::<Id>().ok()?.into();
+                let owner = icon.object_props.attributed_to_link::<Id>().ok()?;
                 Media::save_remote(
                     &c.conn,
                     icon.object_props.url_string().ok()?,
@@ -348,7 +348,7 @@ impl FromId<PlumeRocket> for Blog {
             .image_image()
             .ok()
             .and_then(|banner| {
-                let owner: String = banner.object_props.attributed_to_link::<Id>().ok()?.into();
+                let owner = banner.object_props.attributed_to_link::<Id>().ok()?;
                 Media::save_remote(
                     &c.conn,
                     banner.object_props.url_string().ok()?,

plume-models/src/comments.rs

@@ -236,10 +236,7 @@ impl FromId<PlumeRocket> for Comment {
                     })?,
                     author_id: User::from_id(
                         c,
-                        &{
+                        &note.object_props.attributed_to_link::<Id>()?,
-                            let res: String = note.object_props.attributed_to_link::<Id>()?.into();
-                            res
-                        },
                         None,
                     )
                     .map_err(|(_, e)| e)?

plume-models/src/follows.rs

@@ -163,24 +163,10 @@ impl FromId<PlumeRocket> for Follow {
     }
 
     fn from_activity(c: &PlumeRocket, follow: FollowAct) -> Result<Self> {
-        let actor = User::from_id(
+        let actor =
-            c,
+            User::from_id(c, &follow.follow_props.actor_link::<Id>()?, None).map_err(|(_, e)| e)?;
-            &{
-                let res: String = follow.follow_props.actor_link::<Id>()?.into();
-                res
-            },
-            None,
-        )
-        .map_err(|(_, e)| e)?;
 
-        let target = User::from_id(
+        let target = User::from_id(c, &follow.follow_props.object_link::<Id>()?, None)
-            c,
-            &{
-                let res: String = follow.follow_props.object_link::<Id>()?.into();
-                res
-            },
-            None,
-        )
             .map_err(|(_, e)| e)?;
         Follow::accept_follow(&c.conn, &actor, &target, follow, actor.id, target.id)
     }

plume-models/src/likes.rs

@@ -115,24 +115,10 @@ impl FromId<PlumeRocket> for Like {
         let res = Like::insert(
             &c.conn,
             NewLike {
-                post_id: Post::from_id(
+                post_id: Post::from_id(c, &act.like_props.object_link::<Id>()?, None)
-                    c,
-                    &{
-                        let res: String = act.like_props.object_link::<Id>()?.into();
-                        res
-                    },
-                    None,
-                )
                     .map_err(|(_, e)| e)?
                     .id,
-                user_id: User::from_id(
+                user_id: User::from_id(c, &act.like_props.actor_link::<Id>()?, None)
-                    c,
-                    &{
-                        let res: String = act.like_props.actor_link::<Id>()?.into();
-                        res
-                    },
-                    None,
-                )
                     .map_err(|(_, e)| e)?
                     .id,
                 ap_url: act.object_props.id_string()?,

plume-models/src/posts.rs

@@ -642,7 +642,7 @@ impl FromId<PlumeRocket> for Post {
             .attributed_to_link_vec::<Id>()?
             .into_iter()
             .fold((None, vec![]), |(blog, mut authors), link| {
-                let url: String = link.into();
+                let url = link;
                 match User::from_id(&c, &url, None) {
                     Ok(u) => {
                         authors.push(u);

plume-models/src/reshares.rs

@@ -140,24 +140,10 @@ impl FromId<PlumeRocket> for Reshare {
         let res = Reshare::insert(
             &c.conn,
             NewReshare {
-                post_id: Post::from_id(
+                post_id: Post::from_id(c, &act.announce_props.object_link::<Id>()?, None)
-                    c,
-                    &{
-                        let res: String = act.announce_props.object_link::<Id>()?.into();
-                        res
-                    },
-                    None,
-                )
                     .map_err(|(_, e)| e)?
                     .id,
-                user_id: User::from_id(
+                user_id: User::from_id(c, &act.announce_props.actor_link::<Id>()?, None)
-                    c,
-                    &{
-                        let res: String = act.announce_props.actor_link::<Id>()?.into();
-                        res
-                    },
-                    None,
-                )
                     .map_err(|(_, e)| e)?
                     .id,
                 ap_url: act.object_props.id_string()?,

src/main.rs

@@ -62,6 +62,8 @@ mod mail;
 #[macro_use]
 mod template_utils;
 mod routes;
+#[macro_use]
+extern crate shrinkwraprs;
 #[cfg(feature = "test")]
 mod test_routes;
 

src/routes/mod.rs

@@ -16,7 +16,7 @@ use plume_models::{posts::Post, Connection};
 
 const ITEMS_PER_PAGE: i32 = 12;
 
-#[derive(Copy, Clone, UriDisplayQuery)]
+#[derive(Shrinkwrap, Copy, Clone, UriDisplayQuery)]
 pub struct Page(i32);
 
 impl<'v> FromFormValue<'v> for Page {
@@ -52,6 +52,7 @@ impl Page {
     }
 }
 
+#[derive(Shrinkwrap)]
 pub struct ContentLen(pub u64);
 
 impl<'a, 'r> FromRequest<'a, 'r> for ContentLen {
@@ -72,7 +73,7 @@ impl Default for Page {
 }
 
 /// A form for remote interaction, used by multiple routes
-#[derive(Clone, Default, FromForm)]
+#[derive(Shrinkwrap, Clone, Default, FromForm)]
 pub struct RemoteForm {
     pub remote: String,
 }

src/routes/user.rs

@@ -193,8 +193,7 @@ pub fn follow_not_connected(
 ) -> Result<Result<Flash<Ructe>, Redirect>, ErrorPage> {
     let target = User::find_by_fqn(&rockets, &name)?;
     if let Some(remote_form) = remote_form {
-        let remote = &remote_form.remote;
+        if let Some(uri) = User::fetch_remote_interact_uri(&remote_form)
-        if let Some(uri) = User::fetch_remote_interact_uri(remote)
             .ok()
             .and_then(|uri| {
                 rt_format!(