remove redundant use statements

we do this by making the macro parse and generate doc comments

.circleci/config.yml

@@ -10,7 +10,7 @@ executors:
         type: boolean
         default: false
     docker:
-    - image: plumeorg/plume-buildenv:v0.0.7
+    - image: plumeorg/plume-buildenv:v0.0.9
     - 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-dir '/*' -o lcov.info
+    - run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore '/*' -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,6 +226,7 @@ jobs:
     steps:
     - restore_env:
         cache: none
+    - run: cargo build
     - run: crowdin upload -b master
 
 workflows:

.circleci/images/plume-buildenv/Dockerfile

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

.env.sample

@@ -0,0 +1,47 @@
+# This file contains your instance configuration
+# Some documentation about these variables is available here:
+# https://docs.joinplu.me/environment/
+
+## GENERAL SETTINGS ##
+
+# The directory containing database migrations
+# For Postgres: migrations/postgres
+# For SQlite: migrations/sqlite
+MIGRATION_DIRECTORY=migrations/postgres
+
+# The URL of your database (or its path for SQlite databases)
+DATABASE_URL=postgres://plume:plume@localhost/plume
+
+# The domain of your instance
+BASE_URL=plu.me
+
+# The secret key for private cookies and CSRF protection
+# You can generate one with `openssl rand -base64 32`
+ROCKET_SECRET_KEY=
+
+# Port and address which Plume will use
+ROCKET_PORT=7878
+ROCKET_ADDRESS=127.0.0.1
+
+## MAIL CONFIG ##
+#MAIL_SERVER=smtp.plu.me
+#MAIL_ADDRESS=no-reply@plu.me
+#MAIL_USER=plume
+#MAIL_PASSWORD=
+#MAIL_HELO_NAME=no-reply@plu.me
+
+## ADVANCED OPTIONS ##
+#MEDIA_UPLOAD_DIRECTORY=static/media
+#SEARCH_INDEX=search_index
+
+# Sample logo configuration
+#PLUME_LOGO=icons/trwnh/paragraphs/plumeParagraphs.svg
+#PLUME_LOGO_FAVICON=icons/trwnh/paragraphs/plumeParagraphs32.png
+#PLUME_LOGO_48=icons/trwnh/paragraphs/plumeParagraphs48.png
+#PLUME_LOGO_72=icons/trwnh/paragraphs/plumeParagraphs72.png
+#PLUME_LOGO_96=icons/trwnh/paragraphs/plumeParagraphs96.png
+#PLUME_LOGO_144=icons/trwnh/paragraphs/plumeParagraphs144.png
+#PLUME_LOGO_160=icons/trwnh/paragraphs/plumeParagraphs160.png
+#PLUME_LOGO_192=icons/trwnh/paragraphs/plumeParagraphs192.png
+#PLUME_LOGO_256=icons/trwnh/paragraphs/plumeParagraphs256.png
+#PLUME_LOGO_512=icons/trwnh/paragraphs/plumeParagraphs512.png

.gitignore

@@ -7,7 +7,7 @@ translations
 .env
 Rocket.toml
 !.gitkeep
-static/media
+static
 docker-compose.yml
 *.db
 *.sqlite
@@ -16,8 +16,6 @@ docker-compose.yml
 tags.*
 !tags.rs
 search_index
-main.css
-*.wasm
-*.js
 .buildconfig
 __pycache__
+.vscode/

Cargo.toml

@@ -1,12 +1,14 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.3.0"
+version = "0.4.0"
 repository = "https://github.com/Plume-org/Plume"
+edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
 askama_escape = "0.1"
+async-trait = "*"
 atom_syndication = "0.6"
 clap = "2.33"
 colored = "1.8"
@@ -16,22 +18,22 @@ gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "
 gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 guid-create = "0.1"
 heck = "0.3.0"
-lettre = { git = "https://github.com/lettre/lettre", rev = "c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" }
-lettre_email = { git = "https://github.com/lettre/lettre", rev = "c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" }
-num_cpus = "1.0"
-rocket = "0.4.0"
-rocket_contrib = { version = "0.4.0", features = ["json"] }
-rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
-rpassword = "3.0"
-runtime-fmt = "0.3.0"
-scheduled-thread-pool = "0.2.0"
+lettre = "0.9.2"
+lettre_email = "0.9.2"
+num_cpus = "1.10"
+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"
 serde_json = "1.0"
-serde_qs = "0.4"
+serde_qs = "0.5"
 shrinkwraprs = "0.2.1"
-validator = "0.8"
-validator_derive = "0.8"
-webfinger = "0.4.1"
+syntect = "3.3"
+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"
@@ -63,12 +65,14 @@ path = "plume-common"
 [dependencies.plume-models]
 path = "plume-models"
 
-[dependencies.rocket_csrf]
-git = "https://github.com/fdb-hiroshima/rocket_csrf"
-rev = "4a72ea2ec716cb0b26188fb00bccf2ef7d1e031c"
+[dependencies.rocket_i18n]
+git = "https://github.com/Plume-org/rocket_i18n"
+branch = "go-async"
+default-features = false
+features = ["rocket"]
 
 [build-dependencies]
-ructe = "0.6.2"
+ructe = "0.9.0"
 rsass = "0.9"
 
 [features]

Dockerfile

@@ -10,7 +10,8 @@ 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 .

README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-  <img src="https://raw.githubusercontent.com/Plume-org/Plume/master/static/icons/trwnh/feather/plumeFeather64.png" alt="Plume's logo">
+  <img src="https://raw.githubusercontent.com/Plume-org/Plume/master/assets/icons/trwnh/feather/plumeFeather64.png" alt="Plume's logo">
   Plume
 </h1>
 <p align="center">