remove redundant use statements

unroll filter_map() to easier .await
2020-05-25 20:00:57 +02:00 · 2020-05-25 20:00:28 +02:00 · 2020-05-25 19:18:24 +02:00 · 2020-05-25 19:17:32 +02:00 · 2020-05-25 15:44:32 +02:00 · 2020-05-25 15:23:55 +02:00
111 changed files with 2538 additions and 3456 deletions
@@ -1,5 +1,5 @@
 localhost:443 {
-  proxy / integration:7878 {
+  proxy / localhost:7878 {
    transparent
  }
  tls self_signed
@@ -1,233 +0,0 @@
-// This is the CI config for Plume.
-// It uses a Drone CI instance, on https://ci.joinplu.me
-
-// First of all, we define a few useful constants
-
-// This Docker image contains everything we need to build Plume.
-// Its Dockerfile can be found at https://git.joinplu.me/plume/buildenv
-local plumeEnv = "plumeorg/plume-buildenv:v0.2.0";
-
-// Common cache config
-local cacheConfig(name, extra) = {
-    name: name,
-    image: "meltwater/drone-cache:dev",
-    pull: true,
-    environment: {
-      AWS_ACCESS_KEY_ID: { from_secret: 'minio_key' },
-      AWS_SECRET_ACCESS_KEY: { from_secret: 'minio_secret' },
-    },
-    settings: extra + {
-        cache_key: 'v0-{{ checksum "Cargo.lock" }}-{{ .Commit.Branch }}',
-        archive_format: "gzip",
-        mount: [ "~/.cargo/", "./target" ],
-        bucket: 'cache',
-        path_style: true,
-        endpoints: "127.0.0.1:9000",
-        region: 'us-east-1',
-        debug: true,
-    },
-    volumes: [ { name: "cache", path: "/tmp/cache" } ]
-};
-
-
-// A pipeline step that restores the cache.
-// The cache contains all the cargo build files.
-// Thus, we don't have to download and compile all of our dependencies for each
-// commit.
-// This cache is only "deleted" when the contents of Cargo.lock changes.
-//
-// We use this plugin for caching: https://github.com/meltwater/drone-cache/
-//
-// Potential TODO: use one cache per pipeline, as we used to do when we were
-// using CircleCI.
-local restoreCache = cacheConfig("restore-cache", { restore: true });
-// And a step that saves the cache.
-local saveCache = cacheConfig("save-cache", { rebuild: true });
-
-// This step starts a PostgreSQL database if the db parameter is "postgres",
-// otherwise it does nothing.
-local startDb(db) = if db == "postgres" then {
-    name: "start-db",
-    image: "postgres:12.3-alpine",
-    detach: true,
-    environment: {
-        POSTGRES_USER: "plume",
-        POSTGRES_DB: "plume",
-        POSTGRES_PASSWORD: "password",
-    }
-} else {};
-
-// A utility function to generate a new pipeline
-local basePipeline(name, steps) = {
-    kind: "pipeline",
-    name: name,
-    type: "docker",
-    environment: {
-        RUST_TEST_THREADS: '1',
-    },
-    steps: steps
-};
-
-// And this function creates a pipeline with caching
-local cachedPipeline(name, commands) = basePipeline(
-    name,
-    [
-        restoreCache,
-        {
-            name: name,
-            image: plumeEnv,
-            commands: commands,
-        },
-        saveCache
-    ]
-);
-
-// This function creates a step to upload artifacts to Minio
-local upload(name, source) = {
-    name: name,
-    image: 'plugins/s3',
-    settings: {
-        bucket: 'artifacts',
-        source: source,
-        target: '/${DRONE_BUILD_NUMBER}',
-        path_style: true,
-        endpoint: 'http://127.0.0.1:9000',
-        access_key: { from_secret: 'minio_key' },
-        secret_key: { from_secret: 'minio_secret' },
-    },
-};
-
-
-// Here starts the actual list of pipelines!
-
-// PIPELINE 1: a pipeline that runs cargo fmt, and that fails if the style of
-// the code is not standard.
-local CargoFmt() = cachedPipeline(
-    "cargo-fmt",
-    [ "cargo fmt --all -- --check" ]
-);
-
-// PIPELINE 2: runs clippy, a tool that helps
-// you writing idiomatic Rust.
-
-// Helper function:
-local cmd(db, pkg, features=true) = if features then
-    "cargo clippy --no-default-features --features " + db + " --release -p "
-    + pkg + " -- -D warnings"
-else
-    "cargo clippy --no-default-features --release -p "
-    + pkg + " -- -D warnings";
-
-// The actual pipeline:
-local Clippy(db) = cachedPipeline(
-    "clippy-" + db,
-    [
-        cmd(db, "plume"),
-        cmd(db, "plume-cli"),
-        cmd(db, "plume-front", false)
-    ]
-);
-
-// PIPELINE 3: runs unit tests
-local Unit(db) = cachedPipeline(
-    "unit-" + db,
-    [
-        "cargo test --all --exclude plume-front --exclude plume-macro"
-        + " --no-run --no-default-features --features=" + db
-    ]
-);
-
-// PIPELINE 4: runs integration tests
-// It installs a local instance an run integration test with Python scripts
-// that use Selenium (located in scripts/browser_test).
-local Integration(db) = basePipeline(
-    "integration-" + db,
-    [
-        restoreCache,
-        startDb(db),
-        {
-            name: 'selenium',
-            image: 'elgalu/selenium:latest',
-            detach: true,
-        },
-        {
-            name: "integration",
-            image: plumeEnv,
-            environment: {
-                BROWSER: "firefox",
-                DATABASE_URL: if db == "postgres" then "postgres://plume:password@start-db/plume" else "plume.db",
-            },
-            commands: [
-                // Install the front-end
-                "cargo web deploy -p plume-front",
-                // Install the server
-                'cargo install --debug --no-default-features --features="'
-                + db + '",test --force --path .',
-                // Install plm
-                'cargo install --debug --no-default-features --features="'
-                + db + '" --force --path plume-cli',
-                // Run the tests
-                "./script/run_browser_test.sh"
-            ],
-        },
-        saveCache,
-    ]
-);
-
-// PIPELINE 5: make a release build and save artifacts
-//
-// It should also deploy the SQlite build to a test instance
-// located at https://pr-XXX.joinplu.me (but this system is not very
-// stable, and often breaks).
-local Release(db) = basePipeline(
-    "release-" + db,
-    [
-        restoreCache,
-        {
-            name: 'release-' + db,
-            image: plumeEnv,
-            commands: [
-                "cargo web deploy -p plume-front --release",
-                "cargo build --release --no-default-features --features=" + db + " -p plume",
-                "cargo build --release --no-default-features --features=" + db + " -p plume-cli",
-                "./script/generate_artifact.sh",
-            ] + if db == "sqlite" then
-            [ "./script/upload_test_environment.sh" ] else
-            []
-        },
-        upload('artifacts-' + db, '*.tar.gz'),
-        saveCache,
-    ]
-
-);
-
-// PIPELINE 6: upload the new PO templates (.pot) to Crowdin
-//
-// TODO: run only on master
-local PushTranslations() = basePipeline(
-    "push-translations",
-    [
-        {
-            name: "push-translations",
-            image: plumeEnv,
-            commands: [
-                "cargo build",
-                "crowdin upload -b master"
-            ]
-        }
-    ]
-);
-
-// And finally, the list of all our pipelines:
-[
-    CargoFmt(),
-    Clippy("postgres"),
-    Clippy("sqlite"),
-    Unit("postgres"),
-    Unit("sqlite"),
-    Integration("postgres"),
-    Integration("sqlite"),
-    Release("postgres"),
-    Release("sqlite"),
-    PushTranslations()
-]
@@ -18,3 +18,4 @@ tags.*
 search_index
 .buildconfig
 __pycache__
+.vscode/
@@ -8,6 +8,7 @@ edition = "2018"
 [dependencies]
 activitypub = "0.1.3"
 askama_escape = "0.1"
+async-trait = "*"
 atom_syndication = "0.6"
 clap = "2.33"
 colored = "1.8"
@@ -20,9 +21,8 @@ heck = "0.3.0"
 lettre = "0.9.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
-rocket = "0.4.2"
-rocket_contrib = { version = "0.4.2", features = ["json"] }
-rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
+rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
+rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" , features = ["json"] }
 rpassword = "4.0"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
@@ -30,9 +30,10 @@ serde_json = "1.0"
 serde_qs = "0.5"
 shrinkwraprs = "0.2.1"
 syntect = "3.3"
-validator = "0.8"
-validator_derive = "0.8"
-webfinger = "0.4.1"
+tokio = "0.2"
+validator = "0.10"
+validator_derive = "0.10"
+webfinger = { git = "https://github.com/Plume-org/webfinger", rev = "4e8f12810c4a7ba7a07bbcb722cd265fdff512b6", features = ["async"] }

 [[bin]]
 name = "plume"
@@ -64,9 +65,11 @@ path = "plume-common"
 [dependencies.plume-models]
 path = "plume-models"

-[dependencies.rocket_csrf]
-git = "https://github.com/fdb-hiroshima/rocket_csrf"
-rev = "29910f2829e7e590a540da3804336577b48c7b31"
+[dependencies.rocket_i18n]
+git = "https://github.com/Plume-org/rocket_i18n"
+branch = "go-async"
+default-features = false
+features = ["rocket"]

 [build-dependencies]
 ructe = "0.9.0"
@@ -78,7 +81,6 @@ postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
 debug-mailer = []
 test = []
-search-lindera = ["plume-models/search-lindera"]

 [workspace]
 members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front", "plume-macro"]
@@ -1,10 +1,10 @@
 /* Color Scheme */
-$gray: #f3f3f3;
+$gray: #F3F3F3;
 $black: #242424;
-$white: #f8f8f8;
-$purple: #7765e3;
+$white: #F8F8F8;
+$purple: #7765E3;
 $lightpurple: #c2bbee;
-$red: #e92f2f;
+$red: #E92F2F;
 $yellow: #ffe347;
 $green: #23f0c7;

@@ -24,14 +24,14 @@ $margin: 0 $horizontal-margin;

 /* Fonts */

-$route159: "Shabnam", "Route159", serif;
-$playfair: "Vazir", "Playfair Display", serif;
-$lora: "Vazir", "Lora", serif;
+$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-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;
@@ -1,14 +1,12 @@
 /* color palette: https://coolors.co/23f0c7-ef767a-7765e3-6457a6-ffe347 */

-@import url("./feather.css");
-@import url("./fonts/Route159/Route159.css");
-@import url("./fonts/Lora/Lora.css");
-@import url("./fonts/Playfair_Display/PlayfairDisplay.css");
-@import url("./fonts/Vazir_WOL/Vazir_WOL.css");
-@import url("./fonts/Shabnam_WOL/Shabnam_WOL.css");
+@import url('./feather.css');
+@import url('./fonts/Route159/Route159.css');
+@import url('./fonts/Lora/Lora.css');
+@import url('./fonts/Playfair_Display/PlayfairDisplay.css');

-@import "dark_variables";
-@import "global";
-@import "header";
-@import "article";
-@import "forms";
+@import 'dark_variables';
+@import 'global';
+@import 'header';
+@import 'article';
+@import 'forms';
@@ -1,94 +0,0 @@
-Copyright (c) 2015, Saber Rastikerdar (saber.rastikerdar@gmail.com),
-Glyphs and data from Roboto font are licensed under the Apache License, Version 2.0.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -1,49 +0,0 @@
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-WOL.eot");
-    src: url("Shabnam-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-WOL.woff2") format("woff2"),
-        url("Shabnam-WOL.woff") format("woff"),
-        url("Shabnam-WOL.ttf") format("truetype");
-    font-weight: normal;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Bold-WOL.eot");
-    src: url("Shabnam-Bold-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Bold-WOL.woff2") format("woff2"),
-        url("Shabnam-Bold-WOL.woff") format("woff"),
-        url("Shabnam-Bold-WOL.ttf") format("truetype");
-    font-weight: bold;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Thin-WOL.eot");
-    src: url("Shabnam-Thin-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Thin-WOL.woff2") format("woff2"),
-        url("Shabnam-Thin-WOL.woff") format("woff"),
-        url("Shabnam-Thin-WOL.ttf") format("truetype");
-    font-weight: 100;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Light-WOL.eot");
-    src: url("Shabnam-Light-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Light-WOL.woff2") format("woff2"),
-        url("Shabnam-Light-WOL.woff") format("woff"),
-        url("Shabnam-Light-WOL.ttf") format("truetype");
-    font-weight: 300;
-}
-
-@font-face {
-    font-family: Shabnam;
-    src: url("Shabnam-Medium-WOL.eot");
-    src: url("Shabnam-Medium-WOL.eot?#iefix") format("embedded-opentype"),
-        url("Shabnam-Medium-WOL.woff2") format("woff2"),
-        url("Shabnam-Medium-WOL.woff") format("woff"),
-        url("Shabnam-Medium-WOL.ttf") format("truetype");
-    font-weight: 500;
-}
@@ -1,51 +0,0 @@
-Changes by Saber Rastikerdar (saber.rastikerdar@gmail.com) are in public domain.
-Glyphs and data from Roboto font are licensed under the Apache License, Version 2.0.
-
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. 
-
-Bitstream Vera Fonts Copyright
------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
@@ -1,65 +0,0 @@
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-WOL.eot');
-    src: url('Vazir-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-WOL.woff2') format('woff2'),
-        url('Vazir-WOL.woff') format('woff'),
-        url('Vazir-WOL.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Bold-WOL.eot');
-    src: url('Vazir-Bold-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Bold-WOL.woff2') format('woff2'),
-        url('Vazir-Bold-WOL.woff') format('woff'),
-        url('Vazir-Bold-WOL.ttf') format('truetype');
-    font-weight: bold;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Black-WOL.eot');
-    src: url('Vazir-Black-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Black-WOL.woff2') format('woff2'),
-        url('Vazir-Black-WOL.woff') format('woff'),
-        url('Vazir-Black-WOL.ttf') format('truetype');
-    font-weight: 900;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Medium-WOL.eot');
-    src: url('Vazir-Medium-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Medium-WOL.woff2') format('woff2'),
-        url('Vazir-Medium-WOL.woff') format('woff'),
-        url('Vazir-Medium-WOL.ttf') format('truetype');
-    font-weight: 500;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Light-WOL.eot');
-    src: url('Vazir-Light-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Light-WOL.woff2') format('woff2'),
-        url('Vazir-Light-WOL.woff') format('woff'),
-        url('Vazir-Light-WOL.ttf') format('truetype');
-    font-weight: 300;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: Vazir;
-    src: url('Vazir-Thin-WOL.eot');
-    src: url('Vazir-Thin-WOL.eot?#iefix') format('embedded-opentype'),
-        url('Vazir-Thin-WOL.woff2') format('woff2'),
-        url('Vazir-Thin-WOL.woff') format('woff'),
-        url('Vazir-Thin-WOL.ttf') format('truetype');
-    font-weight: 100;
-    font-style: normal;
-}
@@ -1,14 +1,12 @@
 /* color palette: https://coolors.co/23f0c7-ef767a-7765e3-6457a6-ffe347 */

