cargo update

.circleci/config.yml

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

.circleci/images/plume-buildenv/Caddyfile

@@ -1,5 +1,5 @@
 localhost:443 {
-  proxy / integration:7878 {
+  proxy / localhost:7878 {
     transparent
   }
   tls self_signed

.circleci/images/plume-buildenv/Dockerfile

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

.drone.jsonnet

@@ -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()
-]

Cargo.toml

@@ -1,9 +1,8 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.4.0"
+version = "0.3.0"
 repository = "https://github.com/Plume-org/Plume"
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
@@ -20,16 +19,16 @@ heck = "0.3.0"
 lettre = "0.9.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
-rocket = "0.4.2"
+rocket = "0.4.0"
-rocket_contrib = { version = "0.4.2", features = ["json"] }
+rocket_contrib = { version = "0.4.0", features = ["json"] }
 rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
 rpassword = "4.0"
+runtime-fmt = "0.4.0"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_json = "1.0"
 serde_qs = "0.5"
 shrinkwraprs = "0.2.1"
-syntect = "3.3"
 validator = "0.8"
 validator_derive = "0.8"
 webfinger = "0.4.1"
@@ -69,7 +68,7 @@ git = "https://github.com/fdb-hiroshima/rocket_csrf"
 rev = "29910f2829e7e590a540da3804336577b48c7b31"
 
 [build-dependencies]
-ructe = "0.9.0"
+ructe = "0.6.2"
 rsass = "0.9"
 
 [features]
@@ -78,7 +77,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"]

Dockerfile

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

assets/themes/default/_dark_variables.scss

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

assets/themes/default/_global.scss

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

assets/themes/default/_header.scss

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

assets/themes/default/_variables.scss

@@ -1,10 +1,10 @@
 /* Color Scheme */
-$gray: #f3f3f3;
+$gray: #F3F3F3;
 $black: #242424;
-$white: #f8f8f8;
+$white: #F8F8F8;
-$purple: #7765e3;
+$purple: #7765E3;
 $lightpurple: #c2bbee;
-$red: #e92f2f;
+$red: #E92F2F;
 $yellow: #ffe347;
 $green: #23f0c7;
 
@@ -24,14 +24,6 @@ $margin: 0 $horizontal-margin;
 
 /* Fonts */
 
-$route159: "Shabnam", "Route159", serif;
+$route159: "Route159", serif;
-$playfair: "Vazir", "Playfair Display", serif;
+$playfair: "Playfair Display", serif;
-$lora: "Vazir", "Lora", serif;
+$lora: "Lora", serif;
-
-//Code Highlighting
-$code-keyword-color: #45244a;
-$code-source-color: #4c588c;
-$code-constant-color: scale-color(magenta, $lightness: -5%);
-$code-operator-color: scale-color($code-source-color, $lightness: -5%);
-$code-string-color: #8a571c;
-$code-comment-color: #1c4c8a;

assets/themes/default/dark.scss

@@ -1,14 +1,12 @@
 /* color palette: https://coolors.co/23f0c7-ef767a-7765e3-6457a6-ffe347 */
 
-@import url("./feather.css");
+@import url('./feather.css');
-@import url("./fonts/Route159/Route159.css");
+@import url('./fonts/Route159/Route159.css');
-@import url("./fonts/Lora/Lora.css");
+@import url('./fonts/Lora/Lora.css');
-@import url("./fonts/Playfair_Display/PlayfairDisplay.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 "dark_variables";
+@import 'dark_variables';
-@import "global";
+@import 'global';
-@import "header";
+@import 'header';
-@import "article";
+@import 'article';
-@import "forms";
+@import 'forms';

assets/themes/default/fonts/Shabnam_WOL/LICENSE

@@ -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.

assets/themes/default/fonts/Shabnam_WOL/Shabnam_WOL.css

@@ -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;
-}

assets/themes/default/fonts/Vazir_WOL/LICENSE

@@ -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. 

assets/themes/default/fonts/Vazir_WOL/Vazir_WOL.css

@@ -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;
-}

assets/themes/default/light.scss

@@ -1,14 +1,12 @@
 /* color palette: https://coolors.co/23f0c7-ef767a-7765e3-6457a6-ffe347 */
 
