cargo update

.circleci/config.yml

@@ -10,7 +10,7 @@ executors:
         type: boolean
         default: false
     docker:
-    - image: plumeorg/plume-buildenv:v0.0.9
+    - image: plumeorg/plume-buildenv:v0.0.7
     - image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
       environment:
         POSTGRES_USER: postgres
@@ -82,7 +82,7 @@ commands:
         type: string
     steps:
     - run: zip -0 ccov.zip `find . -name 'plume*.gc*' -o -name 'plm*.gc*'`
-    - run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore '/*' -o lcov.info
+    - run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore-dir '/*' -o lcov.info
     - run: bash <(curl -s https://codecov.io/bash) -f lcov.info -F <<parameters.type>>
     - run: find . -name 'plume*.gc*' -delete -o -name 'plm*.gc*' -delete
     - run: rm ccov.zip lcov.info
@@ -226,7 +226,6 @@ jobs:
     steps:
     - restore_env:
         cache: none
-    - run: cargo build
     - run: crowdin upload -b master
 
 workflows:

.circleci/images/plume-buildenv/Dockerfile

@@ -4,11 +4,11 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 #install native/circleci/build dependancies
 RUN apt update &&\
     apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\
-    apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip libclang-dev&&\
+    apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip &&\
     rm -rf /var/lib/apt/lists/*
 
 #install and configure rust
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-01-15 -y &&\
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2019-03-23 -y &&\
     rustup component add rustfmt clippy &&\
     rustup component add rust-std --target wasm32-unknown-unknown
 

.gitignore

@@ -18,4 +18,3 @@ tags.*
 search_index
 .buildconfig
 __pycache__
-.vscode/

Cargo.toml

@@ -1,14 +1,12 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.4.0"
+version = "0.3.0"
 repository = "https://github.com/Plume-org/Plume"
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
 askama_escape = "0.1"
-async-trait = "*"
 atom_syndication = "0.6"
 clap = "2.33"
 colored = "1.8"
@@ -21,19 +19,19 @@ heck = "0.3.0"
 lettre = "0.9.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
-rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
+rocket = "0.4.0"
-rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" , features = ["json"] }
+rocket_contrib = { version = "0.4.0", features = ["json"] }
+rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
 rpassword = "4.0"
+runtime-fmt = "0.4.0"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_json = "1.0"
 serde_qs = "0.5"
 shrinkwraprs = "0.2.1"
-syntect = "3.3"
+validator = "0.8"
-tokio = "0.2"
+validator_derive = "0.8"
-validator = "0.10"
+webfinger = "0.4.1"
-validator_derive = "0.10"
-webfinger = { git = "https://github.com/Plume-org/webfinger", rev = "4e8f12810c4a7ba7a07bbcb722cd265fdff512b6", features = ["async"] }
 
 [[bin]]
 name = "plume"
@@ -65,14 +63,12 @@ path = "plume-common"
 [dependencies.plume-models]
 path = "plume-models"
 
-[dependencies.rocket_i18n]
+[dependencies.rocket_csrf]
-git = "https://github.com/Plume-org/rocket_i18n"
+git = "https://github.com/fdb-hiroshima/rocket_csrf"
-branch = "go-async"
+rev = "29910f2829e7e590a540da3804336577b48c7b31"
-default-features = false
-features = ["rocket"]
 
 [build-dependencies]
-ructe = "0.9.0"
+ructe = "0.6.2"
 rsass = "0.9"
 
 [features]

Dockerfile

@@ -10,8 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     gcc \
     make \
     openssl \
-    libssl-dev \
+    libssl-dev
-    clang
 
 WORKDIR /scratch
 COPY script/wasm-deps.sh .

assets/themes/default/_dark_variables.scss

@@ -17,12 +17,3 @@ $text-color: $white;
 $primary: $purple;
 $primary-text-color: $white; // text color on primary background (buttons for instance)
 $success-color: $blue;
-
-//Code Highlighting
-
-$code-keyword-color: #f79ac1;
-$code-source-color: #a6f0ab;
-$code-constant-color: #dfec84;
-$code-operator-color: #eddf95;
-$code-string-color: #f2ae60;
-$code-comment-color: #a3b4f9;

assets/themes/default/_global.scss

@@ -190,28 +190,7 @@ p.error {
 
  	background: $gray;
 
-  text-overflow: ellipsis;
+ 	text-overflow: ellipsis;
-
-  footer.authors {
-    div {
-      float: left;
-      margin-right: 0.25em;
-    }
-
-    .likes { color: $red; }
-    .reshares { color: $primary; }
-
-    span.likes, span.resahres {
-      font-family: "Route159",serif;
-      font-size: 1em;
-    }
-
-    svg.feather {
-      width: 0.85em;
-      height: 0.85em;
-    }
-  }
-
 
  	> * {
  	  margin: 20px;
@@ -490,6 +469,93 @@ figure {
 
 /// Small screens
 @media screen and (max-width: 600px) {
+  @keyframes menuOpening {
+    from {
+      transform: scaleX(0);
+      transform-origin: left;
+      opacity: 0;
+    }
+    to {
+      transform: scaleX(1);
+      transform-origin: left;
+      opacity: 1;
+    }
+  }
+
+  body > header {
+    flex-direction: column;
+
+    nav#menu {
+      display: inline-flex;
+      z-index: 21;
+    }
+
+    #content {
+      display: none;
+      appearance: none;
+      text-align: center;
+      z-index: 20;
+    }
+  }
+
+  body > header:focus-within #content, #content.show {
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+
+    animation: 0.2s menuOpening;
+
+    &::before {
+      content: "";
+      position: absolute;
+      transform: skewX(-10deg);
+      top: 0;
+      left: -20%;
+      width: 100%;
+      height: 100%;
+
+      z-index: -10;
+
+      background: $primary;
+    }
+
+    > nav {
+      flex-direction: column;
+      align-items: flex-start;
+
+      a {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin: 0;
+        padding: 1rem 1.5rem;
+        color: $background;
+        font-size: 1.4em;
+        font-weight: 300;
+
+        &.title { font-size: 1.8em; }
+
+        > *:first-child { width: 3rem; }
+        > img:first-child { height: 3rem; }
+        > *:last-child { margin-left: 1rem; }
+        > nav hr {
+          display: block;
+          margin: 0;
+          width: 100%;
+          border: solid $background 0.1rem;
+        }
+        .mobile-label { display: initial; }
+      }
+    }
+  }
+
   main .article-meta {
     > *, .comments {
       margin: 0 5%;
@@ -557,28 +623,3 @@ figure {
     }
   }
 }
-
-//highlighting
-code {
-  .constant{
-      color: $code-constant-color;
-  }
-  .string{
-      color: $code-string-color;
-  }
-  .keyword.type,.keyword.control,.type{
-      color: $code-keyword-color;
-  }
-  .keyword.operator{
-      color: $code-operator-color;
-  }
-  .source{
-      color: $code-source-color;
-  }
-  .comment{
-      color: $code-comment-color;
-  }
-  .function{
-      color:inherit;
-  }
-}

assets/themes/default/_header.scss

@@ -101,96 +101,6 @@ body > header {
   }
 }
 
-/// Small screens
-@media screen and (max-width: 600px) {
-  @keyframes menuOpening {
-    from {
-      transform: scaleX(0);
-      transform-origin: left;
-      opacity: 0;
-    }
-    to {
-      transform: scaleX(1);
-      transform-origin: left;
-      opacity: 1;
-    }
-  }
-
-  body > header {
-    flex-direction: column;
-
-    nav#menu {
-      display: inline-flex;
-      z-index: 21;
-    }
-
-    #content {
-      display: none;
-      appearance: none;
-      text-align: center;
-      z-index: 20;
-    }
-  }
-
-  body > header:focus-within #content, #content.show {
-    position: fixed;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-
-    animation: 0.2s menuOpening;
-
-    &::before {
-      content: "";
-      position: absolute;
-      transform: skewX(-10deg);
-      top: 0;
-      left: -20%;
-      width: 100%;
-      height: 100%;
-
-      z-index: -10;
-
-      background: $primary;
-    }
-
-    > nav {
-      flex-direction: column;
-      align-items: flex-start;
-
-      a {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        margin: 0;
-        padding: 1rem 1.5rem;
-        color: $background;
-        font-size: 1.4em;
-        font-weight: 300;
-
-        &.title { font-size: 1.8em; }
-
-        > *:first-child { width: 3rem; }
-        > img:first-child { height: 3rem; }
-        > *:last-child { margin-left: 1rem; }
-        > nav hr {
-          display: block;
-          margin: 0;
-          width: 100%;
-          border: solid $background 0.1rem;
-        }
-        .mobile-label { display: initial; }
-      }
-    }
-  }
-}
-
 /* Only enable label animations on large screens */
 @media screen and (min-width: 600px) {
  	header nav a {

assets/themes/default/_variables.scss

@@ -27,11 +27,3 @@ $margin: 0 $horizontal-margin;
 $route159: "Route159", serif;
 $playfair: "Playfair Display", serif;
 $lora: "Lora", serif;
-
-//Code Highlighting
-$code-keyword-color: #45244a;
-$code-source-color: #4c588c;
-$code-constant-color: scale-color(magenta,$lightness:-5%);
-$code-operator-color: scale-color($code-source-color,$lightness:-5%);
-$code-string-color: #8a571c;
-$code-comment-color: #1c4c8a;

build.rs

@@ -1,3 +1,5 @@
+extern crate rsass;
+extern crate ructe;
 use ructe::Ructe;
 use std::process::{Command, Stdio};
 use std::{ffi::OsStr, fs::*, io::Write, path::*};

migrations/postgres/2020-01-05-232816_add_blocklist/down.sql

@@ -1,3 +0,0 @@
--- This file should undo anything in `up.sql`
-
-drop table email_blocklist;

migrations/postgres/2020-01-05-232816_add_blocklist/up.sql

@@ -1,6 +0,0 @@
--- Your SQL goes here
-CREATE TABLE email_blocklist(id SERIAL PRIMARY KEY,
-                             email_address TEXT UNIQUE,
-                             note TEXT,
-                             notify_user BOOLEAN DEFAULT FALSE,
-                             notification_text TEXT);

migrations/sqlite/2020-01-05-232816_add_blocklist/down.sql

@@ -1,3 +0,0 @@
--- This file should undo anything in `up.sql`
-
-drop table email_blocklist;

migrations/sqlite/2020-01-05-232816_add_blocklist/up.sql

@@ -1,6 +0,0 @@
--- Your SQL goes here
-CREATE TABLE email_blocklist(id INTEGER PRIMARY KEY,
-                             email_address TEXT UNIQUE,
-                             note TEXT,
-                             notify_user BOOLEAN DEFAULT FALSE,
-                             notification_text TEXT);

plume-api/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-api"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 serde = "1.0"

plume-api/src/lib.rs

@@ -1,3 +1,4 @@
+extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 

plume-cli/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-cli"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [[bin]]
 name = "plm"

plume-cli/src/main.rs

@@ -1,4 +1,8 @@
-use dotenv;
+extern crate clap;
+extern crate diesel;
+extern crate dotenv;
+extern crate plume_models;
+extern crate rpassword;
 
 use clap::App;
 use diesel::Connection;

plume-common/Cargo.toml

@@ -1,28 +1,25 @@
 [package]
 name = "plume-common"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
-activitystreams-derive = "0.2"
+activitystreams-derive = "0.1.1"
 activitystreams-traits = "0.1.0"
 array_tool = "1.0"
 base64 = "0.10"
-futures-util = "*"
 heck = "0.3.0"
 hex = "0.3"
-hyper = "0.13"
+hyper = "0.12.33"
 openssl = "0.10.22"
-rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
+rocket = "0.4.0"
+reqwest = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 shrinkwraprs = "0.2.1"
-syntect = "3.3"
+tokio = "0.1.22"
-tokio = "0.2"
-regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }
 
 [dependencies.chrono]
 features = ["serde"]
@@ -31,7 +28,3 @@ version = "0.4"
 [dependencies.pulldown-cmark]
 default-features = false
 version = "0.2.0"
-
-[dependencies.reqwest]
-features = ["json", "blocking"]
-version = "0.10"

plume-common/src/activity_pub/inbox.rs

@@ -279,9 +279,8 @@ pub trait FromId<C>: Sized {
 
     /// Dereferences an ID
     fn deref(id: &str) -> Result<Self::Object, (Option<serde_json::Value>, Self::Error)> {
-        // Use blocking reqwest API here, since defer cannot be async (yet)
+        reqwest::ClientBuilder::new()
-        reqwest::blocking::Client::builder()
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
-            .connect_timeout(std::time::Duration::from_secs(5))
             .build()
             .map_err(|_| (None, InboxError::DerefError.into()))?
             .get(id)
@@ -297,7 +296,7 @@ pub trait FromId<C>: Sized {
             )
             .send()
             .map_err(|_| (None, InboxError::DerefError))
-            .and_then(|r| {
+            .and_then(|mut r| {
                 let json: serde_json::Value = r
                     .json()
                     .map_err(|_| (None, InboxError::InvalidObject(None)))?;

plume-common/src/activity_pub/mod.rs

@@ -1,12 +1,14 @@
 use activitypub::{Activity, Link, Object};
 use array_tool::vec::Uniq;
-use reqwest::ClientBuilder;
+use reqwest::r#async::ClientBuilder;
 use rocket::{
     http::Status,
     request::{FromRequest, Request},
-    response::{Responder, Response, Result},
+    response::{Responder, Response},
     Outcome,
 };
+use serde_json;
+use tokio::prelude::*;
 
 use self::sign::Signable;
 
@@ -60,45 +62,39 @@ impl<T> ActivityStream<T> {
         ActivityStream(t)
     }
 }
-#[rocket::async_trait]
+
-impl<'r, O: Object + Send + 'r> Responder<'r> for ActivityStream<O> {
+impl<'r, O: Object> Responder<'r> for ActivityStream<O> {
-    async fn respond_to(self, request: &'r Request<'_>) -> Result<'r> {
+    fn respond_to(self, request: &Request) -> Result<Response<'r>, Status> {
         let mut json = serde_json::to_value(&self.0).map_err(|_| Status::InternalServerError)?;
         json["@context"] = context();
-        let result = serde_json::to_string(&json).map_err(rocket::response::Debug);
+        serde_json::to_string(&json).respond_to(request).map(|r| {
-        match result.respond_to(request).await {
+            Response::build_from(r)
-            Ok(r) => Response::build_from(r)
                 .raw_header("Content-Type", "application/activity+json")
-                .ok(),
+                .finalize()
-            Err(e) => Err(e),
+        })
-        }
     }
 }
 
 #[derive(Clone)]
 pub struct ApRequest;
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for ApRequest {
     type Error = ();
 
-    async fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> {
+    fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> {
         request
             .headers()
             .get_one("Accept")
             .map(|header| {
                 header
                     .split(',')
-                    .map(|ct| {
+                    .map(|ct| match ct.trim() {
-                        match ct.trim() {
+                        // bool for Forward: true if found a valid Content-Type for Plume first (HTML), false otherwise
-                            // bool for Forward: true if found a valid Content-Type for Plume first (HTML),
+                        "application/ld+json; profile=\"https://w3.org/ns/activitystreams\""
-                            // false otherwise
+                        | "application/ld+json;profile=\"https://w3.org/ns/activitystreams\""
-                            "application/ld+json; profile=\"https://w3.org/ns/activitystreams\""
+                        | "application/activity+json"
-                            | "application/ld+json;profile=\"https://w3.org/ns/activitystreams\""
+                        | "application/ld+json" => Outcome::Success(ApRequest),
-                            | "application/activity+json"
+                        "text/html" => Outcome::Forward(true),
-                            | "application/ld+json" => Outcome::Success(ApRequest),
+                        _ => Outcome::Forward(false),
-                            "text/html" => Outcome::Forward(true),
-                            _ => Outcome::Forward(false),
-                        }
                     })
                     .fold(Outcome::Forward(false), |out, ct| {
                         if out.clone().forwarded().unwrap_or_else(|| out.is_success()) {
@@ -134,38 +130,36 @@ where
         .sign(sender)
         .expect("activity_pub::broadcast: signature error");
 
-    let rt = tokio::runtime::Builder::new()
+    let mut rt = tokio::runtime::current_thread::Runtime::new()
-        .threaded_scheduler()
-        .build()
         .expect("Error while initializing tokio runtime for federation");
+    let client = ClientBuilder::new()
+        .connect_timeout(std::time::Duration::from_secs(5))
+        .build()
+        .expect("Can't build client");
     for inbox in boxes {
         let body = signed.to_string();
         let mut headers = request::headers();
         headers.insert("Digest", request::Digest::digest(&body));
-        let sig = request::signature(sender, &headers)
+        rt.spawn(
-            .expect("activity_pub::broadcast: request signature error");
-        let client = ClientBuilder::new()
-            .connect_timeout(std::time::Duration::from_secs(5))
-            .build()
-            .expect("Can't build client");
-        rt.spawn(async move {
             client
                 .post(&inbox)
                 .headers(headers.clone())
-                .header("Signature", sig)
+                .header(
+                    "Signature",
+                    request::signature(sender, &headers)
+                        .expect("activity_pub::broadcast: request signature error"),
+                )
                 .body(body)
                 .send()
-                .await
+                .and_then(|r| r.into_body().concat2())
-                .unwrap()
-                .text()
-                .await
                 .map(move |response| {
                     println!("Successfully sent activity to inbox ({})", inbox);
                     println!("Response: \"{:?}\"\n", response)
                 })
-                .map_err(|e| println!("Error while sending to inbox ({:?})", e))
+                .map_err(|e| println!("Error while sending to inbox ({:?})", e)),
-        });
+        );
     }
+    rt.run().unwrap();
 }
 
 #[derive(Shrinkwrap, Clone, Serialize, Deserialize)]
@@ -209,7 +203,8 @@ pub struct PublicKey {
     pub public_key_pem: Option<serde_json::Value>,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Default, UnitString)]
+#[activitystreams(Hashtag)]
 pub struct HashtagType;
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]

plume-common/src/activity_pub/request.rs

@@ -1,11 +1,12 @@
+use base64;
 use chrono::{offset::Utc, DateTime};
 use openssl::hash::{Hasher, MessageDigest};
 use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, DATE, USER_AGENT};
 use std::ops::Deref;
 use std::time::SystemTime;
 
-use crate::activity_pub::sign::Signer;
+use activity_pub::sign::Signer;
-use crate::activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
+use activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
 
 const PLUME_USER_AGENT: &str = concat!("Plume/", env!("CARGO_PKG_VERSION"));
 

plume-common/src/activity_pub/sign.rs

@@ -1,7 +1,10 @@
 use super::request;
+use base64;
 use chrono::{naive::NaiveDateTime, DateTime, Duration, Utc};
+use hex;
 use openssl::{pkey::PKey, rsa::Rsa, sha::sha256};
 use rocket::http::HeaderMap;
+use serde_json;
 
 /// Returns (public key, private key)
 pub fn gen_keypair() -> (Vec<u8>, Vec<u8>) {
@@ -128,7 +131,7 @@ impl SignatureValidity {
 
 pub fn verify_http_headers<S: Signer + ::std::fmt::Debug>(
     sender: &S,
-    all_headers: &HeaderMap<'_>,
+    all_headers: &HeaderMap,
     data: &request::Digest,
 ) -> SignatureValidity {
     let sig_header = all_headers.get_one("Signature");

plume-common/src/lib.rs

@@ -1,14 +1,26 @@
 #![feature(associated_type_defaults)]
 
+extern crate activitypub;
 #[macro_use]
 extern crate activitystreams_derive;
-
+extern crate activitystreams_traits;
+extern crate array_tool;
+extern crate base64;
+extern crate chrono;
+extern crate heck;
+extern crate hex;
+extern crate openssl;
+extern crate pulldown_cmark;
+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;
+extern crate tokio;
 
 pub mod activity_pub;
 pub mod utils;

plume-common/src/utils.rs

@@ -1,15 +1,12 @@
 use heck::CamelCase;
 use openssl::rand::rand_bytes;
 use pulldown_cmark::{html, Event, Options, Parser, Tag};
-use regex_syntax::is_word_character;
 use rocket::{
     http::uri::Uri,
     response::{Flash, Redirect},
 };
 use std::borrow::Cow;
 use std::collections::HashSet;
-use syntect::html::ClassedHTMLGenerator;
-use syntect::parsing::SyntaxSet;
 
 /// Generates an hexadecimal representation of 32 bytes of random data
 pub fn random_hex() -> String {
@@ -49,7 +46,7 @@ enum State {
     Ready,
 }
 
-fn to_inline(tag: Tag<'_>) -> Tag<'_> {
+fn to_inline(tag: Tag) -> Tag {
     match tag {
         Tag::Header(_) | Tag::Table(_) | Tag::TableHead | Tag::TableRow | Tag::TableCell => {
             Tag::Paragraph
@@ -58,54 +55,7 @@ fn to_inline(tag: Tag<'_>) -> Tag<'_> {
         t => t,
     }
 }
-struct HighlighterContext {
+
-    content: Vec<String>,
-}
-fn highlight_code<'a>(
-    context: &mut Option<HighlighterContext>,
-    evt: Event<'a>,
-) -> Option<Vec<Event<'a>>> {
-    match evt {
-        Event::Start(Tag::CodeBlock(lang)) => {
-            if lang.is_empty() {
-                Some(vec![Event::Start(Tag::CodeBlock(lang))])
-            } else {
-                *context = Some(HighlighterContext { content: vec![] });
-                Some(vec![Event::Start(Tag::CodeBlock(lang))])
-            }
-        }
-        Event::End(Tag::CodeBlock(x)) => {
-            let mut result = vec![];
-            if let Some(ctx) = context.take() {
-                let syntax_set = SyntaxSet::load_defaults_newlines();
-                let syntax = syntax_set.find_syntax_by_token(&x).unwrap_or_else(|| {
-                    syntax_set
-                        .find_syntax_by_name(&x)
-                        .unwrap_or_else(|| syntax_set.find_syntax_plain_text())
-                });
-                let mut html = ClassedHTMLGenerator::new(&syntax, &syntax_set);
-                for line in ctx.content {
-                    html.parse_html_for_line(&line);
-                }
-                let q = html.finalize();
-                result.push(Event::Html(q.into()));
-            }
-            result.push(Event::End(Tag::CodeBlock(x)));
-            *context = None;
-            Some(result)
-        }
-        Event::Text(t) => {
-            if let Some(mut c) = context.take() {
-                c.content.push(t.to_string());
-                *context = Some(c);
-                Some(vec![])
-            } else {
-                Some(vec![Event::Text(t)])
-            }
-        }
-        _ => Some(vec![evt]),
-    }
-}
 fn flatten_text<'a>(state: &mut Option<String>, evt: Event<'a>) -> Option<Vec<Event<'a>>> {
     let (s, res) = match evt {
         Event::Text(txt) => match state.take() {
@@ -158,7 +108,9 @@ fn process_image<'a, 'b>(
         match evt {
             Event::Start(Tag::Image(id, title)) => {
                 if let Some((url, cw)) = id.parse::<i32>().ok().and_then(processor.as_ref()) {
-                    if let (Some(cw), false) = (cw, inline) {
+                    if inline || cw.is_none() {
+                        Event::Start(Tag::Image(Cow::Owned(url), title))
+                    } else {
                         // there is a cw, and where are not inline
                         Event::Html(Cow::Owned(format!(
                             r#"<label for="postcontent-cw-{id}">
@@ -169,11 +121,9 @@ fn process_image<'a, 'b>(
     </span>
   <img src="{url}" alt=""#,
                             id = random_hex(),
-                            cw = cw,
+                            cw = cw.unwrap(),
                             url = url
                         )))
-                    } else {
-                        Event::Start(Tag::Image(Cow::Owned(url), title))
                     }
                 } else {
                     Event::Start(Tag::Image(id, title))
@@ -201,12 +151,6 @@ fn process_image<'a, 'b>(
     }
 }
 
-#[derive(Default, Debug)]
-struct DocumentContext {
-    in_code: bool,
-    in_link: bool,
-}
-
 /// Returns (HTML, mentions, hashtags)
 pub fn md_to_html<'a>(
     md: &str,
@@ -221,32 +165,14 @@ pub fn md_to_html<'a>(
     };
     let parser = Parser::new_ext(md, Options::all());
 
-    let (parser, mentions, hashtags): (Vec<Event<'_>>, Vec<String>, Vec<String>) = parser
+    let (parser, mentions, hashtags): (Vec<Event>, Vec<String>, Vec<String>) = parser
         // Flatten text because pulldown_cmark break #hashtag in two individual text elements
         .scan(None, flatten_text)
-        .flatten()
+        .flat_map(IntoIterator::into_iter)
-        .scan(None, highlight_code)
-        .flatten()
         .map(|evt| process_image(evt, inline, &media_processor))
         // Ignore headings, images, and tables if inline = true
         .scan((vec![], inline), inline_tags)
-        .scan(&mut DocumentContext::default(), |ctx, evt| match evt {
+        .map(|evt| match evt {
-            Event::Start(Tag::CodeBlock(_)) | Event::Start(Tag::Code) => {
-                ctx.in_code = true;
-                Some((vec![evt], vec![], vec![]))
-            }
-            Event::End(Tag::CodeBlock(_)) | Event::End(Tag::Code) => {
-                ctx.in_code = false;
-                Some((vec![evt], vec![], vec![]))
-            }
-            Event::Start(Tag::Link(_, _)) => {
-                ctx.in_link = true;
-                Some((vec![evt], vec![], vec![]))
-            }
-            Event::End(Tag::Link(_, _)) => {
-                ctx.in_link = false;
-                Some((vec![evt], vec![], vec![]))
-            }
             Event::Text(txt) => {
                 let (evts, _, _, _, new_mentions, new_hashtags) = txt.chars().fold(
                     (vec![], State::Ready, String::new(), 0, vec![], vec![]),
@@ -262,7 +188,7 @@ pub fn md_to_html<'a>(
                                         text_acc.push(c)
                                     }
                                     let mention = text_acc;
-                                    let short_mention = mention.splitn(1, '@').next().unwrap_or("");
+                                    let short_mention = mention.splitn(1, '@').nth(0).unwrap_or("");
                                     let link = Tag::Link(
                                         format!("{}@/{}/", base_url, &mention).into(),
                                         short_mention.to_owned().into(),
@@ -284,7 +210,7 @@ pub fn md_to_html<'a>(
                                 }
                             }
                             State::Hashtag => {
-                                let char_matches = c == '-' || is_word_character(c);
+                                let char_matches = c.is_alphanumeric() || "-_".contains(c);
                                 if char_matches && (n < (txt.chars().count() - 1)) {
                                     text_acc.push(c);
                                     (events, State::Hashtag, text_acc, n + 1, mentions, hashtags)
@@ -315,7 +241,7 @@ pub fn md_to_html<'a>(
                                 }
                             }
                             State::Ready => {
-                                if !ctx.in_code && !ctx.in_link && c == '@' {
+                                if c == '@' {
                                     events.push(Event::Text(text_acc.into()));
                                     (
                                         events,
@@ -325,7 +251,7 @@ pub fn md_to_html<'a>(
                                         mentions,
                                         hashtags,
                                     )
-                                } else if !ctx.in_code && !ctx.in_link && c == '#' {
+                                } else if c == '#' {
                                     events.push(Event::Text(text_acc.into()));
                                     (
                                         events,
@@ -370,9 +296,9 @@ pub fn md_to_html<'a>(
                         }
                     },
                 );
-                Some((evts, new_mentions, new_hashtags))
+                (evts, new_mentions, new_hashtags)
             }
-            _ => Some((vec![evt], vec![], vec![])),
+            _ => (vec![evt], vec![], vec![]),
         })
         .fold(
             (vec![], vec![], vec![]),
@@ -409,12 +335,9 @@ mod tests {
             ("mention at @end", vec!["end"]),
             ("between parenthesis (@test)", vec!["test"]),
             ("with some punctuation @test!", vec!["test"]),
-            (" @spaces     ", vec!["spaces"]),
+            ("      @spaces     ", vec!["spaces"]),
             ("@is_a@mention", vec!["is_a@mention"]),
             ("not_a@mention", vec![]),
-            ("`@helo`", vec![]),
-            ("```\n@hello\n```", vec![]),
-            ("[@atmark in link](https://example.org/)", vec![]),
         ];
 
         for (md, mentions) in tests {
@@ -438,10 +361,8 @@ mod tests {
             ("hashtag at #end", vec!["end"]),
             ("between parenthesis (#test)", vec!["test"]),
             ("with some punctuation #test!", vec!["test"]),
-            (" #spaces     ", vec!["spaces"]),
+            ("      #spaces     ", vec!["spaces"]),
             ("not_a#hashtag", vec![]),
-            ("#نرم‌افزار_آزاد", vec!["نرم‌افزار_آزاد"]),
-            ("[#hash in link](https://example.org/)", vec![]),
         ];
 
         for (md, mentions) in tests {

plume-front/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-front"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 stdweb = "=0.4.18"
@@ -12,4 +11,4 @@ gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "
 gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 lazy_static = "1.3"
 serde = "1.0"
-serde_json = "1.0"
+serde_json = "1.0"

plume-front/src/editor.rs

@@ -1,4 +1,3 @@
-use crate::CATALOG;
 use serde::{Deserialize, Serialize};
 use serde_json;
 use std::sync::Mutex;
@@ -6,6 +5,7 @@ use stdweb::{
     unstable::{TryFrom, TryInto},
     web::{event::*, html_element::*, *},
 };
+use CATALOG;
 
 macro_rules! mv {
     ( $( $var:ident ),* => $exp:expr ) => {

plume-front/src/main.rs

@@ -1,12 +1,15 @@
 #![recursion_limit = "128"]
 #![feature(decl_macro, proc_macro_hygiene, try_trait)]
 
+extern crate gettext;
 #[macro_use]
 extern crate gettext_macros;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
 extern crate stdweb;
+extern crate serde;
+extern crate serde_json;
 use stdweb::web::{event::*, *};
 
 init_i18n!(

plume-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plume-macro"
-version = "0.4.0"
+version = "0.1.0"
 authors = ["Trinity Pointard <trinity.pointard@insa-rennes.fr>"]
 edition = "2018"
 description = "Plume procedural macros"

plume-macro/src/lib.rs

@@ -1,7 +1,8 @@
 #![recursion_limit = "128"]
-
+extern crate proc_macro;
 #[macro_use]
 extern crate quote;
+extern crate syn;
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
@@ -102,17 +103,19 @@ fn file_to_migration(file: &str) -> TokenStream2 {
                 acc.push_str(line);
                 acc.push('\n');
             }
-        } else if line.starts_with("--#!") {
-            acc.push_str(&line[4..]);
-            acc.push('\n');
-        } else if line.starts_with("--") {
-            continue;
         } else {
-            let func: TokenStream2 = trampoline(TokenStream::from_str(&acc).unwrap().into());
+            if line.starts_with("--#!") {
-            actions.push(quote!(Action::Function(&#func)));
+                acc.push_str(&line[4..]);
-            sql = true;
+                acc.push('\n');
-            acc = line.to_string();
+            } else if line.starts_with("--") {
-            acc.push('\n');
+                continue;
+            } else {
+                let func: TokenStream2 = trampoline(TokenStream::from_str(&acc).unwrap().into());
+                actions.push(quote!(Action::Function(&#func)));
+                sql = true;
+                acc = line.to_string();
+                acc.push('\n');
+            }
         }
     }
     if !acc.trim().is_empty() {

plume-models/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-models"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
@@ -10,26 +9,25 @@ ammonia = "2.1.1"
 askama_escape = "0.1"
 bcrypt = "0.5"
 guid-create = "0.1"
-futures = "0.3"
 heck = "0.3.0"
 itertools = "0.8.0"
-lazy_static = "1.0"
+lazy_static = "*"
 migrations_internals= "1.4.0"
 openssl = "0.10.22"
-rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
+rocket = "0.4.0"
+rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
+reqwest = "0.9"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 tantivy = "0.10.1"
-tokio = "0.2"
 url = "2.1"
 walkdir = "2.2"
-webfinger = { git = "https://github.com/Plume-org/webfinger", rev = "4e8f12810c4a7ba7a07bbcb722cd265fdff512b6", features = ["async"] }
+webfinger = "0.4.1"
 whatlang = "0.7.1"
-shrinkwraprs = "0.3"
+shrinkwraprs = "0.2.1"
 diesel-derive-newtype = "0.1.2"
-glob = "0.3.0"
 
 [dependencies.chrono]
 features = ["serde"]
@@ -48,19 +46,8 @@ path = "../plume-common"
 [dependencies.plume-macro]
 path = "../plume-macro"
 
-[dependencies.reqwest]
-features = ["json", "blocking"]
-version = "0.10"
-
-
-[dependencies.rocket_i18n]
-git = "https://github.com/Plume-org/rocket_i18n"
-branch = "go-async"
-default-features = false
-features = ["rocket"]
-
 [dev-dependencies]
-diesel_migrations = "1.4.0"
+diesel_migrations = "1.3.0"
 
 [features]
 postgres = ["diesel/postgres", "plume-macro/postgres" ]

plume-models/src/admin.rs

@@ -1,19 +1,19 @@
-use crate::users::User;
 use rocket::{
     http::Status,
     request::{self, FromRequest, Request},
     Outcome,
 };
 
+use users::User;
+
 /// Wrapper around User to use as a request guard on pages reserved to admins.
 pub struct Admin(pub User);
 
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for Admin {
     type Error = ();
 
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<Admin, ()> {
-        let user = try_outcome!(User::from_request(request).await);
+        let user = request.guard::<User>()?;
         if user.is_admin() {
             Outcome::Success(Admin(user))
         } else {
@@ -25,12 +25,11 @@ impl<'a, 'r> FromRequest<'a, 'r> for Admin {
 /// Same as `Admin` but for moderators.
 pub struct Moderator(pub User);
 
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for Moderator {
     type Error = ();
 
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<Moderator, ()> {
-        let user = try_outcome!(User::from_request(request).await);
+        let user = request.guard::<User>()?;
         if user.is_moderator() {
             Outcome::Success(Moderator(user))
         } else {

plume-models/src/api_tokens.rs

@@ -1,4 +1,3 @@
-use crate::{db_conn::DbConn, schema::api_tokens, Error, Result};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use rocket::{
@@ -7,6 +6,10 @@ use rocket::{
     Outcome,
 };
 
+use db_conn::DbConn;
+use schema::api_tokens;
+use {Error, Result};
+
 #[derive(Clone, Queryable)]
 pub struct ApiToken {
     pub id: i32,
@@ -76,36 +79,32 @@ pub enum TokenError {
     DbError,
 }
 
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for ApiToken {
     type Error = TokenError;
 
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<ApiToken, TokenError> {
         let headers: Vec<_> = request.headers().get("Authorization").collect();
         if headers.len() != 1 {
             return Outcome::Failure((Status::BadRequest, TokenError::NoHeader));
         }
 
         let mut parsed_header = headers[0].split(' ');
-        if let Some(auth_type) = parsed_header.next() {
+        let auth_type = parsed_header.next().map_or_else(
-            if let Some(val) = parsed_header.next() {
+            || Outcome::Failure((Status::BadRequest, TokenError::NoType)),
-                if auth_type == "Bearer" {
+            Outcome::Success,
-                    if let Outcome::Success(conn) = DbConn::from_request(request).await {
+        )?;
-                        if let Ok(token) = ApiToken::find_by_value(&*conn, val) {
+        let val = parsed_header.next().map_or_else(
-                            return Outcome::Success(token);
+            || Outcome::Failure((Status::BadRequest, TokenError::NoValue)),
-                        }
+            Outcome::Success,
-                    } else {
+        )?;
-                        return Outcome::Failure((
+
-                            Status::InternalServerError,
+        if auth_type == "Bearer" {
-                            TokenError::DbError,
+            let conn = request
-                        ));
+                .guard::<DbConn>()
-                    }
+                .map_failure(|_| (Status::InternalServerError, TokenError::DbError))?;
-                }
+            if let Ok(token) = ApiToken::find_by_value(&*conn, val) {
-            } else {
+                return Outcome::Success(token);
-                return Outcome::Failure((Status::BadRequest, TokenError::NoValue));
             }
-        } else {
-            return Outcome::Failure((Status::BadRequest, TokenError::NoType));
         }
 
         Outcome::Forward(())

plume-models/src/apps.rs

@@ -1,7 +1,9 @@
-use crate::{schema::apps, Error, Result};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use schema::apps;
+use {Error, Result};
+
 #[derive(Clone, Queryable, Serialize)]
 pub struct App {
     pub id: i32,

plume-models/src/blocklisted_emails.rs

@@ -1,139 +0,0 @@
-use crate::{schema::email_blocklist, Connection, Error, Result};
-use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, TextExpressionMethods};
-use glob::Pattern;
-
-#[derive(Clone, Queryable, Identifiable)]
-#[table_name = "email_blocklist"]
-pub struct BlocklistedEmail {
-    pub id: i32,
-    pub email_address: String,
-    pub note: String,
-    pub notify_user: bool,
-    pub notification_text: String,
-}
-
-#[derive(Insertable, FromForm)]
-#[table_name = "email_blocklist"]
-pub struct NewBlocklistedEmail {
-    pub email_address: String,
-    pub note: String,
-    pub notify_user: bool,
-    pub notification_text: String,
-}
-
-impl BlocklistedEmail {
-    insert!(email_blocklist, NewBlocklistedEmail);
-    get!(email_blocklist);
-    find_by!(email_blocklist, find_by_id, id as i32);
-    pub fn delete_entries(conn: &Connection, ids: Vec<i32>) -> Result<bool> {
-        use diesel::delete;
-        for i in ids {
-            let be: BlocklistedEmail = BlocklistedEmail::find_by_id(&conn, i)?;
-            delete(&be).execute(conn)?;
-        }
-        Ok(true)
-    }
-    pub fn find_for_domain(conn: &Connection, domain: &str) -> Result<Vec<BlocklistedEmail>> {
-        let effective = format!("%@{}", domain);
-        email_blocklist::table
-            .filter(email_blocklist::email_address.like(effective))
-            .load::<BlocklistedEmail>(conn)
-            .map_err(Error::from)
-    }
-    pub fn matches_blocklist(conn: &Connection, email: &str) -> Result<Option<BlocklistedEmail>> {
-        let mut result = email_blocklist::table.load::<BlocklistedEmail>(conn)?;
-        for i in result.drain(..) {
-            if let Ok(x) = Pattern::new(&i.email_address) {
-                if x.matches(email) {
-                    return Ok(Some(i));
-                }
-            }
-        }
-        Ok(None)
-    }
-    pub fn page(conn: &Connection, (min, max): (i32, i32)) -> Result<Vec<BlocklistedEmail>> {
-        email_blocklist::table
-            .offset(min.into())
-            .limit((max - min).into())
-            .load::<BlocklistedEmail>(conn)
-            .map_err(Error::from)
-    }
-    pub fn count(conn: &Connection) -> Result<i64> {
-        email_blocklist::table
-            .count()
-            .get_result(conn)
-            .map_err(Error::from)
-    }
-    pub fn pattern_errors(pat: &str) -> Option<glob::PatternError> {
-        let c = Pattern::new(pat);
-        c.err()
-    }
-    pub fn new(
-        conn: &Connection,
-        pattern: &str,
-        note: &str,
-        show_notification: bool,
-        notification_text: &str,
-    ) -> Result<BlocklistedEmail> {
-        let c = NewBlocklistedEmail {
-            email_address: pattern.to_owned(),
-            note: note.to_owned(),
-            notify_user: show_notification,
-            notification_text: notification_text.to_owned(),
-        };
-        BlocklistedEmail::insert(conn, c)
-    }
-}
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use crate::{instance::tests as instance_tests, tests::rockets, Connection as Conn};
-    use diesel::Connection;
-
-    pub(crate) fn fill_database(conn: &Conn) -> Vec<BlocklistedEmail> {
-        instance_tests::fill_database(conn);
-        let domainblock =
-            BlocklistedEmail::new(conn, "*@bad-actor.com", "Mean spammers", false, "").unwrap();
-        let userblock = BlocklistedEmail::new(
-            conn,
-            "spammer@lax-administration.com",
-            "Decent enough domain, but this user is a problem.",
-            true,
-            "Stop it please",
-        )
-        .unwrap();
-        vec![domainblock, userblock]
-    }
-    #[test]
-    fn test_match() {
-        let r = rockets();
-        let conn = &*r.conn;
-        conn.test_transaction::<_, (), _>(|| {
-            let various = fill_database(conn);
-            let match1 = "user1@bad-actor.com";
-            let match2 = "spammer@lax-administration.com";
-            let no_match = "happy-user@lax-administration.com";
-            assert_eq!(
-                BlocklistedEmail::matches_blocklist(conn, match1)
-                    .unwrap()
-                    .unwrap()
-                    .id,
-                various[0].id
-            );
-            assert_eq!(
-                BlocklistedEmail::matches_blocklist(conn, match2)
-                    .unwrap()
-                    .unwrap()
-                    .id,
-                various[1].id
-            );
-            assert_eq!(
-                BlocklistedEmail::matches_blocklist(conn, no_match)
-                    .unwrap()
-                    .is_none(),
-                true
-            );
-            Ok(())
-        });
-    }
-}

plume-models/src/blog_authors.rs

@@ -1,6 +1,8 @@
-use crate::{schema::blog_authors, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use schema::blog_authors;
+use {Error, Result};
+
 #[derive(Clone, Queryable, Identifiable)]
 pub struct BlogAuthor {
     pub id: i32,

plume-models/src/blogs.rs

@@ -1,7 +1,3 @@
-use crate::{
-    ap_url, instance::*, medias::Media, posts::Post, safe_string::SafeString, schema::blogs,
-    search::Searcher, users::User, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE,
-};
 use activitypub::{
     actor::Group,
     collection::{OrderedCollection, OrderedCollectionPage},
@@ -16,12 +12,22 @@ use openssl::{
     rsa::Rsa,
     sign::{Signer, Verifier},
 };
+use serde_json;
+use url::Url;
+use webfinger::*;
+
+use instance::*;
+use medias::Media;
 use plume_common::activity_pub::{
     inbox::{AsActor, FromId},
     sign, ActivityStream, ApSignature, Id, IntoId, PublicKey, Source,
 };
-use url::Url;
+use posts::Post;
-use webfinger::*;
+use safe_string::SafeString;
+use schema::blogs;
+use search::Searcher;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE};
 
 pub type CustomGroup = CustomObject<ApSignature, Group>;
 
@@ -70,8 +76,7 @@ impl Blog {
     insert!(blogs, NewBlog, |inserted, conn| {
         let instance = inserted.get_instance(conn)?;
         if inserted.outbox_url.is_empty() {
-            inserted.outbox_url =
+            inserted.outbox_url = instance.compute_box(BLOG_PREFIX, &inserted.actor_id, "outbox");
-                instance.compute_box(BLOG_PREFIX, &inserted.actor_id, r#"outbox"#);
         }
 
         if inserted.inbox_url.is_empty() {
@@ -101,8 +106,8 @@ impl Blog {
     }
 
     pub fn list_authors(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
-        use crate::schema::users;
+        use schema::users;
         let authors_ids = blog_authors::table
             .filter(blog_authors::blog_id.eq(self.id))
             .select(blog_authors::author_id);
@@ -113,7 +118,7 @@ impl Blog {
     }
 
     pub fn count_authors(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         blog_authors::table
             .filter(blog_authors::blog_id.eq(self.id))
             .count()
@@ -122,7 +127,7 @@ impl Blog {
     }
 
     pub fn find_for_author(conn: &Connection, author: &User) -> Result<Vec<Blog>> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         let author_ids = blog_authors::table
             .filter(blog_authors::author_id.eq(author.id))
             .select(blog_authors::blog_id);
@@ -132,7 +137,7 @@ impl Blog {
             .map_err(Error::from)
     }
 
-    pub async fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<Blog> {
+    pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<Blog> {
         let from_db = blogs::table
             .filter(blogs::fqn.eq(fqn))
             .first(&*c.conn)
@@ -140,13 +145,12 @@ impl Blog {
         if let Some(from_db) = from_db {
             Ok(from_db)
         } else {
-            Blog::fetch_from_webfinger(c, fqn).await
+            Blog::fetch_from_webfinger(c, fqn)
         }
     }
 
-    async fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> {
+    fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> {
-        resolve_with_prefix(Prefix::Group, acct.to_owned(), true)
+        resolve_with_prefix(Prefix::Group, acct.to_owned(), true)?
-            .await?
             .links
             .into_iter()
             .find(|l| l.mime_type == Some(String::from("application/activity+json")))
@@ -497,16 +501,14 @@ impl NewBlog {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{
+    use blog_authors::*;
-        blog_authors::*,
-        instance::tests as instance_tests,
-        medias::NewMedia,
-        search::tests::get_searcher,
-        tests::{db, rockets},
-        users::tests as usersTests,
-        Connection as Conn,
-    };
     use diesel::Connection;
+    use instance::tests as instance_tests;
+    use medias::NewMedia;
+    use search::tests::get_searcher;
+    use tests::{db, rockets};
+    use users::tests as usersTests;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> (Vec<User>, Vec<Blog>) {
         instance_tests::fill_database(conn);

plume-models/src/comment_seers.rs

@@ -1,6 +1,10 @@
-use crate::{comments::Comment, schema::comment_seers, users::User, Connection, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use comments::Comment;
+use schema::comment_seers;
+use users::User;
+use {Connection, Error, Result};
+
 #[derive(Queryable, Clone)]
 pub struct CommentSeers {
     pub id: i32,

plume-models/src/comments.rs

@@ -1,15 +1,3 @@
-use crate::{
-    comment_seers::{CommentSeers, NewCommentSeers},
-    instance::Instance,
-    medias::Media,
-    mentions::Mention,
-    notifications::*,
-    posts::Post,
-    safe_string::SafeString,
-    schema::comments,
-    users::User,
-    Connection, Error, PlumeRocket, Result,
-};
 use activitypub::{
     activity::{Create, Delete},
     link,
@@ -17,16 +5,26 @@ use activitypub::{
 };
 use chrono::{self, NaiveDateTime};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
-use futures::stream::{self, StreamExt};
+use serde_json;
-use plume_common::{
+
-    activity_pub::{
-        inbox::{AsActor, AsObject, FromId},
-        Id, IntoId, PUBLIC_VISIBILITY,
-    },
-    utils,
-};
 use std::collections::HashSet;
 
+use comment_seers::{CommentSeers, NewCommentSeers};
+use instance::Instance;
+use medias::Media;
+use mentions::Mention;
+use notifications::*;
+use plume_common::activity_pub::{
+    inbox::{AsActor, AsObject, FromId},
+    Id, IntoId, PUBLIC_VISIBILITY,
+};
+use plume_common::utils;
+use posts::Post;
+use safe_string::SafeString;
+use schema::comments;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
+
 #[derive(Queryable, Identifiable, Clone, AsChangeset)]
 pub struct Comment {
     pub id: i32,
@@ -79,7 +77,7 @@ impl Comment {
     }
 
     pub fn count_local(conn: &Connection) -> Result<i64> {
-        use crate::schema::users;
+        use schema::users;
         let local_authors = users::table
             .filter(users::instance_id.eq(Instance::get_local()?.id))
             .select(users::id);
@@ -105,7 +103,7 @@ impl Comment {
                 .unwrap_or(false)
     }
 
-    pub async fn to_activity(&self, c: &PlumeRocket) -> Result<Note> {
+    pub fn to_activity(&self, c: &PlumeRocket) -> Result<Note> {
         let author = User::get(&c.conn, self.author_id)?;
         let (html, mentions, _hashtags) = utils::md_to_html(
             self.content.get().as_ref(),
@@ -129,21 +127,22 @@ impl Comment {
             )?))?;
         note.object_props
             .set_published_string(chrono::Utc::now().to_rfc3339())?;
-        note.object_props.set_attributed_to_link(author.into_id())?;
+        note.object_props
-        note.object_props.set_to_link_vec(to)?;
+            .set_attributed_to_link(author.clone().into_id())?;
+        note.object_props.set_to_link_vec(to.clone())?;
         note.object_props.set_tag_link_vec(
-            stream::iter(mentions)
+            mentions
-                .filter_map(|m| async move { Mention::build_activity(c, &m).await.ok() })
+                .into_iter()
-                .collect::<Vec<link::Mention>>()
+                .filter_map(|m| Mention::build_activity(c, &m).ok())
-                .await,
+                .collect::<Vec<link::Mention>>(),
         )?;
         Ok(note)
     }
 
-    pub async fn create_activity(&self, c: &PlumeRocket) -> Result<Create> {
+    pub fn create_activity(&self, c: &PlumeRocket) -> Result<Create> {
         let author = User::get(&c.conn, self.author_id)?;
 
-        let note = self.to_activity(c).await?;
+        let note = self.to_activity(c)?;
         let mut act = Create::default();
         act.create_props.set_actor_link(author.into_id())?;
         act.create_props.set_object_object(note.clone())?;

plume-models/src/config.rs

@@ -11,8 +11,6 @@ pub struct Config {
     pub base_url: String,
     pub database_url: String,
     pub db_name: &'static str,
-    pub db_max_size: Option<u32>,
-    pub db_min_idle: Option<u32>,
     pub search_index: String,
     pub rocket: Result<RocketConfig, RocketError>,
     pub logo: LogoConfig,
@@ -195,14 +193,6 @@ lazy_static! {
             var("ROCKET_PORT").unwrap_or_else(|_| "7878".to_owned())
         )),
         db_name: DB_NAME,
-        db_max_size: var("DB_MAX_SIZE").map_or(None, |s| Some(
-            s.parse::<u32>()
-                .expect("Couldn't parse DB_MAX_SIZE into u32")
-        )),
-        db_min_idle: var("DB_MIN_IDLE").map_or(None, |s| Some(
-            s.parse::<u32>()
-                .expect("Couldn't parse DB_MIN_IDLE into u32")
-        )),
         #[cfg(feature = "postgres")]
         database_url: var("DATABASE_URL")
             .unwrap_or_else(|_| format!("postgres://plume:plume@localhost/{}", DB_NAME)),

plume-models/src/db_conn.rs

@@ -1,4 +1,3 @@
-use crate::Connection;
 use diesel::r2d2::{
     ConnectionManager, CustomizeConnection, Error as ConnError, Pool, PooledConnection,
 };
@@ -7,10 +6,12 @@ use diesel::{dsl::sql_query, ConnectionError, RunQueryDsl};
 use rocket::{
     http::Status,
     request::{self, FromRequest},
-    Outcome, Request,
+    Outcome, Request, State,
 };
 use std::ops::Deref;
 
+use Connection;
+
 pub type DbPool = Pool<ConnectionManager<Connection>>;
 
 // From rocket documentation
@@ -21,14 +22,14 @@ pub struct DbConn(pub PooledConnection<ConnectionManager<Connection>>);
 /// Attempts to retrieve a single connection from the managed database pool. If
 /// no pool is currently managed, fails with an `InternalServerError` status. If
 /// no connections are available, fails with a `ServiceUnavailable` status.
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for DbConn {
     type Error = ();
 
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
-        match DbConn::from_request(request).await {
+        let pool = request.guard::<State<DbPool>>()?;
-            Outcome::Success(a) => Outcome::Success(a),
+        match pool.get() {
-            _ => Outcome::Failure((Status::ServiceUnavailable, ())),
+            Ok(conn) => Outcome::Success(DbConn(conn)),
+            Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),
         }
     }
 }

plume-models/src/follows.rs

@@ -1,15 +1,16 @@
-use crate::{
-    ap_url, notifications::*, schema::follows, users::User, Connection, Error, PlumeRocket, Result,
-    CONFIG,
-};
 use activitypub::activity::{Accept, Follow as FollowAct, Undo};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
+
+use notifications::*;
 use plume_common::activity_pub::{
     broadcast,
     inbox::{AsActor, AsObject, FromId},
     sign::Signer,
     Id, IntoId, PUBLIC_VISIBILITY,
 };
+use schema::follows;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, CONFIG};
 
 #[derive(Clone, Queryable, Identifiable, Associations, AsChangeset)]
 #[belongs_to(User, foreign_key = "following_id")]
@@ -55,7 +56,8 @@ impl Follow {
         let target = User::get(conn, self.following_id)?;
 
         let mut act = FollowAct::default();
-        act.follow_props.set_actor_link::<Id>(user.into_id())?;
+        act.follow_props
+            .set_actor_link::<Id>(user.clone().into_id())?;
         act.follow_props
             .set_object_link::<Id>(target.clone().into_id())?;
         act.object_props.set_id_string(self.ap_url.clone())?;
@@ -200,8 +202,9 @@ impl IntoId for Follow {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as user_tests};
     use diesel::Connection;
+    use tests::db;
+    use users::tests as user_tests;
 
     #[test]
     fn test_id() {

plume-models/src/headers.rs

@@ -6,11 +6,10 @@ use rocket::{
 
 pub struct Headers<'r>(pub HeaderMap<'r>);
 
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for Headers<'r> {
     type Error = ();
 
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, ()> {
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, ()> {
         let mut headers = HeaderMap::new();
         for header in request.headers().clone().into_iter() {
             headers.add(header);

plume-models/src/inbox.rs

@@ -1,4 +1,5 @@
 use activitypub::activity::*;
+use serde_json;
 
 use crate::{
     comments::Comment,

plume-models/src/instance.rs

@@ -1,16 +1,15 @@
-use crate::{
-    ap_url,
-    medias::Media,
-    safe_string::SafeString,
-    schema::{instances, users},
-    users::{Role, User},
-    Connection, Error, Result,
-};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
-use plume_common::utils::md_to_html;
 use std::sync::RwLock;
 
+use ap_url;
+use medias::Media;
+use plume_common::utils::md_to_html;
+use safe_string::SafeString;
+use schema::{instances, users};
+use users::{Role, User};
+use {Connection, Error, Result};
+
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Instance {
     pub id: i32,
@@ -243,8 +242,9 @@ impl Instance {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{tests::db, Connection as Conn};
     use diesel::Connection;
+    use tests::db;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> Vec<(NewInstance, Instance)> {
         let res = vec![

plume-models/src/lib.rs

@@ -1,22 +1,42 @@
 #![feature(try_trait)]
 #![feature(never_type)]
+//#![feature(register_attr)]
+//#![feature(register_tool)]
 #![feature(proc_macro_hygiene)]
 
+extern crate activitypub;
+extern crate ammonia;
+extern crate askama_escape;
+extern crate bcrypt;
+extern crate chrono;
 #[macro_use]
 extern crate diesel;
-extern crate futures;
+extern crate guid_create;
+extern crate heck;
+extern crate itertools;
 #[macro_use]
 extern crate lazy_static;
+extern crate migrations_internals;
+extern crate openssl;
+extern crate plume_api;
+extern crate plume_common;
 #[macro_use]
 extern crate plume_macro;
-#[macro_use]
+extern crate reqwest;
 extern crate rocket;
+extern crate rocket_i18n;
+extern crate scheduled_thread_pool;
+extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 #[macro_use]
 extern crate tantivy;
+extern crate url;
+extern crate walkdir;
+extern crate webfinger;
+extern crate whatlang;
 
 use plume_common::activity_pub::inbox::InboxError;
 
@@ -34,7 +54,6 @@ pub type Connection = diesel::PgConnection;
 /// All the possible errors that can be encoutered in this crate
 #[derive(Debug)]
 pub enum Error {
-    Blocklisted(bool, String),
     Db(diesel::result::Error),
     Inbox(Box<InboxError<Error>>),
     InvalidValue,
@@ -76,12 +95,6 @@ impl From<std::option::NoneError> for Error {
     }
 }
 
-impl From<Error> for std::option::NoneError {
-    fn from(_: Error) -> Self {
-        std::option::NoneError
-    }
-}
-
 impl From<url::ParseError> for Error {
     fn from(_: url::ParseError) -> Self {
         Error::Url
@@ -235,10 +248,10 @@ macro_rules! get {
 /// Model::insert(connection, NewModelType::new());
 /// ```
 macro_rules! insert {
-    ($table:ident, $from:ty) => {
+    ($table:ident, $from:ident) => {
         insert!($table, $from, |x, _conn| Ok(x));
     };
-    ($table:ident, $from:ty, |$val:ident, $conn:ident | $( $after:tt )+) => {
+    ($table:ident, $from:ident, |$val:ident, $conn:ident | $( $after:tt )+) => {
         last!($table);
 
         #[allow(dead_code)]
@@ -288,12 +301,16 @@ pub fn ap_url(url: &str) -> String {
 #[cfg(test)]
 #[macro_use]
 mod tests {
-    use crate::{db_conn, migrations::IMPORTED_MIGRATIONS, search, Connection as Conn, CONFIG};
+    use db_conn;
     use diesel::r2d2::ConnectionManager;
+    use migrations::IMPORTED_MIGRATIONS;
     use plume_common::utils::random_hex;
     use scheduled_thread_pool::ScheduledThreadPool;
+    use search;
     use std::env::temp_dir;
     use std::sync::Arc;
+    use Connection as Conn;
+    use CONFIG;
 
     #[macro_export]
     macro_rules! part_eq {
@@ -337,7 +354,6 @@ mod tests {
 pub mod admin;
 pub mod api_tokens;
 pub mod apps;
-pub mod blocklisted_emails;
 pub mod blog_authors;
 pub mod blogs;
 pub mod comment_seers;

plume-models/src/likes.rs

@@ -1,14 +1,17 @@
-use crate::{
-    notifications::*, posts::Post, schema::likes, timeline::*, users::User, Connection, Error,
-    PlumeRocket, Result,
-};
 use activitypub::activity;
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use notifications::*;
 use plume_common::activity_pub::{
     inbox::{AsActor, AsObject, FromId},
     Id, IntoId, PUBLIC_VISIBILITY,
 };
+use posts::Post;
+use schema::likes;
+use timeline::*;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Like {

plume-models/src/lists.rs

@@ -1,14 +1,13 @@
-use crate::{
-    blogs::Blog,
-    schema::{blogs, list_elems, lists, users},
-    users::User,
-    Connection, Error, Result,
-};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
-use std::convert::{TryFrom, TryInto};
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+use blogs::Blog;
+use schema::{blogs, list_elems, lists, users};
+use std::convert::{TryFrom, TryInto};
+use users::User;
+use {Connection, Error, Result};
+
 /// Represent what a list is supposed to store. Represented in database as an integer
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum ListType {
     User,
     Blog,
@@ -58,11 +57,7 @@ struct NewList<'a> {
 }
 
 macro_rules! func {
-    (
+    (@elem User $id:expr, $value:expr) => {
-        $(#[$outer:meta])*
-        @elem User $id:expr, $value:expr
-    ) => {
-        $(#[$outer])*
         NewListElem {
             list_id: $id,
             user_id: Some(*$value),
@@ -70,11 +65,7 @@ macro_rules! func {
             word: None,
         }
     };
-    (
+    (@elem Blog $id:expr, $value:expr) => {
-        $(#[$outer:meta])*
-        @elem Blog $id:expr, $value:expr
-    ) => {
-        $(#[$outer])*
         NewListElem {
             list_id: $id,
             user_id: None,
@@ -82,11 +73,7 @@ macro_rules! func {
             word: None,
         }
     };
-    (
+    (@elem Word $id:expr, $value:expr) => {
-        $(#[$outer:meta])*
-        @elem Word $id:expr, $value:expr
-    ) => {
-        $(#[$outer])*
         NewListElem {
             list_id: $id,
             user_id: None,
@@ -94,11 +81,7 @@ macro_rules! func {
             word: Some($value),
         }
     };
-    (
+    (@elem Prefix $id:expr, $value:expr) => {
-        $(#[$outer:meta])*
-        @elem Prefix $id:expr, $value:expr
-    ) => {
-        $(#[$outer])*
         NewListElem {
             list_id: $id,
             user_id: None,
@@ -115,11 +98,7 @@ macro_rules! func {
     (@out_type Word) => { String };
     (@out_type Prefix) => { String };
 
-    (
+    (add: $fn:ident, $kind:ident) => {
-        $(#[$outer:meta])*
-        add: $fn:ident, $kind:ident
-    ) => {
-        $(#[$outer])*
         pub fn $fn(&self, conn: &Connection, vals: &[func!(@in_type $kind)]) -> Result<()> {
             if self.kind() != ListType::$kind {
                 return Err(Error::InvalidValue);
@@ -136,11 +115,7 @@ macro_rules! func {
         }
     };
 
-    (
+    (list: $fn:ident, $kind:ident, $table:ident) => {
-        $(#[$outer:meta])*
-        list: $fn:ident, $kind:ident, $table:ident
-    ) => {
-        $(#[$outer])*
         pub fn $fn(&self, conn: &Connection) -> Result<Vec<func!(@out_type $kind)>> {
             if self.kind() != ListType::$kind {
                 return Err(Error::InvalidValue);
@@ -156,11 +131,7 @@ macro_rules! func {
 
 
 
-    (
+    (set: $fn:ident, $kind:ident, $add:ident) => {
-        $(#[$outer:meta])*
-        set: $fn:ident, $kind:ident, $add:ident
-    ) => {
-        $(#[$outer])*
         pub fn $fn(&self, conn: &Connection, val: &[func!(@in_type $kind)]) -> Result<()> {
             if self.kind() != ListType::$kind {
                 return Err(Error::InvalidValue);
@@ -193,7 +164,7 @@ impl List {
     last!(lists);
     get!(lists);
 
-    fn insert(conn: &Connection, val: NewList<'_>) -> Result<Self> {
+    fn insert(conn: &Connection, val: NewList) -> Result<Self> {
         diesel::insert_into(lists::table)
             .values(val)
             .execute(conn)?;
@@ -274,35 +245,23 @@ impl List {
         private::ListElem::prefix_in_list(conn, self, word)
     }
 
-    func! {
+    /// Insert new users in a list
-        /// Insert new users in a list
+    func! {add: add_users, User}
-        add: add_users, User
-    }
 
-    func! {
+    /// Insert new blogs in a list
-        /// Insert new blogs in a list
+    func! {add: add_blogs, Blog}
-        add: add_blogs, Blog
-    }
 
-    func! {
+    /// Insert new words in a list
-        /// Insert new words in a list
+    func! {add: add_words, Word}
-        add: add_words, Word
-    }
 
-    func! {
+    /// Insert new prefixes in a list
-        /// Insert new prefixes in a list
+    func! {add: add_prefixes, Prefix}
-        add: add_prefixes, Prefix
-    }
 
-    func! {
+    /// Get all users in the list
-        /// Get all users in the list
+    func! {list: list_users, User, users}
-        list: list_users, User, users
-    }
 
-    func! {
+    /// Get all blogs in the list
-        /// Get all blogs in the list
+    func! {list: list_blogs, Blog, blogs}
-        list: list_blogs, Blog, blogs
-    }
 
     /// Get all words in the list
     pub fn list_words(&self, conn: &Connection) -> Result<Vec<String>> {
@@ -350,7 +309,7 @@ mod private {
     };
 
     impl ListElem {
-        insert!(list_elems, NewListElem<'_>);
+        insert!(list_elems, NewListElem);
 
         pub fn user_in_list(conn: &Connection, list: &List, user: i32) -> Result<bool> {
             dsl::select(dsl::exists(
@@ -400,8 +359,9 @@ mod private {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{blogs::tests as blog_tests, tests::db};
+    use blogs::tests as blog_tests;
     use diesel::Connection;
+    use tests::db;
 
     #[test]
     fn list_type() {

plume-models/src/medias.rs

@@ -1,17 +1,20 @@
-use crate::{
-    ap_url, instance::Instance, safe_string::SafeString, schema::medias, users::User, Connection,
-    Error, PlumeRocket, Result,
-};
 use activitypub::object::Image;
 use askama_escape::escape;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use guid_create::GUID;
+use reqwest;
+use std::{fs, path::Path};
+
 use plume_common::{
     activity_pub::{inbox::FromId, Id},
     utils::MediaProcessor,
 };
-use std::{fs, path::Path};
+
-use tokio::prelude::*;
+use instance::Instance;
+use safe_string::SafeString;
+use schema::medias;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Media {
@@ -197,7 +200,7 @@ impl Media {
     }
 
     // TODO: merge with save_remote?
-    pub async fn from_activity(c: &PlumeRocket, image: &Image) -> Result<Media> {
+    pub fn from_activity(c: &PlumeRocket, image: &Image) -> Result<Media> {
         let conn = &*c.conn;
         let remote_url = image.object_props.url_string().ok()?;
         let ext = remote_url
@@ -211,9 +214,11 @@ impl Media {
             ext
         ));
 
-        let mut dest = tokio::fs::File::create(path.clone()).await?;
+        let mut dest = fs::File::create(path.clone()).ok()?;
-        let contents = reqwest::get(remote_url.as_str()).await?.bytes().await?;
+        reqwest::get(remote_url.as_str())
-        dest.write_all(&contents).await?;
+            .ok()?
+            .copy_to(&mut dest)
+            .ok()?;
 
         Media::insert(
             conn,
@@ -258,11 +263,13 @@ impl Media {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as usersTests, Connection as Conn};
     use diesel::Connection;
     use std::env::{current_dir, set_current_dir};
     use std::fs;
     use std::path::Path;
+    use tests::db;
+    use users::tests as usersTests;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> (Vec<User>, Vec<Media>) {
         let mut wd = current_dir().unwrap().to_path_buf();

plume-models/src/mentions.rs

@@ -1,10 +1,14 @@
-use crate::{
-    comments::Comment, notifications::*, posts::Post, schema::mentions, users::User, Connection,
-    Error, PlumeRocket, Result,
-};
 use activitypub::link;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use comments::Comment;
+use notifications::*;
 use plume_common::activity_pub::inbox::AsActor;
+use posts::Post;
+use schema::mentions;
+use users::User;
+use PlumeRocket;
+use {Connection, Error, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Mention {
@@ -52,8 +56,8 @@ impl Mention {
         }
     }
 
-    pub async fn build_activity(c: &PlumeRocket, ment: &str) -> Result<link::Mention> {
+    pub fn build_activity(c: &PlumeRocket, ment: &str) -> Result<link::Mention> {
-        let user = User::find_by_fqn(c, ment).await?;
+        let user = User::find_by_fqn(c, ment)?;
         let mut mention = link::Mention::default();
         mention.link_props.set_href_string(user.ap_url)?;
         mention.link_props.set_name_string(format!("@{}", ment))?;

plume-models/src/migrations.rs

@@ -1,6 +1,10 @@
-use crate::{Connection, Error, Result};
+use Connection;
+use Error;
+use Result;
+
 use diesel::connection::{Connection as Conn, SimpleConnection};
 use migrations_internals::{setup_database, MigrationConnection};
+
 use std::path::Path;
 
 #[allow(dead_code)] //variants might not be constructed if not required by current migrations

plume-models/src/notifications.rs

@@ -1,17 +1,16 @@
-use crate::{
-    comments::Comment,
-    follows::Follow,
-    likes::Like,
-    mentions::Mention,
-    posts::Post,
-    reshares::Reshare,
-    schema::{follows, notifications},
-    users::User,
-    Connection, Error, Result,
-};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, JoinOnDsl, QueryDsl, RunQueryDsl};
 
+use comments::Comment;
+use follows::Follow;
+use likes::Like;
+use mentions::Mention;
+use posts::Post;
+use reshares::Reshare;
+use schema::{follows, notifications};
+use users::User;
+use {Connection, Error, Result};
+
 pub mod notification_kind {
     pub const COMMENT: &str = "COMMENT";
     pub const FOLLOW: &str = "FOLLOW";

plume-models/src/password_reset_requests.rs

@@ -1,6 +1,7 @@
-use crate::{schema::password_reset_requests, Connection, Error, Result};
 use chrono::{offset::Utc, Duration, NaiveDateTime};
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
+use schema::password_reset_requests;
+use {Connection, Error, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct PasswordResetRequest {
@@ -74,8 +75,9 @@ impl PasswordResetRequest {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as user_tests};
     use diesel::Connection;
+    use tests::db;
+    use users::tests as user_tests;
 
     #[test]
     fn test_insert_and_find_password_reset_request() {

plume-models/src/plume_rocket.rs

@@ -2,7 +2,9 @@ pub use self::module::PlumeRocket;
 
 #[cfg(not(test))]
 mod module {
-    use crate::{db_conn::DbConn, search, users};
+    use crate::db_conn::DbConn;
+    use crate::search;
+    use crate::users;
     use rocket::{
         request::{self, FlashMessage, FromRequest, Request},
         Outcome, State,
@@ -20,35 +22,20 @@ mod module {
         pub flash_msg: Option<(String, String)>,
     }
 
-    #[rocket::async_trait]
     impl<'a, 'r> FromRequest<'a, 'r> for PlumeRocket {
         type Error = ();
 
-        async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        fn from_request(request: &'a Request<'r>) -> request::Outcome<PlumeRocket, ()> {
-            let conn = DbConn::from_request(request).await.succeeded().unwrap();
+            let conn = request.guard::<DbConn>()?;
-            let intl = rocket_i18n::I18n::from_request(request)
+            let intl = request.guard::<rocket_i18n::I18n>()?;
-                .await
+            let user = request.guard::<users::User>().succeeded();
-                .succeeded()
+            let worker = request.guard::<State<Arc<ScheduledThreadPool>>>()?;
-                .unwrap();
+            let searcher = request.guard::<State<Arc<search::Searcher>>>()?;
-            let user = users::User::from_request(request)
+            let flash_msg = request.guard::<FlashMessage>().succeeded();
-                .await
-                .succeeded()
-                .unwrap();
-            let worker = request
-                .guard::<State<'_, Arc<ScheduledThreadPool>>>()
-                .await
-                .succeeded()
-                .unwrap();
-            let searcher = request
-                .guard::<State<'_, Arc<search::Searcher>>>()
-                .await
-                .succeeded()
-                .unwrap();
-            let flash_msg = request.guard::<FlashMessage<'_, '_>>().await.succeeded();
             Outcome::Success(PlumeRocket {
                 conn,
                 intl,
-                user: Some(user),
+                user,
                 flash_msg: flash_msg.map(|f| (f.name().into(), f.msg().into())),
                 worker: worker.clone(),
                 searcher: searcher.clone(),
@@ -59,7 +46,9 @@ mod module {
 
 #[cfg(test)]
 mod module {
-    use crate::{db_conn::DbConn, search, users};
+    use crate::db_conn::DbConn;
+    use crate::search;
+    use crate::users;
     use rocket::{
         request::{self, FromRequest, Request},
         Outcome, State,
@@ -75,18 +64,17 @@ mod module {
         pub worker: Arc<ScheduledThreadPool>,
     }
 
-    #[rocket::async_trait]
     impl<'a, 'r> FromRequest<'a, 'r> for PlumeRocket {
         type Error = ();
 
-        async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        fn from_request(request: &'a Request<'r>) -> request::Outcome<PlumeRocket, ()> {
-            let conn = try_outcome!(DbConn::from_request(request).await);
+            let conn = request.guard::<DbConn>()?;
-            let user = try_outcome!(users::User::from_request(request).await);
+            let user = request.guard::<users::User>().succeeded();
-            let worker = try_outcome!(request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>());
+            let worker = request.guard::<State<Arc<ScheduledThreadPool>>>()?;
-            let searcher = try_outcome!(request.guard::<'_, State<'_, Arc<search::Searcher>>>());
+            let searcher = request.guard::<State<Arc<search::Searcher>>>()?;
             Outcome::Success(PlumeRocket {
                 conn,
-                user: Some(user),
+                user,
                 worker: worker.clone(),
                 searcher: searcher.clone(),
             })

plume-models/src/post_authors.rs

@@ -1,6 +1,10 @@
-use crate::{posts::Post, schema::post_authors, users::User, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 
+use posts::Post;
+use schema::post_authors;
+use users::User;
+use {Error, Result};
+
 #[derive(Clone, Queryable, Identifiable, Associations)]
 #[belongs_to(Post)]
 #[belongs_to(User, foreign_key = "author_id")]

plume-models/src/posts.rs

@@ -1,8 +1,3 @@
-use crate::{
-    ap_url, blogs::Blog, instance::Instance, medias::Media, mentions::Mention, post_authors::*,
-    safe_string::SafeString, schema::posts, search::Searcher, tags::*, timeline::*, users::User,
-    Connection, Error, PlumeRocket, Result, CONFIG,
-};
 use activitypub::{
     activity::{Create, Delete, Update},
     link,
@@ -12,6 +7,13 @@ use activitypub::{
 use chrono::{NaiveDateTime, TimeZone, Utc};
 use diesel::{self, BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
 use heck::{CamelCase, KebabCase};
+use serde_json;
+use std::collections::HashSet;
+
+use blogs::Blog;
+use instance::Instance;
+use medias::Media;
+use mentions::Mention;
 use plume_common::{
     activity_pub::{
         inbox::{AsObject, FromId},
@@ -19,8 +21,14 @@ use plume_common::{
     },
     utils::md_to_html,
 };
-use std::collections::HashSet;
+use post_authors::*;
-use tokio::runtime::Runtime;
+use safe_string::SafeString;
+use schema::posts;
+use search::Searcher;
+use tags::*;
+use timeline::*;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, CONFIG};
 
 pub type LicensedArticle = CustomObject<Licensed, Article>;
 
@@ -103,7 +111,7 @@ impl Post {
         tag: String,
         (min, max): (i32, i32),
     ) -> Result<Vec<Post>> {
-        use crate::schema::tags;
+        use schema::tags;
 
         let ids = tags::table.filter(tags::tag.eq(tag)).select(tags::post_id);
         posts::table
@@ -117,7 +125,7 @@ impl Post {
     }
 
     pub fn count_for_tag(conn: &Connection, tag: String) -> Result<i64> {
-        use crate::schema::tags;
+        use schema::tags;
         let ids = tags::table.filter(tags::tag.eq(tag)).select(tags::post_id);
         posts::table
             .filter(posts::id.eq_any(ids))
@@ -131,8 +139,8 @@ impl Post {
     }
 
     pub fn count_local(conn: &Connection) -> Result<i64> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::users;
+        use schema::users;
         let local_authors = users::table
             .filter(users::instance_id.eq(Instance::get_local()?.id))
             .select(users::id);
@@ -180,7 +188,7 @@ impl Post {
         author: &User,
         limit: i64,
     ) -> Result<Vec<Post>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
 
         let posts = PostAuthor::belonging_to(author).select(post_authors::post_id);
         posts::table
@@ -231,7 +239,7 @@ impl Post {
     }
 
     pub fn drafts_by_author(conn: &Connection, author: &User) -> Result<Vec<Post>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
 
         let posts = PostAuthor::belonging_to(author).select(post_authors::post_id);
         posts::table
@@ -243,8 +251,8 @@ impl Post {
     }
 
     pub fn get_authors(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::users;
+        use schema::users;
         let author_list = PostAuthor::belonging_to(self).select(post_authors::author_id);
         users::table
             .filter(users::id.eq_any(author_list))
@@ -253,7 +261,7 @@ impl Post {
     }
 
     pub fn is_author(&self, conn: &Connection, author_id: i32) -> Result<bool> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
         Ok(PostAuthor::belonging_to(self)
             .filter(post_authors::author_id.eq(author_id))
             .count()
@@ -262,7 +270,7 @@ impl Post {
     }
 
     pub fn get_blog(&self, conn: &Connection) -> Result<Blog> {
-        use crate::schema::blogs;
+        use schema::blogs;
         blogs::table
             .filter(blogs::id.eq(self.blog_id))
             .first(conn)
@@ -270,7 +278,7 @@ impl Post {
     }
 
     pub fn count_likes(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::likes;
+        use schema::likes;
         likes::table
             .filter(likes::post_id.eq(self.id))
             .count()
@@ -279,7 +287,7 @@ impl Post {
     }
 
     pub fn count_reshares(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::reshares;
+        use schema::reshares;
         reshares::table
             .filter(reshares::post_id.eq(self.id))
             .count()
@@ -579,11 +587,11 @@ impl FromId<PlumeRocket> for Post {
                 }
             });
 
-        let image = article.object_props.icon_object::<Image>().ok().unwrap();
+        let cover = article
-
+            .object_props
-        let mut r = Runtime::new().unwrap();
+            .icon_object::<Image>()
-        let cover =
+            .ok()
-            Some(r.block_on(async { Media::from_activity(&c, &image).await.ok().unwrap().id }));
+            .and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id));
 
         let title = article.object_props.name_string()?;
         let post = Post::insert(
@@ -624,7 +632,7 @@ impl FromId<PlumeRocket> for Post {
             .into_iter()
             .map(|s| s.to_camel_case())
             .collect::<HashSet<_>>();
-        if let Some(serde_json::Value::Array(tags)) = article.object_props.tag {
+        if let Some(serde_json::Value::Array(tags)) = article.object_props.tag.clone() {
             for tag in tags {
                 serde_json::from_value::<link::Mention>(tag.clone())
                     .map(|m| Mention::from_activity(conn, &m, post.id, true, true))
@@ -699,22 +707,17 @@ impl FromId<PlumeRocket> for PostUpdate {
     }
 
     fn from_activity(c: &PlumeRocket, updated: LicensedArticle) -> Result<Self> {
-        let image = updated
-            .object
-            .object_props
-            .icon_object::<Image>()
-            .ok()
-            .unwrap();
-        let mut r = Runtime::new().unwrap();
-        let cover =
-            Some(r.block_on(async { Media::from_activity(&c, &image).await.ok().unwrap().id }));
-
         Ok(PostUpdate {
             ap_url: updated.object.object_props.id_string()?,
             title: updated.object.object_props.name_string().ok(),
             subtitle: updated.object.object_props.summary_string().ok(),
             content: updated.object.object_props.content_string().ok(),
-            cover,
+            cover: updated
+                .object
+                .object_props
+                .icon_object::<Image>()
+                .ok()
+                .and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id)),
             source: updated
                 .object
                 .ap_object_props
@@ -722,7 +725,7 @@ impl FromId<PlumeRocket> for PostUpdate {
                 .ok()
                 .map(|x| x.content),
             license: updated.custom_props.license_string().ok(),
-            tags: updated.object.object_props.tag,
+            tags: updated.object.object_props.tag.clone(),
         })
     }
 }
@@ -803,7 +806,7 @@ impl AsObject<User, Update, &PlumeRocket> for PostUpdate {
 
 impl IntoId for Post {
     fn into_id(self) -> Id {
-        Id::new(self.ap_url)
+        Id::new(self.ap_url.clone())
     }
 }
 

plume-models/src/reshares.rs

@@ -1,14 +1,17 @@
-use crate::{
-    notifications::*, posts::Post, schema::reshares, timeline::*, users::User, Connection, Error,
-    PlumeRocket, Result,
-};
 use activitypub::activity::{Announce, Undo};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use notifications::*;
 use plume_common::activity_pub::{
     inbox::{AsActor, AsObject, FromId},
     Id, IntoId, PUBLIC_VISIBILITY,
 };
+use posts::Post;
+use schema::reshares;
+use timeline::*;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Reshare {

plume-models/src/safe_string.rs

@@ -31,41 +31,10 @@ lazy_static! {
             .add_tag_attributes("label", ["for"].iter())
             .add_tag_attributes("input", ["type", "checked"].iter())
             .add_allowed_classes("input", ["cw-checkbox"].iter())
-            .add_allowed_classes(
-                "span",
-                [
-                    "cw-container",
-                    "cw-text",
-                    //Scope classes for the syntax highlighting.
-                    "attribute-name",
-                    "comment",
-                    "constant",
-                    "control",
-                    "declaration",
-                    "entity",
-                    "function",
-                    "invalid",
-                    "keyword",
-                    "language",
-                    "modifier",
-                    "name",
-                    "numeric",
-                    "operator",
-                    "parameter",
-                    "punctuation",
-                    "source",
-                    "storage",
-                    "string",
-                    "support",
-                    "tag",
-                    "type",
-                    "variable",
-                ]
-                .iter(),
-            )
             // Related to https://github.com/Plume-org/Plume/issues/637
             .add_allowed_classes("sup", ["footnote-reference", "footnote-definition-label"].iter())
             .add_allowed_classes("div", ["footnote-definition"].iter())
+            .add_allowed_classes("span", ["cw-container", "cw-text"].iter())
             .attribute_filter(|elem, att, val| match (elem, att) {
                 ("input", "type") => Some("checkbox".into()),
                 ("input", "checked") => Some("checked".into()),
@@ -82,7 +51,7 @@ lazy_static! {
     };
 }
 
-fn url_add_prefix(url: &str) -> Option<Cow<'_, str>> {
+fn url_add_prefix(url: &str) -> Option<Cow<str>> {
     if url.starts_with('#') && !url.starts_with("#postcontent-") {
         //if start with an #
         let mut new_url = "#postcontent-".to_owned(); //change to valid id
@@ -139,7 +108,7 @@ struct SafeStringVisitor;
 impl<'de> Visitor<'de> for SafeStringVisitor {
     type Value = SafeString;
 
-    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str("a string")
     }
 
@@ -181,7 +150,7 @@ where
     DB: diesel::backend::Backend,
     str: ToSql<diesel::sql_types::Text, DB>,
 {
-    fn to_sql<W: Write>(&self, out: &mut Output<'_, W, DB>) -> serialize::Result {
+    fn to_sql<W: Write>(&self, out: &mut Output<W, DB>) -> serialize::Result {
         str::to_sql(&self.value, out)
     }
 }
@@ -193,7 +162,7 @@ impl Borrow<str> for SafeString {
 }
 
 impl Display for SafeString {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{}", self.value)
     }
 }

plume-models/src/schema.rs

@@ -73,15 +73,6 @@ table! {
         user_id -> Int4,
     }
 }
-table! {
-    email_blocklist(id){
-        id -> Int4,
-        email_address -> VarChar,
-        note -> Text,
-        notify_user -> Bool,
-        notification_text -> Text,
-    }
-}
 
 table! {
     follows (id) {

plume-models/src/search/mod.rs

@@ -8,17 +8,15 @@ pub use self::searcher::*;
 pub(crate) mod tests {
     use super::{Query, Searcher};
     use diesel::Connection;
-    use plume_common::utils::random_hex;
     use std::env::temp_dir;
     use std::str::FromStr;
 
-    use crate::{
+    use blogs::tests::fill_database;
-        blogs::tests::fill_database,
+    use plume_common::utils::random_hex;
-        post_authors::*,
+    use post_authors::*;
-        posts::{NewPost, Post},
+    use posts::{NewPost, Post};
-        safe_string::SafeString,
+    use safe_string::SafeString;
-        tests::db,
+    use tests::db;
-    };
 
     pub(crate) fn get_searcher() -> Searcher {
         let dir = temp_dir().join(&format!("plume-test-{}", random_hex()));

plume-models/src/search/query.rs

@@ -1,5 +1,5 @@
-use crate::search::searcher::Searcher;
 use chrono::{naive::NaiveDate, offset::Utc, Datelike};
+use search::searcher::Searcher;
 use std::{cmp, ops::Bound};
 use tantivy::{query::*, schema::*, Term};
 

plume-models/src/search/searcher.rs

@@ -1,11 +1,9 @@
-use crate::{
+use instance::Instance;
-    instance::Instance,
+use posts::Post;
-    posts::Post,
+use schema::posts;
-    schema::posts,
+use tags::Tag;
-    search::{query::PlumeQuery, tokenizer},
+use Connection;
-    tags::Tag,
+
-    Connection, Result,
-};
 use chrono::Datelike;
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use itertools::Itertools;
@@ -16,6 +14,10 @@ use tantivy::{
 };
 use whatlang::{detect as detect_lang, Lang};
 
+use super::tokenizer;
+use search::query::PlumeQuery;
+use Result;
+
 #[derive(Debug)]
 pub enum SearcherError {
     IndexCreationError,
@@ -173,7 +175,7 @@ impl Searcher {
             post_id => i64::from(post.id),
             author => post.get_authors(conn)?.into_iter().map(|u| u.fqn).join(" "),
             creation_date => i64::from(post.creation_date.num_days_from_ce()),
-            instance => Instance::get(conn, post.get_blog(conn)?.instance_id)?.public_domain,
+            instance => Instance::get(conn, post.get_blog(conn)?.instance_id)?.public_domain.clone(),
             tag => Tag::for_post(conn, post.id)?.into_iter().map(|t| t.tag).join(" "),
             blog_name => post.get_blog(conn)?.title,
             content => post.content.get().clone(),

plume-models/src/tags.rs

@@ -1,6 +1,9 @@
-use crate::{ap_url, instance::Instance, schema::tags, Connection, Error, Result};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use instance::Instance;
 use plume_common::activity_pub::Hashtag;
+use schema::tags;
+use {ap_url, Connection, Error, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Tag {

plume-models/src/timeline/mod.rs

@@ -1,17 +1,17 @@
-use crate::{
-    lists::List,
-    posts::Post,
-    schema::{posts, timeline, timeline_definition},
-    Connection, Error, PlumeRocket, Result,
-};
 use diesel::{self, BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use lists::List;
+use posts::Post;
+use schema::{posts, timeline, timeline_definition};
 use std::ops::Deref;
+use {Connection, Error, PlumeRocket, Result};
 
 pub(crate) mod query;
 
-pub use self::query::Kind;
 use self::query::{QueryError, TimelineQuery};
 
+pub use self::query::Kind;
+
 #[derive(Clone, Debug, PartialEq, Queryable, Identifiable, AsChangeset)]
 #[table_name = "timeline_definition"]
 pub struct Timeline {
@@ -119,7 +119,7 @@ impl Timeline {
                         }
                     })
             {
-                return Err(err);
+                Err(err)?;
             }
         }
         Self::insert(
@@ -157,7 +157,7 @@ impl Timeline {
                         }
                     })
             {
-                return Err(err);
+                Err(err)?;
             }
         }
         Self::insert(
@@ -208,7 +208,7 @@ impl Timeline {
             .map_err(Error::from)
     }
 
-    pub fn add_to_all_timelines(rocket: &PlumeRocket, post: &Post, kind: Kind<'_>) -> Result<()> {
+    pub fn add_to_all_timelines(rocket: &PlumeRocket, post: &Post, kind: Kind) -> Result<()> {
         let timelines = timeline_definition::table
             .load::<Self>(rocket.conn.deref())
             .map_err(Error::from)?;
@@ -231,7 +231,7 @@ impl Timeline {
         Ok(())
     }
 
-    pub fn matches(&self, rocket: &PlumeRocket, post: &Post, kind: Kind<'_>) -> Result<bool> {
+    pub fn matches(&self, rocket: &PlumeRocket, post: &Post, kind: Kind) -> Result<bool> {
         let query = TimelineQuery::parse(&self.query)?;
         query.matches(rocket, self, post, kind)
     }
@@ -240,18 +240,16 @@ impl Timeline {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
+    use blogs::tests as blogTests;
-        blogs::tests as blogTests,
-        follows::*,
-        lists::ListType,
-        post_authors::{NewPostAuthor, PostAuthor},
-        posts::NewPost,
-        safe_string::SafeString,
-        tags::Tag,
-        tests::{db, rockets},
-        users::tests as userTests,
-    };
     use diesel::Connection;
+    use follows::*;
+    use lists::ListType;
+    use post_authors::{NewPostAuthor, PostAuthor};
+    use posts::NewPost;
+    use safe_string::SafeString;
+    use tags::Tag;
+    use tests::{db, rockets};
+    use users::tests as userTests;
 
     #[test]
     fn test_timeline() {

plume-models/src/timeline/query.rs

@@ -1,17 +1,15 @@
-use crate::{
+use blogs::Blog;
-    blogs::Blog,
+use lists::{self, ListType};
-    lists::{self, ListType},
-    posts::Post,
-    tags::Tag,
-    timeline::Timeline,
-    users::User,
-    PlumeRocket, Result,
-};
-use futures::stream::{self, StreamExt};
 use plume_common::activity_pub::inbox::AsActor;
-use tokio::runtime::Runtime;
+use posts::Post;
+use tags::Tag;
+use users::User;
 use whatlang::{self, Lang};
 
+use {PlumeRocket, Result};
+
+use super::Timeline;
+
 #[derive(Debug, Clone, PartialEq)]
 pub enum QueryError {
     SyntaxError(usize, usize, String),
@@ -67,7 +65,7 @@ impl<'a> Token<'a> {
         }
     }
 
-    fn get_error<T>(&self, token: Token<'_>) -> QueryResult<T> {
+    fn get_error<T>(&self, token: Token) -> QueryResult<T> {
         let (b, e) = self.get_pos();
         let message = format!(
             "Syntax Error: Expected {}, got {}",
@@ -81,7 +79,7 @@ impl<'a> Token<'a> {
 impl<'a> ToString for Token<'a> {
     fn to_string(&self) -> String {
         if let Token::Word(0, 0, v) = self {
-            return (*v).to_string();
+            return v.to_string();
         }
         format!(
             "'{}'",
@@ -129,7 +127,7 @@ macro_rules! gen_tokenizer {
     }
 }
 
-fn lex(stream: &str) -> Vec<Token<'_>> {
+fn lex(stream: &str) -> Vec<Token> {
     stream
         .chars()
         .chain(" ".chars()) // force a last whitespace to empty scan's state
@@ -165,7 +163,7 @@ impl<'a> TQ<'a> {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match self {
             TQ::Or(inner) => inner.iter().try_fold(false, |s, e| {
@@ -183,7 +181,7 @@ impl<'a> TQ<'a> {
             TQ::Or(inner) => inner.iter().flat_map(TQ::list_used_lists).collect(),
             TQ::And(inner) => inner.iter().flat_map(TQ::list_used_lists).collect(),
             TQ::Arg(Arg::In(typ, List::List(name)), _) => vec![(
-                (*name).to_string(),
+                name.to_string(),
                 match typ {
                     WithList::Blog => ListType::Blog,
                     WithList::Author { .. } => ListType::User,
@@ -210,7 +208,7 @@ impl<'a> Arg<'a> {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match self {
             Arg::In(t, l) => t.matches(rocket, timeline, post, l, kind),
@@ -235,8 +233,8 @@ impl WithList {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        list: &List<'_>,
+        list: &List,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match list {
             List::List(name) => {
@@ -292,38 +290,19 @@ impl WithList {
                     (_, _) => Err(QueryError::RuntimeError(format!(
                         "The list '{}' is of the wrong type for this usage",
                         name
-                    ))
+                    )))?,
-                    .into()),
                 }
             }
             List::Array(list) => match self {
-                WithList::Blog => {
+                WithList::Blog => Ok(list
-                    let mut rt = Runtime::new().unwrap();
+                    .iter()
-                    rt.block_on(async move {
+                    .filter_map(|b| Blog::find_by_fqn(rocket, b).ok())
-                        Ok(stream::iter(list)
+                    .any(|b| b.id == post.blog_id)),
-                            .filter_map(|b| async move {
-                                Some(Blog::find_by_fqn(rocket, b).await.ok().unwrap())
-                            })
-                            .collect::<Vec<_>>()
-                            .await
-                            .into_iter()
-                            .any(|b| b.id == post.blog_id))
-                    })
-                }
                 WithList::Author { boosts, likes } => match kind {
-                    Kind::Original => {
+                    Kind::Original => Ok(list
-                        let mut rt = Runtime::new().unwrap();
+                        .iter()
-                        rt.block_on(async move {
+                        .filter_map(|a| User::find_by_fqn(rocket, a).ok())
-                            Ok(stream::iter(list)
+                        .any(|a| post.is_author(&rocket.conn, a.id).unwrap_or(false))),
-                                .filter_map(|a| async move {
-                                    Some(User::find_by_fqn(rocket, a).await.ok().unwrap())
-                                })
-                                .collect::<Vec<_>>()
-                                .await
-                                .into_iter()
-                                .any(|a| post.is_author(&rocket.conn, a.id).unwrap_or(false)))
-                        })
-                    }
                     Kind::Reshare(u) => {
                         if *boosts {
                             Ok(list.iter().any(|user| &u.fqn == user))
@@ -394,7 +373,7 @@ impl Bool {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         match self {
             Bool::Followed { boosts, likes } => {
@@ -665,7 +644,7 @@ impl<'a> TimelineQuery<'a> {
         rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
-        kind: Kind<'_>,
+        kind: Kind,
     ) -> Result<bool> {
         self.0.matches(rocket, timeline, post, kind)
     }

plume-models/src/users.rs

@@ -1,9 +1,3 @@
-use crate::{
-    ap_url, blocklisted_emails::BlocklistedEmail, blogs::Blog, db_conn::DbConn, follows::Follow,
-    instance::*, medias::Media, notifications::Notification, post_authors::PostAuthor, posts::Post,
-    safe_string::SafeString, schema::users, search::Searcher, timeline::Timeline, Connection,
-    Error, PlumeRocket, Result, ITEMS_PER_PAGE,
-};
 use activitypub::{
     activity::Delete,
     actor::Person,
@@ -11,6 +5,7 @@ use activitypub::{
     object::{Image, Tombstone},
     Activity, CustomObject, Endpoint,
 };
+use bcrypt;
 use chrono::{NaiveDateTime, Utc};
 use diesel::{self, BelongingToDsl, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl};
 use openssl::{
@@ -19,15 +14,13 @@ use openssl::{
     rsa::Rsa,
     sign,
 };
-use plume_common::{
+use plume_common::activity_pub::{
-    activity_pub::{
+    ap_accept_header,
-        ap_accept_header,
+    inbox::{AsActor, AsObject, FromId},
-        inbox::{AsActor, AsObject, FromId},
+    sign::{gen_keypair, Signer},
-        sign::{gen_keypair, Signer},
+    ActivityStream, ApSignature, Id, IntoId, PublicKey, PUBLIC_VISIBILITY,
-        ActivityStream, ApSignature, Id, IntoId, PublicKey, PUBLIC_VISIBILITY,
-    },
-    utils,
 };
+use plume_common::utils;
 use reqwest::{
     header::{HeaderValue, ACCEPT},
     ClientBuilder,
@@ -36,6 +29,7 @@ use rocket::{
     outcome::IntoOutcome,
     request::{self, FromRequest, Request},
 };
+use serde_json;
 use std::{
     cmp::PartialEq,
     hash::{Hash, Hasher},
@@ -43,6 +37,20 @@ use std::{
 use url::Url;
 use webfinger::*;
 
+use blogs::Blog;
+use db_conn::DbConn;
+use follows::Follow;
+use instance::*;
+use medias::Media;
+use notifications::Notification;
+use post_authors::PostAuthor;
+use posts::Post;
+use safe_string::SafeString;
+use schema::users;
+use search::Searcher;
+use timeline::Timeline;
+use {ap_url, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE};
+
 pub type CustomPerson = CustomObject<ApSignature, Person>;
 
 pub enum Role {
@@ -52,7 +60,6 @@ pub enum Role {
 }
 
 #[derive(Queryable, Identifiable, Clone, Debug, AsChangeset)]
-#[changeset_options(treat_none_as_null = "true")]
 pub struct User {
     pub id: i32,
     pub username: String,
@@ -129,7 +136,7 @@ impl User {
     }
 
     pub fn delete(&self, conn: &Connection, searcher: &Searcher) -> Result<()> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
 
         for blog in Blog::find_for_author(conn, self)?
             .iter()
@@ -189,7 +196,7 @@ impl User {
             .map_err(Error::from)
     }
 
-    pub async fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<User> {
+    pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<User> {
         let from_db = users::table
             .filter(users::fqn.eq(fqn))
             .first(&*c.conn)
@@ -197,13 +204,12 @@ impl User {
         if let Some(from_db) = from_db {
             Ok(from_db)
         } else {
-            User::fetch_from_webfinger(c, fqn).await
+            User::fetch_from_webfinger(c, fqn)
         }
     }
 
-    async fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<User> {
+    fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<User> {
-        let link = resolve(acct.to_owned(), true)
+        let link = resolve(acct.to_owned(), true)?
-            .await?
             .links
             .into_iter()
             .find(|l| l.mime_type == Some(String::from("application/activity+json")))
@@ -211,9 +217,8 @@ impl User {
         User::from_id(c, link.href.as_ref()?, None).map_err(|(_, e)| e)
     }
 
-    pub async fn fetch_remote_interact_uri(acct: &str) -> Result<String> {
+    pub fn fetch_remote_interact_uri(acct: &str) -> Result<String> {
-        resolve(acct.to_owned(), true)
+        resolve(acct.to_owned(), true)?
-            .await?
             .links
             .into_iter()
             .find(|l| l.rel == "http://ostatus.org/schema/1.0/subscribe")
@@ -221,9 +226,9 @@ impl User {
             .ok_or(Error::Webfinger)
     }
 
-    async fn fetch(url: &str) -> Result<CustomPerson> {
+    fn fetch(url: &str) -> Result<CustomPerson> {
-        let res = ClientBuilder::new()
+        let mut res = ClientBuilder::new()
-            .connect_timeout(std::time::Duration::from_secs(5))
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
             .build()?
             .get(url)
             .header(
@@ -235,9 +240,8 @@ impl User {
                         .join(", "),
                 )?,
             )
-            .send()
+            .send()?;
-            .await?;
+        let text = &res.text()?;
-        let text = &res.text().await?;
         // without this workaround, publicKey is not correctly deserialized
         let ap_sign = serde_json::from_str::<ApSignature>(text)?;
         let mut json = serde_json::from_str::<CustomPerson>(text)?;
@@ -245,48 +249,48 @@ impl User {
         Ok(json)
     }
 
-    pub async fn fetch_from_url(c: &PlumeRocket, url: &str) -> Result<User> {
+    pub fn fetch_from_url(c: &PlumeRocket, url: &str) -> Result<User> {
-        let json = User::fetch(url).await?;
+        User::fetch(url).and_then(|json| User::from_activity(c, json))
-        User::from_activity(c, json)
     }
 
-    pub async fn refetch(&self, conn: &Connection) -> Result<()> {
+    pub fn refetch(&self, conn: &Connection) -> Result<()> {
-        let json = User::fetch(&self.ap_url.clone()).await?;
+        User::fetch(&self.ap_url.clone()).and_then(|json| {
-        let avatar = Media::save_remote(
+            let avatar = Media::save_remote(
-            conn,
+                conn,
-            json.object
+                json.object
-                .object_props
+                    .object_props
-                .icon_image()?
+                    .icon_image()?
-                .object_props
+                    .object_props
-                .url_string()?,
+                    .url_string()?,
-            &self,
+                &self,
-        )
+            )
-        .ok();
+            .ok();
 
-        diesel::update(self)
+            diesel::update(self)
-            .set((
+                .set((
-                users::username.eq(json.object.ap_actor_props.preferred_username_string()?),
+                    users::username.eq(json.object.ap_actor_props.preferred_username_string()?),
-                users::display_name.eq(json.object.object_props.name_string()?),
+                    users::display_name.eq(json.object.object_props.name_string()?),
-                users::outbox_url.eq(json.object.ap_actor_props.outbox_string()?),
+                    users::outbox_url.eq(json.object.ap_actor_props.outbox_string()?),
-                users::inbox_url.eq(json.object.ap_actor_props.inbox_string()?),
+                    users::inbox_url.eq(json.object.ap_actor_props.inbox_string()?),
-                users::summary.eq(SafeString::new(
+                    users::summary.eq(SafeString::new(
-                    &json
+                        &json
-                        .object
+                            .object
-                        .object_props
+                            .object_props
-                        .summary_string()
+                            .summary_string()
-                        .unwrap_or_default(),
+                            .unwrap_or_default(),
-                )),
+                    )),
-                users::followers_endpoint.eq(json.object.ap_actor_props.followers_string()?),
+                    users::followers_endpoint.eq(json.object.ap_actor_props.followers_string()?),
-                users::avatar_id.eq(avatar.map(|a| a.id)),
+                    users::avatar_id.eq(avatar.map(|a| a.id)),
-                users::last_fetched_date.eq(Utc::now().naive_utc()),
+                    users::last_fetched_date.eq(Utc::now().naive_utc()),
-                users::public_key.eq(json
+                    users::public_key.eq(json
-                    .custom_props
+                        .custom_props
-                    .public_key_publickey()?
+                        .public_key_publickey()?
-                    .public_key_pem_string()?),
+                        .public_key_pem_string()?),
-            ))
+                ))
-            .execute(conn)
+                .execute(conn)
-            .map(|_| ())
+                .map(|_| ())
-            .map_err(Error::from)
+                .map_err(Error::from)
+        })
     }
 
     pub fn hash_pass(pass: &str) -> Result<String> {
@@ -357,10 +361,9 @@ impl User {
             .set_part_of_link(Id::new(&self.outbox_url))?;
         Ok(ActivityStream::new(coll))
     }
-
+    fn fetch_outbox_page<T: Activity>(&self, url: &str) -> Result<(Vec<T>, Option<String>)> {
-    async fn fetch_outbox_page<T: Activity>(&self, url: &str) -> Result<(Vec<T>, Option<String>)> {
+        let mut res = ClientBuilder::new()
-        let res = ClientBuilder::new()
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
-            .connect_timeout(std::time::Duration::from_secs(5))
             .build()?
             .get(url)
             .header(
@@ -372,9 +375,8 @@ impl User {
                         .join(", "),
                 )?,
             )
-            .send()
+            .send()?;
-            .await?;
+        let text = &res.text()?;
-        let text = &res.text().await?;
         let json: serde_json::Value = serde_json::from_str(text)?;
         let items = json["items"]
             .as_array()
@@ -389,9 +391,9 @@ impl User {
         };
         Ok((items, next))
     }
-    pub async fn fetch_outbox<T: Activity>(&self) -> Result<Vec<T>> {
+    pub fn fetch_outbox<T: Activity>(&self) -> Result<Vec<T>> {
-        let res = ClientBuilder::new()
+        let mut res = ClientBuilder::new()
-            .connect_timeout(std::time::Duration::from_secs(5))
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
             .build()?
             .get(&self.outbox_url[..])
             .header(
@@ -403,14 +405,13 @@ impl User {
                         .join(", "),
                 )?,
             )
-            .send()
+            .send()?;
-            .await?;
+        let text = &res.text()?;
-        let text = &res.text().await?;
         let json: serde_json::Value = serde_json::from_str(text)?;
         if let Some(first) = json.get("first") {
             let mut items: Vec<T> = Vec::new();
             let mut next = first.as_str().unwrap().to_owned();
-            while let Ok((mut page, nxt)) = self.fetch_outbox_page(&next).await {
+            while let Ok((mut page, nxt)) = self.fetch_outbox_page(&next) {
                 if page.is_empty() {
                     break;
                 }
@@ -435,9 +436,9 @@ impl User {
         }
     }
 
-    pub async fn fetch_followers_ids(&self) -> Result<Vec<String>> {
+    pub fn fetch_followers_ids(&self) -> Result<Vec<String>> {
-        let res = ClientBuilder::new()
+        let mut res = ClientBuilder::new()
-            .connect_timeout(std::time::Duration::from_secs(5))
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
             .build()?
             .get(&self.followers_endpoint[..])
             .header(
@@ -449,9 +450,8 @@ impl User {
                         .join(", "),
                 )?,
             )
-            .send()
+            .send()?;
-            .await?;
+        let text = &res.text()?;
-        let text = &res.text().await?;
         let json: serde_json::Value = serde_json::from_str(text)?;
         Ok(json["items"]
             .as_array()
@@ -461,8 +461,8 @@ impl User {
             .collect::<Vec<String>>())
     }
     fn get_activities_count(&self, conn: &Connection) -> i64 {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::posts;
+        use schema::posts;
         let posts_by_self = PostAuthor::belonging_to(self).select(post_authors::post_id);
         posts::table
             .filter(posts::published.eq(true))
@@ -476,8 +476,8 @@ impl User {
         conn: &Connection,
         (min, max): (i32, i32),
     ) -> Result<Vec<serde_json::Value>> {
-        use crate::schema::post_authors;
+        use schema::post_authors;
-        use crate::schema::posts;
+        use schema::posts;
         let posts_by_self = PostAuthor::belonging_to(self).select(post_authors::post_id);
         let posts = posts::table
             .filter(posts::published.eq(true))
@@ -497,7 +497,7 @@ impl User {
     }
 
     pub fn get_followers(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = Follow::belonging_to(self).select(follows::follower_id);
         users::table
             .filter(users::id.eq_any(follows))
@@ -506,7 +506,7 @@ impl User {
     }
 
     pub fn count_followers(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = Follow::belonging_to(self).select(follows::follower_id);
         users::table
             .filter(users::id.eq_any(follows))
@@ -520,7 +520,7 @@ impl User {
         conn: &Connection,
         (min, max): (i32, i32),
     ) -> Result<Vec<User>> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = Follow::belonging_to(self).select(follows::follower_id);
         users::table
             .filter(users::id.eq_any(follows))
@@ -531,7 +531,7 @@ impl User {
     }
 
     pub fn get_followed(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::follows::dsl::*;
+        use schema::follows::dsl::*;
         let f = follows.filter(follower_id.eq(self.id)).select(following_id);
         users::table
             .filter(users::id.eq_any(f))
@@ -540,7 +540,7 @@ impl User {
     }
 
     pub fn count_followed(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::follows;
+        use schema::follows;
         follows::table
             .filter(follows::follower_id.eq(self.id))
             .count()
@@ -553,7 +553,7 @@ impl User {
         conn: &Connection,
         (min, max): (i32, i32),
     ) -> Result<Vec<User>> {
-        use crate::schema::follows;
+        use schema::follows;
         let follows = follows::table
             .filter(follows::follower_id.eq(self.id))
             .select(follows::following_id)
@@ -566,7 +566,7 @@ impl User {
     }
 
     pub fn is_followed_by(&self, conn: &Connection, other_id: i32) -> Result<bool> {
-        use crate::schema::follows;
+        use schema::follows;
         follows::table
             .filter(follows::follower_id.eq(other_id))
             .filter(follows::following_id.eq(self.id))
@@ -577,7 +577,7 @@ impl User {
     }
 
     pub fn is_following(&self, conn: &Connection, other_id: i32) -> Result<bool> {
-        use crate::schema::follows;
+        use schema::follows;
         follows::table
             .filter(follows::follower_id.eq(self.id))
             .filter(follows::following_id.eq(other_id))
@@ -588,7 +588,7 @@ impl User {
     }
 
     pub fn has_liked(&self, conn: &Connection, post: &Post) -> Result<bool> {
-        use crate::schema::likes;
+        use schema::likes;
         likes::table
             .filter(likes::post_id.eq(post.id))
             .filter(likes::user_id.eq(self.id))
@@ -599,7 +599,7 @@ impl User {
     }
 
     pub fn has_reshared(&self, conn: &Connection, post: &Post) -> Result<bool> {
-        use crate::schema::reshares;
+        use schema::reshares;
         reshares::table
             .filter(reshares::post_id.eq(post.id))
             .filter(reshares::user_id.eq(self.id))
@@ -610,7 +610,7 @@ impl User {
     }
 
     pub fn is_author_in(&self, conn: &Connection, blog: &Blog) -> Result<bool> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         blog_authors::table
             .filter(blog_authors::author_id.eq(self.id))
             .filter(blog_authors::blog_id.eq(blog.id))
@@ -765,7 +765,7 @@ impl User {
                     mime_type: None,
                     href: None,
                     template: Some(format!(
-                        "https://{}/remote_interact?target={{uri}}",
+                        "https://{}/remote_interact?{{uri}}",
                         self.get_instance(conn)?.public_domain
                     )),
                 },
@@ -794,12 +794,11 @@ impl User {
     }
 }
 
-#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for User {
     type Error = ();
 
-    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<User, ()> {
-        let conn = try_outcome!(DbConn::from_request(request).await);
+        let conn = request.guard::<DbConn>()?;
         request
             .cookies()
             .get_private(AUTH_COOKIE)
@@ -811,7 +810,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
 
 impl IntoId for User {
     fn into_id(self) -> Id {
-        Id::new(self.ap_url)
+        Id::new(self.ap_url.clone())
     }
 }
 
@@ -993,10 +992,6 @@ impl NewUser {
     ) -> Result<User> {
         let (pub_key, priv_key) = gen_keypair();
         let instance = Instance::get_local()?;
-        let blocklisted = BlocklistedEmail::matches_blocklist(conn, &email)?;
-        if let Some(x) = blocklisted {
-            return Err(Error::Blocklisted(x.notify_user, x.notification_text));
-        }
 
         let res = User::insert(
             conn,
@@ -1031,13 +1026,11 @@ impl NewUser {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{
-        instance::{tests as instance_tests, Instance},
-        search::tests::get_searcher,
-        tests::{db, rockets},
-        Connection as Conn,
-    };
     use diesel::Connection;
+    use instance::{tests as instance_tests, Instance};
+    use search::tests::get_searcher;
+    use tests::{db, rockets};
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> Vec<User> {
         instance_tests::fill_database(conn);

plume-models/tests/lib.rs

@@ -1,3 +1,7 @@
+extern crate diesel;
+extern crate plume_common;
+extern crate plume_models;
+
 use diesel::Connection;
 use plume_common::utils::random_hex;
 use plume_models::migrations::IMPORTED_MIGRATIONS;

po/plume-front/af.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 19:54\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Afrikaans\n"
 "Language: af_ZA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: af\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/ar.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 19:54\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ar\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "فتح محرر النصوص الغني"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "العنوان"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "العنوان الثانوي أو الملخص"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "اكتب مقالك هنا. ماركداون مُدَعَّم."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "يتبقا {} حرفا تقريبا"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "الوسوم"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "الرخصة"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "الغلاف"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "هذه مسودة"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "نشر كتابا"
-

po/plume-front/bg.po

@@ -3,55 +3,55 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: bg\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Отворете редактора с богат текст"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Заглавие"
+msgstr ""
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Подзаглавие или резюме"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Напишете статията си тук. Поддържа се Markdown."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Остават {} знака вляво"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Етикети"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Лиценз"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Основно изображение"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Това е проект"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Публикувай"
+msgstr ""
-

po/plume-front/ca.po

@@ -3,55 +3,55 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Catalan\n"
 "Language: ca_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ca\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Obre l’editor de text enriquit"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Títol"
+msgstr ""
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Subtítol o resum"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Escriviu el vostre article ací. Podeu fer servir el Markdown."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Queden uns {} caràcters"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Etiquetes"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Llicència"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Coberta"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Açò és un esborrany"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Publica"
+msgstr ""
-

po/plume-front/cs.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: cs\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Otevřít editor formátovaného textu"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Nadpis"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "Podnadpis, nebo shrnutí"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Sem napište svůj článek. Markdown je podporován."
+msgstr "Napište sem svůj článek. Markdown je podporován."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Zbývá kolem {} znaků"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tagy"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licence"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Titulka"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Tohle je koncept"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Zveřejnit"
-

po/plume-front/da.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: da\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/de.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: de\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr " Rich Text Editor (RTE) öffnen"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titel"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Untertitel oder Zusammenfassung"
+msgstr "Untertitel oder Übersicht"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Schreiben  deinen Artikel hier. Markdown wird unterstützt."
+msgstr "Schreibe deinen Artikel hier. Markdown ist unterstützt."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Ungefähr {} Zeichen übrig"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Schlagwörter"
+msgstr "Tags"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Lizenz"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Einband"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Dies ist ein Entwurf"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Veröffentlichen"
-

po/plume-front/el.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: el\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/en.po

@@ -3,23 +3,24 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: English\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: en\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
@@ -27,31 +28,30 @@ msgstr ""
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
-

po/plume-front/eo.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Esperanto\n"
 "Language: eo_UY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: eo\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Malfermi la riĉan redaktilon"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titolo"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Subtitolo aŭ resumo"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Verku vian artikolon ĉi tie. Markdown estas subtenita."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Proksimume {} signoj restantaj"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etikedoj"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Permesilo"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Kovro"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Malfinias"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Eldoni"
-

po/plume-front/es.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: es-ES\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Abrir el editor de texto enriquecido"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Título"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Subtítulo o resumen"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Escriba su artículo aquí. Puede utilizar Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Quedan unos {} caracteres"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etiquetas"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licencia"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Cubierta"
+msgstr "Cobertura"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Esto es un borrador"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicar"
-

po/plume-front/fa.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: fa\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "باز کردن ویرایش‌گر غنی"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "عنوان"
+msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
-msgstr "زیرعنوان، یا چکیده"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "مقاله را اینجا بنویسید. از مارک‌داون پشتیبانی می‌شود."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "نزدیک به {} نویسه باقی مانده است"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "برچسب‌ها"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "پروانه"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "این، یک پیش‌نویس است"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "انتشار"
+msgstr ""
 

po/plume-front/fi.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: fi\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Avaa edistynyt tekstieditori"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
-msgstr "Otsikko"
+msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
-msgstr "Alaotsikko tai tiivistelmä"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Kirjoita artikkelisi tähän. Markdown -kuvauskieli on tuettu."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "%{count} merkkiä jäljellä"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Tagit"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Lisenssi"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Kansi"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Tämä on luonnos"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Julkaise"
+msgstr ""
 

po/plume-front/fr.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: fr\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Ouvrir l'éditeur de texte avancé"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titre"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "Sous-titre ou résumé"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Écrivez votre article ici. Vous pouvez utiliser du Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Environ {} caractères restant"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Étiquettes"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licence"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Illustration"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Ceci est un brouillon"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publier"
-

po/plume-front/gl.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Galician\n"
 "Language: gl_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: gl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Abra o editor de texto enriquecido"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Título"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Subtítulo, ou resumo"
+msgstr "Subtítulo ou resumo"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Escriba aquí o seu artigo: pode utilizar Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Dispón de {} caracteres restantes"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etiquetas"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenza"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Portada"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Este é un borrador"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicar"
-

po/plume-front/he.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: he\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/hi.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:14\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Hindi\n"
 "Language: hi_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: hi\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "शीर्षक"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "उपशीर्षक या सारांश"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "अपना आर्टिकल या लेख यहाँ लिखें. Markdown उपलब्ध है."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "लगभग {} अक्षर बाकी हैं"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "टैग्स"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "लाइसेंस"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "पब्लिश करें"
-

po/plume-front/hr.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Croatian\n"
 "Language: hr_HR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: hr\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Naslov"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Podnaslov ili sažetak"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tagovi"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenca"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Objavi"
-

po/plume-front/hu.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: hu\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/it.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: it\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Apri il compositore di testo avanzato"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titolo"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Sottotitolo, o sommario"
+msgstr "Sottotitolo o sommario"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Scrivi qui il tuo articolo. È supportato il Markdown."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Circa {} caratteri rimasti"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etichette"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenza"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Copertina"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Questa è una bozza"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Pubblica"
-

po/plume-front/ja.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ja\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "リッチテキストエディターを開く"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "タイトル"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "サブタイトル、または概要"
+msgstr "サブタイトルまたは概要"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "投稿をここに書きます。Markdown がサポートされています。"
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "残り約 {} 文字"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "タグ"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "ライセンス"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "カバー"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "これは下書きです"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "公開"
-

po/plume-front/ko.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ko\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/nl.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:06\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: nl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/no.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Norwegian\n"
 "Language: no_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: no\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
 

po/plume-front/pl.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
+"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
+"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: pl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Otwórz edytor tekstu sformatowanego"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Tytuł"
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Podtytuł, lub podsumowanie"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Napisz swój artykuł tutaj. Markdown jest obsługiwany."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Pozostało w okolicy {} znaków"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tagi"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licencja"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Okładka"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "To jest szkic"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Publikuj"
+msgstr "Opublikuj"
-

po/plume-front/pt.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-18 07:05\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
-"Language-Team: Portuguese, Brazilian\n"
+"Language-Team: Portuguese\n"
-"Language: pt_BR\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Language: pt-BR\n"
+"X-Crowdin-Language: pt-PT\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Abrir o editor de rich text"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Título"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr "Subtítulo ou resumo"
+msgstr "Legenda ou resumo"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Escreva seu artigo aqui. Markdown é suportado."
+msgstr "Escreva seu artigo aqui. Markdown pode ser usado."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Cerca de {} caracteres restantes"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Tags"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licença"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Capa"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Isso é um rascunho"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicar"
-

po/plume-front/ro.po

@@ -3,55 +3,57 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Romanian\n"
 "Language: ro_RO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100>0 && n%100<20)) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100>0 && n"
+"%100<20)) ? 1 : 2);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ro\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Deschide editorul de text"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titlu"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Subtitlu sau rezumat"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Scrie articolul tău aici. Markdown este acceptat."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "În apropiere de {} caractere rămase"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Etichete"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenţă"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Coperta"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Aceasta este o ciornă"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publică"
-

po/plume-front/ru.po

@@ -3,23 +3,26 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
+"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 "
+"&& n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 "
+"&& n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ru\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr ""
 
@@ -27,31 +30,30 @@ msgstr ""
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
-

po/plume-front/sk.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Slovak\n"
 "Language: sk_SK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sk\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr "Otvor editor formátovaného textu"
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Nadpis"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
 msgstr "Zhrnutie, alebo podnadpis"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Tu napíš svoj článok. Markdown je podporovaný."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Zostáva asi {} znakov"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Štítky"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licencia"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Obálka"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "Toto je koncept"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Zverejniť"
-

po/plume-front/sl.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 19:55\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sl\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Naslov"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Oznake"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licenca"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr "To je osnutek"
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Objavi"
 

po/plume-front/sr.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 20:49\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Serbian (Latin)\n"
 "Language: sr_CS\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sr-CS\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
-msgstr "Otvori uređivač sa stilizacijom"
+msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Naslov"
 
 # plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
-msgstr "Podnaslov, ili sažetak"
+msgstr ""
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
-msgstr "Napišite vaš članak ovde. Na raspolaganju vam je Markdown."
+msgstr ""
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
-msgstr "Preostalo oko {} znakova"
+msgstr ""
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
-msgstr "Markeri"
+msgstr ""
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
-msgstr "Licenca"
+msgstr ""
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
-msgstr "Naslovna strana"
+msgstr ""
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
-msgstr "Ovo je nacrt"
+msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
-msgstr "Objavi"
+msgstr ""
-

po/plume-front/sv.po

@@ -3,55 +3,56 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2019-12-16 21:07\n"
+"PO-Revision-Date: 2019-04-17 18:15\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Ana Gelez (AnaGelez)\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: sv-SE\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:115
+# plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:145
+# plume-front/src/editor.rs:143
 msgid "Title"
 msgstr "Titel"
 
-# plume-front/src/editor.rs:149
+# plume-front/src/editor.rs:147
+#, fuzzy
 msgid "Subtitle, or summary"
-msgstr ""
+msgstr "Undertitel eller sammanfattning"
 
-# plume-front/src/editor.rs:156
+# plume-front/src/editor.rs:154
 msgid "Write your article here. Markdown is supported."
 msgstr "Skriv din artikel här. Markdown stöds."
 
-# plume-front/src/editor.rs:167
+# plume-front/src/editor.rs:165
 msgid "Around {} characters left"
 msgstr "Ungefär {} karaktärer kvar"
 
-# plume-front/src/editor.rs:243
+# plume-front/src/editor.rs:228
 msgid "Tags"
 msgstr "Taggar"
 
-# plume-front/src/editor.rs:244
+# plume-front/src/editor.rs:229
 msgid "License"
 msgstr "Licens"
 
-# plume-front/src/editor.rs:247
+# plume-front/src/editor.rs:232
 msgid "Cover"
 msgstr "Omslag"
 
-# plume-front/src/editor.rs:267
+# plume-front/src/editor.rs:252
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:274
+# plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr "Publicera"
-