-@import url("./feather.css");
-@import url("./fonts/Route159/Route159.css");
-@import url("./fonts/Lora/Lora.css");
-@import url("./fonts/Playfair_Display/PlayfairDisplay.css");
-@import url("./fonts/Vazir_WOL/Vazir_WOL.css");
-@import url("./fonts/Shabnam_WOL/Shabnam_WOL.css");
+@import url('./feather.css');
+@import url('./fonts/Route159/Route159.css');
+@import url('./fonts/Lora/Lora.css');
+@import url('./fonts/Playfair_Display/PlayfairDisplay.css');

-@import "variables";
-@import "global";
-@import "header";
-@import "article";
-@import "forms";
+@import 'variables';
+@import 'global';
+@import 'header';
+@import 'article';
+@import 'forms';
@@ -1,5 +1,3 @@
-use rsass;
-
 use ructe::Ructe;
 use std::process::{Command, Stdio};
 use std::{ffi::OsStr, fs::*, io::Write, path::*};
@@ -23,4 +23,3 @@ path = "../plume-models"
 [features]
 postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
-search-lindera = ["plume-models/search-lindera"]
@@ -82,7 +82,7 @@ fn init<'a>(args: &ArgMatches<'a>, conn: &Connection) {
        }
    };
    if can_do || force {
-        let searcher = Searcher::create(&path, &CONFIG.search_tokenizers).unwrap();
+        let searcher = Searcher::create(&path).unwrap();
        refill(args, conn, Some(searcher));
    } else {
        eprintln!(
@@ -98,8 +98,7 @@ fn refill<'a>(args: &ArgMatches<'a>, conn: &Connection, searcher: Option<Searche
        Some(path) => Path::new(path).join("search_index"),
        None => Path::new(&CONFIG.search_index).to_path_buf(),
    };
-    let searcher =
-        searcher.unwrap_or_else(|| Searcher::open(&path, &CONFIG.search_tokenizers).unwrap());
+    let searcher = searcher.unwrap_or_else(|| Searcher::open(&path).unwrap());

    searcher.fill(conn).expect("Couldn't import post");
    println!("Commiting result");
@@ -6,22 +6,22 @@ edition = "2018"

 [dependencies]
 activitypub = "0.1.1"
-activitystreams-derive = "0.1.1"
+activitystreams-derive = "0.2"
 activitystreams-traits = "0.1.0"
 array_tool = "1.0"
 base64 = "0.10"
+futures-util = "*"
 heck = "0.3.0"
 hex = "0.3"
-hyper = "0.12.33"
+hyper = "0.13"
 openssl = "0.10.22"
-rocket = "0.4.0"
-reqwest = "0.9"
+rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
 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]
@@ -31,3 +31,7 @@ version = "0.4"
 [dependencies.pulldown-cmark]
 default-features = false
 version = "0.2.0"