-@import url("./feather.css");
+@import url('./feather.css');
-@import url("./fonts/Route159/Route159.css");
+@import url('./fonts/Route159/Route159.css');
-@import url("./fonts/Lora/Lora.css");
+@import url('./fonts/Lora/Lora.css');
-@import url("./fonts/Playfair_Display/PlayfairDisplay.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 "variables";
+@import 'variables';
-@import "global";
+@import 'global';
-@import "header";
+@import 'header';
-@import "article";
+@import 'article';
-@import "forms";
+@import 'forms';

build.rs

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

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

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

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

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

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

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

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

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

plume-api/Cargo.toml

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

plume-api/src/lib.rs

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

plume-cli/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-cli"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [[bin]]
 name = "plm"
@@ -23,4 +22,3 @@ path = "../plume-models"
 [features]
 postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
-search-lindera = ["plume-models/search-lindera"]

plume-cli/src/main.rs

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

plume-cli/src/search.rs

@@ -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 =
+    let searcher = searcher.unwrap_or_else(|| Searcher::open(&path).unwrap());
-        searcher.unwrap_or_else(|| Searcher::open(&path, &CONFIG.search_tokenizers).unwrap());
 
     searcher.fill(conn).expect("Couldn't import post");
     println!("Commiting result");

plume-common/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-common"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
@@ -20,9 +19,7 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 shrinkwraprs = "0.2.1"
-syntect = "3.3"
 tokio = "0.1.22"
-regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }
 
 [dependencies.chrono]
 features = ["serde"]

plume-common/src/activity_pub/mod.rs

@@ -64,7 +64,7 @@ impl<T> ActivityStream<T> {
 }
 
 impl<'r, O: Object> Responder<'r> for ActivityStream<O> {
-    fn respond_to(self, request: &Request<'_>) -> Result<Response<'r>, Status> {
+    fn respond_to(self, request: &Request) -> Result<Response<'r>, Status> {
         let mut json = serde_json::to_value(&self.0).map_err(|_| Status::InternalServerError)?;
         json["@context"] = context();
         serde_json::to_string(&json).respond_to(request).map(|r| {

plume-common/src/activity_pub/request.rs

@@ -5,8 +5,8 @@ use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, DATE, USER_A
 use std::ops::Deref;
 use std::time::SystemTime;
 
-use crate::activity_pub::sign::Signer;
+use activity_pub::sign::Signer;
-use crate::activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
+use activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
 
 const PLUME_USER_AGENT: &str = concat!("Plume/", env!("CARGO_PKG_VERSION"));
 

plume-common/src/activity_pub/sign.rs

@@ -131,7 +131,7 @@ impl SignatureValidity {
 
 pub fn verify_http_headers<S: Signer + ::std::fmt::Debug>(
     sender: &S,
-    all_headers: &HeaderMap<'_>,
+    all_headers: &HeaderMap,
     data: &request::Digest,
 ) -> SignatureValidity {
     let sig_header = all_headers.get_one("Signature");

plume-common/src/lib.rs

@@ -1,16 +1,26 @@
 #![feature(associated_type_defaults)]
 
+extern crate activitypub;
 #[macro_use]
 extern crate activitystreams_derive;
-use activitystreams_traits;
+extern crate activitystreams_traits;
-
+extern crate array_tool;
-use serde;
+extern crate base64;
+extern crate chrono;
+extern crate heck;
+extern crate hex;
+extern crate openssl;
+extern crate pulldown_cmark;
+extern crate reqwest;
+extern crate rocket;
+extern crate serde;
 #[macro_use]
 extern crate shrinkwraprs;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
+extern crate tokio;
 
 pub mod activity_pub;
 pub mod utils;

plume-common/src/utils.rs

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

plume-front/Cargo.toml

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

plume-front/src/editor.rs

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

plume-front/src/main.rs

@@ -1,12 +1,15 @@
 #![recursion_limit = "128"]
 #![feature(decl_macro, proc_macro_hygiene, try_trait)]
 
+extern crate gettext;
 #[macro_use]
 extern crate gettext_macros;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
 extern crate stdweb;
+extern crate serde;
+extern crate serde_json;
 use stdweb::web::{event::*, *};
 
 init_i18n!(
@@ -19,7 +22,6 @@ init_i18n!(
     en,
     eo,
     es,
-    fa,
     fr,
     gl,
     hi,

plume-macro/Cargo.toml

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

plume-macro/src/lib.rs

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

plume-models/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "plume-models"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Plume contributors"]
-edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
@@ -12,7 +11,7 @@ bcrypt = "0.5"
 guid-create = "0.1"
 heck = "0.3.0"
 itertools = "0.8.0"
-lazy_static = "1.0"
+lazy_static = "*"
 migrations_internals= "1.4.0"
 openssl = "0.10.22"
 rocket = "0.4.0"
@@ -22,15 +21,13 @@ 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"
 url = "2.1"
 walkdir = "2.2"
 webfinger = "0.4.1"
 whatlang = "0.7.1"
 shrinkwraprs = "0.2.1"
 diesel-derive-newtype = "0.1.2"
-glob = "0.3.0"
-lindera-tantivy = { version = "0.1.2", optional = true }
 
 [dependencies.chrono]
 features = ["serde"]
@@ -55,4 +52,3 @@ diesel_migrations = "1.3.0"
 [features]
 postgres = ["diesel/postgres", "plume-macro/postgres" ]
 sqlite = ["diesel/sqlite", "plume-macro/sqlite" ]
-search-lindera = ["lindera-tantivy"]

plume-models/src/admin.rs

@@ -1,10 +1,11 @@
-use crate::users::User;
 use rocket::{
     http::Status,
     request::{self, FromRequest, Request},
     Outcome,
 };
 
+use users::User;
+
 /// Wrapper around User to use as a request guard on pages reserved to admins.
 pub struct Admin(pub User);
 

plume-models/src/api_tokens.rs

@@ -1,4 +1,3 @@
-use crate::{db_conn::DbConn, schema::api_tokens, Error, Result};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use rocket::{
@@ -7,6 +6,10 @@ use rocket::{
     Outcome,
 };
 
+use db_conn::DbConn;
+use schema::api_tokens;
+use {Error, Result};
+
 #[derive(Clone, Queryable)]
 pub struct ApiToken {
     pub id: i32,

plume-models/src/apps.rs

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

plume-models/src/blocklisted_emails.rs

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

plume-models/src/blog_authors.rs

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

plume-models/src/blogs.rs

@@ -1,7 +1,3 @@
-use crate::{
-    ap_url, instance::*, medias::Media, posts::Post, safe_string::SafeString, schema::blogs,
-    search::Searcher, users::User, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE,
-};
 use activitypub::{
     actor::Group,
     collection::{OrderedCollection, OrderedCollectionPage},
@@ -16,13 +12,22 @@ use openssl::{
     rsa::Rsa,
     sign::{Signer, Verifier},
 };
+use serde_json;
+use url::Url;
+use webfinger::*;
+
+use instance::*;
+use medias::Media;
 use plume_common::activity_pub::{
     inbox::{AsActor, FromId},
     sign, ActivityStream, ApSignature, Id, IntoId, PublicKey, Source,
 };
-use serde_json;
+use posts::Post;
-use url::Url;
+use safe_string::SafeString;
-use webfinger::*;
+use schema::blogs;
+use search::Searcher;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE};
 
 pub type CustomGroup = CustomObject<ApSignature, Group>;
 
@@ -101,8 +106,8 @@ impl Blog {
     }
 
     pub fn list_authors(&self, conn: &Connection) -> Result<Vec<User>> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
-        use crate::schema::users;
+        use schema::users;
         let authors_ids = blog_authors::table
             .filter(blog_authors::blog_id.eq(self.id))
             .select(blog_authors::author_id);
@@ -113,7 +118,7 @@ impl Blog {
     }
 
     pub fn count_authors(&self, conn: &Connection) -> Result<i64> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         blog_authors::table
             .filter(blog_authors::blog_id.eq(self.id))
             .count()
@@ -122,7 +127,7 @@ impl Blog {
     }
 
     pub fn find_for_author(conn: &Connection, author: &User) -> Result<Vec<Blog>> {
-        use crate::schema::blog_authors;
+        use schema::blog_authors;
         let author_ids = blog_authors::table
             .filter(blog_authors::author_id.eq(author.id))
             .select(blog_authors::blog_id);
@@ -496,17 +501,14 @@ impl NewBlog {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{
+    use blog_authors::*;
-        blog_authors::*,
-        config::CONFIG,
-        instance::tests as instance_tests,
-        medias::NewMedia,
-        search::tests::get_searcher,
-        tests::{db, rockets},
-        users::tests as usersTests,
-        Connection as Conn,
-    };
     use diesel::Connection;
+    use instance::tests as instance_tests;
+    use medias::NewMedia;
+    use search::tests::get_searcher;
+    use tests::{db, rockets};
+    use users::tests as usersTests;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> (Vec<User>, Vec<Blog>) {
         instance_tests::fill_database(conn);
@@ -768,9 +770,7 @@ pub(crate) mod tests {
         conn.test_transaction::<_, (), _>(|| {
             let (_, blogs) = fill_database(conn);
 
-            blogs[0]
+            blogs[0].delete(conn, &get_searcher()).unwrap();
-                .delete(conn, &get_searcher(&CONFIG.search_tokenizers))
-                .unwrap();
             assert!(Blog::get(conn, blogs[0].id).is_err());
             Ok(())
         })
@@ -780,7 +780,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(

plume-models/src/comment_seers.rs

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

plume-models/src/comments.rs

@@ -1,15 +1,3 @@
-use crate::{
-    comment_seers::{CommentSeers, NewCommentSeers},
-    instance::Instance,
-    medias::Media,
-    mentions::Mention,
-    notifications::*,
-    posts::Post,
-    safe_string::SafeString,
-    schema::comments,
-    users::User,
-    Connection, Error, PlumeRocket, Result,
-};
 use activitypub::{
     activity::{Create, Delete},
     link,
@@ -17,16 +5,26 @@ use activitypub::{
 };
 use chrono::{self, NaiveDateTime};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
-use plume_common::{
-    activity_pub::{
-        inbox::{AsActor, AsObject, FromId},
-        Id, IntoId, PUBLIC_VISIBILITY,
-    },
-    utils,
-};
 use serde_json;
+
 use std::collections::HashSet;
 
+use comment_seers::{CommentSeers, NewCommentSeers};
+use instance::Instance;
+use medias::Media;
+use mentions::Mention;
+use notifications::*;
+use plume_common::activity_pub::{
+    inbox::{AsActor, AsObject, FromId},
+    Id, IntoId, PUBLIC_VISIBILITY,
+};
+use plume_common::utils;
+use posts::Post;
+use safe_string::SafeString;
+use schema::comments;
+use users::User;
+use {Connection, Error, PlumeRocket, Result};
+
 #[derive(Queryable, Identifiable, Clone, AsChangeset)]
 pub struct Comment {
     pub id: i32,
@@ -79,7 +77,7 @@ impl Comment {
     }
 
     pub fn count_local(conn: &Connection) -> Result<i64> {
-        use crate::schema::users;
+        use schema::users;
         let local_authors = users::table
             .filter(users::instance_id.eq(Instance::get_local()?.id))
             .select(users::id);
@@ -129,8 +127,9 @@ impl Comment {
             )?))?;
         note.object_props
             .set_published_string(chrono::Utc::now().to_rfc3339())?;
-        note.object_props.set_attributed_to_link(author.into_id())?;
+        note.object_props
-        note.object_props.set_to_link_vec(to)?;
+            .set_attributed_to_link(author.clone().into_id())?;
+        note.object_props.set_to_link_vec(to.clone())?;
         note.object_props.set_tag_link_vec(
             mentions
                 .into_iter()

plume-models/src/config.rs

@@ -1,4 +1,3 @@
-use crate::search::TokenizerKind as SearchTokenizer;
 use rocket::config::Limits;
 use rocket::Config as RocketConfig;
 use std::env::{self, var};
@@ -12,10 +11,7 @@ pub struct Config {
     pub base_url: String,
     pub database_url: String,
     pub db_name: &'static str,
-    pub db_max_size: Option<u32>,
-    pub db_min_idle: Option<u32>,
     pub search_index: String,
-    pub search_tokenizers: SearchTokenizerConfig,
     pub rocket: Result<RocketConfig, RocketError>,
     pub logo: LogoConfig,
     pub default_theme: String,
@@ -190,56 +186,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!(
@@ -247,21 +193,12 @@ lazy_static! {
             var("ROCKET_PORT").unwrap_or_else(|_| "7878".to_owned())
         )),
         db_name: DB_NAME,
-        db_max_size: var("DB_MAX_SIZE").map_or(None, |s| Some(
-            s.parse::<u32>()
-                .expect("Couldn't parse DB_MAX_SIZE into u32")
-        )),
-        db_min_idle: var("DB_MIN_IDLE").map_or(None, |s| Some(
-            s.parse::<u32>()
-                .expect("Couldn't parse DB_MIN_IDLE into u32")
-        )),
         #[cfg(feature = "postgres")]
         database_url: var("DATABASE_URL")
             .unwrap_or_else(|_| format!("postgres://plume:plume@localhost/{}", DB_NAME)),
         #[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()),

plume-models/src/db_conn.rs

@@ -1,4 +1,3 @@
-use crate::Connection;
 use diesel::r2d2::{
     ConnectionManager, CustomizeConnection, Error as ConnError, Pool, PooledConnection,
 };
@@ -11,6 +10,8 @@ use rocket::{
 };
 use std::ops::Deref;
 
+use Connection;
+
 pub type DbPool = Pool<ConnectionManager<Connection>>;
 
 // From rocket documentation
@@ -25,7 +26,7 @@ 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>>()?;
+        let pool = request.guard::<State<DbPool>>()?;
         match pool.get() {
             Ok(conn) => Outcome::Success(DbConn(conn)),
             Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),

plume-models/src/follows.rs

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

plume-models/src/instance.rs

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

plume-models/src/lib.rs

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

plume-models/src/likes.rs

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

plume-models/src/lists.rs

@@ -1,11 +1,10 @@
-use crate::{
-    blogs::Blog,
-    schema::{blogs, list_elems, lists, users},
-    users::User,
-    Connection, Error, Result,
-};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use blogs::Blog;
+use schema::{blogs, list_elems, lists, users};
 use std::convert::{TryFrom, TryInto};
+use users::User;
+use {Connection, Error, Result};
 
 /// Represent what a list is supposed to store. Represented in database as an integer
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -165,7 +164,7 @@ impl List {
     last!(lists);
     get!(lists);
 
-    fn insert(conn: &Connection, val: NewList<'_>) -> Result<Self> {
+    fn insert(conn: &Connection, val: NewList) -> Result<Self> {
         diesel::insert_into(lists::table)
             .values(val)
             .execute(conn)?;
@@ -310,7 +309,7 @@ mod private {
     };
 
     impl ListElem {
-        insert!(list_elems, NewListElem<'_>);
+        insert!(list_elems, NewListElem);
 
         pub fn user_in_list(conn: &Connection, list: &List, user: i32) -> Result<bool> {
             dsl::select(dsl::exists(
@@ -360,8 +359,9 @@ mod private {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{blogs::tests as blog_tests, tests::db};
+    use blogs::tests as blog_tests;
     use diesel::Connection;
+    use tests::db;
 
     #[test]
     fn list_type() {

plume-models/src/medias.rs

@@ -1,17 +1,20 @@
-use crate::{
-    ap_url, instance::Instance, safe_string::SafeString, schema::medias, users::User, Connection,
-    Error, PlumeRocket, Result,
-};
 use activitypub::object::Image;
 use askama_escape::escape;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use guid_create::GUID;
+use reqwest;
+use std::{fs, path::Path};
+
 use plume_common::{
     activity_pub::{inbox::FromId, Id},
     utils::MediaProcessor,
 };
-use reqwest;
+
-use std::{fs, path::Path};
+use instance::Instance;
+use safe_string::SafeString;
+use schema::medias;
+use users::User;
+use {ap_url, Connection, Error, PlumeRocket, Result};
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Media {
@@ -260,11 +263,13 @@ impl Media {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{tests::db, users::tests as usersTests, Connection as Conn};
     use diesel::Connection;
     use std::env::{current_dir, set_current_dir};
     use std::fs;
     use std::path::Path;
+    use tests::db;
+    use users::tests as usersTests;
+    use Connection as Conn;
 
     pub(crate) fn fill_database(conn: &Conn) -> (Vec<User>, Vec<Media>) {
         let mut wd = current_dir().unwrap().to_path_buf();

plume-models/src/mentions.rs

@@ -1,10 +1,14 @@
-use crate::{
-    comments::Comment, notifications::*, posts::Post, schema::mentions, users::User, Connection,
-    Error, PlumeRocket, Result,
-};
 use activitypub::link;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
+
+use comments::Comment;
+use notifications::*;
 use plume_common::activity_pub::inbox::AsActor;
+use posts::Post;
+use schema::mentions;
+use users::User;
+use PlumeRocket;
+use {Connection, Error, Result};
 
 #[derive(Clone, Queryable, Identifiable)]
 pub struct Mention {