+
+[dependencies.reqwest]
+features = ["json", "blocking"]
+version = "0.10"
@@ -279,8 +279,9 @@ pub trait FromId<C>: Sized {

    /// Dereferences an ID
    fn deref(id: &str) -> Result<Self::Object, (Option<serde_json::Value>, Self::Error)> {
-        reqwest::ClientBuilder::new()
-            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+        // Use blocking reqwest API here, since defer cannot be async (yet)
+        reqwest::blocking::Client::builder()
+            .connect_timeout(std::time::Duration::from_secs(5))
            .build()
            .map_err(|_| (None, InboxError::DerefError.into()))?
            .get(id)
@@ -296,7 +297,7 @@ pub trait FromId<C>: Sized {
            )
            .send()
            .map_err(|_| (None, InboxError::DerefError))
-            .and_then(|mut r| {
+            .and_then(|r| {
                let json: serde_json::Value = r
                    .json()
                    .map_err(|_| (None, InboxError::InvalidObject(None)))?;
@@ -1,14 +1,12 @@
 use activitypub::{Activity, Link, Object};
 use array_tool::vec::Uniq;
-use reqwest::r#async::ClientBuilder;
+use reqwest::ClientBuilder;
 use rocket::{
    http::Status,
    request::{FromRequest, Request},
-    response::{Responder, Response},
+    response::{Responder, Response, Result},
    Outcome,
 };
-use serde_json;
-use tokio::prelude::*;

 use self::sign::Signable;

@@ -62,39 +60,45 @@ impl<T> ActivityStream<T> {
        ActivityStream(t)
    }
 }
-
-impl<'r, O: Object> Responder<'r> for ActivityStream<O> {
-    fn respond_to(self, request: &Request<'_>) -> Result<Response<'r>, Status> {
+#[rocket::async_trait]
+impl<'r, O: Object + Send + 'r> Responder<'r> for ActivityStream<O> {
+    async fn respond_to(self, request: &'r Request<'_>) -> Result<'r> {
        let mut json = serde_json::to_value(&self.0).map_err(|_| Status::InternalServerError)?;
        json["@context"] = context();
-        serde_json::to_string(&json).respond_to(request).map(|r| {
-            Response::build_from(r)
+        let result = serde_json::to_string(&json).map_err(rocket::response::Debug);
+        match result.respond_to(request).await {
+            Ok(r) => Response::build_from(r)
                .raw_header("Content-Type", "application/activity+json")
-                .finalize()
-        })
+                .ok(),
+            Err(e) => Err(e),
+        }
    }
 }

 #[derive(Clone)]
 pub struct ApRequest;
+#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for ApRequest {
    type Error = ();

-    fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> {
+    async fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> {
        request
            .headers()
            .get_one("Accept")
            .map(|header| {
                header
                    .split(',')
-                    .map(|ct| match ct.trim() {
-                        // bool for Forward: true if found a valid Content-Type for Plume first (HTML), 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" => Outcome::Success(ApRequest),
-                        "text/html" => Outcome::Forward(true),
-                        _ => Outcome::Forward(false),
+                    .map(|ct| {
+                        match ct.trim() {
+                            // bool for Forward: true if found a valid Content-Type for Plume first (HTML),
+                            // 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" => Outcome::Success(ApRequest),
+                            "text/html" => Outcome::Forward(true),
+                            _ => Outcome::Forward(false),
+                        }
                    })
                    .fold(Outcome::Forward(false), |out, ct| {
                        if out.clone().forwarded().unwrap_or_else(|| out.is_success()) {
@@ -130,36 +134,38 @@ where
        .sign(sender)
        .expect("activity_pub::broadcast: signature error");

-    let mut rt = tokio::runtime::current_thread::Runtime::new()
-        .expect("Error while initializing tokio runtime for federation");
-    let client = ClientBuilder::new()
-        .connect_timeout(std::time::Duration::from_secs(5))
+    let rt = tokio::runtime::Builder::new()
+        .threaded_scheduler()
        .build()
-        .expect("Can't build client");
+        .expect("Error while initializing tokio runtime for federation");
    for inbox in boxes {
        let body = signed.to_string();
        let mut headers = request::headers();
        headers.insert("Digest", request::Digest::digest(&body));
-        rt.spawn(
+        let sig = request::signature(sender, &headers)
+            .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",
-                    request::signature(sender, &headers)
-                        .expect("activity_pub::broadcast: request signature error"),
-                )
+                .header("Signature", sig)
                .body(body)
                .send()
-                .and_then(|r| r.into_body().concat2())
+                .await
+                .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)]
@@ -203,8 +209,7 @@ pub struct PublicKey {
    pub public_key_pem: Option<serde_json::Value>,
 }

-#[derive(Clone, Debug, Default, UnitString)]
-#[activitystreams(Hashtag)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct HashtagType;

 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
@@ -1,4 +1,3 @@
-use base64;
 use chrono::{offset::Utc, DateTime};
 use openssl::hash::{Hasher, MessageDigest};
 use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, DATE, USER_AGENT};
@@ -1,10 +1,7 @@
 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>) {
@@ -2,9 +2,7 @@

 #[macro_use]
 extern crate activitystreams_derive;
-use activitystreams_traits;

-use serde;
 #[macro_use]
 extern crate shrinkwraprs;
 #[macro_use]
@@ -442,7 +442,6 @@ mod tests {
            ("not_a#hashtag", vec![]),
            ("#نرم‌افزار_آزاد", vec!["نرم‌افزار_آزاد"]),
            ("[#hash in link](https://example.org/)", vec![]),
-            ("#zwsp\u{200b}inhash", vec!["zwsp"]),
        ];

        for (md, mentions) in tests {
@@ -19,7 +19,6 @@ init_i18n!(
    en,
    eo,
    es,
-    fa,
    fr,
    gl,
    hi,
@@ -10,27 +10,26 @@ 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"
 migrations_internals= "1.4.0"
 openssl = "0.10.22"
-rocket = "0.4.0"
-rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
-reqwest = "0.9"
+rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-tantivy = "0.12.0"
+tantivy = "0.10.1"
+tokio = "0.2"
 url = "2.1"
 walkdir = "2.2"
-webfinger = "0.4.1"
+webfinger = { git = "https://github.com/Plume-org/webfinger", rev = "4e8f12810c4a7ba7a07bbcb722cd265fdff512b6", features = ["async"] }
 whatlang = "0.7.1"
-shrinkwraprs = "0.2.1"
+shrinkwraprs = "0.3"
 diesel-derive-newtype = "0.1.2"
 glob = "0.3.0"
-lindera-tantivy = { version = "0.1.2", optional = true }

 [dependencies.chrono]
 features = ["serde"]
@@ -49,10 +48,20 @@ 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.3.0"
+diesel_migrations = "1.4.0"

 [features]
 postgres = ["diesel/postgres", "plume-macro/postgres" ]
 sqlite = ["diesel/sqlite", "plume-macro/sqlite" ]
-search-lindera = ["lindera-tantivy"]
@@ -8,11 +8,12 @@ use rocket::{
 /// 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 = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Admin, ()> {
-        let user = request.guard::<User>()?;
+    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        let user = try_outcome!(User::from_request(request).await);
        if user.is_admin() {
            Outcome::Success(Admin(user))
        } else {
@@ -24,11 +25,12 @@ 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 = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Moderator, ()> {
-        let user = request.guard::<User>()?;
+    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        let user = try_outcome!(User::from_request(request).await);
        if user.is_moderator() {
            Outcome::Success(Moderator(user))
        } else {
@@ -76,32 +76,36 @@ pub enum TokenError {
    DbError,
 }

+#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for ApiToken {
    type Error = TokenError;

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<ApiToken, TokenError> {
+    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
        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(' ');
-        let auth_type = parsed_header.next().map_or_else(
-            || Outcome::Failure((Status::BadRequest, TokenError::NoType)),
-            Outcome::Success,
-        )?;
-        let val = parsed_header.next().map_or_else(
-            || Outcome::Failure((Status::BadRequest, TokenError::NoValue)),
-            Outcome::Success,
-        )?;
-
-        if auth_type == "Bearer" {
-            let conn = request
-                .guard::<DbConn>()
-                .map_failure(|_| (Status::InternalServerError, TokenError::DbError))?;
-            if let Ok(token) = ApiToken::find_by_value(&*conn, val) {
-                return Outcome::Success(token);
+        if let Some(auth_type) = parsed_header.next() {
+            if let Some(val) = parsed_header.next() {
+                if auth_type == "Bearer" {
+                    if let Outcome::Success(conn) = DbConn::from_request(request).await {
+                        if let Ok(token) = ApiToken::find_by_value(&*conn, val) {
+                            return Outcome::Success(token);
+                        }
+                    } else {
+                        return Outcome::Failure((
+                            Status::InternalServerError,
+                            TokenError::DbError,
+                        ));
+                    }
+                }
+            } else {
+                return Outcome::Failure((Status::BadRequest, TokenError::NoValue));
            }
+        } else {
+            return Outcome::Failure((Status::BadRequest, TokenError::NoType));
        }

        Outcome::Forward(())
@@ -20,7 +20,6 @@ use plume_common::activity_pub::{
    inbox::{AsActor, FromId},
    sign, ActivityStream, ApSignature, Id, IntoId, PublicKey, Source,
 };
-use serde_json;
 use url::Url;
 use webfinger::*;

@@ -71,7 +70,8 @@ impl Blog {
    insert!(blogs, NewBlog, |inserted, conn| {
        let instance = inserted.get_instance(conn)?;
        if inserted.outbox_url.is_empty() {
-            inserted.outbox_url = instance.compute_box(BLOG_PREFIX, &inserted.actor_id, "outbox");
+            inserted.outbox_url =
+                instance.compute_box(BLOG_PREFIX, &inserted.actor_id, r#"outbox"#);
        }

        if inserted.inbox_url.is_empty() {
@@ -132,7 +132,7 @@ impl Blog {
            .map_err(Error::from)
    }

-    pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<Blog> {
+    pub async fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<Blog> {
        let from_db = blogs::table
            .filter(blogs::fqn.eq(fqn))
            .first(&*c.conn)
@@ -140,12 +140,13 @@ impl Blog {
        if let Some(from_db) = from_db {
            Ok(from_db)
        } else {
-            Blog::fetch_from_webfinger(c, fqn)
+            Blog::fetch_from_webfinger(c, fqn).await
        }
    }

-    fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> {
-        resolve_with_prefix(Prefix::Group, acct.to_owned(), true)?
+    async fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> {
+        resolve_with_prefix(Prefix::Group, acct.to_owned(), true)
+            .await?
            .links
            .into_iter()
            .find(|l| l.mime_type == Some(String::from("application/activity+json")))
@@ -498,7 +499,6 @@ pub(crate) mod tests {
    use super::*;
    use crate::{
        blog_authors::*,
-        config::CONFIG,
        instance::tests as instance_tests,
        medias::NewMedia,
        search::tests::get_searcher,
@@ -768,9 +768,7 @@ pub(crate) mod tests {
        conn.test_transaction::<_, (), _>(|| {
            let (_, blogs) = fill_database(conn);

-            blogs[0]
-                .delete(conn, &get_searcher(&CONFIG.search_tokenizers))
-                .unwrap();
+            blogs[0].delete(conn, &get_searcher()).unwrap();
            assert!(Blog::get(conn, blogs[0].id).is_err());
            Ok(())
        })
@@ -780,7 +778,7 @@ pub(crate) mod tests {
    fn delete_via_user() {
        let conn = &db();
        conn.test_transaction::<_, (), _>(|| {
-            let searcher = get_searcher(&CONFIG.search_tokenizers);
+            let searcher = get_searcher();
            let (user, _) = fill_database(conn);

            let b1 = Blog::insert(
@@ -17,6 +17,7 @@ use activitypub::{
 };
 use chrono::{self, NaiveDateTime};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
+use futures::stream::{self, StreamExt};
 use plume_common::{
    activity_pub::{
        inbox::{AsActor, AsObject, FromId},
@@ -24,7 +25,6 @@ use plume_common::{
    },
    utils,
 };
-use serde_json;
 use std::collections::HashSet;

 #[derive(Queryable, Identifiable, Clone, AsChangeset)]
@@ -105,7 +105,7 @@ impl Comment {
                .unwrap_or(false)
    }

-    pub fn to_activity(&self, c: &PlumeRocket) -> Result<Note> {
+    pub async 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(),
@@ -132,18 +132,18 @@ impl Comment {
        note.object_props.set_attributed_to_link(author.into_id())?;
        note.object_props.set_to_link_vec(to)?;
        note.object_props.set_tag_link_vec(
-            mentions
-                .into_iter()
-                .filter_map(|m| Mention::build_activity(c, &m).ok())
-                .collect::<Vec<link::Mention>>(),
+            stream::iter(mentions)
+                .filter_map(|m| async move { Mention::build_activity(c, &m).await.ok() })
+                .collect::<Vec<link::Mention>>()
+                .await,
        )?;
        Ok(note)
    }

-    pub fn create_activity(&self, c: &PlumeRocket) -> Result<Create> {
+    pub async fn create_activity(&self, c: &PlumeRocket) -> Result<Create> {
        let author = User::get(&c.conn, self.author_id)?;

-        let note = self.to_activity(c)?;
+        let note = self.to_activity(c).await?;
        let mut act = Create::default();
        act.create_props.set_actor_link(author.into_id())?;
        act.create_props.set_object_object(note.clone())?;
@@ -1,4 +1,3 @@
-use crate::search::TokenizerKind as SearchTokenizer;
 use rocket::config::Limits;
 use rocket::Config as RocketConfig;
 use std::env::{self, var};
@@ -15,7 +14,6 @@ pub struct Config {
    pub db_max_size: Option<u32>,
    pub db_min_idle: Option<u32>,
    pub search_index: String,
-    pub search_tokenizers: SearchTokenizerConfig,
    pub rocket: Result<RocketConfig, RocketError>,
    pub logo: LogoConfig,
    pub default_theme: String,
@@ -190,56 +188,6 @@ impl Default for LogoConfig {
    }
 }

-pub struct SearchTokenizerConfig {
-    pub tag_tokenizer: SearchTokenizer,
-    pub content_tokenizer: SearchTokenizer,
-    pub property_tokenizer: SearchTokenizer,
-}
-
-impl SearchTokenizerConfig {
-    pub fn init() -> Self {
-        use SearchTokenizer::*;
-
-        match var("SEARCH_LANG").ok().as_deref() {
-            Some("ja") => {
-                #[cfg(not(feature = "search-lindera"))]
-                panic!("You need build Plume with search-lindera feature, or execute it with SEARCH_TAG_TOKENIZER=ngram and SEARCH_CONTENT_TOKENIZER=ngram to enable Japanese search feature");
-                #[cfg(feature = "search-lindera")]
-                Self {
-                    tag_tokenizer: Self::determine_tokenizer("SEARCH_TAG_TOKENIZER", Lindera),
-                    content_tokenizer: Self::determine_tokenizer(
-                        "SEARCH_CONTENT_TOKENIZER",
-                        Lindera,
-                    ),
-                    property_tokenizer: Ngram,
-                }
-            }
-            _ => Self {
-                tag_tokenizer: Self::determine_tokenizer("SEARCH_TAG_TOKENIZER", Whitespace),
-                content_tokenizer: Self::determine_tokenizer("SEARCH_CONTENT_TOKENIZER", Simple),
-                property_tokenizer: Ngram,
-            },
-        }
-    }
-
-    fn determine_tokenizer(var_name: &str, default: SearchTokenizer) -> SearchTokenizer {
-        use SearchTokenizer::*;
-
-        match var(var_name).ok().as_deref() {
-            Some("simple") => Simple,
-            Some("ngram") => Ngram,
-            Some("whitespace") => Whitespace,
-            Some("lindera") => {
-                #[cfg(not(feature = "search-lindera"))]
-                panic!("You need build Plume with search-lindera feature to use Lindera tokenizer");
-                #[cfg(feature = "search-lindera")]
-                Lindera
-            }
-            _ => default,
-        }
-    }
-}
-
 lazy_static! {
    pub static ref CONFIG: Config = Config {
        base_url: var("BASE_URL").unwrap_or_else(|_| format!(
@@ -261,7 +209,6 @@ lazy_static! {
        #[cfg(feature = "sqlite")]
        database_url: var("DATABASE_URL").unwrap_or_else(|_| format!("{}.sqlite", DB_NAME)),
        search_index: var("SEARCH_INDEX").unwrap_or_else(|_| "search_index".to_owned()),
-        search_tokenizers: SearchTokenizerConfig::init(),
        rocket: get_rocket_config(),
        logo: LogoConfig::default(),
        default_theme: var("DEFAULT_THEME").unwrap_or_else(|_| "default-light".to_owned()),
@@ -7,7 +7,7 @@ use diesel::{dsl::sql_query, ConnectionError, RunQueryDsl};
 use rocket::{
    http::Status,
    request::{self, FromRequest},
-    Outcome, Request, State,
+    Outcome, Request,
 };
 use std::ops::Deref;

@@ -21,14 +21,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 = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
-        let pool = request.guard::<State<'_, DbPool>>()?;
-        match pool.get() {
-            Ok(conn) => Outcome::Success(DbConn(conn)),
-            Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),
+    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        match DbConn::from_request(request).await {
+            Outcome::Success(a) => Outcome::Success(a),
+            _ => Outcome::Failure((Status::ServiceUnavailable, ())),
        }
    }
 }
@@ -6,10 +6,11 @@ use rocket::{

 pub struct Headers<'r>(pub HeaderMap<'r>);

+#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for Headers<'r> {
    type Error = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, ()> {
+    async 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);
@@ -1,5 +1,4 @@
 use activitypub::activity::*;
-use serde_json;

 use crate::{
    comments::Comment,
@@ -4,6 +4,7 @@

 #[macro_use]
 extern crate diesel;
+extern crate futures;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
@@ -75,6 +76,12 @@ 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
@@ -320,7 +327,7 @@ mod tests {
    pub fn rockets() -> super::PlumeRocket {
        super::PlumeRocket {
            conn: db_conn::DbConn((*DB_POOL).get().unwrap()),
-            searcher: Arc::new(search::tests::get_searcher(&CONFIG.search_tokenizers)),
+            searcher: Arc::new(search::tests::get_searcher()),
            worker: Arc::new(ScheduledThreadPool::new(2)),
            user: None,
        }
@@ -7,8 +7,8 @@ use crate::{
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use std::convert::{TryFrom, TryInto};

-/// Represent what a list is supposed to store. Represented in database as an integer
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
+/// Represent what a list is supposed to store. Represented in database as an integer
 pub enum ListType {
    User,
    Blog,
@@ -58,7 +58,11 @@ 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),
@@ -66,7 +70,11 @@ 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,
@@ -74,7 +82,11 @@ 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,
@@ -82,7 +94,11 @@ 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,
@@ -99,7 +115,11 @@ 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);
@@ -116,7 +136,11 @@ 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);
@@ -132,7 +156,11 @@ 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);
@@ -246,23 +274,35 @@ impl List {
        private::ListElem::prefix_in_list(conn, self, word)
    }

-    /// Insert new users in a list
-    func! {add: add_users, User}
+    func! {
+        /// Insert new users in a list
+        add: add_users, User
+    }

-    /// Insert new blogs in a list
-    func! {add: add_blogs, Blog}
+    func! {
+        /// Insert new blogs in a list
+        add: add_blogs, Blog
+    }

-    /// Insert new words in a list
-    func! {add: add_words, Word}
+    func! {
+        /// Insert new words in a list
+        add: add_words, Word
+    }

-    /// Insert new prefixes in a list
-    func! {add: add_prefixes, Prefix}
+    func! {
+        /// Insert new prefixes in a list
+        add: add_prefixes, Prefix
+    }

-    /// Get all users in the list
-    func! {list: list_users, User, users}
+    func! {
+        /// Get all users in the list
+        list: list_users, User, users
+    }

-    /// Get all blogs in the list
-    func! {list: list_blogs, Blog, blogs}
+    func! {
+        /// Get all blogs in the list
+        list: list_blogs, Blog, blogs
+    }

    /// Get all words in the list
    pub fn list_words(&self, conn: &Connection) -> Result<Vec<String>> {
@@ -10,8 +10,8 @@ use plume_common::{
    activity_pub::{inbox::FromId, Id},
    utils::MediaProcessor,
 };
-use reqwest;
 use std::{fs, path::Path};
+use tokio::prelude::*;

 #[derive(Clone, Identifiable, Queryable)]
 pub struct Media {
@@ -197,7 +197,7 @@ impl Media {
    }

    // TODO: merge with save_remote?
-    pub fn from_activity(c: &PlumeRocket, image: &Image) -> Result<Media> {
+    pub async 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,11 +211,9 @@ impl Media {
            ext
        ));

-        let mut dest = fs::File::create(path.clone()).ok()?;
-        reqwest::get(remote_url.as_str())
-            .ok()?
-            .copy_to(&mut dest)
-            .ok()?;
+        let mut dest = tokio::fs::File::create(path.clone()).await?;
+        let contents = reqwest::get(remote_url.as_str()).await?.bytes().await?;
+        dest.write_all(&contents).await?;

        Media::insert(
            conn,
@@ -52,8 +52,8 @@ impl Mention {
        }
    }

-    pub fn build_activity(c: &PlumeRocket, ment: &str) -> Result<link::Mention> {
-        let user = User::find_by_fqn(c, ment)?;
+    pub async fn build_activity(c: &PlumeRocket, ment: &str) -> Result<link::Mention> {
+        let user = User::find_by_fqn(c, ment).await?;
        let mut mention = link::Mention::default();
        mention.link_props.set_href_string(user.ap_url)?;
        mention.link_props.set_name_string(format!("@{}", ment))?;
@@ -20,20 +20,35 @@ mod module {
        pub flash_msg: Option<(String, String)>,
    }

+    #[rocket::async_trait]
    impl<'a, 'r> FromRequest<'a, 'r> for PlumeRocket {
        type Error = ();

-        fn from_request(request: &'a Request<'r>) -> request::Outcome<PlumeRocket, ()> {
-            let conn = request.guard::<DbConn>()?;
-            let intl = request.guard::<rocket_i18n::I18n>()?;
-            let user = request.guard::<users::User>().succeeded();
-            let worker = request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>()?;
-            let searcher = request.guard::<'_, State<'_, Arc<search::Searcher>>>()?;
-            let flash_msg = request.guard::<FlashMessage<'_, '_>>().succeeded();
+        async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+            let conn = DbConn::from_request(request).await.succeeded().unwrap();
+            let intl = rocket_i18n::I18n::from_request(request)
+                .await
+                .succeeded()
+                .unwrap();
+            let user = users::User::from_request(request)
+                .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,
+                user: Some(user),
                flash_msg: flash_msg.map(|f| (f.name().into(), f.msg().into())),
                worker: worker.clone(),
                searcher: searcher.clone(),
@@ -60,17 +75,18 @@ mod module {
        pub worker: Arc<ScheduledThreadPool>,
    }

+    #[rocket::async_trait]
    impl<'a, 'r> FromRequest<'a, 'r> for PlumeRocket {
        type Error = ();

-        fn from_request(request: &'a Request<'r>) -> request::Outcome<PlumeRocket, ()> {
-            let conn = request.guard::<DbConn>()?;
-            let user = request.guard::<users::User>().succeeded();
-            let worker = request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>()?;
-            let searcher = request.guard::<'_, State<'_, Arc<search::Searcher>>>()?;
+        async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+            let conn = try_outcome!(DbConn::from_request(request).await);
+            let user = try_outcome!(users::User::from_request(request).await);
+            let worker = try_outcome!(request.guard::<'_, State<'_, Arc<ScheduledThreadPool>>>());
+            let searcher = try_outcome!(request.guard::<'_, State<'_, Arc<search::Searcher>>>());
            Outcome::Success(PlumeRocket {
                conn,
-                user,
+                user: Some(user),
                worker: worker.clone(),
                searcher: searcher.clone(),
            })
@@ -19,8 +19,8 @@ use plume_common::{
    },
    utils::md_to_html,
 };
-use serde_json;
 use std::collections::HashSet;
+use tokio::runtime::Runtime;

 pub type LicensedArticle = CustomObject<Licensed, Article>;

@@ -579,11 +579,11 @@ impl FromId<PlumeRocket> for Post {
                }
            });

-        let cover = article
-            .object_props
-            .icon_object::<Image>()
-            .ok()
-            .and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id));
+        let image = article.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 }));

        let title = article.object_props.name_string()?;
        let post = Post::insert(
@@ -699,17 +699,22 @@ 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: updated
-                .object
-                .object_props
-                .icon_object::<Image>()
-                .ok()
-                .and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id)),
+            cover,
            source: updated
                .object
                .ap_object_props
@@ -3,11 +3,10 @@ mod searcher;
 mod tokenizer;
 pub use self::query::PlumeQuery as Query;
 pub use self::searcher::*;
-pub use self::tokenizer::TokenizerKind;

 #[cfg(test)]
 pub(crate) mod tests {
-    use super::{Query, Searcher, TokenizerKind};
+    use super::{Query, Searcher};
    use diesel::Connection;
    use plume_common::utils::random_hex;
    use std::env::temp_dir;
@@ -15,20 +14,18 @@ pub(crate) mod tests {

    use crate::{
        blogs::tests::fill_database,
-        config::SearchTokenizerConfig,
        post_authors::*,
        posts::{NewPost, Post},
        safe_string::SafeString,
        tests::db,
-        CONFIG,
    };

-    pub(crate) fn get_searcher(tokenizers: &SearchTokenizerConfig) -> Searcher {
+    pub(crate) fn get_searcher() -> Searcher {
        let dir = temp_dir().join(&format!("plume-test-{}", random_hex()));
        if dir.exists() {
-            Searcher::open(&dir, tokenizers)
+            Searcher::open(&dir)
        } else {
-            Searcher::create(&dir, tokenizers)
+            Searcher::create(&dir)
        }
        .unwrap()
    }
@@ -103,27 +100,27 @@ pub(crate) mod tests {
    fn open() {
        let dir = temp_dir().join(format!("plume-test-{}", random_hex()));
        {
-            Searcher::create(&dir, &CONFIG.search_tokenizers).unwrap();
+            Searcher::create(&dir).unwrap();
        }
-        Searcher::open(&dir, &CONFIG.search_tokenizers).unwrap();
+        Searcher::open(&dir).unwrap();
    }

    #[test]
    fn create() {
        let dir = temp_dir().join(format!("plume-test-{}", random_hex()));

-        assert!(Searcher::open(&dir, &CONFIG.search_tokenizers).is_err());
+        assert!(Searcher::open(&dir).is_err());
        {
-            Searcher::create(&dir, &CONFIG.search_tokenizers).unwrap();
+            Searcher::create(&dir).unwrap();
        }
-        Searcher::open(&dir, &CONFIG.search_tokenizers).unwrap(); //verify it's well created
+        Searcher::open(&dir).unwrap(); //verify it's well created
    }

    #[test]
    fn search() {
        let conn = &db();
        conn.test_transaction::<_, (), _>(|| {
-            let searcher = get_searcher(&CONFIG.search_tokenizers);
+            let searcher = get_searcher();
            let blog = &fill_database(conn).1[0];
            let author = &blog.list_authors(conn).unwrap()[0];

@@ -183,69 +180,10 @@ pub(crate) mod tests {
        });
    }

-    #[cfg(feature = "search-lindera")]
-    #[test]
-    fn search_japanese() {
-        let conn = &db();
-        conn.test_transaction::<_, (), _>(|| {
-            let tokenizers = SearchTokenizerConfig {
-                tag_tokenizer: TokenizerKind::Lindera,
-                content_tokenizer: TokenizerKind::Lindera,
-                property_tokenizer: TokenizerKind::Ngram,
-            };
-            let searcher = get_searcher(&tokenizers);
-            let blog = &fill_database(conn).1[0];
-
-            let title = random_hex()[..8].to_owned();
-
-            let post = Post::insert(
-                conn,
-                NewPost {
-                    blog_id: blog.id,
-                    slug: title.clone(),
-                    title: title.clone(),
-                    content: SafeString::new("ブログエンジンPlumeです。"),
-                    published: true,
-                    license: "CC-BY-SA".to_owned(),
-                    ap_url: "".to_owned(),
-                    creation_date: None,
-                    subtitle: "".to_owned(),
-                    source: "".to_owned(),
-                    cover_id: None,
-                },
-                &searcher,
-            )
-            .unwrap();
-
-            searcher.commit();
-
-            assert_eq!(
-                searcher.search_document(conn, Query::from_str("ブログエンジン").unwrap(), (0, 1))
-                    [0]
-                .id,
-                post.id
-            );
-            assert_eq!(
-                searcher.search_document(conn, Query::from_str("Plume").unwrap(), (0, 1))[0].id,
-                post.id
-            );
-            assert_eq!(
-                searcher.search_document(conn, Query::from_str("です").unwrap(), (0, 1))[0].id,
-                post.id
-            );
-            assert_eq!(
-                searcher.search_document(conn, Query::from_str("。").unwrap(), (0, 1))[0].id,
-                post.id
-            );
-
-            Ok(())
-        });
-    }
-
    #[test]
    fn drop_writer() {
-        let searcher = get_searcher(&CONFIG.search_tokenizers);
+        let searcher = get_searcher();
        searcher.drop_writer();
-        get_searcher(&CONFIG.search_tokenizers);
+        get_searcher();
    }
 }
@@ -1,14 +1,18 @@
 use crate::{
-    config::SearchTokenizerConfig, instance::Instance, posts::Post, schema::posts,
-    search::query::PlumeQuery, tags::Tag, Connection, Result,
+    instance::Instance,
+    posts::Post,
+    schema::posts,
+    search::{query::PlumeQuery, tokenizer},
+    tags::Tag,
+    Connection, Result,
 };
 use chrono::Datelike;
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use itertools::Itertools;
 use std::{cmp, fs::create_dir_all, path::Path, sync::Mutex};
 use tantivy::{
-    collector::TopDocs, directory::MmapDirectory, schema::*, Index, IndexReader, IndexWriter,
-    ReloadPolicy, Term,
+    collector::TopDocs, directory::MmapDirectory, schema::*, tokenizer::*, Index, IndexReader,
+    IndexWriter, ReloadPolicy, Term,
 };
 use whatlang::{detect as detect_lang, Lang};

@@ -30,7 +34,7 @@ impl Searcher {
    pub fn schema() -> Schema {
        let tag_indexing = TextOptions::default().set_indexing_options(
            TextFieldIndexing::default()
-                .set_tokenizer("tag_tokenizer")
+                .set_tokenizer("whitespace_tokenizer")
                .set_index_option(IndexRecordOption::Basic),
        );

@@ -66,7 +70,15 @@ impl Searcher {
        schema_builder.build()
    }

-    pub fn create(path: &dyn AsRef<Path>, tokenizers: &SearchTokenizerConfig) -> Result<Self> {
+    pub fn create(path: &dyn AsRef<Path>) -> Result<Self> {
+        let whitespace_tokenizer = tokenizer::WhitespaceTokenizer.filter(LowerCaser);
+
+        let content_tokenizer = SimpleTokenizer
+            .filter(RemoveLongFilter::limit(40))
+            .filter(LowerCaser);
+
+        let property_tokenizer = NgramTokenizer::new(2, 8, false).filter(LowerCaser);
+
        let schema = Self::schema();

        create_dir_all(path).map_err(|_| SearcherError::IndexCreationError)?;
@@ -78,9 +90,9 @@ impl Searcher {

        {
            let tokenizer_manager = index.tokenizers();
-            tokenizer_manager.register("tag_tokenizer", tokenizers.tag_tokenizer);
-            tokenizer_manager.register("content_tokenizer", tokenizers.content_tokenizer);
-            tokenizer_manager.register("property_tokenizer", tokenizers.property_tokenizer);
+            tokenizer_manager.register("whitespace_tokenizer", whitespace_tokenizer);
+            tokenizer_manager.register("content_tokenizer", content_tokenizer);
+            tokenizer_manager.register("property_tokenizer", property_tokenizer);
        } //to please the borrow checker
        Ok(Self {
            writer: Mutex::new(Some(
@@ -97,38 +109,31 @@ impl Searcher {
        })
    }

-    pub fn open(path: &dyn AsRef<Path>, tokenizers: &SearchTokenizerConfig) -> Result<Self> {
-        let mut index =
+    pub fn open(path: &dyn AsRef<Path>) -> Result<Self> {
+        let whitespace_tokenizer = tokenizer::WhitespaceTokenizer.filter(LowerCaser);
+
+        let content_tokenizer = SimpleTokenizer
+            .filter(RemoveLongFilter::limit(40))
+            .filter(LowerCaser);
+
+        let property_tokenizer = NgramTokenizer::new(2, 8, false).filter(LowerCaser);
+
+        let index =
            Index::open(MmapDirectory::open(path).map_err(|_| SearcherError::IndexOpeningError)?)
                .map_err(|_| SearcherError::IndexOpeningError)?;

        {
            let tokenizer_manager = index.tokenizers();
-            tokenizer_manager.register("tag_tokenizer", tokenizers.tag_tokenizer);
-            tokenizer_manager.register("content_tokenizer", tokenizers.content_tokenizer);
-            tokenizer_manager.register("property_tokenizer", tokenizers.property_tokenizer);
+            tokenizer_manager.register("whitespace_tokenizer", whitespace_tokenizer);
+            tokenizer_manager.register("content_tokenizer", content_tokenizer);
+            tokenizer_manager.register("property_tokenizer", property_tokenizer);
        } //to please the borrow checker
-        let writer = index
+        let mut writer = index
            .writer(50_000_000)
            .map_err(|_| SearcherError::WriteLockAcquisitionError)?;
-
-        // Since Tantivy v0.12.0, IndexWriter::garbage_collect_files() returns Future.
-        // To avoid conflict with Plume async project, we don't introduce async now.
-        // After async is introduced to Plume, we can use garbage_collect_files() again.
-        // Algorithm stolen from Tantivy's SegmentUpdater::list_files()
-        use std::collections::HashSet;
-        use std::path::PathBuf;
-        let mut files: HashSet<PathBuf> = index
-            .list_all_segment_metas()
-            .into_iter()
-            .flat_map(|segment_meta| segment_meta.list_files())
-            .collect();
-        files.insert(Path::new("meta.json").to_path_buf());
-        index
-            .directory_mut()
-            .garbage_collect(|| files)
+        writer
+            .garbage_collect_files()
            .map_err(|_| SearcherError::IndexEditionError)?;
-
        Ok(Self {
            writer: Mutex::new(Some(writer)),
            reader: index
@@ -1,34 +1,5 @@
-#[cfg(feature = "search-lindera")]
-use lindera_tantivy::tokenizer::LinderaTokenizer;
 use std::str::CharIndices;
-use tantivy::tokenizer::*;
-
-#[derive(Clone, Copy)]
-pub enum TokenizerKind {
-    Simple,
-    Ngram,
-    Whitespace,
-    #[cfg(feature = "search-lindera")]
-    Lindera,
-}
-
-impl From<TokenizerKind> for TextAnalyzer {
-    fn from(tokenizer: TokenizerKind) -> TextAnalyzer {
-        use TokenizerKind::*;
-
-        match tokenizer {
-            Simple => TextAnalyzer::from(SimpleTokenizer)
-                .filter(RemoveLongFilter::limit(40))
-                .filter(LowerCaser),
-            Ngram => TextAnalyzer::from(NgramTokenizer::new(2, 8, false)).filter(LowerCaser),
-            Whitespace => TextAnalyzer::from(WhitespaceTokenizer).filter(LowerCaser),
-            #[cfg(feature = "search-lindera")]
-            Lindera => {
-                TextAnalyzer::from(LinderaTokenizer::new("decompose", "")).filter(LowerCaser)
-            }
-        }
-    }
-}
+use tantivy::tokenizer::{Token, TokenStream, Tokenizer};

 /// Tokenize the text by splitting on whitespaces. Pretty much a copy of Tantivy's SimpleTokenizer,
 /// but not splitting on punctuation
@@ -41,13 +12,15 @@ pub struct WhitespaceTokenStream<'a> {
    token: Token,
 }

-impl Tokenizer for WhitespaceTokenizer {
-    fn token_stream<'a>(&self, text: &'a str) -> BoxTokenStream<'a> {
-        BoxTokenStream::from(WhitespaceTokenStream {
+impl<'a> Tokenizer<'a> for WhitespaceTokenizer {
+    type TokenStreamImpl = WhitespaceTokenStream<'a>;
+
+    fn token_stream(&self, text: &'a str) -> Self::TokenStreamImpl {
+        WhitespaceTokenStream {
            text,
            chars: text.char_indices(),
            token: Token::default(),
-        })
+        }
    }
 }
 impl<'a> WhitespaceTokenStream<'a> {
@@ -7,7 +7,9 @@ use crate::{
    users::User,
    PlumeRocket, Result,
 };
+use futures::stream::{self, StreamExt};
 use plume_common::activity_pub::inbox::AsActor;
+use tokio::runtime::Runtime;
 use whatlang::{self, Lang};

 #[derive(Debug, Clone, PartialEq)]
@@ -295,15 +297,33 @@ impl WithList {
                }
            }
            List::Array(list) => match self {
-                WithList::Blog => Ok(list
-                    .iter()
-                    .filter_map(|b| Blog::find_by_fqn(rocket, b).ok())
-                    .any(|b| b.id == post.blog_id)),
+                WithList::Blog => {
+                    let mut rt = Runtime::new().unwrap();
+                    rt.block_on(async move {
+                        Ok(stream::iter(list)
+                            .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 => Ok(list
-                        .iter()
-                        .filter_map(|a| User::find_by_fqn(rocket, a).ok())
-                        .any(|a| post.is_author(&rocket.conn, a.id).unwrap_or(false))),
+                    Kind::Original => {
+                        let mut rt = Runtime::new().unwrap();
+                        rt.block_on(async move {
+                            Ok(stream::iter(list)
+                                .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))
@@ -406,8 +426,8 @@ impl Bool {
                }
            }
            Bool::HasCover => Ok(post.cover_id.is_some()),
-            Bool::Local => Ok(post.get_blog(&rocket.conn)?.is_local() && kind == Kind::Original),
-            Bool::All => Ok(kind == Kind::Original),
+            Bool::Local => Ok(post.get_blog(&rocket.conn)?.is_local()),
+            Bool::All => Ok(true),
        }
    }
 }
@@ -11,7 +11,6 @@ use activitypub::{
    object::{Image, Tombstone},
    Activity, CustomObject, Endpoint,
 };
-use bcrypt;
 use chrono::{NaiveDateTime, Utc};
 use diesel::{self, BelongingToDsl, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl};
 use openssl::{
@@ -37,7 +36,6 @@ use rocket::{
    outcome::IntoOutcome,
    request::{self, FromRequest, Request},
 };
-use serde_json;
 use std::{
    cmp::PartialEq,
    hash::{Hash, Hasher},
@@ -191,7 +189,7 @@ impl User {
            .map_err(Error::from)
    }

-    pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<User> {
+    pub async fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<User> {
        let from_db = users::table
            .filter(users::fqn.eq(fqn))
            .first(&*c.conn)
@@ -199,12 +197,13 @@ impl User {
        if let Some(from_db) = from_db {
            Ok(from_db)
        } else {
-            User::fetch_from_webfinger(c, fqn)
+            User::fetch_from_webfinger(c, fqn).await
        }
    }

-    fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<User> {
-        let link = resolve(acct.to_owned(), true)?
+    async fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<User> {
+        let link = resolve(acct.to_owned(), true)
+            .await?
            .links
            .into_iter()
            .find(|l| l.mime_type == Some(String::from("application/activity+json")))
@@ -212,8 +211,9 @@ impl User {
        User::from_id(c, link.href.as_ref()?, None).map_err(|(_, e)| e)
    }

-    pub fn fetch_remote_interact_uri(acct: &str) -> Result<String> {
-        resolve(acct.to_owned(), true)?
+    pub async fn fetch_remote_interact_uri(acct: &str) -> Result<String> {
+        resolve(acct.to_owned(), true)
+            .await?
            .links
            .into_iter()
            .find(|l| l.rel == "http://ostatus.org/schema/1.0/subscribe")
@@ -221,9 +221,9 @@ impl User {
            .ok_or(Error::Webfinger)
    }

-    fn fetch(url: &str) -> Result<CustomPerson> {
-        let mut res = ClientBuilder::new()
-            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+    async fn fetch(url: &str) -> Result<CustomPerson> {
+        let res = ClientBuilder::new()
+            .connect_timeout(std::time::Duration::from_secs(5))
            .build()?
            .get(url)
            .header(
@@ -235,8 +235,9 @@ impl User {
                        .join(", "),
                )?,
            )
-            .send()?;
-        let text = &res.text()?;
+            .send()
+            .await?;
+        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)?;
@@ -244,48 +245,48 @@ impl User {
        Ok(json)
    }

-    pub fn fetch_from_url(c: &PlumeRocket, url: &str) -> Result<User> {
-        User::fetch(url).and_then(|json| User::from_activity(c, json))
+    pub async fn fetch_from_url(c: &PlumeRocket, url: &str) -> Result<User> {
+        let json = User::fetch(url).await?;
+        User::from_activity(c, json)
    }

-    pub fn refetch(&self, conn: &Connection) -> Result<()> {
-        User::fetch(&self.ap_url.clone()).and_then(|json| {
-            let avatar = Media::save_remote(
-                conn,
-                json.object
-                    .object_props
-                    .icon_image()?
-                    .object_props
-                    .url_string()?,
-                &self,
-            )
-            .ok();
+    pub async fn refetch(&self, conn: &Connection) -> Result<()> {
+        let json = User::fetch(&self.ap_url.clone()).await?;
+        let avatar = Media::save_remote(
+            conn,
+            json.object
+                .object_props
+                .icon_image()?
+                .object_props
+                .url_string()?,
+            &self,
+        )
+        .ok();

-            diesel::update(self)
-                .set((
-                    users::username.eq(json.object.ap_actor_props.preferred_username_string()?),
-                    users::display_name.eq(json.object.object_props.name_string()?),
-                    users::outbox_url.eq(json.object.ap_actor_props.outbox_string()?),
-                    users::inbox_url.eq(json.object.ap_actor_props.inbox_string()?),
-                    users::summary.eq(SafeString::new(
-                        &json
-                            .object
-                            .object_props
-                            .summary_string()
-                            .unwrap_or_default(),
-                    )),
-                    users::followers_endpoint.eq(json.object.ap_actor_props.followers_string()?),
-                    users::avatar_id.eq(avatar.map(|a| a.id)),
-                    users::last_fetched_date.eq(Utc::now().naive_utc()),
-                    users::public_key.eq(json
-                        .custom_props
-                        .public_key_publickey()?
-                        .public_key_pem_string()?),
-                ))
-                .execute(conn)
-                .map(|_| ())
-                .map_err(Error::from)
-        })
+        diesel::update(self)
+            .set((
+                users::username.eq(json.object.ap_actor_props.preferred_username_string()?),
+                users::display_name.eq(json.object.object_props.name_string()?),
+                users::outbox_url.eq(json.object.ap_actor_props.outbox_string()?),
+                users::inbox_url.eq(json.object.ap_actor_props.inbox_string()?),
+                users::summary.eq(SafeString::new(
+                    &json
+                        .object
+                        .object_props
+                        .summary_string()
+                        .unwrap_or_default(),
+                )),
+                users::followers_endpoint.eq(json.object.ap_actor_props.followers_string()?),
+                users::avatar_id.eq(avatar.map(|a| a.id)),
+                users::last_fetched_date.eq(Utc::now().naive_utc()),
+                users::public_key.eq(json
+                    .custom_props
+                    .public_key_publickey()?
+                    .public_key_pem_string()?),
+            ))
+            .execute(conn)
+            .map(|_| ())
+            .map_err(Error::from)
    }

    pub fn hash_pass(pass: &str) -> Result<String> {
@@ -356,9 +357,10 @@ 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>)> {
-        let mut res = ClientBuilder::new()
-            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+
+    async fn fetch_outbox_page<T: Activity>(&self, url: &str) -> Result<(Vec<T>, Option<String>)> {
+        let res = ClientBuilder::new()
+            .connect_timeout(std::time::Duration::from_secs(5))
            .build()?
            .get(url)
            .header(
@@ -370,8 +372,9 @@ impl User {
                        .join(", "),
                )?,
            )
-            .send()?;
-        let text = &res.text()?;
+            .send()
+            .await?;
+        let text = &res.text().await?;
        let json: serde_json::Value = serde_json::from_str(text)?;
        let items = json["items"]
            .as_array()
@@ -386,9 +389,9 @@ impl User {
        };
        Ok((items, next))
    }
-    pub fn fetch_outbox<T: Activity>(&self) -> Result<Vec<T>> {
-        let mut res = ClientBuilder::new()
-            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+    pub async fn fetch_outbox<T: Activity>(&self) -> Result<Vec<T>> {
+        let res = ClientBuilder::new()
+            .connect_timeout(std::time::Duration::from_secs(5))
            .build()?
            .get(&self.outbox_url[..])
            .header(
@@ -400,13 +403,14 @@ impl User {
                        .join(", "),
                )?,
            )
-            .send()?;
-        let text = &res.text()?;
+            .send()
+            .await?;
+        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) {
+            while let Ok((mut page, nxt)) = self.fetch_outbox_page(&next).await {
                if page.is_empty() {
                    break;
                }
@@ -431,9 +435,9 @@ impl User {
        }
    }

-    pub fn fetch_followers_ids(&self) -> Result<Vec<String>> {
-        let mut res = ClientBuilder::new()
-            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+    pub async fn fetch_followers_ids(&self) -> Result<Vec<String>> {
+        let res = ClientBuilder::new()
+            .connect_timeout(std::time::Duration::from_secs(5))
            .build()?
            .get(&self.followers_endpoint[..])
            .header(
@@ -445,8 +449,9 @@ impl User {
                        .join(", "),
                )?,
            )
-            .send()?;
-        let text = &res.text()?;
+            .send()
+            .await?;
+        let text = &res.text().await?;
        let json: serde_json::Value = serde_json::from_str(text)?;
        Ok(json["items"]
            .as_array()
@@ -789,11 +794,12 @@ impl User {
    }
 }

+#[rocket::async_trait]
 impl<'a, 'r> FromRequest<'a, 'r> for User {
    type Error = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<User, ()> {
-        let conn = request.guard::<DbConn>()?;
+    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        let conn = try_outcome!(DbConn::from_request(request).await);
        request
            .cookies()
            .get_private(AUTH_COOKIE)
@@ -1026,7 +1032,6 @@ impl NewUser {
 pub(crate) mod tests {
    use super::*;
    use crate::{
-        config::CONFIG,
        instance::{tests as instance_tests, Instance},
        search::tests::get_searcher,
        tests::{db, rockets},
@@ -1123,9 +1128,7 @@ pub(crate) mod tests {
            let inserted = fill_database(conn);

            assert!(User::get(conn, inserted[0].id).is_ok());
-            inserted[0]
-                .delete(conn, &get_searcher(&CONFIG.search_tokenizers))
-                .unwrap();
+            inserted[0].delete(conn, &get_searcher()).unwrap();
            assert!(User::get(conn, inserted[0].id).is_err());
            Ok(())
        });
@@ -10,7 +10,8 @@ msgstr ""
 "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-Crowdin-Project: plume\n"
 "X-Crowdin-Language: ar\n"
 "X-Crowdin-File: /master/po/plume/plume.pot\n"
@@ -1 +1 @@
-nightly-2020-01-15
+nightly-2020-05-05
@@ -13,12 +13,10 @@ class Browser(unittest.TestCase):
            raise Exception("No browser was requested")
        capabilities['acceptSslCerts'] = True
        self.driver = webdriver.Remote(
-            # The "selenium" address is set up by Drone CI and "points" to the container running selenium
-            command_executor='http://selenium:24444/wd/hub',
+            command_executor='http://localhost:24444/wd/hub',
            desired_capabilities=capabilities)
    def tearDown(self):
        self.driver.close()

    def get(self, url):
-        # Like "selenium", integration is mapped to the container that runs the plume instance
        return self.driver.get("https://localhost" + url)
@@ -12,7 +12,7 @@ plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password'
 plume &
 caddy -conf /Caddyfile &

-until curl http://localhost:7878/test/health -f; do sleep 1; done #2>/dev/null >/dev/null
+until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null

 cd $(dirname $0)/browser_test/
 python3 -m unittest *.py
@@ -35,6 +35,7 @@ impl Scope for plume_models::posts::Post {

 pub struct Authorization<A, S>(pub ApiToken, PhantomData<(A, S)>);

+#[rocket::async_trait]
 impl<'a, 'r, A, S> FromRequest<'a, 'r> for Authorization<A, S>
 where
    A: Action,
@@ -42,9 +43,10 @@ where
 {
    type Error = ();

-    fn from_request(request: &'a Request<'r>) -> request::Outcome<Authorization<A, S>, ()> {
+    async fn from_request(request: &'a Request<'r>) -> request::Outcome<Authorization<A, S>, ()> {
        request
            .guard::<ApiToken>()
+            .await
            .map_failure(|_| (Status::Unauthorized, ()))
            .and_then(|token| {
                if token.can(A::to_str(), S::to_str()) {
@@ -4,7 +4,6 @@ use rocket::{
    response::{self, Responder},
 };
 use rocket_contrib::json::Json;
-use serde_json;

 use plume_common::utils::random_hex;
 use plume_models::{api_tokens::*, apps::App, users::User, Error, PlumeRocket};
@@ -26,21 +25,31 @@ impl From<std::option::NoneError> for ApiError {
    }
 }

+#[rocket::async_trait]
 impl<'r> Responder<'r> for ApiError {
-    fn respond_to(self, req: &Request<'_>) -> response::Result<'r> {
+    async fn respond_to(self, req: &'r Request<'_>) -> response::Result<'r> {
        match self.0 {
-            Error::NotFound => Json(json!({
-                "error": "Not found"
-            }))
-            .respond_to(req),
-            Error::Unauthorized => Json(json!({
-                "error": "You are not authorized to access this resource"
-            }))
-            .respond_to(req),
-            _ => Json(json!({
-                "error": "Server error"
-            }))
-            .respond_to(req),
+            Error::NotFound => {
+                Json(json!({
+                    "error": "Not found"
+                }))
+                .respond_to(req)
+                .await
+            }
+            Error::Unauthorized => {
+                Json(json!({
+                    "error": "You are not authorized to access this resource"
+                }))
+                .respond_to(req)
+                .await
+            }
+            _ => {
+                Json(json!({
+                    "error": "Server error"
+                }))
+                .respond_to(req)
+                .await
+            }
        }
    }
 }
@@ -55,14 +64,14 @@ pub struct OAuthRequest {
 }

 #[get("/oauth2?<query..>")]
-pub fn oauth(
+pub async fn oauth(
    query: Form<OAuthRequest>,
    rockets: PlumeRocket,
 ) -> Result<Json<serde_json::Value>, ApiError> {
    let conn = &*rockets.conn;
    let app = App::find_by_client_id(conn, &query.client_id)?;
    if app.client_secret == query.client_secret {
-        if let Ok(user) = User::find_by_fqn(&rockets, &query.username) {
+        if let Ok(user) = User::find_by_fqn(&rockets, &query.username).await {
            if user.auth(&query.password) {
                let token = ApiToken::insert(
                    conn,
@@ -98,7 +98,7 @@ pub fn list(
 }

 #[post("/posts", data = "<payload>")]
-pub fn create(
+pub async fn create(
    auth: Authorization<Write, Post>,
    payload: Json<NewPostData>,
    rockets: PlumeRocket,
@@ -192,7 +192,7 @@ pub fn create(
        for m in mentions.into_iter() {
            Mention::from_activity(
                &*conn,
-                &Mention::build_activity(&rockets, &m)?,
+                &Mention::build_activity(&rockets, &m).await?,
                post.id,
                true,
                true,
@@ -9,9 +9,9 @@ use plume_models::{
 use rocket::{data::*, http::Status, response::status, Outcome::*, Request};
 use rocket_contrib::json::*;
 use serde::Deserialize;
-use std::io::Read;
+use tokio::io::AsyncReadExt;

-pub fn handle_incoming(
+pub async fn handle_incoming(
    rockets: PlumeRocket,
    data: SignedJson<serde_json::Value>,
    headers: Headers<'_>,
@@ -32,6 +32,7 @@ pub fn handle_incoming(
        // maybe we just know an old key?
        actor
            .refetch(conn)
+            .await
            .and_then(|_| User::get(conn, actor.id))
            .and_then(|u| {
                if verify_http_headers(&u, &headers.0, &sig).is_secure() || act.clone().verify(&u) {
@@ -73,32 +74,31 @@ impl<'a, T: Deserialize<'a>> FromData<'a> for SignedJson<T> {
    type Owned = String;
    type Borrowed = str;

-    fn transform(
-        r: &Request<'_>,
-        d: Data,
-    ) -> Transform<rocket::data::Outcome<Self::Owned, Self::Error>> {
-        let size_limit = r.limits().get("json").unwrap_or(JSON_LIMIT);
-        let mut s = String::with_capacity(512);
-        match d.open().take(size_limit).read_to_string(&mut s) {
-            Ok(_) => Transform::Borrowed(Success(s)),
-            Err(e) => Transform::Borrowed(Failure((Status::BadRequest, JsonError::Io(e)))),
-        }
+    fn transform<'r>(r: &'r Request, d: Data) -> TransformFuture<'r, Self::Owned, Self::Error> {
+        Box::pin(async move {
+            let size_limit = r.limits().get("json").unwrap_or(JSON_LIMIT);
+            let mut s = String::with_capacity(512);
+            let outcome = match d.open().take(size_limit).read_to_string(&mut s).await {
+                Ok(_) => Success(s),
+                Err(e) => Failure((Status::BadRequest, JsonError::Io(e))),
+            };
+            Transform::Borrowed(outcome)
+        })
    }

    fn from_data(
        _: &Request<'_>,
        o: Transformed<'a, Self>,
-    ) -> rocket::data::Outcome<Self, Self::Error> {
-        let string = o.borrowed()?;
-        match serde_json::from_str(&string) {
-            Ok(v) => Success(SignedJson(Digest::from_body(&string), Json(v))),
-            Err(e) => {
-                if e.is_data() {
-                    Failure((Status::UnprocessableEntity, JsonError::Parse(string, e)))
-                } else {
-                    Failure((Status::BadRequest, JsonError::Parse(string, e)))
+    ) -> FromDataFuture<'a, Self, Self::Error> {
+        Box::pin(async move {
+            let string = try_outcome!(o.borrowed());
+            match serde_json::from_str(&string) {
+                Ok(v) => Success(SignedJson(Digest::from_body(&string), Json(v))),
+                Err(e) if e.is_data() => {
+                    return Failure((Status::UnprocessableEntity, JsonError::Parse(string, e)))
                }
+                Err(e) => Failure((Status::BadRequest, JsonError::Parse(string, e))),
            }
-        }
+        })
    }
 }
@@ -1,5 +1,5 @@
 #![allow(clippy::too_many_arguments)]
-#![feature(decl_macro, proc_macro_hygiene, try_trait)]
+#![feature(proc_macro_hygiene, try_trait)]

 #[macro_use]
 extern crate gettext_macros;
@@ -9,6 +9,7 @@ extern crate rocket;
 extern crate serde_json;
 #[macro_use]
 extern crate validator_derive;
+extern crate validator;

 use clap::App;
 use diesel::r2d2::ConnectionManager;
@@ -19,15 +20,13 @@ use plume_models::{
    search::{Searcher as UnmanagedSearcher, SearcherError},
    Connection, Error, CONFIG,
 };
-use rocket_csrf::CsrfFairingBuilder;
 use scheduled_thread_pool::ScheduledThreadPool;
 use std::process::exit;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;

 init_i18n!(
-    "plume", ar, bg, ca, cs, de, en, eo, es, fa, fr, gl, hi, hr, it, ja, nb, pl, pt, ro, ru, sr,
-    sk, sv
+    "plume", ar, bg, ca, cs, de, en, eo, es, fr, gl, hi, hr, it, ja, nb, pl, pt, ro, ru, sr, sk, sv
 );

 mod api;
@@ -99,7 +98,7 @@ Then try to restart Plume.
    let workpool = ScheduledThreadPool::with_name("worker {}", num_cpus::get());
    // we want a fast exit here, so
    #[allow(clippy::match_wild_err_arm)]
-    let searcher = match UnmanagedSearcher::open(&CONFIG.search_index, &CONFIG.search_tokenizers) {
+    let searcher = match UnmanagedSearcher::open(&CONFIG.search_index) {
        Err(Error::Search(e)) => match e {
            SearcherError::WriteLockAcquisitionError => panic!(
                r#"
@@ -274,25 +273,7 @@ Then try to restart Plume
        .manage(dbpool)
        .manage(Arc::new(workpool))
        .manage(searcher)
-        .manage(include_i18n!())
-        .attach(
-            CsrfFairingBuilder::new()
-                .set_default_target(
-                    "/csrf-violation?target=<uri>".to_owned(),
-                    rocket::http::Method::Post,
-                )
-                .add_exceptions(vec![
-                    ("/inbox".to_owned(), "/inbox".to_owned(), None),
-                    (
-                        "/@/<name>/inbox".to_owned(),
-                        "/@/<name>/inbox".to_owned(),
-                        None,
-                    ),
-                    ("/api/<path..>".to_owned(), "/api/<path..>".to_owned(), None),
-                ])
-                .finalize()
-                .expect("main: csrf fairing creation error"),
-        );
+        .manage(include_i18n!());

    #[cfg(feature = "test")]
    let rocket = rocket.mount("/test", routes![test_routes::health,]);
@@ -19,10 +19,14 @@ use plume_models::{
 };

 #[get("/~/<name>?<page>", rank = 2)]
-pub fn details(name: String, page: Option<Page>, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
+pub async fn details(
+    name: String,
+    page: Option<Page>,
+    rockets: PlumeRocket,
+) -> Result<Ructe, ErrorPage> {
    let page = page.unwrap_or_default();
    let conn = &*rockets.conn;
-    let blog = Blog::find_by_fqn(&rockets, &name)?;
+    let blog = Blog::find_by_fqn(&rockets, &name).await?;
    let posts = Post::blog_page(conn, &blog, page.limits())?;
    let articles_count = Post::count_for_blog(conn, &blog)?;
    let authors = &blog.list_authors(conn)?;
@@ -38,12 +42,12 @@ pub fn details(name: String, page: Option<Page>, rockets: PlumeRocket) -> Result
 }

 #[get("/~/<name>", rank = 1)]
-pub fn activity_details(
+pub async fn activity_details(
    name: String,
    rockets: PlumeRocket,
    _ap: ApRequest,
 ) -> Option<ActivityStream<CustomGroup>> {
-    let blog = Blog::find_by_fqn(&rockets, &name).ok()?;
+    let blog = Blog::find_by_fqn(&rockets, &name).await?;
    Some(ActivityStream::new(blog.to_activity(&*rockets.conn).ok()?))
 }

@@ -83,7 +87,7 @@ fn valid_slug(title: &str) -> Result<(), ValidationError> {
 }

 #[post("/blogs/new", data = "<form>")]
-pub fn create(form: LenientForm<NewBlogForm>, rockets: PlumeRocket) -> RespondOrRedirect {
+pub async fn create(form: LenientForm<NewBlogForm>, rockets: PlumeRocket) -> RespondOrRedirect {
    let slug = utils::make_actor_id(&form.title);
    let conn = &*rockets.conn;
    let intl = &rockets.intl.catalog;
@@ -93,7 +97,7 @@ pub fn create(form: LenientForm<NewBlogForm>, rockets: PlumeRocket) -> RespondOr
        Ok(_) => ValidationErrors::new(),
        Err(e) => e,
    };
-    if Blog::find_by_fqn(&rockets, &slug).is_ok() {
+    if Blog::find_by_fqn(&rockets, &slug).await.is_ok() {
        errors.add(
            "title",
            ValidationError {
@@ -143,9 +147,11 @@ pub fn create(form: LenientForm<NewBlogForm>, rockets: PlumeRocket) -> RespondOr
 }

 #[post("/~/<name>/delete")]
-pub fn delete(name: String, rockets: PlumeRocket) -> RespondOrRedirect {
+pub async fn delete(name: String, rockets: PlumeRocket) -> RespondOrRedirect {
    let conn = &*rockets.conn;
-    let blog = Blog::find_by_fqn(&rockets, &name).expect("blog::delete: blog not found");
+    let blog = Blog::find_by_fqn(&rockets, &name)
+        .await
+        .expect("blog::delete: blog not found");

    if rockets
        .user
@@ -184,9 +190,9 @@ pub struct EditForm {
 }

 #[get("/~/<name>/edit")]
-pub fn edit(name: String, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
+pub async fn edit(name: String, rockets: PlumeRocket) -> Result<Ructe, ErrorPage> {
    let conn = &*rockets.conn;
-    let blog = Blog::find_by_fqn(&rockets, &name)?;
+    let blog = Blog::find_by_fqn(&rockets, &name).await?;
    if rockets
        .user
        .clone()
@@ -233,14 +239,16 @@ fn check_media(conn: &Connection, id: i32, user: &User) -> bool {
 }

 #[put("/~/<name>/edit", data = "<form>")]
-pub fn update(
+pub async fn update(
    name: String,
    form: LenientForm<EditForm>,
    rockets: PlumeRocket,
 ) -> RespondOrRedirect {
    let conn = &*rockets.conn;
    let intl = &rockets.intl.catalog;
-    let mut blog = Blog::find_by_fqn(&rockets, &name).expect("blog::update: blog not found");
+    let mut blog = Blog::find_by_fqn(&rockets, &name)
+        .await
+        .expect("blog::update: blog not found");
    if !rockets
        .user
        .clone()
@@ -342,23 +350,28 @@ pub fn update(
 }

 #[get("/~/<name>/outbox")]
-pub fn outbox(name: String, rockets: PlumeRocket) -> Option<ActivityStream<OrderedCollection>> {
-    let blog = Blog::find_by_fqn(&rockets, &name).ok()?;
+pub async fn outbox(
+    name: String,
+    rockets: PlumeRocket,
+) -> Option<ActivityStream<OrderedCollection>> {
+    let blog = Blog::find_by_fqn(&rockets, &name).await?;
    Some(blog.outbox(&*rockets.conn).ok()?)
 }
+
 #[allow(unused_variables)]
 #[get("/~/<name>/outbox?<page>")]
-pub fn outbox_page(
+pub async fn outbox_page(
    name: String,
    page: Page,
    rockets: PlumeRocket,
 ) -> Option<ActivityStream<OrderedCollectionPage>> {
-    let blog = Blog::find_by_fqn(&rockets, &name).ok()?;
+    let blog = Blog::find_by_fqn(&rockets, &name).await?;
    Some(blog.outbox_page(&*rockets.conn, page.limits()).ok()?)
 }
+
 #[get("/~/<name>/atom.xml")]
-pub fn atom_feed(name: String, rockets: PlumeRocket) -> Option<Content<String>> {
-    let blog = Blog::find_by_fqn(&rockets, &name).ok()?;
+pub async fn atom_feed(name: String, rockets: PlumeRocket) -> Option<Content<String>> {
+    let blog = Blog::find_by_fqn(&rockets, &name).await?;
    let conn = &*rockets.conn;
    let entries = Post::get_recents_for_blog(&*conn, &blog, 15).ok()?;
    let uri = Instance::get_local()
@@ -22,13 +22,13 @@ use plume_models::{
 #[derive(Default, FromForm, Debug, Validate)]
 pub struct NewCommentForm {
    pub responding_to: Option<i32>,
-    #[validate(length(min = "1", message = "Your comment can't be empty"))]
+    #[validate(length(min = 1, message = "Your comment can't be empty"))]
    pub content: String,
    pub warning: String,
 }

 #[post("/~/<blog_name>/<slug>/comment", data = "<form>")]
-pub fn create(
+pub async fn create(
    blog_name: String,
    slug: String,
    form: LenientForm<NewCommentForm>,
@@ -36,10 +36,12 @@ pub fn create(
    rockets: PlumeRocket,
 ) -> Result<Flash<Redirect>, Ructe> {
    let conn = &*rockets.conn;
-    let blog = Blog::find_by_fqn(&rockets, &blog_name).expect("comments::create: blog error");
+    let blog = Blog::find_by_fqn(&rockets, &blog_name)
+        .await
+        .expect("comments::create: blog error");
    let post = Post::find_by_slug(&*conn, &slug, blog.id).expect("comments::create: post error");
-    form.validate()
-        .map(|_| {
+    match form.validate() {
+        Ok(_ok) => {
            let (html, mentions, _hashtags) = utils::md_to_html(
                form.content.as_ref(),
                Some(
@@ -66,6 +68,7 @@ pub fn create(
            .expect("comments::create: insert error");
            let new_comment = comm
                .create_activity(&rockets)
+                .await
                .expect("comments::create: activity error");

            // save mentions
@@ -73,6 +76,7 @@ pub fn create(
                Mention::from_activity(
                    &*conn,
                    &Mention::build_activity(&rockets, &ment)
+                        .await
                        .expect("comments::create: build mention error"),
                    comm.id,
                    false,
@@ -90,14 +94,14 @@ pub fn create(
                .worker
                .execute(move || broadcast(&user_clone, new_comment, dest));

-            Flash::success(
+            Ok(Flash::success(
                Redirect::to(
                    uri!(super::posts::details: blog = blog_name, slug = slug, responding_to = _),
                ),
                i18n!(&rockets.intl.catalog, "Your comment has been posted."),
-            )
-        })
-        .map_err(|errors| {
+            ))
+        }
+        Err(errors) => {
            // TODO: de-duplicate this code
            let comments = CommentTree::from_post(&*conn, &post, Some(&user))
                .expect("comments::create: comments error");
@@ -106,7 +110,7 @@ pub fn create(
                .responding_to
                .and_then(|r| Comment::get(&*conn, r).ok());

-            render!(posts::details(
+            Err(render!(posts::details(
                &rockets.to_context(),
                post.clone(),
                blog,
@@ -133,8 +137,9 @@ pub fn create(
                post.get_authors(&*conn)
                    .expect("comments::create: authors error")[0]
                    .clone()
-            ))
-        })
+            )))
+        }
+    }
 }

 #[post("/~/<blog>/<slug>/comment/<id>/delete")]
@@ -174,15 +179,16 @@ pub fn delete(
 }

 #[get("/~/<_blog>/<_slug>/comment/<id>")]
-pub fn activity_pub(
+pub async fn activity_pub(
    _blog: String,
    _slug: String,
    id: i32,
    _ap: ApRequest,
    rockets: PlumeRocket,
 ) -> Option<ActivityStream<Note>> {
-    Comment::get(&*rockets.conn, id)
-        .and_then(|c| c.to_activity(&rockets))
-        .ok()
-        .map(ActivityStream::new)
+    let c = match Comment::get(&*rockets.conn, id) {
+        Ok(c) => c.to_activity(&rockets).await.ok(),
+        Err(_) => None,
+    };
+    c.map(ActivityStream::new)
 }
@@ -1,6 +1,7 @@
 use crate::template_utils::{IntoContext, Ructe};
 use plume_models::{Error, PlumeRocket};
 use rocket::{
+    request::FromRequest,
    response::{self, Responder},
    Request,
 };
@@ -14,35 +15,46 @@ impl From<Error> for ErrorPage {
    }
 }

+#[rocket::async_trait]
 impl<'r> Responder<'r> for ErrorPage {
-    fn respond_to(self, req: &Request<'_>) -> response::Result<'r> {
-        let rockets = req.guard::<PlumeRocket>().unwrap();
+    async fn respond_to(self, req: &'r Request<'_>) -> response::Result<'r> {
+        let rockets = PlumeRocket::from_request(req).await.unwrap();

        match self.0 {
-            Error::NotFound => render!(errors::not_found(&rockets.to_context())).respond_to(req),
-            Error::Unauthorized => {
-                render!(errors::not_found(&rockets.to_context())).respond_to(req)
+            Error::NotFound => {
+                render!(errors::not_found(&rockets.to_context()))
+                    .respond_to(req)
+                    .await
+            }
+            Error::Unauthorized => {
+                render!(errors::not_found(&rockets.to_context()))
+                    .respond_to(req)
+                    .await
+            }
+            _ => {
+                render!(errors::not_found(&rockets.to_context()))
+                    .respond_to(req)
+                    .await
            }
-            _ => render!(errors::not_found(&rockets.to_context())).respond_to(req),
        }
    }
 }

 #[catch(404)]
-pub fn not_found(req: &Request<'_>) -> Ructe {
-    let rockets = req.guard::<PlumeRocket>().unwrap();
+pub async fn not_found(req: &Request<'_>) -> Ructe {
+    let rockets = req.guard::<PlumeRocket>().await.unwrap();
    render!(errors::not_found(&rockets.to_context()))
 }

 #[catch(422)]
-pub fn unprocessable_entity(req: &Request<'_>) -> Ructe {
-    let rockets = req.guard::<PlumeRocket>().unwrap();
+pub async fn unprocessable_entity(req: &Request<'_>) -> Ructe {
+    let rockets = req.guard::<PlumeRocket>().await.unwrap();
    render!(errors::unprocessable_entity(&rockets.to_context()))
 }

 #[catch(500)]
-pub fn server_error(req: &Request<'_>) -> Ructe {
-    let rockets = req.guard::<PlumeRocket>().unwrap();
+pub async fn server_error(req: &Request<'_>) -> Ructe {
+    let rockets = req.guard::<PlumeRocket>().await.unwrap();
    render!(errors::server_error(&rockets.to_context()))
 }

@@ -5,7 +5,7 @@ use rocket::{
 use rocket_contrib::json::Json;
 use rocket_i18n::I18n;
 use scheduled_thread_pool::ScheduledThreadPool;
-use serde_json;
+use std::path::PathBuf;
 use std::str::FromStr;
 use validator::{Validate, ValidationErrors};

@@ -76,12 +76,12 @@ pub fn admin_mod(_mod: Moderator, rockets: PlumeRocket) -> Ructe {

 #[derive(Clone, FromForm, Validate)]
 pub struct InstanceSettingsForm {
-    #[validate(length(min = "1"))]
+    #[validate(length(min = 1))]
    pub name: String,
    pub open_registrations: bool,
    pub short_description: SafeString,
    pub long_description: SafeString,
-    #[validate(length(min = "1"))]
+    #[validate(length(min = 1))]
    pub default_license: String,
 }

@@ -386,17 +386,21 @@ fn ban(
 }

 #[post("/inbox", data = "<data>")]
-pub fn shared_inbox(
+pub async fn shared_inbox(
    rockets: PlumeRocket,
    data: inbox::SignedJson<serde_json::Value>,
    headers: Headers<'_>,
 ) -> Result<String, status::BadRequest<&'static str>> {
-    inbox::handle_incoming(rockets, data, headers)
+    inbox::handle_incoming(rockets, data, headers).await
 }

 #[get("/remote_interact?<target>")]
-pub fn interact(rockets: PlumeRocket, user: Option<User>, target: String) -> Option<Redirect> {
-    if User::find_by_fqn(&rockets, &target).is_ok() {
+pub async fn interact(
+    rockets: PlumeRocket,
+    user: Option<User>,
+    target: String,
+) -> Option<Redirect> {
+    if User::find_by_fqn(&rockets, &target).await.is_ok() {
        return Some(Redirect::to(uri!(super::user::details: name = target)));
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mina Galić	b596e77f03	remove redundant use statements	2020-05-25 20:00:57 +02:00
Mina Galić	41f97b01f0	unroll filter_map() to easier .await	2020-05-25 20:00:28 +02:00
Mina Galić	a508a4150c	remove redundant use statements	2020-05-25 19:18:24 +02:00
Mina Galić	25c40adf20	yet another dubious clippy warnings fix re returns	2020-05-25 19:17:32 +02:00
Mina Galić	7490567a21	fix warnings about unused doc comments we do this by making the macro parse and generate doc comments	2020-05-25 15:44:32 +02:00
Mina Galić	492bbb1ba6	make clippy happy with a weird quirk wrt return not happy about this lint or rust behaviour where the return statement must not have a `;`	2020-05-25 15:23:55 +02:00
Mina Galić	cf3708e1c6	make clippy happy by removing unused imports	2020-05-25 13:40:35 +02:00
Mina Galić	df442002c2	replace .map().map_err() with a match so we can .await without worries. plus, it changes nothing about the code, other than making the intent clearer at first sight.	2020-05-24 22:16:42 +02:00
Mina Galić	07036b5fad	upgrade validator: it now uses types! in macros!!	2020-05-24 22:03:26 +02:00
Mina Galić	0726375859	add another async (and correctly convert followers_count)	2020-05-24 21:03:59 +02:00
Mina Galić	cb1c260692	remove an experiment of disabling Send… it makes no sense	2020-05-24 21:03:02 +02:00
Mina Galić	de6bfca084	removed a few unused imports	2020-05-24 21:01:16 +02:00
Mina Galić	7aabb9661e	upgrade webfinger everywhere, and implement async	2020-05-24 20:27:39 +02:00
Mina Galić	18bb413011	add async/.await until all our errors are the same: that our Connection is not Send-safe.	2020-05-24 19:40:02 +02:00
Mina Galić	d2881ee3f7	add async/.await until all our errors are the same: that our Connection is not Send-safe.	2020-05-23 23:32:10 +02:00
Mina Galić	850b3c1337	add async/.await until all our errors are the same: that our Connection is not Send-safe. once we get there, we can start thinking about restructing the way we pass along our connection, or consider using #[database].	2020-05-22 21:41:33 +02:00
Igor Galić	44ebce516c	fix some, break some compiling by adding async/await in front of it i forgot that we can't `Send` diesel connections over threads, so this is going to require some rethinking.	2020-05-16 12:06:58 +02:00
Igor Galić	3c830ab0ce	move towards using #[rocket::async_trait] this also upgrades some dependencies some of that fixes stuff, others breaks stuff.	2020-05-15 22:38:21 +02:00
Igor Galić	097d0ea9ce	make plume-models async (again)	2020-05-06 22:33:10 +02:00
Igor Galić	6fe16c9f84	upgrade and use futures… then block_on .await in a trait?	2020-05-06 22:32:59 +02:00
Igor Galić	43cb9f700c	update webfinger as requested in https://github.com/Plume-org/webfinger/issues/8 and provided in https://github.com/Plume-org/webfinger/pull/9 ``` meena@76ix ~/s/a/plume (go/async) [101]> cargo update --package webfinger Updating crates.io index Updating git repository `https://github.com/Plume-org/webfinger` Removing bytes v0.4.12 Removing cookie v0.12.0 Removing cookie_store v0.7.0 Removing crossbeam-deque v0.7.2 Removing crossbeam-epoch v0.8.0 Removing crossbeam-queue v0.1.2 Removing crossbeam-utils v0.7.0 Removing h2 v0.1.26 Removing http v0.1.21 Removing http-body v0.1.0 Removing hyper v0.12.35 Removing hyper-tls v0.3.2 Removing publicsuffix v1.5.4 Removing reqwest v0.9.24 Removing serde_urlencoded v0.5.5 Removing string v0.2.1 Removing tokio v0.1.22 Removing tokio-buf v0.1.1 Removing tokio-current-thread v0.1.6 Removing tokio-executor v0.1.9 Removing tokio-io v0.1.12 Removing tokio-reactor v0.1.11 Removing tokio-sync v0.1.7 Removing tokio-tcp v0.1.3 Removing tokio-threadpool v0.1.17 Removing tokio-timer v0.2.12 Removing try_from v0.3.2 Removing want v0.2.0 Adding webfinger v0.5.0 (https://github.com/Plume-org/webfinger?rev=update-deps#cdaab95e) Removing webfinger v0.5.0 meena@76ix ~/s/a/plume (go/async)> ```	2020-05-06 22:30:33 +02:00
Igor Galić	2c285b9aca	start async-ifying routes template utils and error routes	2020-05-06 22:29:36 +02:00
Igor Galić	e4bb73d22e	cargo clippy	2020-05-06 22:29:36 +02:00
Igor Galić	e9c7259ffb	cargo fmt	2020-05-06 22:29:35 +02:00
Igor Galić	be8c67ee9a	move reqwest client out of thread spawning this way, we only spawn one, and reuse that.	2020-05-06 22:29:34 +02:00
Igor Galić	65b2c38c29	.await? result from read_to_string()	2020-05-06 22:29:33 +02:00
Jeb Rosen	8aa99cea35	move signature outside the spawning this allows us to actually move stuff into the async block and we can drop the 'static life-time.	2020-05-06 22:29:32 +02:00
Igor Galić	a010025074	asyncify reqwest calls (again?)	2020-05-06 22:29:32 +02:00
Igor Galić	82088596a8	asyncify from_activity calls (i.e.: block_on())	2020-05-06 22:29:31 +02:00
Igor Galić	87ce3a7b51	asyncify plume-models: media upload is now async including the use of tokio!	2020-05-06 22:29:27 +02:00
Igor Galić	3472a58299	move ClientBuilder into thread, since we cannot Copy it	2020-05-06 22:26:37 +02:00
Igor Galić	a3f165f9f4	Use blocking reqwest API in defer defer, or, trait functions such as it in general(?) cannot be async (yet)	2020-05-06 22:26:32 +02:00
Igor Galić	25c5da1a7c	add tokio (0.2) as dependency to further async-ify our FromData code i'm using this opportunity to also update reqwest (0.10), but it's turning out to be a little trickier, as it requires more modern async setup, and that appears to need a lot of thinking…	2020-05-06 22:23:35 +02:00
Igor Galić	022e037eea	when using macros!() we need to import the things that they use	2020-05-06 22:20:49 +02:00
Igor Galić	45c335e17b	"manually" create ETag and Cache-Control headers	2020-05-06 22:20:48 +02:00
Igor Galić	b51551973a	start fixing tests in plume-models	2020-05-06 22:20:47 +02:00
Igor Galić	59e5c49aa8	convert plume-models to all async where sensible! note that State has no asynchronous work to do, so wrapping it up in async makes no sense.	2020-05-06 22:20:47 +02:00
Igor Galić	ce119ffe50	start making PlumeRocket async	2020-05-06 22:20:46 +02:00
Igor Galić	944f8c42fa	plume-models: convert api-tokens. use DbConn::from_request() directly there doesn't seem to be a request.guard_async (yet?)	2020-05-06 22:17:25 +02:00
Igor Galić	909f677bdd	plume-models: convert admin & api-tokens to async n.b.: I do not like the error handling in api_tokens 😒️	2020-05-06 22:17:24 +02:00
Igor Galić	fd9764ff17	plume-common: also make requests async	2020-05-06 22:17:24 +02:00
Igor Galić	75722abc9e	rocket does not need decl_macro anymore	2020-05-06 22:17:23 +02:00
Igor Galić	ec9b699c6e	convert plume-common to rocket async it only took 3 hours of @jebrosen's patient help.	2020-05-06 22:17:22 +02:00
Igor Galić	bb5c2b69a7	update rocket* everywhere! and run cargo update	2020-05-06 22:17:17 +02:00
Igor Galić	e52944e477	update rocket*; which gets us stuck in dependency conflicts	2020-05-06 21:01:25 +02:00
Igor Galić	928470610e	remove csrf for now, so we can update the rest	2020-05-06 21:01:18 +02:00