I guess it was localhost this time

.cargo/config.toml

@@ -1,10 +0,0 @@
-[target.wasm32-unknown-unknown]
-# required for clippy
-rustflags = [
-  "--cfg", "web_sys_unstable_apis",
-]
-
-[target.x86_64-unknown-linux-gnu]
-rustflags = [
-  "--cfg", "web_sys_unstable_apis",
-]

.circleci/config.yml

@@ -10,7 +10,7 @@ executors:
         type: boolean
         default: false
     docker:
-    - image: plumeorg/plume-buildenv:v0.4.0
+    - 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
@@ -21,7 +21,6 @@ executors:
       RUST_TEST_THREADS: 1
       FEATURES: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
       DATABASE_URL: <<#parameters.postgres>>postgres://postgres@localhost/plume<</parameters.postgres>><<^parameters.postgres>>plume.sqlite<</parameters.postgres>>
-      ROCKET_SECRET_KEY: VN5xV1DN7XdpATadOCYcuGeR/dV0hHfgx9mx9TarLdM=
 
 
 commands:
@@ -63,7 +62,7 @@ commands:
         type: boolean
         default: false
     steps:
-    - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings -A clippy::needless_borrow
+    - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings
 
   run_with_coverage:
     description: run command with environment for coverage
@@ -72,7 +71,7 @@ commands:
         type: string
     steps:
     - run: |
-       export RUSTFLAGS="-Zprofile -Zfewer-names -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Clink-arg=-Xlinker -Clink-arg=--no-keep-memory -Clink-arg=-Xlinker -Clink-arg=--reduce-memory-overheads"
+       export RUSTFLAGS="-Zprofile -Zfewer-names -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zno-landing-pads -Clink-arg=-Xlinker -Clink-arg=--no-keep-memory -Clink-arg=-Xlinker -Clink-arg=--reduce-memory-overheads"
        export CARGO_INCREMENTAL=0
        << parameters.cmd >>
 
@@ -100,7 +99,7 @@ commands:
     steps:
     - run: |
             cmd="cargo build <<#parameters.release>>--release<</parameters.release>> --no-default-features --features="${FEATURES}" -p <<parameters.package>> -j"
-            for i in 16 4 2 1 1; do
+            for i in 36 4 2 1 1; do
                 $cmd $i && exit 0
             done
             exit 1
@@ -144,14 +143,11 @@ jobs:
         cache: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
     - run_with_coverage:
         cmd: |
-          cargo build -p plume-cli --no-default-features --features=${FEATURES} -j 4
-          ./target/debug/plm migration run
-          ./target/debug/plm search init
           cmd="cargo test --all --exclude plume-front --exclude plume-macro --no-run --no-default-features --features=${FEATURES} -j"
-          for i in 16 4 2 1 1; do
+          for i in 36 4 2 1 1; do
               $cmd $i && break
           done
-          cargo test --all --exclude plume-front --exclude plume-macro --no-default-features --features="${FEATURES}" -j1
+          cargo test --all --exclude plume-front --exclude plume-macro --no-default-features --features="${FEATURES}" -j1 -- --test-threads=1
     - upload_coverage:
         type: unit
     - cache:
@@ -168,18 +164,18 @@ jobs:
     steps:
     - restore_env:
         cache: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
-    - run: wasm-pack build --target web --release plume-front
+    - run: cargo web deploy -p plume-front
     - run_with_coverage:
         cmd: |
             cmd="cargo install --debug --no-default-features --features="${FEATURES}",test --force --path . -j"
-            for i in 16 4 2 1 1; do
+            for i in 36 4 2 1 1; do
                 $cmd $i && exit 0
             done
             exit 1
     - run_with_coverage:
         cmd: |
             cmd="cargo install --debug --no-default-features --features="${FEATURES}" --force --path plume-cli -j"
-            for i in 16 4 2 1 1; do
+            for i in 36 4 2 1 1; do
                 $cmd $i && exit 0
             done
             exit 1
@@ -203,7 +199,7 @@ jobs:
     steps:
     - restore_env:
         cache: release-<<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
-    - run: wasm-pack build --target web --release plume-front
+    - run: cargo web deploy -p plume-front --release
     - build:
         package: plume
         release: true

.circleci/images/plume-buildenv/Caddyfile

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

.circleci/images/plume-buildenv/Dockerfile

@@ -1,22 +1,19 @@
-FROM debian:buster-20210208
+FROM debian:stretch-20190326
 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&&\
-    echo "deb [trusted=yes] https://apt.fury.io/caddy/ /" \
+    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&&\
-    | tee -a /etc/apt/sources.list.d/caddy-fury.list &&\
-    apt update &&\
-    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 clang caddy&&\
     rm -rf /var/lib/apt/lists/*
 
 #install and configure rust
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-11-27 -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
 
 #compile some deps
-RUN cargo install wasm-pack &&\
+RUN cargo install cargo-web &&\
     cargo install grcov &&\
     strip /root/.cargo/bin/* &&\
     rm -fr ~/.cargo/registry
@@ -27,7 +24,8 @@ COPY cargo_config /root/.cargo/config
 #install selenium for front end tests
 RUN pip3 install selenium
 
-#configure caddy
+#install and configure caddy
+RUN curl https://getcaddy.com | bash -s personal
 COPY Caddyfile /Caddyfile
 
 #install crowdin

.drone.jsonnet

@@ -0,0 +1,233 @@
+// 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()
+]

.env.sample

@@ -15,9 +15,6 @@ DATABASE_URL=postgres://plume:plume@localhost/plume
 # The domain of your instance
 BASE_URL=plu.me
 
-# Log level for each crate
-RUST_LOG=info
-
 # The secret key for private cookies and CSRF protection
 # You can generate one with `openssl rand -base64 32`
 ROCKET_SECRET_KEY=
@@ -48,12 +45,3 @@ ROCKET_ADDRESS=127.0.0.1
 #PLUME_LOGO_192=icons/trwnh/paragraphs/plumeParagraphs192.png
 #PLUME_LOGO_256=icons/trwnh/paragraphs/plumeParagraphs256.png
 #PLUME_LOGO_512=icons/trwnh/paragraphs/plumeParagraphs512.png
-
-## LDAP CONFIG ##
-# the object that will be bound is "${USER_NAME_ATTR}=${username},${BASE_DN}"
-#LDAP_ADDR=ldap://127.0.0.1:1389
-#LDAP_BASE_DN="ou=users,dc=your-org,dc=eu"
-#LDAP_USER_NAME_ATTR=cn
-#LDAP_USER_MAIL_ATTR=mail
-#LDAP_TLS=false
-

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,16 +7,6 @@ assignees: ''
 
 ---
 
-<!--
-We would appreciated if you report a bug at our Gitea instance's issue page:
-https://git.joinplu.me/Plume/Plume/issues
-You can login to the Gitea with your GitHub account.
-
-We welcome to receive bug reports here, GitHub, too.
--->
-
-
-
 <!-- Describe your bug, explaining how to reproduce it, and what was expected -->
 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,15 +7,6 @@ assignees: ''
 
 ---
 
-<!--
-We would appreciated if you request a feature at our Gitea instance's issue page:
-https://git.joinplu.me/Plume/Plume/issues
-You can login to the Gitea with your GitHub account.
-
-We welcome to receive feature requests here, GitHub, too.
--->
-
-
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

.github/pull_request_template.md

@@ -1,7 +0,0 @@
-<!--
-We would appreciated if you report a bug at our Gitea instance's pull request page:
-https://git.joinplu.me/Plume/Plume/pulls
-You can login to the Gitea with your GitHub account.
-
-We welcome to receive pull requests here, GitHub, too.
--->

.github/workflows/deploy-docker-latest.yaml

@@ -1,30 +0,0 @@
-name: cd
-
-on:
-  push:
-    branches:
-      - 'main'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: plumeorg/plume:latest

.github/workflows/deploy-docker-tag.yaml

@@ -1,36 +0,0 @@
-name: cd
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: plumeorg/plume
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}

.gitignore

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

CHANGELOG.md

@@ -1,246 +0,0 @@
-# Changelog
-
-<!-- next-header -->
-
-## [Unreleased] - ReleaseDate
-
-## [[0.7.1]] - 2022-01-12
-
-### Added
-
-- Introduce environment variable `MAIL_PORT` (#980)
-- Introduce email sign-up feature (#636, #1002)
-
-### Changed
-
-- Some styling improvements (#976, #977, #978)
-- Respond with error status code when error (#1002)
-
-### Fiexed
-
-- Fix comment link (#974)
-- Fix a bug that prevents posting articles (#975)
-- Fix a bug that notification page doesn't show (#981)
-
-## [[0.7.0]] - 2022-01-02
-
-### Added
-
-- Allow `dir` attributes for LtoR text in RtoL document (#860)
-- More translation languages (#862)
-- Proxy support (#829)
-- Riker a actor system library (#870)
-- (request-target) and Host header in HTTP Signature (#872)
-- Default log levels for RUST_LOG (#885, #886, #919)
-
-### Changed
-
-- Upgrade some dependent crates (#858)
-- Use tracing crate (#868)
-- Update Rust version to nightly-2021-11-27 (#961)
-- Upgrade Tantivy to 0.13.3 and lindera-tantivy to 0.7.1 (#878)
-- Run searcher on actor system (#870)
-- Extract a function to calculate posts' ap_url and share it with some places (#918)
-- Use article title as its slug instead of capitalizing and inserting hyphens (#920)
-- Sign GET requests to other instances (#957)
-
-### Fixed
-
-- Percent-encode URI for remote_interact (#866, #857)
-- Menu animation not opening on iOS (#876, #897)
-- Make actors subscribe to channel once (#913)
-- Upsert posts and media instead of trying to insert and fail (#912)
-- Update post's ActivityPub id when published by update (#915)
-- Calculate media URI properly even when MEDIA_UPLOAD_DIRECTORY configured (#916)
-- Prevent duplicated posts in 'all' timeline (#917)
-- Draw side line for blockquote on start (#933)
-- Fix URIs of posts on Mastodon (#947)
-- Place edit link proper position (#956, #963, #964)
-
-## [[0.6.0]] - 2020-12-29
-
-### Added
-
-- Vazir font for better support of languages written in Arabic script (#787)
-- Login via LDAP (#826)
-- cargo-release (#835)
-- Care about weak ETag header for better caching (#840)
-- Support for right to left languages in post content (#853)
-
-### Changed
-
-- Bump Docker base images to Buster flavor (#797)
-- Upgrade Rocket to 0.4.5 (#800)
-- Keep tags as-is (#832)
-- Update Docker image for testing (#838)
-- Update Dockerfile.dev (#841)
-
-### Fixed
-
-- Recreate search index if its format is outdated (#802)
-- Make it possible to switch to rich text editor (#808)
-- Fix margins for the mobile devices (#817)
-- GPU acceleration for the mobile menu (#818)
-- Natural title position for RtoL languages (#825)
-- Remove link to unimplemented page (#827)
-- Fix displaying not found page when submitting a duplicated blocklist email (#831)
-
-### Security
-
-- Validate spoofing of activity
-
-## [0.5.0] - 2020-06-21
-
-### Added
-
-- Email blocklisting (#718)
-- Syntax highlighting (#691)
-- Persian localization (#782)
-- Switchable tokenizer - enables Japanese full-text search (#776)
-- Make database connections configurable by environment variables (#768)
-
-### Changed
-
-- Display likes and boost on post cards (#744)
-- Rust 2018 (#726)
-- Bump to LLVM to 9.0.0 to fix ARM builds (#737)
-- Remove dependency on runtime-fmt (#773)
-- Drop the -alpha suffix in release names, it is implied that Plume is not stable yet because of the 0 major version (Plume 1.0.0 will be the first stable release).
-
-### Fixed
-
-- Fix parsing of mentions inside a Markdown code block (be430c6)
-- Fix RSS issues (#720)
-- Fix Atom feed (#764)
-- Fix default theme (#746)
-- Fix shown password on remote interact pages (#741)
-- Allow unicode hashtags (#757)
-- Fix French grammar for for 0 (#760)
-- Don't show boosts and likes for "all" and "local" in timelines (#781)
-- Fix liking and boosting posts on remote instances (#762)
-
-## [0.4.0] - 2019-12-23
-
-### Added
-
-- Add support for generic timeline (#525)
-- Federate user deletion (#551)
-- import migrations and don't require diesel_cli for admins (#555)
-- Cache local instance (#572)
-- Initial RTL support #575 (#577)
-- Confirm deletion of blog (#602)
-- Make a distinction between moderators and admins (#619)
-- Theming (#624)
-- Add clap to plume in order to print help and version (#631)
-- Add Snapcraft metadata and install/maintenance hooks (#666)
-- Add environmental variable to control path of media (#683)
-- Add autosaving to the editor (#688)
-- CI: Upload artifacts to pull request deploy environment (#539)
-- CI: Upload artifact of wasm binary (#571)
-
-### Changed
-
-- Update follow_remote.rs.html grammar (#548)
-- Add some feedback when performing some actions (#552)
-- Theme update (#553)
-- Remove the new index lock tantivy uses (#556)
-- Reduce reqwest timeout to 5s (#557)
-- Improve notification management (#561)
-- Fix occurrences of 'have been' to 'has been' (#578) + Direct follow-up to #578 (#603)
-- Store password reset requests in database (#610)
-- Use futures and tokio to send activities (#620)
-- Don't ignore dotenv errors (#630)
-- Replace the input! macro with an Input builder (#646)
-- Update default license (#659)
-- Paginate the outbox responses. Fixes #669 (#681)
-- Use the "classic" editor by default (#697)
-- Fix issue #705 (#708)
-- Make comments in styleshhets a bit clearer (#545)
-- Rewrite circleci config (#558)
-- Use openssl instead of sha256sum for build.rs (#568)
-- Update dependencies (#574)
-- Refactor code to use Shrinkwraprs and diesel-derive-newtype (#598)
-- Add enum containing all successful route returns (#614)
-- Update dependencies which depended on nix -- fixes arm32 builds (#615)
-- Update some documents (#616)
-- Update dependencies (#643)
-- Make the comment syntax consistent across all CSS (#487)
-
-### Fixed
-
-- Remove r (#535)
-- Fix certain improper rendering of forms (#560)
-- make hashtags work in profile summary (#562)
-- Fix some federation issue (#573)
-- Prevent comment form submit button distortion on iOS (#592)
-- Update textarea overflow to scroll (#609)
-- Fix arm builds (#612)
-- Fix theme caching (#647)
-- Fix issue #642, frontend not in English if the user language does not exist (#648)
-- Don't index drafts (#656)
-- Fill entirely user on creation (#657)
-- Delete notification on user deletion (#658)
-- Order media so that latest added are top (#660)
-- Fix logo URL (#664)
-- Snap: Ensure cargo-web doesn't erroneously adopt our workspace. (#667)
-- Snap: Another fix for building (#668)
-- Snap: Fix build for non-Tier-1 Rust platforms (#672)
-- Don't split sentences for translations (#677)
-- Escape href quotation marks (#678)
-- Re-add empty strings in translation (#682)
-- Make the search index creation during migration respect SEARCH_INDEX (#689)
-- Fix the navigation menu not opening on touch (#690)
-- Make search items optional (#693)
-- Various snap fixes (#698)
-- Fix #637 : Markdown footnotes (#700)
-- Fix lettre (#706)
-- CI: Fix Crowdin upload (#576)
-
-### Removed
-
-- Remove the Canapi dependency (#540)
-- Remove use of Rust in migrations (#704)
-
-## [0.3.0] - 2019-04-19
-
-### Added
-
-- Cover for articles (#299, #387)
-- Password reset (#448)
-- New editor (#293, #458, #482, #483, #486, #530)
-- Search (#324, #375, #445)
-- Edit blogs (#460, #494, #497)
-- Hashtags in articles (#283, #295)
-- API endpoints (#245, #285, #307)
-- A bunch of new translations! (#479, #501, #506, #510, #512, #514)
-
-### Changed
-
-- Federation improvements (#216, #217, #357, #364, #399, #443, #446, #455, #502, #519)
-- Improved build process (#281, #374, #392, #402, #489, #498, #503, #511, #513, #515, #528)
-
-### Fixes
-
-- UI usability fixes (#370, #386, #401, #417, #418, #444, #452, #480, #516, #518, #522, #532)
-
-## [0.2.0] - 2018-09-12
-
-### Added
-
-- Article publishing, or save as a draft
-- Like, or boost an article
-- Basic Markdown editor
-- Federated commenting system
-- User account creation
-- Limited federation on other platforms and subscribing to users
-- Ability to create multiple blogs
-
-<!-- next-url -->
-[Unreleased]: https://github.com/Plume-org/Plume/compare/0.7.1...HEAD
-[[0.7.1]]: https://github.com/Plume-org/Plume/compare/0.7.0...0.7.1
-[[0.7.0]]: https://github.com/Plume-org/Plume/compare/0.6.0...0.7.0
-[[0.6.0]]: https://github.com/Plume-org/Plume/compare/0.5.0...0.6.0
-[0.5.0]: https://github.com/Plume-org/Plume/compare/0.4.0-alpha-4...0.5.0
-[0.4.0]: https://github.com/Plume-org/Plume/compare/0.3.0-alpha-2...0.4.0-alpha-4
-[0.3.0]: https://github.com/Plume-org/Plume/compare/0.2.0-alpha-1...0.3.0-alpha-2
-[0.2.0]: https://github.com/Plume-org/Plume/releases/tag/0.2.0-alpha-1

Cargo.toml

@@ -1,33 +1,38 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.7.1"
+version = "0.4.0"
 repository = "https://github.com/Plume-org/Plume"
 edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
+askama_escape = "0.1"
 atom_syndication = "0.6"
 clap = "2.33"
-dotenv = "0.15.0"
+colored = "1.8"
+dotenv = "0.14"
 gettext = { git = "https://github.com/Plume-org/gettext/", rev = "294c54d74c699fbc66502b480a37cc66c1daa7f3" }
 gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
-guid-create = "0.2"
+guid-create = "0.1"
+heck = "0.3.0"
+lettre = "0.9.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
-rocket = "0.4.6"
+rocket = "0.4.2"
-rocket_contrib = { version = "0.4.5", features = ["json"] }
+rocket_contrib = { version = "0.4.2", features = ["json"] }
 rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
+rpassword = "4.0"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
-serde_json = "1.0.70"
+serde_json = "1.0"
-shrinkwraprs = "0.3.0"
+serde_qs = "0.5"
-validator = { version = "0.14", features = ["derive"] }
+shrinkwraprs = "0.2.1"
+syntect = "3.3"
+validator = "0.8"
+validator_derive = "0.8"
 webfinger = "0.4.1"
-tracing = "0.1.22"
-tracing-subscriber = "0.3.5"
-riker = "0.4.2"
 
 [[bin]]
 name = "plume"
@@ -43,12 +48,12 @@ version = "3.1.2"
 
 [dependencies.diesel]
 features = ["r2d2", "chrono"]
-version = "1.4.5"
+version = "*"
 
 [dependencies.multipart]
 default-features = false
 features = ["server"]
-version = "0.18"
+version = "0.16"
 
 [dependencies.plume-api]
 path = "plume-api"
@@ -64,8 +69,8 @@ git = "https://github.com/fdb-hiroshima/rocket_csrf"
 rev = "29910f2829e7e590a540da3804336577b48c7b31"
 
 [build-dependencies]
-ructe = "0.13.0"
+ructe = "0.9.0"
-rsass = "0.23"
+rsass = "0.9"
 
 [features]
 default = ["postgres"]

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1-buster as builder
+FROM rust:1-stretch as builder
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -19,7 +19,7 @@ RUN chmod a+x ./wasm-deps.sh && sleep 1 && ./wasm-deps.sh
 
 WORKDIR /app
 COPY Cargo.toml Cargo.lock rust-toolchain ./
-RUN cargo install wasm-pack
+RUN cargo install cargo-web
 
 COPY . .
 
@@ -28,7 +28,7 @@ RUN cargo install --path ./ --force --no-default-features --features postgres
 RUN cargo install --path plume-cli --force --no-default-features --features postgres
 RUN cargo clean
 
-FROM debian:buster-slim
+FROM debian:stretch-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM rust:1-buster
+FROM rust:1-stretch
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -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 .
@@ -20,7 +19,7 @@ RUN chmod a+x ./wasm-deps.sh && sleep 1 && ./wasm-deps.sh
 WORKDIR /app
 COPY Cargo.toml Cargo.lock rust-toolchain ./
 RUN cargo install diesel_cli --no-default-features --features postgres --version '=1.3.0'
-RUN cargo install wasm-pack
+RUN cargo install cargo-web
 
 COPY . .
 

README.md

@@ -30,11 +30,11 @@ A lot of features are still missing, but what is already here should be quite st
 - **Media management**: you can upload pictures to illustrate your articles, but also audio files if you host a podcast, and manage them all from Plume.
 - **Federation**: Plume is part of a network of interconnected websites called the Fediverse. Each of these websites (often called *instances*) have their own
 rules and thematics, but they can all communicate with each other.
-- **Collaborative writing**: invite other people to your blogs, and write articles together. (Not implemented yet, but will be in 1.0)
+- **Collaborative writing**: invite other people to your blogs, and write articles together.
 
 ## Get involved
 
-If you want to have regular news about the project, the best place is probably [our blog](https://fediverse.blog/~/PlumeDev), or our Matrix room: [`#plume-blog:matrix.org`](https://matrix.to/#/#plume-blog:matrix.org).
+If you want to have regular news about the project, the best place is probably [our blog](https://fediverse.blog/~/PlumeDev), or our Matrix room: [`#plume:disroot.org`](https://riot.im/app/#/room/#plume:disroot.org).
 
 If you want to contribute more, a good first step is to read [our contribution guides](https://docs.joinplu.me/contribute). We accept all kind of contribution:
 

assets/themes/blog-monospace/theme.scss

@@ -1,3 +1,3 @@
 * {
-  font-family: monospace;
+	font-family: monospace;
 }

assets/themes/default/_article.scss

@@ -40,7 +40,7 @@ main header.article {
 
     display: flex;
     flex-direction: column;
-    justify-content: flex-end;
+    justify-content: end;
 
     h1, .article-info {
       text-align: center;
@@ -64,41 +64,41 @@ main header.article {
 }
 
 main .article-info {
-  margin: 0 auto 3em;
+ 	margin: 0 auto 3em;
-  font-size: 0.95em;
+ 	font-size: 0.95em;
-  font-weight: 400;
+ 	font-weight: 400;
 
-  .author, .author a {
+ 	.author, .author a {
-    font-weight: 600;
+ 	  font-weight: 600;
-  }
+ 	}
 }
 
 /* The article itself */
 main article {
   max-width: $article-width;
-  margin: 2.5em auto;
+ 	margin: 2.5em auto;
-  font-family: $lora;
+ 	font-family: $lora;
-  font-size: 1.2em;
+ 	font-size: 1.2em;
-  line-height: 1.7;
+ 	line-height: 1.7;
 
-  a:hover {
+ 	a:hover {
-    text-decoration: underline;
+ 	  text-decoration: underline;
-  }
+ 	}
 
-  img {
+ 	img {
-    display: block;
+   	display: block;
-    margin: 3em auto;
+   	margin: 3em auto;
-    max-width: 100%;
+   	max-width: 100%;
   }
 
   pre {
-    padding: 1em;
+   	padding: 1em;
-    background: $gray;
+   	background: $gray;
-    overflow: auto;
+   	overflow: auto;
   }
 
   blockquote {
-    border-inline-start: 5px solid $gray;
+    border-left: 5px solid $gray;
     margin: 1em auto;
     padding: 0em 2em;
   }
@@ -126,7 +126,7 @@ main .article-meta {
 
   > p {
     margin: 2em $horizontal-margin;
-    font-size: 0.9em;
+ 	  font-size: 0.9em;
   }
 
   /* Article Tags */
@@ -157,15 +157,15 @@ main .article-meta {
   /* Likes & Boosts */
   .actions {
     display: flex;
-    flex-direction: row;
+   	flex-direction: row;
-    justify-content: space-around;
+   	justify-content: space-around;
   }
 
   .likes, .reshares {
     display: flex;
-    flex-direction: column;
+   	flex-direction: column;
-    align-items: center;
+   	align-items: center;
-    padding: 0.5em 0;
+   	padding: 0.5em 0;
 
     p {
       font-size: 1.5em;
@@ -175,34 +175,34 @@ main .article-meta {
 
     .action {
       display: flex;
-      flex-direction: column;
+     	flex-direction: column;
-      align-items: center;
+     	align-items: center;
-      justify-content: center;
+     	justify-content: center;
-      margin: 0;
+     	margin: 0;
-      padding: 0;
+     	padding: 0;
-      background: none;
+     	background: none;
-      color: $text-color;
+     	color: $text-color;
-      border: none;
+     	border: none;
-      font-size: 1.1em;
+     	font-size: 1.1em;
       cursor: pointer;
 
-      svg.feather {
+     	svg.feather {
-        transition: background 0.1s ease-in;
+       	transition: background 0.1s ease-in;
-        display: flex;
+       	display: flex;
-        align-items: center;
+       	align-items: center;
-        justify-content: center;
+       	justify-content: center;
 
-        margin: 0.5em 0;
+       	margin: 0.5em 0;
-        width: 2.5em;
+       	width: 2.5em;
-        height: 2.5em;
+       	height: 2.5em;
 
-        border-radius: 50%;
+       	border-radius: 50%;
       }
 
       &.reshared, &.liked {
         svg.feather {
-          color: $background;
+         	color: $background;
-          font-weight: 900;
+         	font-weight: 900;
         }
       }
     }
@@ -213,14 +213,14 @@ main .article-meta {
 
     .action svg.feather {
       padding: 0.7em;
-      box-sizing: border-box;
+     	box-sizing: border-box;
-      color: $red;
+     	color: $red;
-      fill: none;
+     	fill: none;
-      border: solid $red thin;
+     	border: solid $red thin;
     }
 
     .action:hover svg.feather {
-      background: transparentize($red, 0.85);
+     	background: transparentize($red, 0.85);
     }
 
     .action.liked svg.feather {
@@ -238,22 +238,22 @@ main .article-meta {
 
     .action svg.feather {
       padding: 0.7em;
-      box-sizing: border-box;
+     	box-sizing: border-box;
-      color: $primary;
+     	color: $primary;
-      border: solid $primary thin;
+     	border: solid $primary thin;
-      font-weight: 600;
+     	font-weight: 600;
     }
 
     .action:hover svg.feather {
-      background: transparentize($primary, 0.85);
+     	background: transparentize($primary, 0.85);
     }
 
     .action.reshared svg.feather {
       background: $primary;
     }
     .action.reshared:hover svg.feather {
-      background: transparentize($primary, 0.75)
+     	background: transparentize($primary, 0.75)
-      color: $primary;
+     	color: $primary;
     }
   }
 
@@ -262,9 +262,9 @@ main .article-meta {
     margin: 0 $horizontal-margin;
 
     h2 {
-      color: $primary;
+     	color: $primary;
-      font-size: 1.5em;
+     	font-size: 1.5em;
-      font-weight: 600;
+     	font-weight: 600;
     }
 
     summary {
@@ -279,16 +279,16 @@ main .article-meta {
 
     // Respond & delete comment buttons
     a.button, form.inline, form.inline input {
-      padding: 0;
+     	padding: 0;
-      background: none;
+     	background: none;
-      color: $text-color;
+     	color: $text-color;
-      margin-right: 2em;
+     	margin-right: 2em;
-      font-family: $route159;
+     	font-family: $route159;
       font-weight: normal;
 
-      &::before {
+     	&::before {
-        color: $primary;
+     	  color: $primary;
-        padding-right: 0.5em;
+     	  padding-right: 0.5em;
       }
 
       &:hover { color: $primary; }
@@ -296,8 +296,8 @@ main .article-meta {
 
     .comment {
       margin: 1em 0;
-      font-size: 1em;
+     	font-size: 1em;
-      border: none;
+     	border: none;
 
       .content {
         background: $gray;
@@ -328,36 +328,36 @@ main .article-meta {
         color: transparentize($text-color, 0.6);
       }
 
-      .author {
+     	.author {
-        display: flex;
+     	  display: flex;
-        flex-direction: row;
+       	flex-direction: row;
-        align-items: center;
+       	align-items: center;
-        align-content: center;
+       	align-content: center;
 
-        * {
+       	* {
-          transition: all 0.1s ease-in;
+       	  transition: all 0.1s ease-in;
-        }
+       	}
 
-        .display-name {
+       	.display-name {
-          color: $text-color;
+         	color: $text-color;
         }
 
         &:hover {
           .display-name { color: $primary; }
           small { opacity: 1; }
         }
-      }
+     	}
 
       & > .comment {
           padding-left: 2em;
       }
 
-      .text {
+     	.text {
-        padding: 1.25em 0;
+       	padding: 1.25em 0;
-        font-family: $lora;
+       	font-family: $lora;
-        font-size: 1.1em;
+       	font-size: 1.1em;
-        line-height: 1.4;
+       	line-height: 1.4;
-        text-align: left;
+       	text-align: left;
       }
     }
   }
@@ -490,37 +490,3 @@ input:checked ~ .cw-container > .cw-text {
     display: inline;
   }
 }
-
-// Small screens
-@media screen and (max-width: 600px) {
-  #plume-editor header {
-    flex-direction: column-reverse;
-
-    button {
-      flex: 0 0 0;
-    }
-  }
-
-  .popup {
-    top: 10vh;
-    bottom: 10vh;
-    left: 1vw;
-    right: 1vw;
-  }
-
-  main article {
-    margin: 2.5em .5em;
-    max-width: none;
-  }
-
-  main .article-meta > *, main .article-meta .comments, main .article-meta > .banner > * {
-    margin: 0 5%;
-  }
-
-  .bottom-bar {
-    align-items: center;
-    & > div:nth-child(2) {
-      margin: 0;
-    }
-  }
-}

assets/themes/default/_forms.scss

@@ -1,27 +1,27 @@
 label {
-  display: block;
+ 	display: block;
-  margin: 2em auto .5em;
+ 	margin: 2em auto .5em;
-  font-size: 1.2em;
+ 	font-size: 1.2em;
 }
 input, textarea, select {
-  transition: all 0.1s ease-in;
+ 	transition: all 0.1s ease-in;
-  display: block;
+ 	display: block;
-  width: 100%;
+ 	width: 100%;
-  margin: auto;
+ 	margin: auto;
-  padding: 1em;
+ 	padding: 1em;
-  box-sizing: border-box;
+ 	box-sizing: border-box;
   -webkit-appearance: textarea;
 
-  background: $form-input-background;
+ 	background: $form-input-background;
-  color: $text-color;
+ 	color: $text-color;
-  border: solid $form-input-border thin;
+ 	border: solid $form-input-border thin;
 
-  font-size: 1.2em;
+ 	font-size: 1.2em;
-  font-weight: 400;
+ 	font-weight: 400;
 
-  &:focus {
+ 	&:focus {
-    border-color: $primary;
+ 	  border-color: $primary;
-  }
+ 	}
 }
 form input[type="submit"] {
  margin: 2em auto;
@@ -29,18 +29,18 @@ form input[type="submit"] {
 }
 
 textarea {
-  resize: vertical;
+ 	resize: vertical;
   overflow-y: scroll;
-  font-family: $lora;
+ 	font-family: $lora;
-  font-size: 1.1em;
+ 	font-size: 1.1em;
-  line-height: 1.5;
+ 	line-height: 1.5;
 }
 
 input[type="checkbox"] {
-  display: inline;
+ 	display: inline;
-  margin: initial;
+ 	margin: initial;
-  min-width: initial;
+ 	min-width: initial;
-  width: initial;
+ 	width: initial;
   -webkit-appearance: checkbox;
 }
 
@@ -71,31 +71,31 @@ form.inline {
 }
 
 .button, .button:visited, input[type="submit"], input[type="submit"].button {
-  transition: all 0.1s ease-in;
+ 	transition: all 0.1s ease-in;
-  display: inline-block;
+ 	display: inline-block;
   -webkit-appearance: none;
 
-  margin: 0.5em auto;
+ 	margin: 0.5em auto;
-  padding: 0.75em 1em;
+ 	padding: 0.75em 1em;
 
-  background: $primary;
+ 	background: $primary;
-  color: $primary-text-color;
+ 	color: $primary-text-color;
   font-weight: bold;
   border: none;
 
-  cursor: pointer;
+ 	cursor: pointer;
 
-  &:hover {
+ 	&:hover {
-    background: transparentize($primary, 0.1);
+ 	  background: transparentize($primary, 0.1);
-  }
+ 	}
 
-  &.destructive {
+ 	&.destructive {
-    background: $red;
+ 	  background: $red;
 
     &:hover {
       background: transparentize($red, 0.1);
     }
-  }
+ 	}
 
   &.secondary {
     background: $gray;
@@ -115,20 +115,20 @@ input[type="submit"] {
 form.new-post {
   max-width: 60em;
   .title {
-    margin: 0 auto;
+   	margin: 0 auto;
-    padding: 0.75em 0;
+   	padding: 0.75em 0;
 
-    background: none;
+   	background: none;
-    border: none;
+   	border: none;
 
-    font-family: $playfair;
+   	font-family: $playfair;
-    font-size: 2em;
+   	font-size: 2em;
-    text-align: left;
+   	text-align: left;
   }
   textarea {
-    min-height: 20em;
+   	min-height: 20em;
-    overflow-y: scroll;
+   	overflow-y: scroll;
-    resize: none;
+   	resize: none;
    -webkit-appearance: textarea;
   }
 }

assets/themes/default/_global.scss

@@ -6,43 +6,43 @@ html {
 }
 
 html, body {
-  margin: 0;
+ 	margin: 0;
-  padding: 0;
+ 	padding: 0;
-  background: $background;
+ 	background: $background;
-  color: $text-color;
+ 	color: $text-color;
-  font-family: $route159;
+ 	font-family: $route159;
 
   ::selection {
     background: transparentize($primary, 0.7);
   }
- ::-moz-selection {
+	::-moz-selection {
     background: transparentize($primary, 0.7);
- }
+	}
 }
 
 a, a:visited {
-  color: $primary;
+ 	color: $primary;
-  text-decoration: none;
+ 	text-decoration: none;
 }
 a::selection {
- color: $background;
+	color: $background;
 }
 a::-moz-selection {
- color: $background;
+	color: $background;
 }
 small {
-  margin-left: 1em;
+ 	margin-left: 1em;
-  color: transparentize($text-color, 0.6);
+ 	color: transparentize($text-color, 0.6);
-  font-size: 0.75em;
+ 	font-size: 0.75em;
-  word-wrap: break-word;
+ 	word-wrap: break-word;
-  word-break: break-all;
+ 	word-break: break-all;
 }
 
 .center {
-  text-align: center;
+ 	text-align: center;
-  font-weight: bold;
+ 	font-weight: bold;
-  opacity: 0.6;
+ 	opacity: 0.6;
-  padding: 5em;
+ 	padding: 5em;
 }
 
 .right {
@@ -53,28 +53,28 @@ small {
 }
 
 .spaced {
-  margin: 4rem 0;
+ 	margin: 4rem 0;
 }
 
 .banner {
-  background: $gray;
+ 	background: $gray;
-  padding-top: 2em;
+ 	padding-top: 2em;
-  padding-bottom: 1em;
+ 	padding-bottom: 1em;
-  margin: 3em 0px;
+ 	margin: 3em 0px;
 }
 
 .hidden {
- display: none;
+	display: none;
- appearance: none;
+	appearance: none;
 }
 
 /* Main */
 body > main > *, .h-feed > * {
-  margin: 1em $horizontal-margin;
+ 	margin: 1em $horizontal-margin;
 }
 
 body > main > .h-entry, .h-feed {
- margin: 0;
+	margin: 0;
 }
 
 body > main {
@@ -98,18 +98,18 @@ main {
     margin-top: 1em;
 
     &.article {
-      margin: 1em auto 0.5em;
+     	margin: 1em auto 0.5em;
-      font-family: $playfair;
+     	font-family: $playfair;
-      font-size: 2.5em;
+     	font-size: 2.5em;
-      font-weight: normal;
+     	font-weight: normal;
     }
   }
 
   h2 {
-    font-size: 1.75em;
+   	font-size: 1.75em;
-    font-weight: 300;
+   	font-weight: 300;
 
-    &.article {
+   	&.article {
       font-size: 1.25em;
       margin-bottom: 0.5em;
     }
@@ -139,15 +139,15 @@ main {
 
 /* Errors */
 p.error {
-  color: $red;
+ 	color: $red;
-  font-weight: bold;
+ 	font-weight: bold;
 }
 
 /* User page */
 .user h1 {
-  display: flex;
+ 	display: flex;
-  flex-direction: row;
+ 	flex-direction: row;
-  align-items: center;
+ 	align-items: center;
   margin: 0px;
 }
 
@@ -156,14 +156,14 @@ p.error {
 }
 
 .badge {
-  margin-right: 1em;
+ 	margin-right: 1em;
-  padding: 0.35em 1em;
+ 	padding: 0.35em 1em;
 
-  background: $background;
+ 	background: $background;
-  color: $primary;
+ 	color: $primary;
-  border: 1px solid $primary;
+ 	border: 1px solid $primary;
 
-  font-size: 1rem;
+ 	font-size: 1rem;
 }
 
 .user-summary {
@@ -172,25 +172,23 @@ p.error {
 
 /* Cards */
 .cards {
-  display: flex;
+ 	display: flex;
-  flex-direction: row;
+ 	flex-direction: row;
-  flex-wrap: wrap;
+ 	flex-wrap: wrap;
-  padding: 0 5%;
+ 	padding: 0 5%;
   margin: 1rem 0 5rem;
 }
 .card {
-  flex: 1;
+ 	flex: 1;
-  display: flex;
+ 	display: flex;
-  flex-direction: column;
+ 	flex-direction: column;
 
-  position: relative;
+ 	min-width: 20em;
+ 	min-height: 20em;
+ 	margin: 1em;
+ 	box-sizing: border-box;
 
-  min-width: 20em;
+ 	background: $gray;
-  min-height: 20em;
-  margin: 1em;
-  box-sizing: border-box;
-
-  background: $gray;
 
   text-overflow: ellipsis;
 
@@ -215,68 +213,38 @@ p.error {
   }
 
 
-  > * {
+ 	> * {
-    margin: 20px;
+ 	  margin: 20px;
-  }
+ 	}
 
-  .cover-link {
+ 	.cover {
-    margin: 0;
-
-    &:hover {
-      opacity: 0.9;
-    }
-  }
-
-  .cover {
     min-height: 10em;
     background-position: center;
     background-size: cover;
     margin: 0px;
   }
 
-   header {
-    display: flex;
-  }
-
   h3 {
-    flex-grow: 1;
+   	margin: 0.75em 20px;
-    margin: 0;
+   	font-family: $playfair;
-    font-family: $playfair;
+   	font-size: 1.75em;
-    font-size: 1.75em;
+   	font-weight: normal;
-    font-weight: normal;
+   	a {
-    line-height: 1.10;
+   	  transition: color 0.1s ease-in;
-    display: inline-block;
+   	  color: $text-color;
-    position: relative;
-    a {
-      display: block;
-      width: 100%;
-      height: 100%;
-      padding-block-start: 0.5em;
-      transition: color 0.1s ease-in;
-      color: $text-color;
 
-      &:hover { color: $primary; }
+   	  &:hover { color: $primary; }
-    }
+   	}
-  }
-
-  .controls {
-    flex-shrink: 0;
-    text-align: end;
-
-    .button {
-      margin-top: 0;
-      margin-bottom: 0;
-    }
   }
 
   main {
-    flex: 1;
+   	flex: 1;
 
-    font-family: $lora;
+   	font-family: $lora;
-    font-size: 1em;
+   	font-size: 1em;
-    line-height: 1.25;
+   	line-height: 1.25;
-    text-align: initial;
+   	text-align: left;
-    overflow: hidden;
+   	overflow: hidden;
   }
 }
 
@@ -318,15 +286,15 @@ p.error {
 
 /* Stats */
 .stats {
-  display: flex;
+ 	display: flex;
-  justify-content: space-around;
+ 	justify-content: space-around;
-  margin: 2em;
+ 	margin: 2em;
 
-  > div {
+ 	> div {
-    display: flex;
+   	display: flex;
-    flex-direction: column;
+   	flex-direction: column;
-    justify-content: center;
+   	justify-content: center;
-    align-items: center;
+   	align-items: center;
   }
 
   p {
@@ -479,10 +447,9 @@ figure {
 
 /// Avatars
 .avatar {
-  background-position: center !important;
+  background-position: center;
   background-size: cover;
   border-radius: 100%;
-  flex-shrink: 0;
 
   &.small {
     width: 50px;
@@ -523,10 +490,6 @@ figure {
 
 /// Small screens
 @media screen and (max-width: 600px) {
-  body > main > *, .h-feed > * {
-    margin: 1em;
-  }
-
   main .article-meta {
     > *, .comments {
       margin: 0 5%;
@@ -572,7 +535,15 @@ figure {
     margin: 0;
 
     & > * {
-      max-width: 100% !important;
+      max-width: 100%;
+    }
+  }
+
+  .bottom-bar {
+    flex-direction: column;
+    align-items: center;
+    & > div {
+      margin: 0;
     }
   }
 

assets/themes/default/_header.scss

@@ -3,8 +3,8 @@ body > header {
 
   #content {
     display: flex;
-    align-content: center;
+   	align-content: center;
-    justify-content: space-between;
+   	justify-content: space-between;
   }
 
   nav#menu {
@@ -19,44 +19,44 @@ body > header {
 
     a {
       transform: skewX(15deg);
-      display: flex;
+     	display: flex;
-      flex-direction: column;
+     	flex-direction: column;
-      align-items: center;
+     	align-items: center;
-      justify-content: center;
+     	justify-content: center;
-      width: 1.4em;
+     	width: 1.4em;
-      height: 1.4em;
+     	height: 1.4em;
-      margin: 0;
+     	margin: 0;
-      padding: 0;
+     	padding: 0;
-      color: $gray;
+     	color: $gray;
-      font-size: 1.33em;
+     	font-size: 1.33em;
-    }
+   	}
   }
 
   nav {
     display: flex;
-    flex-direction: row;
+   	flex-direction: row;
-    align-items: center;
+   	align-items: center;
 
-    hr {
+   	hr {
-      height: 100%;
+     	height: 100%;
-      width: 0.2em;
+     	width: 0.2em;
-      background: $primary;
+     	background: $primary;
-      border: none;
+     	border: none;
-      transform: skewX(-15deg);
+     	transform: skewX(-15deg);
     }
     a {
-      display: flex;
+     	display: flex;
-      align-items: center;
+     	align-items: center;
-      position: relative;
+     	position: relative;
-      align-self: stretch;
+     	align-self: stretch;
-      margin: 0;
+     	margin: 0;
-      padding: 0 2em;
+     	padding: 0 2em;
-      font-size: 1em;
+     	font-size: 1em;
 
-      i { font-size: 1.2em; }
+     	i { font-size: 1.2em; }
 
-      &.title {
+     	&.title {
-        margin: 0;
+     	  margin: 0;
         text-align: center;
         padding: 0.5em 1em;
         font-size: 1.75em;
@@ -70,7 +70,7 @@ body > header {
           margin: 0;
           padding-left: 0.5em;
         }
-      }
+     	}
     }
   }
 }
@@ -115,18 +115,6 @@ body > header {
       opacity: 1;
     }
   }
-  @-webkit-keyframes menuOpening {
-    from {
-      -webkit-transform: scaleX(0);
-      transform-origin: left;
-      opacity: 0;
-    }
-    to {
-      -webkit-transform: scaleX(1);
-      transform-origin: left;
-      opacity: 1;
-    }
-  }
 
   body > header {
     flex-direction: column;
@@ -144,7 +132,7 @@ body > header {
     }
   }
 
-  body > header:focus-within #content, .show + #content {
+  body > header:focus-within #content, #content.show {
     position: fixed;
     display: flex;
     flex-direction: column;
@@ -205,133 +193,31 @@ body > header {
 
 /* Only enable label animations on large screens */
 @media screen and (min-width: 600px) {
-  header nav a {
+ 	header nav a {
-    i {
+ 	  i {
-      transition: all 0.2s ease;
+   		transition: all 0.2s ease;
-      margin: 0;
+   		margin: 0;
-    }
+   	}
 
-    .mobile-label {
+   	.mobile-label {
-      transition: all 0.2s ease;
+   		transition: all 0.2s ease;
-      display: block;
+   		display: block;
-      position: absolute;
+   		position: absolute;
-      left: 50%;
+   		left: 50%;
-      transform: translateZ(0);
+   		transform: translate(-50%, 0);
-      opacity: 0;
+   		opacity: 0;
-      font-size: 0.9em;
+   		font-size: 0.9em;
-      white-space: nowrap;
+   		white-space: nowrap;
-    }
+   	}
 
-    img + .mobile-label { display: none; }
+   	img + .mobile-label { display: none; }
 
-    &:hover {
+   	&:hover {
-      i { margin-bottom: 0.75em; }
+   	  i { margin-bottom: 0.75em; }
-      .mobile-label {
+   	  .mobile-label {
-        opacity: 1;
+   	    opacity: 1;
-        transform: translate(-50%, 80%);
+     		transform: translate(-50%, 80%);
-      }
+   		}
     }
-  }
+ 	}
-}
-
-// 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;
-    }
-  }
-  @-webkit-keyframes menuOpening {
-    from {
-      -webkit-transform: scaleX(0);
-      transform-origin: left;
-      opacity: 0;
-    }
-    to {
-      -webkit-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, .show + #content {
-    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; }
-      }
-    }
-  }
 }

build.rs

@@ -1,3 +1,5 @@
+use rsass;
+
 use ructe::Ructe;
 use std::process::{Command, Stdio};
 use std::{ffi::OsStr, fs::*, io::Write, path::*};
@@ -41,20 +43,26 @@ fn main() {
         .expect("compile templates");
 
     compile_themes().expect("Theme compilation error");
-    recursive_copy(&Path::new("assets").join("icons"), Path::new("static"))
+    recursive_copy(&Path::new("assets").join("icons"), &Path::new("static"))
         .expect("Couldn't copy icons");
-    recursive_copy(&Path::new("assets").join("images"), Path::new("static"))
+    recursive_copy(&Path::new("assets").join("images"), &Path::new("static"))
         .expect("Couldn't copy images");
     create_dir_all(&Path::new("static").join("media")).expect("Couldn't init media directory");
 
     let cache_id = &compute_static_hash()[..8];
-    println!("cargo:rerun-if-changed=plume-front/pkg/plume_front_bg.wasm");
+    println!("cargo:rerun-if-changed=target/deploy/plume-front.wasm");
-    copy(
+    copy("target/deploy/plume-front.wasm", "static/plume-front.wasm")
-        "plume-front/pkg/plume_front_bg.wasm",
+        .and_then(|_| read_to_string("target/deploy/plume-front.js"))
-        "static/plume_front_bg.wasm",
+        .and_then(|js| {
-    )
+            write(
-    .and_then(|_| copy("plume-front/pkg/plume_front.js", "static/plume_front.js"))
+                "static/plume-front.js",
-    .ok();
+                js.replace(
+                    "\"plume-front.wasm\"",
+                    &format!("\"/static/cached/{}/plume-front.wasm\"", cache_id),
+                ),
+            )
+        })
+        .ok();
 
     println!("cargo:rustc-env=CACHE_ID={}", cache_id)
 }
@@ -97,12 +105,12 @@ fn compile_theme(path: &Path, out_dir: &Path) -> std::io::Result<()> {
         .components()
         .skip_while(|c| *c != Component::Normal(OsStr::new("themes")))
         .skip(1)
-        .map(|c| {
+        .filter_map(|c| {
             c.as_os_str()
                 .to_str()
                 .unwrap_or_default()
-                .split_once('.')
+                .splitn(2, '.')
-                .map_or(c.as_os_str().to_str().unwrap_or_default(), |x| x.0)
+                .next()
         })
         .collect::<Vec<_>>()
         .join("-");
@@ -120,14 +128,8 @@ fn compile_theme(path: &Path, out_dir: &Path) -> std::io::Result<()> {
     // compile the .scss/.sass file
     let mut out = File::create(out.join("theme.css"))?;
     out.write_all(
-        &rsass::compile_scss_path(
+        &rsass::compile_scss_file(path, rsass::OutputStyle::Compressed)
-            path,
+            .expect("SCSS compilation error"),
-            rsass::output::Format {
-                style: rsass::output::Style::Compressed,
-                ..rsass::output::Format::default()
-            },
-        )
-        .expect("SCSS compilation error"),
     )?;
 
     Ok(())

crowdin.yml

@@ -1,5 +1,5 @@
-"project_id": 352097
+"project_identifier": "plume"
-"api_token_env": "CROWDIN_API_KEY"
+"api_key_env": CROWDIN_API_KEY
 preserve_hierarchy: true
 files:
   - source: /po/plume/plume.pot

migrations/postgres/2021-02-23-153402_medias_index_file_path/down.sql

@@ -1 +0,0 @@
-DROP INDEX medias_index_file_path;

migrations/postgres/2021-02-23-153402_medias_index_file_path/up.sql

@@ -1 +0,0 @@
-CREATE INDEX medias_index_file_path ON medias (file_path);

migrations/postgres/2022-01-04-122156_create_email_signups_table/down.sql

@@ -1 +0,0 @@
-DROP TABLE email_signups;

migrations/postgres/2022-01-04-122156_create_email_signups_table/up.sql

@@ -1,9 +0,0 @@
-CREATE TABLE email_signups (
-  id SERIAL PRIMARY KEY,
-  email VARCHAR NOT NULL,
-  token VARCHAR NOT NULL,
-  expiration_date TIMESTAMP NOT NULL
-);
-
-CREATE INDEX email_signups_token ON email_signups (token);
-CREATE UNIQUE INDEX email_signups_token_requests_email ON email_signups (email);

migrations/sqlite/2021-02-23-153402_medias_index_file_path/down.sql

@@ -1 +0,0 @@
-DROP INDEX medias_index_file_path;

migrations/sqlite/2021-02-23-153402_medias_index_file_path/up.sql

@@ -1 +0,0 @@
-CREATE INDEX medias_index_file_path ON medias (file_path);

migrations/sqlite/2022-01-04-122156_create_email_signups_table/down.sql

@@ -1 +0,0 @@
-DROP TABLE email_signups;

migrations/sqlite/2022-01-04-122156_create_email_signups_table/up.sql

@@ -1,9 +0,0 @@
-CREATE TABLE email_signups (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  email VARCHAR NOT NULL,
-  token VARCHAR NOT NULL,
-  expiration_date TIMESTAMP NOT NULL
-);
-
-CREATE INDEX email_signups_token ON email_signups (token);
-CREATE UNIQUE INDEX email_signups_token_requests_email ON email_signups (email);

plume-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plume-api"
-version = "0.7.1"
+version = "0.4.0"
 authors = ["Plume contributors"]
 edition = "2018"
 

plume-api/release.toml

@@ -1,2 +0,0 @@
-pre-release-hook = ["cargo", "fmt"]
-pre-release-replacements = []

plume-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plume-cli"
-version = "0.7.1"
+version = "0.4.0"
 authors = ["Plume contributors"]
 edition = "2018"
 
@@ -10,12 +10,12 @@ path = "src/main.rs"
 
 [dependencies]
 clap = "2.33"
-dotenv = "0.15"
+dotenv = "0.14"
-rpassword = "5.0.0"
+rpassword = "4.0"
 
 [dependencies.diesel]
 features = ["r2d2", "chrono"]
-version = "1.4.5"
+version = "*"
 
 [dependencies.plume-models]
 path = "../plume-models"

plume-cli/release.toml

@@ -1,2 +0,0 @@
-pre-release-hook = ["cargo", "fmt"]
-pre-release-replacements = []

plume-cli/src/instance.rs

@@ -68,6 +68,4 @@ fn new<'a>(args: &ArgMatches<'a>, conn: &Connection) {
         },
     )
     .expect("Couldn't save instance");
-    Instance::cache_local(conn);
-    Instance::create_local_instance_user(conn).expect("Couldn't save local instance user");
 }

plume-cli/src/main.rs

@@ -1,3 +1,5 @@
+use dotenv;
+
 use clap::App;
 use diesel::Connection;
 use plume_models::{instance::Instance, Connection as Conn, CONFIG};
@@ -25,7 +27,7 @@ fn main() {
         e => e.map(|_| ()).unwrap(),
     }
     let conn = Conn::establish(CONFIG.database_url.as_str());
-    let _ = conn.as_ref().map(Instance::cache_local);
+    let _ = conn.as_ref().map(|conn| Instance::cache_local(conn));
 
     match matches.subcommand() {
         ("instance", Some(args)) => {

plume-cli/src/search.rs

@@ -106,7 +106,7 @@ fn refill<'a>(args: &ArgMatches<'a>, conn: &Connection, searcher: Option<Searche
     searcher.commit();
 }
 
-fn unlock(args: &ArgMatches) {
+fn unlock<'a>(args: &ArgMatches<'a>) {
     let path = match args.value_of("path") {
         None => Path::new(&CONFIG.search_index),
         Some(x) => Path::new(x),

plume-cli/src/users.rs

@@ -1,6 +1,7 @@
 use clap::{App, Arg, ArgMatches, SubCommand};
 
 use plume_models::{instance::Instance, users::*, Connection};
+use rpassword;
 use std::io::{self, Write};
 
 pub fn command<'a, 'b>() -> App<'a, 'b> {
@@ -131,7 +132,7 @@ fn new<'a>(args: &ArgMatches<'a>, conn: &Connection) {
         role,
         &bio,
         email,
-        Some(User::hash_pass(&password).expect("Couldn't hash password")),
+        User::hash_pass(&password).expect("Couldn't hash password"),
     )
     .expect("Couldn't save new user");
 }

plume-common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plume-common"
-version = "0.7.1"
+version = "0.4.0"
 authors = ["Plume contributors"]
 edition = "2018"
 
@@ -9,21 +9,20 @@ activitypub = "0.1.1"
 activitystreams-derive = "0.1.1"
 activitystreams-traits = "0.1.0"
 array_tool = "1.0"
-base64 = "0.13"
+base64 = "0.10"
-heck = "0.4.0"
+heck = "0.3.0"
-hex = "0.4"
+hex = "0.3"
+hyper = "0.12.33"
 openssl = "0.10.22"
-rocket = "0.4.6"
+rocket = "0.4.0"
-reqwest = { version = "0.9", features = ["socks"] }
+reqwest = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
-serde_json = "1.0.70"
+serde_json = "1.0"
-shrinkwraprs = "0.3.0"
+shrinkwraprs = "0.2.1"
-syntect = "4.5.0"
+syntect = "3.3"
 tokio = "0.1.22"
 regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }
-tracing = "0.1.22"
-askama_escape = "0.10.2"
 
 [dependencies.chrono]
 features = ["serde"]
@@ -31,10 +30,4 @@ version = "0.4"
 
 [dependencies.pulldown-cmark]
 default-features = false
-git = "https://git.joinplu.me/Plume/pulldown-cmark"
+version = "0.2.0"
-branch = "bidi-plume"
-
-[dev-dependencies]
-once_cell = "1.5.2"
-
-[features]

plume-common/release.toml

@@ -1,2 +0,0 @@
-pre-release-hook = ["cargo", "fmt"]
-pre-release-replacements = []

plume-common/src/activity_pub/inbox.rs

@@ -1,8 +1,6 @@
-use reqwest;
+use reqwest::header::{HeaderValue, ACCEPT};
 use std::fmt::Debug;
 
-use super::{request, sign::Signer};
-
 /// Represents an ActivityPub inbox.
 ///
 /// It routes an incoming Activity through the registered handlers.
@@ -12,50 +10,7 @@ use super::{request, sign::Signer};
 /// ```rust
 /// # extern crate activitypub;
 /// # use activitypub::{actor::Person, activity::{Announce, Create}, object::Note};
-/// # use openssl::{hash::MessageDigest, pkey::PKey, rsa::Rsa};
-/// # use once_cell::sync::Lazy;
 /// # use plume_common::activity_pub::inbox::*;
-/// # use plume_common::activity_pub::sign::{gen_keypair, Error as SignError, Result as SignResult, Signer};
-/// #
-/// # static MY_SIGNER: Lazy<MySigner> = Lazy::new(|| MySigner::new());
-/// #
-/// # struct MySigner {
-/// #     public_key: String,
-/// #     private_key: String,
-/// # }
-/// #
-/// # impl MySigner {
-/// #     fn new() -> Self {
-/// #         let (pub_key, priv_key) = gen_keypair();
-/// #         Self {
-/// #             public_key: String::from_utf8(pub_key).unwrap(),
-/// #             private_key: String::from_utf8(priv_key).unwrap(),
-/// #         }
-/// #     }
-/// # }
-/// #
-/// # impl Signer for MySigner {
-/// #     fn get_key_id(&self) -> String {
-/// #         "mysigner".into()
-/// #     }
-/// #
-/// #     fn sign(&self, to_sign: &str) -> SignResult<Vec<u8>> {
-/// #         let key = PKey::from_rsa(Rsa::private_key_from_pem(self.private_key.as_ref()).unwrap())
-/// #             .unwrap();
-/// #         let mut signer = openssl::sign::Signer::new(MessageDigest::sha256(), &key).unwrap();
-/// #         signer.update(to_sign.as_bytes()).unwrap();
-/// #         signer.sign_to_vec().map_err(|_| SignError())
-/// #     }
-/// #
-/// #     fn verify(&self, data: &str, signature: &[u8]) -> SignResult<bool> {
-/// #         let key = PKey::from_rsa(Rsa::public_key_from_pem(self.public_key.as_ref()).unwrap())
-/// #             .unwrap();
-/// #         let mut verifier = openssl::sign::Verifier::new(MessageDigest::sha256(), &key).unwrap();
-/// #         verifier.update(data.as_bytes()).unwrap();
-/// #         verifier.verify(&signature).map_err(|_| SignError())
-/// #     }
-/// # }
-/// #
 /// # struct User;
 /// # impl FromId<()> for User {
 /// #     type Error = ();
@@ -68,10 +23,6 @@ use super::{request, sign::Signer};
 /// #     fn from_activity(_: &(), obj: Person) -> Result<Self, Self::Error> {
 /// #         Ok(User)
 /// #     }
-/// #
-/// #     fn get_sender() -> &'static dyn Signer {
-/// #         &*MY_SIGNER
-/// #     }
 /// # }
 /// # impl AsActor<&()> for User {
 /// #    fn get_inbox_url(&self) -> String {
@@ -91,10 +42,6 @@ use super::{request, sign::Signer};
 /// #     fn from_activity(_: &(), obj: Note) -> Result<Self, Self::Error> {
 /// #         Ok(Message)
 /// #     }
-/// #
-/// #     fn get_sender() -> &'static dyn Signer {
-/// #         &*MY_SIGNER
-/// #     }
 /// # }
 /// # impl AsObject<User, Create, &()> for Message {
 /// #     type Error = ();
@@ -124,8 +71,8 @@ use super::{request, sign::Signer};
 /// # let conn = ();
 /// #
 /// let result: Result<(), ()> = Inbox::handle(&conn, activity_json)
-///    .with::<User, Announce, Message>(None)
+///    .with::<User, Announce, Message>()
-///    .with::<User, Create,   Message>(None)
+///    .with::<User, Create,   Message>()
 ///    .done();
 /// ```
 pub enum Inbox<'a, C, E, R>
@@ -197,7 +144,7 @@ where
     }
 
     /// Registers an handler on this Inbox.
-    pub fn with<A, V, M>(self, proxy: Option<&reqwest::Proxy>) -> Inbox<'a, C, E, R>
+    pub fn with<A, V, M>(self) -> Inbox<'a, C, E, R>
     where
         A: AsActor<&'a C> + FromId<C, Error = E>,
         V: activitypub::Activity,
@@ -217,17 +164,11 @@ where
                     Some(x) => x,
                     None => return Inbox::NotHandled(ctx, act, InboxError::InvalidActor(None)),
                 };
-
-                if Self::is_spoofed_activity(&actor_id, &act) {
-                    return Inbox::NotHandled(ctx, act, InboxError::InvalidObject(None));
-                }
-
                 // Transform this actor to a model (see FromId for details about the from_id function)
                 let actor = match A::from_id(
                     ctx,
                     &actor_id,
                     serde_json::from_value(act["actor"].clone()).ok(),
-                    proxy,
                 ) {
                     Ok(a) => a,
                     // If the actor was not found, go to the next handler
@@ -248,7 +189,6 @@ where
                     ctx,
                     &obj_id,
                     serde_json::from_value(act["object"].clone()).ok(),
-                    proxy,
                 ) {
                     Ok(o) => o,
                     Err((json, e)) => {
@@ -260,7 +200,7 @@ where
                 };
 
                 // Handle the activity
-                match obj.activity(ctx, actor, act_id) {
+                match obj.activity(ctx, actor, &act_id) {
                     Ok(res) => Inbox::Handled(res.into()),
                     Err(e) => Inbox::Failed(e),
                 }
@@ -282,26 +222,6 @@ where
             Inbox::Failed(err) => Err(err),
         }
     }
-
-    fn is_spoofed_activity(actor_id: &str, act: &serde_json::Value) -> bool {
-        use serde_json::Value::{Array, Object, String};
-
-        let attributed_to = act["object"].get("attributedTo");
-        if attributed_to.is_none() {
-            return false;
-        }
-        let attributed_to = attributed_to.unwrap();
-        match attributed_to {
-            Array(v) => v.iter().all(|i| match i {
-                String(s) => s != actor_id,
-                Object(obj) => obj.get("id").map_or(true, |s| s != actor_id),
-                _ => false,
-            }),
-            String(s) => s != actor_id,
-            Object(obj) => obj.get("id").map_or(true, |s| s != actor_id),
-            _ => false,
-        }
-    }
 }
 
 /// Get the ActivityPub ID of a JSON value.
@@ -347,24 +267,34 @@ pub trait FromId<C>: Sized {
         ctx: &C,
         id: &str,
         object: Option<Self::Object>,
-        proxy: Option<&reqwest::Proxy>,
     ) -> Result<Self, (Option<serde_json::Value>, Self::Error)> {
         match Self::from_db(ctx, id) {
             Ok(x) => Ok(x),
             _ => match object {
                 Some(o) => Self::from_activity(ctx, o).map_err(|e| (None, e)),
-                None => Self::from_activity(ctx, Self::deref(id, proxy.cloned())?)
+                None => Self::from_activity(ctx, Self::deref(id)?).map_err(|e| (None, e)),
-                    .map_err(|e| (None, e)),
             },
         }
     }
 
     /// Dereferences an ID
-    fn deref(
+    fn deref(id: &str) -> Result<Self::Object, (Option<serde_json::Value>, Self::Error)> {
-        id: &str,
+        reqwest::ClientBuilder::new()
-        proxy: Option<reqwest::Proxy>,
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
-    ) -> Result<Self::Object, (Option<serde_json::Value>, Self::Error)> {
+            .build()
-        request::get(id, Self::get_sender(), proxy)
+            .map_err(|_| (None, InboxError::DerefError.into()))?
+            .get(id)
+            .header(
+                ACCEPT,
+                HeaderValue::from_str(
+                    &super::ap_accept_header()
+                        .into_iter()
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                )
+                .map_err(|_| (None, InboxError::DerefError.into()))?,
+            )
+            .send()
             .map_err(|_| (None, InboxError::DerefError))
             .and_then(|mut r| {
                 let json: serde_json::Value = r
@@ -381,8 +311,6 @@ pub trait FromId<C>: Sized {
 
     /// Tries to find a `Self` with a given ID (`id`), using `ctx` (a database)
     fn from_db(ctx: &C, id: &str) -> Result<Self, Self::Error>;
-
-    fn get_sender() -> &'static dyn Signer;
 }
 
 /// Should be implemented by anything representing an ActivityPub actor.
@@ -421,49 +349,6 @@ pub trait AsActor<C> {
 /// # extern crate activitypub;
 /// # use activitypub::{activity::Create, actor::Person, object::Note};
 /// # use plume_common::activity_pub::inbox::{AsActor, AsObject, FromId};
-/// # use plume_common::activity_pub::sign::{gen_keypair, Error as SignError, Result as SignResult, Signer};
-/// # use openssl::{hash::MessageDigest, pkey::PKey, rsa::Rsa};
-/// # use once_cell::sync::Lazy;
-/// #
-/// # static MY_SIGNER: Lazy<MySigner> = Lazy::new(|| MySigner::new());
-/// #
-/// # struct MySigner {
-/// #     public_key: String,
-/// #     private_key: String,
-/// # }
-/// #
-/// # impl MySigner {
-/// #     fn new() -> Self {
-/// #         let (pub_key, priv_key) = gen_keypair();
-/// #         Self {
-/// #             public_key: String::from_utf8(pub_key).unwrap(),
-/// #             private_key: String::from_utf8(priv_key).unwrap(),
-/// #         }
-/// #     }
-/// # }
-/// #
-/// # impl Signer for MySigner {
-/// #     fn get_key_id(&self) -> String {
-/// #         "mysigner".into()
-/// #     }
-/// #
-/// #     fn sign(&self, to_sign: &str) -> SignResult<Vec<u8>> {
-/// #         let key = PKey::from_rsa(Rsa::private_key_from_pem(self.private_key.as_ref()).unwrap())
-/// #             .unwrap();
-/// #         let mut signer = openssl::sign::Signer::new(MessageDigest::sha256(), &key).unwrap();
-/// #         signer.update(to_sign.as_bytes()).unwrap();
-/// #         signer.sign_to_vec().map_err(|_| SignError())
-/// #     }
-/// #
-/// #     fn verify(&self, data: &str, signature: &[u8]) -> SignResult<bool> {
-/// #         let key = PKey::from_rsa(Rsa::public_key_from_pem(self.public_key.as_ref()).unwrap())
-/// #             .unwrap();
-/// #         let mut verifier = openssl::sign::Verifier::new(MessageDigest::sha256(), &key).unwrap();
-/// #         verifier.update(data.as_bytes()).unwrap();
-/// #         verifier.verify(&signature).map_err(|_| SignError())
-/// #     }
-/// # }
-/// #
 /// # struct Account;
 /// # impl FromId<()> for Account {
 /// #     type Error = ();
@@ -476,10 +361,6 @@ pub trait AsActor<C> {
 /// #     fn from_activity(_: &(), obj: Person) -> Result<Self, Self::Error> {
 /// #         Ok(Account)
 /// #     }
-/// #
-/// #     fn get_sender() -> &'static dyn Signer {
-/// #         &*MY_SIGNER
-/// #     }
 /// # }
 /// # impl AsActor<()> for Account {
 /// #    fn get_inbox_url(&self) -> String {
@@ -503,10 +384,6 @@ pub trait AsActor<C> {
 ///     fn from_activity(_: &(), obj: Note) -> Result<Self, Self::Error> {
 ///         Ok(Message { text: obj.object_props.content_string().map_err(|_| ())? })
 ///     }
-///
-///     fn get_sender() -> &'static dyn Signer {
-///         &*MY_SIGNER
-///     }
 /// }
 ///
 /// impl AsObject<Account, Create, ()> for Message {
@@ -546,51 +423,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::activity_pub::sign::{
-        gen_keypair, Error as SignError, Result as SignResult, Signer,
-    };
     use activitypub::{activity::*, actor::Person, object::Note};
-    use once_cell::sync::Lazy;
-    use openssl::{hash::MessageDigest, pkey::PKey, rsa::Rsa};
-
-    static MY_SIGNER: Lazy<MySigner> = Lazy::new(|| MySigner::new());
-
-    struct MySigner {
-        public_key: String,
-        private_key: String,
-    }
-
-    impl MySigner {
-        fn new() -> Self {
-            let (pub_key, priv_key) = gen_keypair();
-            Self {
-                public_key: String::from_utf8(pub_key).unwrap(),
-                private_key: String::from_utf8(priv_key).unwrap(),
-            }
-        }
-    }
-
-    impl Signer for MySigner {
-        fn get_key_id(&self) -> String {
-            "mysigner".into()
-        }
-
-        fn sign(&self, to_sign: &str) -> SignResult<Vec<u8>> {
-            let key = PKey::from_rsa(Rsa::private_key_from_pem(self.private_key.as_ref()).unwrap())
-                .unwrap();
-            let mut signer = openssl::sign::Signer::new(MessageDigest::sha256(), &key).unwrap();
-            signer.update(to_sign.as_bytes()).unwrap();
-            signer.sign_to_vec().map_err(|_| SignError())
-        }
-
-        fn verify(&self, data: &str, signature: &[u8]) -> SignResult<bool> {
-            let key = PKey::from_rsa(Rsa::public_key_from_pem(self.public_key.as_ref()).unwrap())
-                .unwrap();
-            let mut verifier = openssl::sign::Verifier::new(MessageDigest::sha256(), &key).unwrap();
-            verifier.update(data.as_bytes()).unwrap();
-            verifier.verify(&signature).map_err(|_| SignError())
-        }
-    }
 
     struct MyActor;
     impl FromId<()> for MyActor {
@@ -604,10 +437,6 @@ mod tests {
         fn from_activity(_: &(), _obj: Person) -> Result<Self, Self::Error> {
             Ok(MyActor)
         }
-
-        fn get_sender() -> &'static dyn Signer {
-            &*MY_SIGNER
-        }
     }
 
     impl AsActor<&()> for MyActor {
@@ -632,10 +461,6 @@ mod tests {
         fn from_activity(_: &(), _obj: Note) -> Result<Self, Self::Error> {
             Ok(MyObject)
         }
-
-        fn get_sender() -> &'static dyn Signer {
-            &*MY_SIGNER
-        }
     }
     impl AsObject<MyActor, Create, &()> for MyObject {
         type Error = ();
@@ -700,7 +525,7 @@ mod tests {
     fn test_inbox_basic() {
         let act = serde_json::to_value(build_create()).unwrap();
         let res: Result<(), ()> = Inbox::handle(&(), act)
-            .with::<MyActor, Create, MyObject>(None)
+            .with::<MyActor, Create, MyObject>()
             .done();
         assert!(res.is_ok());
     }
@@ -709,10 +534,10 @@ mod tests {
     fn test_inbox_multi_handlers() {
         let act = serde_json::to_value(build_create()).unwrap();
         let res: Result<(), ()> = Inbox::handle(&(), act)
-            .with::<MyActor, Announce, MyObject>(None)
+            .with::<MyActor, Announce, MyObject>()
-            .with::<MyActor, Delete, MyObject>(None)
+            .with::<MyActor, Delete, MyObject>()
-            .with::<MyActor, Create, MyObject>(None)
+            .with::<MyActor, Create, MyObject>()
-            .with::<MyActor, Like, MyObject>(None)
+            .with::<MyActor, Like, MyObject>()
             .done();
         assert!(res.is_ok());
     }
@@ -722,8 +547,8 @@ mod tests {
         let act = serde_json::to_value(build_create()).unwrap();
         // Create is not handled by this inbox
         let res: Result<(), ()> = Inbox::handle(&(), act)
-            .with::<MyActor, Announce, MyObject>(None)
+            .with::<MyActor, Announce, MyObject>()
-            .with::<MyActor, Like, MyObject>(None)
+            .with::<MyActor, Like, MyObject>()
             .done();
         assert!(res.is_err());
     }
@@ -740,10 +565,6 @@ mod tests {
         fn from_activity(_: &(), _obj: Person) -> Result<Self, Self::Error> {
             Err(())
         }
-
-        fn get_sender() -> &'static dyn Signer {
-            &*MY_SIGNER
-        }
     }
     impl AsActor<&()> for FailingActor {
         fn get_inbox_url(&self) -> String {
@@ -775,13 +596,13 @@ mod tests {
         let act = serde_json::to_value(build_create()).unwrap();
 
         let res: Result<(), ()> = Inbox::handle(&(), act.clone())
-            .with::<FailingActor, Create, MyObject>(None)
+            .with::<FailingActor, Create, MyObject>()
             .done();
         assert!(res.is_err());
 
         let res: Result<(), ()> = Inbox::handle(&(), act.clone())
-            .with::<FailingActor, Create, MyObject>(None)
+            .with::<FailingActor, Create, MyObject>()
-            .with::<MyActor, Create, MyObject>(None)
+            .with::<MyActor, Create, MyObject>()
             .done();
         assert!(res.is_ok());
     }

plume-common/src/activity_pub/mod.rs

@@ -1,14 +1,14 @@
 use activitypub::{Activity, Link, Object};
 use array_tool::vec::Uniq;
-use reqwest::{header::HeaderValue, r#async::ClientBuilder, Url};
+use reqwest::r#async::ClientBuilder;
 use rocket::{
     http::Status,
     request::{FromRequest, Request},
     response::{Responder, Response},
     Outcome,
 };
+use serde_json;
 use tokio::prelude::*;
-use tracing::{debug, warn};
 
 use self::sign::Signable;
 
@@ -108,7 +108,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for ApRequest {
             .unwrap_or(Outcome::Forward(()))
     }
 }
-pub fn broadcast<S, A, T, C>(sender: &S, act: A, to: Vec<T>, proxy: Option<reqwest::Proxy>)
+pub fn broadcast<S, A, T, C>(sender: &S, act: A, to: Vec<T>)
 where
     S: sign::Signer,
     A: Activity,
@@ -132,54 +132,31 @@ where
 
     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))
+        .build()
+        .expect("Can't build client");
     for inbox in boxes {
         let body = signed.to_string();
         let mut headers = request::headers();
-        let url = Url::parse(&inbox);
-        if url.is_err() {
-            warn!("Inbox is invalid URL: {:?}", &inbox);
-            continue;
-        }
-        let url = url.unwrap();
-        if !url.has_host() {
-            warn!("Inbox doesn't have host: {:?}", &inbox);
-            continue;
-        };
-        let host_header_value = HeaderValue::from_str(url.host_str().expect("Unreachable"));
-        if host_header_value.is_err() {
-            warn!("Header value is invalid: {:?}", url.host_str());
-            continue;
-        }
-        headers.insert("Host", host_header_value.unwrap());
         headers.insert("Digest", request::Digest::digest(&body));
         rt.spawn(
-            if let Some(proxy) = proxy.clone() {
+            client
-                ClientBuilder::new().proxy(proxy)
+                .post(&inbox)
-            } else {
+                .headers(headers.clone())
-                ClientBuilder::new()
+                .header(
-            }
+                    "Signature",
-            .connect_timeout(std::time::Duration::from_secs(5))
+                    request::signature(sender, &headers)
-            .build()
+                        .expect("activity_pub::broadcast: request signature error"),
-            .expect("Can't build client")
+                )
-            .post(&inbox)
+                .body(body)
-            .headers(headers.clone())
+                .send()
-            .header(
+                .and_then(|r| r.into_body().concat2())
-                "Signature",
+                .map(move |response| {
-                request::signature(sender, &headers, ("post", url.path(), url.query()))
+                    println!("Successfully sent activity to inbox ({})", inbox);
-                    .expect("activity_pub::broadcast: request signature error"),
+                    println!("Response: \"{:?}\"\n", response)
-            )
+                })
-            .body(body)
+                .map_err(|e| println!("Error while sending to inbox ({:?})", e)),
-            .send()
-            .and_then(move |r| {
-                if r.status().is_success() {
-                    debug!("Successfully sent activity to inbox ({})", &inbox);
-                } else {
-                    warn!("Error while sending to inbox ({:?})", &r)
-                }
-                r.into_body().concat2()
-            })
-            .map(move |response| debug!("Response: \"{:?}\"\n", response))
-            .map_err(|e| warn!("Error while sending to inbox ({:?})", e)),
         );
     }
     rt.run().unwrap();

plume-common/src/activity_pub/request.rs

@@ -1,41 +1,15 @@
+use base64;
 use chrono::{offset::Utc, DateTime};
 use openssl::hash::{Hasher, MessageDigest};
-use reqwest::{
+use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, DATE, USER_AGENT};
-    header::{
-        HeaderMap, HeaderValue, InvalidHeaderValue, ACCEPT, CONTENT_TYPE, DATE, HOST, USER_AGENT,
-    },
-    ClientBuilder, Proxy, Response, Url, UrlError,
-};
 use std::ops::Deref;
 use std::time::SystemTime;
-use tracing::warn;
 
 use crate::activity_pub::sign::Signer;
 use crate::activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
 
 const PLUME_USER_AGENT: &str = concat!("Plume/", env!("CARGO_PKG_VERSION"));
 
-#[derive(Debug)]
-pub struct Error();
-
-impl From<UrlError> for Error {
-    fn from(_err: UrlError) -> Self {
-        Error()
-    }
-}
-
-impl From<InvalidHeaderValue> for Error {
-    fn from(_err: InvalidHeaderValue) -> Self {
-        Error()
-    }
-}
-
-impl From<reqwest::Error> for Error {
-    fn from(_err: reqwest::Error) -> Self {
-        Error()
-    }
-}
-
 pub struct Digest(String);
 
 impl Digest {
@@ -88,16 +62,16 @@ impl Digest {
         base64::decode(&self.0[pos..]).expect("Digest::value: invalid encoding error")
     }
 
-    pub fn from_header(dig: &str) -> Result<Self, Error> {
+    pub fn from_header(dig: &str) -> Result<Self, ()> {
         if let Some(pos) = dig.find('=') {
             let pos = pos + 1;
             if base64::decode(&dig[pos..]).is_ok() {
                 Ok(Digest(dig.to_owned()))
             } else {
-                Err(Error())
+                Err(())
             }
         } else {
-            Err(Error())
+            Err(())
         }
     }
 
@@ -136,47 +110,27 @@ pub fn headers() -> HeaderMap {
     headers
 }
 
-type Method<'a> = &'a str;
+pub fn signature<S: Signer>(signer: &S, headers: &HeaderMap) -> Result<HeaderValue, ()> {
-type Path<'a> = &'a str;
+    let signed_string = headers
-type Query<'a> = &'a str;
-type RequestTarget<'a> = (Method<'a>, Path<'a>, Option<Query<'a>>);
-
-pub fn signature(
-    signer: &dyn Signer,
-    headers: &HeaderMap,
-    request_target: RequestTarget,
-) -> Result<HeaderValue, Error> {
-    let (method, path, query) = request_target;
-    let origin_form = if let Some(query) = query {
-        format!("{}?{}", path, query)
-    } else {
-        path.to_string()
-    };
-
-    let mut headers_vec = Vec::with_capacity(headers.len());
-    for (h, v) in headers.iter() {
-        let v = v.to_str();
-        if v.is_err() {
-            warn!("invalid header error: {:?}", v.unwrap_err());
-            return Err(Error());
-        }
-        headers_vec.push((h.as_str().to_lowercase(), v.expect("Unreachable")));
-    }
-    let request_target = format!("{} {}", method.to_lowercase(), origin_form);
-    headers_vec.push(("(request-target)".to_string(), &request_target));
-
-    let signed_string = headers_vec
         .iter()
-        .map(|(h, v)| format!("{}: {}", h, v))
+        .map(|(h, v)| {
+            format!(
+                "{}: {}",
+                h.as_str().to_lowercase(),
+                v.to_str()
+                    .expect("request::signature: invalid header error")
+            )
+        })
         .collect::<Vec<String>>()
         .join("\n");
-    let signed_headers = headers_vec
+    let signed_headers = headers
         .iter()
-        .map(|(h, _)| h.as_ref())
+        .map(|(h, _)| h.as_str())
         .collect::<Vec<&str>>()
-        .join(" ");
+        .join(" ")
+        .to_lowercase();
 
-    let data = signer.sign(&signed_string).map_err(|_| Error())?;
+    let data = signer.sign(&signed_string).map_err(|_| ())?;
     let sign = base64::encode(&data);
 
     HeaderValue::from_str(&format!(
@@ -184,86 +138,5 @@ pub fn signature(
         key_id = signer.get_key_id(),
         signed_headers = signed_headers,
         signature = sign
-    )).map_err(|_| Error())
+    )).map_err(|_| ())
-}
-
-pub fn get(url_str: &str, sender: &dyn Signer, proxy: Option<Proxy>) -> Result<Response, Error> {
-    let mut headers = headers();
-    let url = Url::parse(url_str)?;
-    if !url.has_host() {
-        return Err(Error());
-    }
-    let host_header_value = HeaderValue::from_str(url.host_str().expect("Unreachable"))?;
-    headers.insert(HOST, host_header_value);
-    if let Some(proxy) = proxy {
-        ClientBuilder::new().proxy(proxy)
-    } else {
-        ClientBuilder::new()
-    }
-    .connect_timeout(Some(std::time::Duration::from_secs(5)))
-    .build()?
-    .get(url_str)
-    .headers(headers.clone())
-    .header(
-        "Signature",
-        signature(sender, &headers, ("get", url.path(), url.query()))?,
-    )
-    .send()
-    .map_err(|_| Error())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::signature;
-    use crate::activity_pub::sign::{gen_keypair, Error, Result, Signer};
-    use openssl::{hash::MessageDigest, pkey::PKey, rsa::Rsa};
-    use reqwest::header::HeaderMap;
-
-    struct MySigner {
-        public_key: String,
-        private_key: String,
-    }
-
-    impl MySigner {
-        fn new() -> Self {
-            let (pub_key, priv_key) = gen_keypair();
-            Self {
-                public_key: String::from_utf8(pub_key).unwrap(),
-                private_key: String::from_utf8(priv_key).unwrap(),
-            }
-        }
-    }
-
-    impl Signer for MySigner {
-        fn get_key_id(&self) -> String {
-            "mysigner".into()
-        }
-
-        fn sign(&self, to_sign: &str) -> Result<Vec<u8>> {
-            let key = PKey::from_rsa(Rsa::private_key_from_pem(self.private_key.as_ref()).unwrap())
-                .unwrap();
-            let mut signer = openssl::sign::Signer::new(MessageDigest::sha256(), &key).unwrap();
-            signer.update(to_sign.as_bytes()).unwrap();
-            signer.sign_to_vec().map_err(|_| Error())
-        }
-
-        fn verify(&self, data: &str, signature: &[u8]) -> Result<bool> {
-            let key = PKey::from_rsa(Rsa::public_key_from_pem(self.public_key.as_ref()).unwrap())
-                .unwrap();
-            let mut verifier = openssl::sign::Verifier::new(MessageDigest::sha256(), &key).unwrap();
-            verifier.update(data.as_bytes()).unwrap();
-            verifier.verify(&signature).map_err(|_| Error())
-        }
-    }
-
-    #[test]
-    fn test_signature_request_target() {
-        let signer = MySigner::new();
-        let headers = HeaderMap::new();
-        let result = signature(&signer, &headers, ("post", "/inbox", None)).unwrap();
-        let fields: Vec<&str> = result.to_str().unwrap().split(",").collect();
-        assert_eq!(r#"headers="(request-target)""#, fields[2]);
-        let sign = &fields[3][11..(fields[3].len() - 1)];
-        assert!(signer.verify("post /inbox", sign.as_bytes()).is_ok());
-    }
 }

plume-common/src/activity_pub/sign.rs

@@ -1,7 +1,10 @@
 use super::request;
+use base64;
 use chrono::{naive::NaiveDateTime, DateTime, Duration, Utc};
+use hex;
 use openssl::{pkey::PKey, rsa::Rsa, sha::sha256};
 use rocket::http::HeaderMap;
+use serde_json;
 
 /// Returns (public key, private key)
 pub fn gen_keypair() -> (Vec<u8>, Vec<u8>) {
@@ -17,27 +20,19 @@ pub fn gen_keypair() -> (Vec<u8>, Vec<u8>) {
     )
 }
 
-#[derive(Debug)]
-pub struct Error();
-pub type Result<T> = std::result::Result<T, Error>;
-
-impl From<openssl::error::ErrorStack> for Error {
-    fn from(_: openssl::error::ErrorStack) -> Self {
-        Self()
-    }
-}
-
 pub trait Signer {
+    type Error;
+
     fn get_key_id(&self) -> String;
 
     /// Sign some data with the signer keypair
-    fn sign(&self, to_sign: &str) -> Result<Vec<u8>>;
+    fn sign(&self, to_sign: &str) -> Result<Vec<u8>, Self::Error>;
     /// Verify if the signature is valid
-    fn verify(&self, data: &str, signature: &[u8]) -> Result<bool>;
+    fn verify(&self, data: &str, signature: &[u8]) -> Result<bool, Self::Error>;
 }
 
 pub trait Signable {
-    fn sign<T>(&mut self, creator: &T) -> Result<&mut Self>
+    fn sign<T>(&mut self, creator: &T) -> Result<&mut Self, ()>
     where
         T: Signer;
     fn verify<T>(self, creator: &T) -> bool
@@ -51,7 +46,7 @@ pub trait Signable {
 }
 
 impl Signable for serde_json::Value {
-    fn sign<T: Signer>(&mut self, creator: &T) -> Result<&mut serde_json::Value> {
+    fn sign<T: Signer>(&mut self, creator: &T) -> Result<&mut serde_json::Value, ()> {
         let creation_date = Utc::now().to_rfc3339();
         let mut options = json!({
             "type": "RsaSignature2017",
@@ -69,7 +64,7 @@ impl Signable for serde_json::Value {
         let document_hash = Self::hash(&self.to_string());
         let to_be_signed = options_hash + &document_hash;
 
-        let signature = base64::encode(&creator.sign(&to_be_signed).map_err(|_| Error())?);
+        let signature = base64::encode(&creator.sign(&to_be_signed).map_err(|_| ())?);
 
         options["signatureValue"] = serde_json::Value::String(signature);
         self["signature"] = options;
@@ -187,7 +182,7 @@ pub fn verify_http_headers<S: Signer + ::std::fmt::Debug>(
     }
     let digest = all_headers.get_one("digest").unwrap_or("");
     let digest = request::Digest::from_header(digest);
-    if !digest.map(|d| d.verify_header(data)).unwrap_or(false) {
+    if !digest.map(|d| d.verify_header(&data)).unwrap_or(false) {
         // signature was valid, but body content does not match its digest
         return SignatureValidity::Invalid;
     }

plume-common/src/lib.rs

@@ -2,6 +2,9 @@
 
 #[macro_use]
 extern crate activitystreams_derive;
+use activitystreams_traits;
+
+use serde;
 #[macro_use]
 extern crate shrinkwraprs;
 #[macro_use]

plume-common/src/utils.rs

@@ -1,10 +1,14 @@
-use heck::ToUpperCamelCase;
+use heck::CamelCase;
 use openssl::rand::rand_bytes;
-use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, LinkType, Options, Parser, Tag};
+use pulldown_cmark::{html, Event, Options, Parser, Tag};
 use regex_syntax::is_word_character;
-use rocket::http::uri::Uri;
+use rocket::{
+    http::uri::Uri,
+    response::{Flash, Redirect},
+};
+use std::borrow::Cow;
 use std::collections::HashSet;
-use syntect::html::{ClassStyle, ClassedHTMLGenerator};
+use syntect::html::ClassedHTMLGenerator;
 use syntect::parsing::SyntaxSet;
 
 /// Generates an hexadecimal representation of 32 bytes of random data
@@ -18,63 +22,23 @@ pub fn random_hex() -> String {
 
 /// Remove non alphanumeric characters and CamelCase a string
 pub fn make_actor_id(name: &str) -> String {
-    name.to_upper_camel_case()
+    name.to_camel_case()
         .chars()
         .filter(|c| c.is_alphanumeric())
         .collect()
 }
 
 /**
- * Percent-encode characters which are not allowed in IRI path segments.
+* Redirects to the login page with a given message.
- *
+*
- * Intended to be used for generating Post ap_url.
+* Note that the message should be translated before passed to this function.
- */
+*/
-pub fn iri_percent_encode_seg(segment: &str) -> String {
+pub fn requires_login<T: Into<Uri<'static>>>(message: &str, url: T) -> Flash<Redirect> {
-    segment.chars().map(iri_percent_encode_seg_char).collect()
+    Flash::new(
-}
+        Redirect::to(format!("/login?m={}", Uri::percent_encode(message))),
-
+        "callback",
-pub fn iri_percent_encode_seg_char(c: char) -> String {
+        url.into().to_string(),
-    if c.is_alphanumeric() {
+    )
-        c.to_string()
-    } else {
-        match c {
-            '-'
-            | '.'
-            | '_'
-            | '~'
-            | '\u{A0}'..='\u{D7FF}'
-            | '\u{20000}'..='\u{2FFFD}'
-            | '\u{30000}'..='\u{3FFFD}'
-            | '\u{40000}'..='\u{4FFFD}'
-            | '\u{50000}'..='\u{5FFFD}'
-            | '\u{60000}'..='\u{6FFFD}'
-            | '\u{70000}'..='\u{7FFFD}'
-            | '\u{80000}'..='\u{8FFFD}'
-            | '\u{90000}'..='\u{9FFFD}'
-            | '\u{A0000}'..='\u{AFFFD}'
-            | '\u{B0000}'..='\u{BFFFD}'
-            | '\u{C0000}'..='\u{CFFFD}'
-            | '\u{D0000}'..='\u{DFFFD}'
-            | '\u{E0000}'..='\u{EFFFD}'
-            | '!'
-            | '$'
-            | '&'
-            | '\''
-            | '('
-            | ')'
-            | '*'
-            | '+'
-            | ','
-            | ';'
-            | '='
-            | ':'
-            | '@' => c.to_string(),
-            _ => {
-                let s = c.to_string();
-                Uri::percent_encode(&s).to_string()
-            }
-        }
-    }
 }
 
 #[derive(Debug)]
@@ -87,61 +51,46 @@ enum State {
 
 fn to_inline(tag: Tag<'_>) -> Tag<'_> {
     match tag {
-        Tag::Heading(_) | Tag::Table(_) | Tag::TableHead | Tag::TableRow | Tag::TableCell => {
+        Tag::Header(_) | Tag::Table(_) | Tag::TableHead | Tag::TableRow | Tag::TableCell => {
             Tag::Paragraph
         }
-        Tag::Image(typ, url, title) => Tag::Link(typ, url, title),
+        Tag::Image(url, title) => Tag::Link(url, title),
         t => t,
     }
 }
 struct HighlighterContext {
     content: Vec<String>,
 }
-#[allow(clippy::unnecessary_wraps)]
 fn highlight_code<'a>(
     context: &mut Option<HighlighterContext>,
     evt: Event<'a>,
 ) -> Option<Vec<Event<'a>>> {
     match evt {
-        Event::Start(Tag::CodeBlock(kind)) => {
+        Event::Start(Tag::CodeBlock(lang)) => {
-            match &kind {
+            if lang.is_empty() {
-                CodeBlockKind::Fenced(lang) if !lang.is_empty() => {
+                Some(vec![Event::Start(Tag::CodeBlock(lang))])
-                    *context = Some(HighlighterContext { content: vec![] });
+            } else {
-                }
+                *context = Some(HighlighterContext { content: vec![] });
-                _ => {}
+                Some(vec![Event::Start(Tag::CodeBlock(lang))])
             }
-            Some(vec![Event::Start(Tag::CodeBlock(kind))])
         }
-        Event::End(Tag::CodeBlock(kind)) => {
+        Event::End(Tag::CodeBlock(x)) => {
             let mut result = vec![];
             if let Some(ctx) = context.take() {
-                let lang = if let CodeBlockKind::Fenced(lang) = &kind {
-                    if lang.is_empty() {
-                        unreachable!();
-                    } else {
-                        lang
-                    }
-                } else {
-                    unreachable!();
-                };
                 let syntax_set = SyntaxSet::load_defaults_newlines();
-                let syntax = syntax_set.find_syntax_by_token(lang).unwrap_or_else(|| {
+                let syntax = syntax_set.find_syntax_by_token(&x).unwrap_or_else(|| {
                     syntax_set
-                        .find_syntax_by_name(lang)
+                        .find_syntax_by_name(&x)
                         .unwrap_or_else(|| syntax_set.find_syntax_plain_text())
                 });
-                let mut html = ClassedHTMLGenerator::new_with_class_style(
+                let mut html = ClassedHTMLGenerator::new(&syntax, &syntax_set);
-                    syntax,
-                    &syntax_set,
-                    ClassStyle::Spaced,
-                );
                 for line in ctx.content {
-                    html.parse_html_for_line_which_includes_newline(&line);
+                    html.parse_html_for_line(&line);
                 }
                 let q = html.finalize();
                 result.push(Event::Html(q.into()));
             }
-            result.push(Event::End(Tag::CodeBlock(kind)));
+            result.push(Event::End(Tag::CodeBlock(x)));
             *context = None;
             Some(result)
         }
@@ -157,7 +106,6 @@ fn highlight_code<'a>(
         _ => Some(vec![evt]),
     }
 }
-#[allow(clippy::unnecessary_wraps)]
 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() {
@@ -165,10 +113,10 @@ fn flatten_text<'a>(state: &mut Option<String>, evt: Event<'a>) -> Option<Vec<Ev
                 prev_txt.push_str(&txt);
                 (Some(prev_txt), vec![])
             }
-            None => (Some(txt.into_string()), vec![]),
+            None => (Some(txt.into_owned()), vec![]),
         },
         e => match state.take() {
-            Some(prev) => (None, vec![Event::Text(CowStr::Boxed(prev.into())), e]),
+            Some(prev) => (None, vec![Event::Text(Cow::Owned(prev)), e]),
             None => (None, vec![e]),
         },
     };
@@ -176,7 +124,6 @@ fn flatten_text<'a>(state: &mut Option<String>, evt: Event<'a>) -> Option<Vec<Ev
     Some(res)
 }
 
-#[allow(clippy::unnecessary_wraps)]
 fn inline_tags<'a>(
     (state, inline): &mut (Vec<Tag<'a>>, bool),
     evt: Event<'a>,
@@ -209,45 +156,42 @@ fn process_image<'a, 'b>(
 ) -> Event<'a> {
     if let Some(ref processor) = *processor {
         match evt {
-            Event::Start(Tag::Image(typ, id, title)) => {
+            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) {
                         // there is a cw, and where are not inline
-                        Event::Html(CowStr::Boxed(
+                        Event::Html(Cow::Owned(format!(
-                            format!(
+                            r#"<label for="postcontent-cw-{id}">
-                                r#"<label for="postcontent-cw-{id}">
   <input type="checkbox" id="postcontent-cw-{id}" checked="checked" class="cw-checkbox">
   <span class="cw-container">
     <span class="cw-text">
         {cw}
     </span>
   <img src="{url}" alt=""#,
-                                id = random_hex(),
+                            id = random_hex(),
-                                cw = cw,
+                            cw = cw,
-                                url = url
+                            url = url
-                            )
+                        )))
-                            .into(),
-                        ))
                     } else {
-                        Event::Start(Tag::Image(typ, CowStr::Boxed(url.into()), title))
+                        Event::Start(Tag::Image(Cow::Owned(url), title))
                     }
                 } else {
-                    Event::Start(Tag::Image(typ, id, title))
+                    Event::Start(Tag::Image(id, title))
                 }
             }
-            Event::End(Tag::Image(typ, id, title)) => {
+            Event::End(Tag::Image(id, title)) => {
                 if let Some((url, cw)) = id.parse::<i32>().ok().and_then(processor.as_ref()) {
                     if inline || cw.is_none() {
-                        Event::End(Tag::Image(typ, CowStr::Boxed(url.into()), title))
+                        Event::End(Tag::Image(Cow::Owned(url), title))
                     } else {
-                        Event::Html(CowStr::Borrowed(
+                        Event::Html(Cow::Borrowed(
                             r#""/>
   </span>
 </label>"#,
                         ))
                     }
                 } else {
-                    Event::End(Tag::Image(typ, id, title))
+                    Event::End(Tag::Image(id, title))
                 }
             }
             e => e,
@@ -287,19 +231,19 @@ pub fn md_to_html<'a>(
         // Ignore headings, images, and tables if inline = true
         .scan((vec![], inline), inline_tags)
         .scan(&mut DocumentContext::default(), |ctx, evt| match evt {
-            Event::Start(Tag::CodeBlock(_)) => {
+            Event::Start(Tag::CodeBlock(_)) | Event::Start(Tag::Code) => {
                 ctx.in_code = true;
                 Some((vec![evt], vec![], vec![]))
             }
-            Event::End(Tag::CodeBlock(_)) => {
+            Event::End(Tag::CodeBlock(_)) | Event::End(Tag::Code) => {
                 ctx.in_code = false;
                 Some((vec![evt], vec![], vec![]))
             }
-            Event::Start(Tag::Link(_, _, _)) => {
+            Event::Start(Tag::Link(_, _)) => {
                 ctx.in_link = true;
                 Some((vec![evt], vec![], vec![]))
             }
-            Event::End(Tag::Link(_, _, _)) => {
+            Event::End(Tag::Link(_, _)) => {
                 ctx.in_link = false;
                 Some((vec![evt], vec![], vec![]))
             }
@@ -318,15 +262,15 @@ pub fn md_to_html<'a>(
                                         text_acc.push(c)
                                     }
                                     let mention = text_acc;
+                                    let short_mention = mention.splitn(1, '@').next().unwrap_or("");
                                     let link = Tag::Link(
-                                        LinkType::Inline,
                                         format!("{}@/{}/", base_url, &mention).into(),
-                                        mention.clone().into(),
+                                        short_mention.to_owned().into(),
                                     );
 
                                     mentions.push(mention.clone());
                                     events.push(Event::Start(link.clone()));
-                                    events.push(Event::Text(format!("@{}", &mention).into()));
+                                    events.push(Event::Text(format!("@{}", &short_mention).into()));
                                     events.push(Event::End(link));
 
                                     (
@@ -350,8 +294,8 @@ pub fn md_to_html<'a>(
                                     }
                                     let hashtag = text_acc;
                                     let link = Tag::Link(
-                                        LinkType::Inline,
+                                        format!("{}tag/{}", base_url, &hashtag.to_camel_case())
-                                        format!("{}tag/{}", base_url, &hashtag).into(),
+                                            .into(),
                                         hashtag.to_owned().into(),
                                     );
 
@@ -450,10 +394,6 @@ pub fn md_to_html<'a>(
     (buf, mentions.collect(), hashtags.collect())
 }
 
-pub fn escape(string: &str) -> askama_escape::Escaped<askama_escape::Html> {
-    askama_escape::escape(string, askama_escape::Html)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -516,29 +456,15 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_iri_percent_encode_seg() {
-        assert_eq!(
-            &iri_percent_encode_seg("including whitespace"),
-            "including%20whitespace"
-        );
-        assert_eq!(&iri_percent_encode_seg("%20"), "%2520");
-        assert_eq!(&iri_percent_encode_seg("é"), "é");
-        assert_eq!(
-            &iri_percent_encode_seg("空白入り 日本語"),
-            "空白入り%20日本語"
-        );
-    }
-
     #[test]
     fn test_inline() {
         assert_eq!(
             md_to_html("# Hello", None, false, None).0,
-            String::from("<h1 dir=\"auto\">Hello</h1>\n")
+            String::from("<h1>Hello</h1>\n")
         );
         assert_eq!(
             md_to_html("# Hello", None, true, None).0,
-            String::from("<p dir=\"auto\">Hello</p>\n")
+            String::from("<p>Hello</p>\n")
         );
     }
 }

plume-front/Cargo.toml

@@ -1,52 +1,15 @@
 [package]
 name = "plume-front"
-version = "0.7.1"
+version = "0.4.0"
 authors = ["Plume contributors"]
 edition = "2018"
 
-[lib]
-crate-type = ["cdylib"]
-
 [dependencies]
+stdweb = "=0.4.18"
+stdweb-internal-runtime = "=0.1.4"
 gettext = { git = "https://github.com/Plume-org/gettext/", rev = "294c54d74c699fbc66502b480a37cc66c1daa7f3" }
 gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 lazy_static = "1.3"
 serde = "1.0"
 serde_json = "1.0"
-wasm-bindgen = "0.2.70"
-js-sys = "0.3.47"
-serde_derive = "1.0.123"
-console_error_panic_hook = "0.1.6"
-
-[dependencies.web-sys]
-version = "0.3.47"
-features = [
-  'console',
-  'ClipboardEvent',
-  'CssStyleDeclaration',
-  'DataTransfer',
-  'Document',
-  'DomStringMap',
-  'DomTokenList',
-  'Element',
-  'EventTarget',
-  'FocusEvent',
-  'History',
-  'HtmlAnchorElement',
-  'HtmlDocument',
-  'HtmlFormElement',
-  'HtmlInputElement',
-  'HtmlSelectElement',
-  'HtmlTextAreaElement',
-  'KeyboardEvent',
-  'Storage',
-  'Location',
-  'MouseEvent',
-  'Navigator',
-  'Node',
-  'NodeList',
-  'Text',
-  'TouchEvent',
-  'Window'
-]

plume-front/release.toml

@@ -1,2 +0,0 @@
-pre-release-hook = ["cargo", "fmt"]
-pre-release-replacements = []

plume-front/src/editor.rs

@@ -1,12 +1,10 @@
-use crate::{document, CATALOG};
+use crate::CATALOG;
-use js_sys::{encode_uri_component, Date, RegExp};
+use serde::{Deserialize, Serialize};
-use serde_derive::{Deserialize, Serialize};
+use serde_json;
-use std::{convert::TryInto, sync::Mutex};
+use std::sync::Mutex;
-use wasm_bindgen::{prelude::*, JsCast, JsValue};
+use stdweb::{
-use web_sys::{
+    unstable::{TryFrom, TryInto},
-    console, window, ClipboardEvent, Element, Event, FocusEvent, HtmlAnchorElement, HtmlDocument,
+    web::{event::*, html_element::*, *},
-    HtmlElement, HtmlFormElement, HtmlInputElement, HtmlSelectElement, HtmlTextAreaElement,
-    KeyboardEvent, MouseEvent, Node,
 };
 
 macro_rules! mv {
@@ -20,29 +18,30 @@ macro_rules! mv {
 
 fn get_elt_value(id: &'static str) -> String {
     let elt = document().get_element_by_id(id).unwrap();
-    let inp: Option<&HtmlInputElement> = elt.dyn_ref();
+    let inp: Result<InputElement, _> = elt.clone().try_into();
-    let textarea: Option<&HtmlTextAreaElement> = elt.dyn_ref();
+    let textarea: Result<TextAreaElement, _> = elt.clone().try_into();
-    let select: Option<&HtmlSelectElement> = elt.dyn_ref();
+    let select: Result<SelectElement, _> = elt.try_into();
-    inp.map(|i| i.value()).unwrap_or_else(|| {
+    inp.map(|i| i.raw_value()).unwrap_or_else(|_| {
         textarea
             .map(|t| t.value())
-            .unwrap_or_else(|| select.unwrap().value())
+            .unwrap_or_else(|_| select.unwrap().raw_value())
     })
 }
 
 fn set_value<S: AsRef<str>>(id: &'static str, val: S) {
     let elt = document().get_element_by_id(id).unwrap();
-    let inp: Option<&HtmlInputElement> = elt.dyn_ref();
+    let inp: Result<InputElement, _> = elt.clone().try_into();
-    let textarea: Option<&HtmlTextAreaElement> = elt.dyn_ref();
+    let textarea: Result<TextAreaElement, _> = elt.clone().try_into();
-    let select: Option<&HtmlSelectElement> = elt.dyn_ref();
+    let select: Result<SelectElement, _> = elt.try_into();
-    inp.map(|i| i.set_value(val.as_ref())).unwrap_or_else(|| {
+    inp.map(|i| i.set_raw_value(val.as_ref()))
-        textarea
+        .unwrap_or_else(|_| {
-            .map(|t| t.set_value(val.as_ref()))
+            textarea
-            .unwrap_or_else(|| select.unwrap().set_value(val.as_ref()))
+                .map(|t| t.set_value(val.as_ref()))
-    })
+                .unwrap_or_else(|_| select.unwrap().set_raw_value(val.as_ref()))
+        })
 }
 
-fn no_return(evt: KeyboardEvent) {
+fn no_return(evt: KeyDownEvent) {
     if evt.key() == "Enter" {
         evt.prevent_default();
     }
@@ -52,9 +51,30 @@ fn no_return(evt: KeyboardEvent) {
 pub enum EditorError {
     NoneError,
     DOMError,
+    TypeError,
 }
 
-const AUTOSAVE_DEBOUNCE_TIME: i32 = 5000;
+impl From<std::option::NoneError> for EditorError {
+    fn from(_: std::option::NoneError) -> Self {
+        EditorError::NoneError
+    }
+}
+impl From<stdweb::web::error::InvalidCharacterError> for EditorError {
+    fn from(_: stdweb::web::error::InvalidCharacterError) -> Self {
+        EditorError::DOMError
+    }
+}
+impl From<stdweb::private::TODO> for EditorError {
+    fn from(_: stdweb::private::TODO) -> Self {
+        EditorError::DOMError
+    }
+}
+impl From<stdweb::private::ConversionError> for EditorError {
+    fn from(_: stdweb::private::ConversionError) -> Self {
+        EditorError::TypeError
+    }
+}
+const AUTOSAVE_DEBOUNCE_TIME: u32 = 5000;
 #[derive(Serialize, Deserialize)]
 struct AutosaveInformation {
     contents: String,
@@ -65,16 +85,10 @@ struct AutosaveInformation {
     tags: String,
     title: String,
 }
+js_serializable!(AutosaveInformation);
 fn is_basic_editor() -> bool {
-    if let Some(basic_editor) = window()
+    if let Some(basic_editor) = window().local_storage().get("basic-editor") {
-        .unwrap()
+        basic_editor == "true"
-        .local_storage()
-        .unwrap()
-        .unwrap()
-        .get("basic-editor")
-        .unwrap()
-    {
-        &basic_editor == "true"
     } else {
         false
     }
@@ -83,58 +97,65 @@ fn get_title() -> String {
     if is_basic_editor() {
         get_elt_value("title")
     } else {
-        document()
+        let title_field = HtmlElement::try_from(
-            .query_selector("#plume-editor > h1")
+            document()
-            .unwrap()
+                .query_selector("#plume-editor > h1")
-            .unwrap()
+                .ok()
-            .dyn_ref::<HtmlElement>()
+                .unwrap()
-            .unwrap()
+                .unwrap(),
-            .inner_text()
+        )
+        .ok()
+        .unwrap();
+        title_field.inner_text()
     }
 }
 fn get_autosave_id() -> String {
     format!(
         "editor_contents={}",
-        window().unwrap().location().pathname().unwrap()
+        window().location().unwrap().pathname().unwrap()
     )
 }
 fn get_editor_contents() -> String {
     if is_basic_editor() {
         get_elt_value("editor-content")
     } else {
-        let editor = document().query_selector("article").unwrap().unwrap();
+        let editor =
-        let child_nodes = editor.child_nodes();
+            HtmlElement::try_from(document().query_selector("article").ok().unwrap().unwrap())
-        let mut md = String::new();
+                .ok()
-        for i in 0..child_nodes.length() {
+                .unwrap();
-            let ch = child_nodes.get(i).unwrap();
+        editor.child_nodes().iter().fold(String::new(), |md, ch| {
             let to_append = match ch.node_type() {
-                Node::ELEMENT_NODE => {
+                NodeType::Element => {
-                    let elt = ch.dyn_ref::<Element>().unwrap();
+                    if js! { return @{&ch}.tagName; } == "DIV" {
-                    if elt.tag_name() == "DIV" {
+                        (js! { return @{&ch}.innerHTML; })
-                        elt.inner_html()
+                            .try_into()
+                            .unwrap_or_default()
                     } else {
-                        elt.outer_html()
+                        (js! { return @{&ch}.outerHTML; })
+                            .try_into()
+                            .unwrap_or_default()
                     }
                 }
-                Node::TEXT_NODE => ch.node_value().unwrap_or_default(),
+                NodeType::Text => ch.node_value().unwrap_or_default(),
                 _ => unreachable!(),
             };
-            md = format!("{}\n\n{}", md, to_append);
+            format!("{}\n\n{}", md, to_append)
-        }
+        })
-        md
     }
 }
 fn get_subtitle() -> String {
     if is_basic_editor() {
         get_elt_value("subtitle")
     } else {
-        document()
+        let subtitle_element = HtmlElement::try_from(
-            .query_selector("#plume-editor > h2")
+            document()
-            .unwrap()
+                .query_selector("#plume-editor > h2")
-            .unwrap()
+                .unwrap()
-            .dyn_ref::<HtmlElement>()
+                .unwrap(),
-            .unwrap()
+        )
-            .inner_text()
+        .ok()
+        .unwrap();
+        subtitle_element.inner_text()
     }
 }
 fn autosave() {
@@ -149,31 +170,27 @@ fn autosave() {
     };
     let id = get_autosave_id();
     match window()
-        .unwrap()
         .local_storage()
-        .unwrap()
+        .insert(&id, &serde_json::to_string(&info).unwrap())
-        .unwrap()
-        .set(&id, &serde_json::to_string(&info).unwrap())
     {
         Ok(_) => {}
-        _ => console::log_1(&"Autosave failed D:".into()),
+        _ => console!(log, "Autosave failed D:"),
     }
 }
+//This is only necessary until we go to stdweb 4.20 at least
+fn confirm(message: &str) -> bool {
+    let result: bool = js! {return confirm(@{message});} == true;
+    result
+}
 fn load_autosave() {
-    if let Ok(Some(autosave_str)) = window()
+    if let Some(autosave_str) = window().local_storage().get(&get_autosave_id()) {
-        .unwrap()
-        .local_storage()
-        .unwrap()
-        .unwrap()
-        .get(&get_autosave_id())
-    {
         let autosave_info: AutosaveInformation = serde_json::from_str(&autosave_str).ok().unwrap();
         let message = i18n!(
             CATALOG,
             "Do you want to load the local autosave last edited at {}?";
-            Date::new(&JsValue::from_f64(autosave_info.last_saved)).to_date_string().as_string().unwrap()
+            Date::from_time(autosave_info.last_saved).to_date_string()
         );
-        if let Ok(true) = window().unwrap().confirm_with_message(&message) {
+        if confirm(&message) {
             set_value("editor-content", &autosave_info.contents);
             set_value("title", &autosave_info.title);
             set_value("subtitle", &autosave_info.subtitle);
@@ -186,33 +203,18 @@ fn load_autosave() {
     }
 }
 fn clear_autosave() {
-    window()
+    window().local_storage().remove(&get_autosave_id());
-        .unwrap()
+    console!(log, &format!("Saved to {}", &get_autosave_id()));
-        .local_storage()
-        .unwrap()
-        .unwrap()
-        .remove_item(&get_autosave_id())
-        .unwrap();
-    console::log_1(&format!("Saved to {}", &get_autosave_id()).into());
 }
-type TimeoutHandle = i32;
 lazy_static! {
     static ref AUTOSAVE_TIMEOUT: Mutex<Option<TimeoutHandle>> = Mutex::new(None);
 }
 fn autosave_debounce() {
-    let window = window().unwrap();
     let timeout = &mut AUTOSAVE_TIMEOUT.lock().unwrap();
     if let Some(timeout) = timeout.take() {
-        window.clear_timeout_with_handle(timeout);
+        timeout.clear();
     }
-    let callback = Closure::once(autosave);
+    **timeout = Some(window().set_clearable_timeout(autosave, AUTOSAVE_DEBOUNCE_TIME));
-    **timeout = window
-        .set_timeout_with_callback_and_timeout_and_arguments_0(
-            callback.as_ref().unchecked_ref(),
-            AUTOSAVE_DEBOUNCE_TIME,
-        )
-        .ok();
-    callback.forget();
 }
 fn init_widget(
     parent: &Element,
@@ -221,33 +223,19 @@ fn init_widget(
     content: String,
     disable_return: bool,
 ) -> Result<HtmlElement, EditorError> {
-    let widget = placeholder(
+    let widget = placeholder(make_editable(tag).try_into()?, &placeholder_text);
-        make_editable(tag).dyn_into::<HtmlElement>().unwrap(),
-        &placeholder_text,
-    );
     if !content.is_empty() {
-        widget
+        widget.dataset().insert("edited", "true")?;
-            .dataset()
-            .set("edited", "true")
-            .map_err(|_| EditorError::DOMError)?;
     }
-    widget
+    widget.append_child(&document().create_text_node(&content));
-        .append_child(&document().create_text_node(&content))
-        .map_err(|_| EditorError::DOMError)?;
     if disable_return {
-        let callback = Closure::wrap(Box::new(no_return) as Box<dyn FnMut(KeyboardEvent)>);
+        widget.add_event_listener(no_return);
-        widget
-            .add_event_listener_with_callback("keydown", callback.as_ref().unchecked_ref())
-            .map_err(|_| EditorError::DOMError)?;
-        callback.forget();
     }
 
-    parent
+    parent.append_child(&widget);
-        .append_child(&widget)
-        .map_err(|_| EditorError::DOMError)?;
     // We need to do that to make sure the placeholder is correctly rendered
-    widget.focus().map_err(|_| EditorError::DOMError)?;
+    widget.focus();
-    widget.blur().map_err(|_| EditorError::DOMError)?;
+    widget.blur();
 
     filter_paste(&widget);
 
@@ -256,88 +244,42 @@ fn init_widget(
 
 fn filter_paste(elt: &HtmlElement) {
     // Only insert text when pasting something
-    let insert_text = Closure::wrap(Box::new(|evt: ClipboardEvent| {
+    js! {
-        evt.prevent_default();
+        @{&elt}.addEventListener("paste", function (evt) {
-        if let Some(data) = evt.clipboard_data() {
+            evt.preventDefault();
-            if let Ok(data) = data.get_data("text") {
+            document.execCommand("insertText", false, evt.clipboardData.getData("text"));
-                document()
+        });
-                    .dyn_ref::<HtmlDocument>()
+    };
-                    .unwrap()
-                    .exec_command_with_show_ui_and_value("insertText", false, &data)
-                    .unwrap();
-            }
-        }
-    }) as Box<dyn FnMut(ClipboardEvent)>);
-    elt.add_event_listener_with_callback("paste", insert_text.as_ref().unchecked_ref())
-        .unwrap();
-    insert_text.forget();
 }
 
 pub fn init() -> Result<(), EditorError> {
     if let Some(ed) = document().get_element_by_id("plume-fallback-editor") {
         load_autosave();
-        let callback = Closure::wrap(Box::new(|_| clear_autosave()) as Box<dyn FnMut(Event)>);
+        ed.add_event_listener(|_: SubmitEvent| clear_autosave());
-        ed.add_event_listener_with_callback("submit", callback.as_ref().unchecked_ref())
-            .map_err(|_| EditorError::DOMError)?;
-        callback.forget();
     }
     // Check if the user wants to use the basic editor
     if window()
-        .unwrap()
         .local_storage()
-        .unwrap()
-        .unwrap()
         .get("basic-editor")
-        .map(|x| x.is_some() && x.unwrap() == "true")
+        .map(|x| x == "true")
         .unwrap_or(true)
     {
         if let Some(editor) = document().get_element_by_id("plume-fallback-editor") {
             if let Ok(Some(title_label)) = document().query_selector("label[for=title]") {
-                let editor_button = document()
+                let editor_button = document().create_element("a")?;
-                    .create_element("a")
+                js! { @{&editor_button}.href = "#"; }
-                    .map_err(|_| EditorError::DOMError)?;
+                editor_button.add_event_listener(|_: ClickEvent| {
-                editor_button
+                    window().local_storage().remove("basic-editor");
-                    .dyn_ref::<HtmlAnchorElement>()
+                    window().history().go(0).ok(); // refresh
-                    .unwrap()
+                });
-                    .set_href("#");
+                editor_button.append_child(
-                let disable_basic_editor = Closure::wrap(Box::new(|_| {
+                    &document().create_text_node(&i18n!(CATALOG, "Open the rich text editor")),
-                    let window = window().unwrap();
-                    if window
-                        .local_storage()
-                        .unwrap()
-                        .unwrap()
-                        .set("basic-editor", "false")
-                        .is_err()
-                    {
-                        console::log_1(&"Failed to write into local storage".into());
-                    }
-                    window.history().unwrap().go_with_delta(0).ok(); // refresh
-                })
-                    as Box<dyn FnMut(MouseEvent)>);
-                editor_button
-                    .add_event_listener_with_callback(
-                        "click",
-                        disable_basic_editor.as_ref().unchecked_ref(),
-                    )
-                    .map_err(|_| EditorError::DOMError)?;
-                disable_basic_editor.forget();
-                editor_button
-                    .append_child(
-                        &document().create_text_node(&i18n!(CATALOG, "Open the rich text editor")),
-                    )
-                    .map_err(|_| EditorError::DOMError)?;
-                editor
-                    .insert_before(&editor_button, Some(&title_label))
-                    .ok();
-                let callback = Closure::wrap(
-                    Box::new(|_| autosave_debounce()) as Box<dyn FnMut(KeyboardEvent)>
                 );
+                editor.insert_before(&editor_button, &title_label).ok();
                 document()
                     .get_element_by_id("editor-content")
                     .unwrap()
-                    .add_event_listener_with_callback("keydown", callback.as_ref().unchecked_ref())
+                    .add_event_listener(|_: KeyDownEvent| autosave_debounce());
-                    .map_err(|_| EditorError::DOMError)?;
-                callback.forget();
             }
         }
 
@@ -350,32 +292,14 @@ pub fn init() -> Result<(), EditorError> {
 fn init_editor() -> Result<(), EditorError> {
     if let Some(ed) = document().get_element_by_id("plume-editor") {
         // Show the editor
-        ed.dyn_ref::<HtmlElement>()
+        js! { @{&ed}.style.display = "block"; };
-            .unwrap()
-            .style()
-            .set_property("display", "block")
-            .map_err(|_| EditorError::DOMError)?;
         // And hide the HTML-only fallback
-        let old_ed = document().get_element_by_id("plume-fallback-editor");
+        let old_ed = document().get_element_by_id("plume-fallback-editor")?;
-        if old_ed.is_none() {
+        let old_title = document().get_element_by_id("plume-editor-title")?;
-            return Ok(());
+        js! {
-        }
+            @{&old_ed}.style.display = "none";
-        let old_ed = old_ed.unwrap();
+            @{&old_title}.style.display = "none";
-        let old_title = document()
+        };
-            .get_element_by_id("plume-editor-title")
-            .ok_or(EditorError::NoneError)?;
-        old_ed
-            .dyn_ref::<HtmlElement>()
-            .unwrap()
-            .style()
-            .set_property("display", "none")
-            .map_err(|_| EditorError::DOMError)?;
-        old_title
-            .dyn_ref::<HtmlElement>()
-            .unwrap()
-            .style()
-            .set_property("display", "none")
-            .map_err(|_| EditorError::DOMError)?;
 
         // Get content from the old editor (when editing an article for instance)
         let title_val = get_elt_value("title");
@@ -397,45 +321,35 @@ fn init_editor() -> Result<(), EditorError> {
             content_val.clone(),
             false,
         )?;
-        content.set_inner_html(&content_val);
+        js! { @{&content}.innerHTML = @{content_val}; };
 
         // character counter
-        let character_counter = Closure::wrap(Box::new(mv!(content => move |_| {
+        content.add_event_listener(mv!(content => move |_: KeyDownEvent| {
-            let update_char_count = Closure::wrap(Box::new(mv!(content => move || {
+            window().set_timeout(mv!(content => move || {
                 if let Some(e) = document().get_element_by_id("char-count") {
                     let count = chars_left("#plume-fallback-editor", &content).unwrap_or_default();
                     let text = i18n!(CATALOG, "Around {} characters left"; count);
-                    e.dyn_ref::<HtmlElement>().map(|e| {
+                    HtmlElement::try_from(e).map(|e| {
-                        e.set_inner_text(&text);
+                        js!{@{e}.innerText = @{text}};
-                    }).unwrap();
+                    }).ok();
                 };
-            })) as Box<dyn FnMut()>);
+            }), 0);
-            window().unwrap().set_timeout_with_callback_and_timeout_and_arguments(update_char_count.as_ref().unchecked_ref(), 0, &js_sys::Array::new()).unwrap();
-            update_char_count.forget();
             autosave_debounce();
-        })) as Box<dyn FnMut(KeyboardEvent)>);
+        }));
-        content
-            .add_event_listener_with_callback("keydown", character_counter.as_ref().unchecked_ref())
-            .map_err(|_| EditorError::DOMError)?;
-        character_counter.forget();
 
-        let show_popup = Closure::wrap(Box::new(mv!(title, subtitle, content, old_ed => move |_| {
+        document().get_element_by_id("publish")?.add_event_listener(
-            let popup = document().get_element_by_id("publish-popup").or_else(||
+            mv!(title, subtitle, content, old_ed => move |_: ClickEvent| {
-                                                                              init_popup(&title, &subtitle, &content, &old_ed).ok()
+                let popup = document().get_element_by_id("publish-popup").or_else(||
-            ).unwrap();
+                        init_popup(&title, &subtitle, &content, &old_ed).ok()
-            let bg = document().get_element_by_id("popup-bg").or_else(||
+                    ).unwrap();
-                                                                      init_popup_bg().ok()
+                let bg = document().get_element_by_id("popup-bg").or_else(||
-            ).unwrap();
+                        init_popup_bg().ok()
+                    ).unwrap();
 
-            popup.class_list().add_1("show").unwrap();
+                popup.class_list().add("show").unwrap();
-            bg.class_list().add_1("show").unwrap();
+                bg.class_list().add("show").unwrap();
-        })) as Box<dyn FnMut(MouseEvent)>);
+            }),
-        document()
+        );
-            .get_element_by_id("publish")
-            .ok_or(EditorError::NoneError)?
-            .add_event_listener_with_callback("click", show_popup.as_ref().unchecked_ref())
-            .map_err(|_| EditorError::DOMError)?;
-        show_popup.forget();
 
         show_errors();
         setup_close_button();
@@ -445,47 +359,32 @@ fn init_editor() -> Result<(), EditorError> {
 
 fn setup_close_button() {
     if let Some(button) = document().get_element_by_id("close-editor") {
-        let close_editor = Closure::wrap(Box::new(|_| {
+        button.add_event_listener(|_: ClickEvent| {
             window()
-                .unwrap()
                 .local_storage()
-                .unwrap()
+                .insert("basic-editor", "true")
-                .unwrap()
-                .set("basic-editor", "true")
                 .unwrap();
-            window()
+            window().history().go(0).unwrap(); // Refresh the page
-                .unwrap()
+        });
-                .history()
-                .unwrap()
-                .go_with_delta(0)
-                .unwrap(); // Refresh the page
-        }) as Box<dyn FnMut(MouseEvent)>);
-        button
-            .add_event_listener_with_callback("click", close_editor.as_ref().unchecked_ref())
-            .unwrap();
-        close_editor.forget();
     }
 }
 
 fn show_errors() {
-    let document = document();
+    if let Ok(Some(header)) = document().query_selector("header") {
-    if let Ok(Some(header)) = document.query_selector("header") {
+        let list = document().create_element("header").unwrap();
-        let list = document.create_element("header").unwrap();
+        list.class_list().add("messages").unwrap();
-        list.class_list().add_1("messages").unwrap();
+        for error in document().query_selector_all("p.error").unwrap() {
-        let errors = document.query_selector_all("p.error").unwrap();
-        for i in 0..errors.length() {
-            let error = errors.get(i).unwrap();
             error
                 .parent_element()
                 .unwrap()
                 .remove_child(&error)
                 .unwrap();
-            let _ = list.append_child(&error);
+            list.append_child(&error);
         }
         header
             .parent_element()
             .unwrap()
-            .insert_before(&list, header.next_sibling().as_ref())
+            .insert_before(&list, &header.next_sibling().unwrap())
             .unwrap();
     }
 }
@@ -496,17 +395,9 @@ fn init_popup(
     content: &HtmlElement,
     old_ed: &Element,
 ) -> Result<Element, EditorError> {
-    let document = document();
+    let popup = document().create_element("div")?;
-    let popup = document
+    popup.class_list().add("popup")?;
-        .create_element("div")
+    popup.set_attribute("id", "publish-popup")?;
-        .map_err(|_| EditorError::DOMError)?;
-    popup
-        .class_list()
-        .add_1("popup")
-        .map_err(|_| EditorError::DOMError)?;
-    popup
-        .set_attribute("id", "publish-popup")
-        .map_err(|_| EditorError::DOMError)?;
 
     let tags = get_elt_value("tags")
         .split(',')
@@ -514,165 +405,112 @@ fn init_popup(
         .map(str::to_string)
         .collect::<Vec<_>>();
     let license = get_elt_value("license");
-    make_input(&i18n!(CATALOG, "Tags"), "popup-tags", &popup).set_value(&tags.join(", "));
+    make_input(&i18n!(CATALOG, "Tags"), "popup-tags", &popup).set_raw_value(&tags.join(", "));
-    make_input(&i18n!(CATALOG, "License"), "popup-license", &popup).set_value(&license);
+    make_input(&i18n!(CATALOG, "License"), "popup-license", &popup).set_raw_value(&license);
 
-    let cover_label = document
+    let cover_label = document().create_element("label")?;
-        .create_element("label")
+    cover_label.append_child(&document().create_text_node(&i18n!(CATALOG, "Cover")));
-        .map_err(|_| EditorError::DOMError)?;
+    cover_label.set_attribute("for", "cover")?;
-    cover_label
+    let cover = document().get_element_by_id("cover")?;
-        .append_child(&document.create_text_node(&i18n!(CATALOG, "Cover")))
+    cover.parent_element()?.remove_child(&cover).ok();
-        .map_err(|_| EditorError::DOMError)?;
+    popup.append_child(&cover_label);
-    cover_label
+    popup.append_child(&cover);
-        .set_attribute("for", "cover")
-        .map_err(|_| EditorError::DOMError)?;
-    let cover = document
-        .get_element_by_id("cover")
-        .ok_or(EditorError::NoneError)?;
-    cover
-        .parent_element()
-        .ok_or(EditorError::NoneError)?
-        .remove_child(&cover)
-        .ok();
-    popup
-        .append_child(&cover_label)
-        .map_err(|_| EditorError::DOMError)?;
-    popup
-        .append_child(&cover)
-        .map_err(|_| EditorError::DOMError)?;
 
-    if let Some(draft_checkbox) = document.get_element_by_id("draft") {
+    if let Some(draft_checkbox) = document().get_element_by_id("draft") {
-        let draft_checkbox = draft_checkbox.dyn_ref::<HtmlInputElement>().unwrap();
+        let draft_label = document().create_element("label")?;
-        let draft_label = document
+        draft_label.set_attribute("for", "popup-draft")?;
-            .create_element("label")
-            .map_err(|_| EditorError::DOMError)?;
-        draft_label
-            .set_attribute("for", "popup-draft")
-            .map_err(|_| EditorError::DOMError)?;
 
-        let draft = document.create_element("input").unwrap();
+        let draft = document().create_element("input").unwrap();
-        draft.set_id("popup-draft");
+        js! {
-        let draft = draft.dyn_ref::<HtmlInputElement>().unwrap();
+            @{&draft}.id = "popup-draft";
-        draft.set_name("popup-draft");
+            @{&draft}.name = "popup-draft";
-        draft.set_type("checkbox");
+            @{&draft}.type = "checkbox";
-        draft.set_checked(draft_checkbox.checked());
+            @{&draft}.checked = @{&draft_checkbox}.checked;
+        };
 
-        draft_label
+        draft_label.append_child(&draft);
-            .append_child(draft)
+        draft_label.append_child(&document().create_text_node(&i18n!(CATALOG, "This is a draft")));
-            .map_err(|_| EditorError::DOMError)?;
+        popup.append_child(&draft_label);
-        draft_label
-            .append_child(&document.create_text_node(&i18n!(CATALOG, "This is a draft")))
-            .map_err(|_| EditorError::DOMError)?;
-        popup
-            .append_child(&draft_label)
-            .map_err(|_| EditorError::DOMError)?;
     }
 
-    let button = document
+    let button = document().create_element("input")?;
-        .create_element("input")
+    js! {
-        .map_err(|_| EditorError::DOMError)?;
+        @{&button}.type = "submit";
-    button
+        @{&button}.value = @{i18n!(CATALOG, "Publish")};
-        .append_child(&document.create_text_node(&i18n!(CATALOG, "Publish")))
+    };
-        .map_err(|_| EditorError::DOMError)?;
+    button.append_child(&document().create_text_node(&i18n!(CATALOG, "Publish")));
-    let button = button.dyn_ref::<HtmlInputElement>().unwrap();
+    button.add_event_listener(
-    button.set_type("submit");
+        mv!(title, subtitle, content, old_ed => move |_: ClickEvent| {
-    button.set_value(&i18n!(CATALOG, "Publish"));
+            title.focus(); // Remove the placeholder before publishing
-    let callback = Closure::wrap(Box::new(mv!(title, subtitle, content, old_ed => move |_| {
+            set_value("title", title.inner_text());
-        let document = self::document();
+            subtitle.focus();
-        title.focus().unwrap(); // Remove the placeholder before publishing
+            set_value("subtitle", subtitle.inner_text());
-        set_value("title", title.inner_text());
+            content.focus();
-        subtitle.focus().unwrap();
+            set_value("editor-content", content.child_nodes().iter().fold(String::new(), |md, ch| {
-        set_value("subtitle", subtitle.inner_text());
+                let to_append = match ch.node_type() {
-        content.focus().unwrap();
+                    NodeType::Element => {
-        let mut md = String::new();
+                        if js!{ return @{&ch}.tagName; } == "DIV" {
-        let child_nodes = content.child_nodes();
+                            (js!{ return @{&ch}.innerHTML; }).try_into().unwrap_or_default()
-        for i in 0..child_nodes.length() {
+                        } else {
-            let ch = child_nodes.get(i).unwrap();
+                            (js!{ return @{&ch}.outerHTML; }).try_into().unwrap_or_default()
-            let to_append = match ch.node_type() {
+                        }
-                Node::ELEMENT_NODE => {
+                    },
-                    let ch = ch.dyn_ref::<Element>().unwrap();
+                    NodeType::Text => ch.node_value().unwrap_or_default(),
-                    if ch.tag_name() == "DIV" {
+                    _ => unreachable!(),
-                        ch.inner_html()
+                };
-                    } else {
+                format!("{}\n\n{}", md, to_append)
-                        ch.outer_html()
+            }));
-                    }
+            set_value("tags", get_elt_value("popup-tags"));
-                },
+            if let Some(draft) = document().get_element_by_id("popup-draft") {
-                Node::TEXT_NODE => ch.node_value().unwrap_or_default(),
+                js!{
-                _ => unreachable!(),
+                    document.getElementById("draft").checked = @{draft}.checked;
-            };
+                };
-            md = format!("{}\n\n{}", md, to_append);
-        }
-        set_value("editor-content", md);
-        set_value("tags", get_elt_value("popup-tags"));
-        if let Some(draft) = document.get_element_by_id("popup-draft") {
-            if let Some(draft_checkbox) = document.get_element_by_id("draft") {
-                let draft_checkbox = draft_checkbox.dyn_ref::<HtmlInputElement>().unwrap();
-                let draft = draft.dyn_ref::<HtmlInputElement>().unwrap();
-                draft_checkbox.set_checked(draft.checked());
             }
-        }
+            let cover = document().get_element_by_id("cover").unwrap();
-        let cover = document.get_element_by_id("cover").unwrap();
+            cover.parent_element().unwrap().remove_child(&cover).ok();
-        cover.parent_element().unwrap().remove_child(&cover).ok();
+            old_ed.append_child(&cover);
-        old_ed.append_child(&cover).unwrap();
+            set_value("license", get_elt_value("popup-license"));
-        set_value("license", get_elt_value("popup-license"));
+            clear_autosave();
-        clear_autosave();
+            js! {
-        let old_ed = old_ed.dyn_ref::<HtmlFormElement>().unwrap();
+                @{&old_ed}.submit();
-        old_ed.submit().unwrap();
+            };
-    })) as Box<dyn FnMut(MouseEvent)>);
+        }),
-    button
+    );
-        .add_event_listener_with_callback("click", callback.as_ref().unchecked_ref())
+    popup.append_child(&button);
-        .map_err(|_| EditorError::DOMError)?;
-    callback.forget();
-    popup
-        .append_child(button)
-        .map_err(|_| EditorError::DOMError)?;
 
-    document
+    document().body()?.append_child(&popup);
-        .body()
-        .ok_or(EditorError::NoneError)?
-        .append_child(&popup)
-        .map_err(|_| EditorError::DOMError)?;
     Ok(popup)
 }
 
 fn init_popup_bg() -> Result<Element, EditorError> {
-    let bg = document()
+    let bg = document().create_element("div")?;
-        .create_element("div")
+    bg.class_list().add("popup-bg")?;
-        .map_err(|_| EditorError::DOMError)?;
+    bg.set_attribute("id", "popup-bg")?;
-    bg.class_list()
-        .add_1("popup-bg")
-        .map_err(|_| EditorError::DOMError)?;
-    bg.set_attribute("id", "popup-bg")
-        .map_err(|_| EditorError::DOMError)?;
 
-    document()
+    document().body()?.append_child(&bg);
-        .body()
+    bg.add_event_listener(|_: ClickEvent| close_popup());
-        .ok_or(EditorError::NoneError)?
-        .append_child(&bg)
-        .map_err(|_| EditorError::DOMError)?;
-    let callback = Closure::wrap(Box::new(|_| close_popup()) as Box<dyn FnMut(MouseEvent)>);
-    bg.add_event_listener_with_callback("click", callback.as_ref().unchecked_ref())
-        .unwrap();
-    callback.forget();
     Ok(bg)
 }
 
 fn chars_left(selector: &str, content: &HtmlElement) -> Option<i32> {
     match document().query_selector(selector) {
-        Ok(Some(form)) => form.dyn_ref::<HtmlElement>().and_then(|form| {
+        Ok(Some(form)) => HtmlElement::try_from(form).ok().and_then(|form| {
             if let Some(len) = form
                 .get_attribute("content-size")
                 .and_then(|s| s.parse::<i32>().ok())
             {
-                (encode_uri_component(&content.inner_html())
+                (js! {
-                    .replace("%20", "+")
+                    let x = encodeURIComponent(@{content}.innerHTML)
-                    .replace("%0A", "%0D0A")
+                        .replace(/%20/g, "+")
-                    .replace_by_pattern(&RegExp::new("[!'*()]", "g"), "XXX")
+                        .replace(/%0A/g, "%0D%0A")
-                    .length()
+                        .replace(new RegExp("[!'*()]", "g"), "XXX") // replace exceptions of encodeURIComponent with placeholder
-                    + 2_u32)
+                        .length + 2;
-                    .try_into()
+                    console.log(x);
-                    .map(|c: i32| len - c)
+                    return x;
-                    .ok()
+                })
+                .try_into()
+                .map(|c: i32| len - c)
+                .ok()
             } else {
                 None
             }
@@ -682,26 +520,26 @@ fn chars_left(selector: &str, content: &HtmlElement) -> Option<i32> {
 }
 
 fn close_popup() {
-    let hide = |x: Element| x.class_list().remove_1("show");
+    let hide = |x: Element| x.class_list().remove("show");
     document().get_element_by_id("publish-popup").map(hide);
     document().get_element_by_id("popup-bg").map(hide);
 }
 
-fn make_input(label_text: &str, name: &'static str, form: &Element) -> HtmlInputElement {
+fn make_input(label_text: &str, name: &'static str, form: &Element) -> InputElement {
-    let document = document();
+    let label = document().create_element("label").unwrap();
-    let label = document.create_element("label").unwrap();
+    label.append_child(&document().create_text_node(label_text));
-    label
-        .append_child(&document.create_text_node(label_text))
-        .unwrap();
     label.set_attribute("for", name).unwrap();
 
-    let inp = document.create_element("input").unwrap();
+    let inp: InputElement = document()
-    let inp = inp.dyn_into::<HtmlInputElement>().unwrap();
+        .create_element("input")
+        .unwrap()
+        .try_into()
+        .unwrap();
     inp.set_attribute("name", name).unwrap();
     inp.set_attribute("id", name).unwrap();
 
-    form.append_child(&label).unwrap();
+    form.append_child(&label);
-    form.append_child(&inp).unwrap();
+    form.append_child(&inp);
     inp
 }
 
@@ -715,46 +553,36 @@ fn make_editable(tag: &'static str) -> Element {
 }
 
 fn placeholder(elt: HtmlElement, text: &str) -> HtmlElement {
-    elt.dataset().set("placeholder", text).unwrap();
+    elt.dataset().insert("placeholder", text).unwrap();
-    elt.dataset().set("edited", "false").unwrap();
+    elt.dataset().insert("edited", "false").unwrap();
 
-    let callback = Closure::wrap(Box::new(mv!(elt => move |_: FocusEvent| {
+    elt.add_event_listener(mv!(elt => move |_: FocusEvent| {
         if elt.dataset().get("edited").unwrap().as_str() != "true" {
             clear_children(&elt);
         }
-    })) as Box<dyn FnMut(FocusEvent)>);
+    }));
-    elt.add_event_listener_with_callback("focus", callback.as_ref().unchecked_ref())
+    elt.add_event_listener(mv!(elt => move |_: BlurEvent| {
-        .unwrap();
-    callback.forget();
-    let callback = Closure::wrap(Box::new(mv!(elt => move |_: Event| {
         if elt.dataset().get("edited").unwrap().as_str() != "true" {
             clear_children(&elt);
 
             let ph = document().create_element("span").expect("Couldn't create placeholder");
-            ph.class_list().add_1("placeholder").expect("Couldn't add class");
+            ph.class_list().add("placeholder").expect("Couldn't add class");
-            ph.append_child(&document().create_text_node(&elt.dataset().get("placeholder").unwrap_or_default())).unwrap();
+            ph.append_child(&document().create_text_node(&elt.dataset().get("placeholder").unwrap_or_default()));
-            elt.append_child(&ph).unwrap();
+            elt.append_child(&ph);
         }
-    })) as Box<dyn FnMut(Event)>);
+    }));
-    elt.add_event_listener_with_callback("blur", callback.as_ref().unchecked_ref())
+    elt.add_event_listener(mv!(elt => move |_: KeyUpEvent| {
-        .unwrap();
+        elt.dataset().insert("edited", if elt.inner_text().trim_matches('\n').is_empty() {
-    callback.forget();
-    let callback = Closure::wrap(Box::new(mv!(elt => move |_: KeyboardEvent| {
-        elt.dataset().set("edited", if elt.inner_text().trim_matches('\n').is_empty() {
             "false"
         } else {
             "true"
         }).expect("Couldn't update edition state");
-    })) as Box<dyn FnMut(KeyboardEvent)>);
+    }));
-    elt.add_event_listener_with_callback("keyup", callback.as_ref().unchecked_ref())
-        .unwrap();
-    callback.forget();
     elt
 }
 
 fn clear_children(elt: &HtmlElement) {
-    let child_nodes = elt.child_nodes();
+    for child in elt.child_nodes() {
-    for _ in 0..child_nodes.length() {
+        elt.remove_child(&child).unwrap();
-        elt.remove_child(&child_nodes.get(0).unwrap()).unwrap();
     }
 }

plume-front/src/lib.rs

@@ -1,174 +0,0 @@
-#![recursion_limit = "128"]
-#![feature(decl_macro, proc_macro_hygiene)]
-
-#[macro_use]
-extern crate gettext_macros;
-#[macro_use]
-extern crate lazy_static;
-
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{console, window, Document, Element, Event, HtmlInputElement, TouchEvent};
-
-init_i18n!(
-    "plume-front",
-    af,
-    ar,
-    bg,
-    ca,
-    cs,
-    cy,
-    da,
-    de,
-    el,
-    en,
-    eo,
-    es,
-    fa,
-    fi,
-    fr,
-    gl,
-    he,
-    hi,
-    hr,
-    hu,
-    it,
-    ja,
-    ko,
-    nb,
-    nl,
-    no,
-    pl,
-    pt,
-    ro,
-    ru,
-    sat,
-    si,
-    sk,
-    sl,
-    sr,
-    sv,
-    tr,
-    uk,
-    vi,
-    zh
-);
-
-mod editor;
-
-compile_i18n!();
-
-lazy_static! {
-    static ref CATALOG: gettext::Catalog = {
-        let catalogs = include_i18n!();
-        let lang = window().unwrap().navigator().language().unwrap();
-        let lang = lang.split_once('-').map_or("en", |x| x.0);
-
-        let english_position = catalogs
-            .iter()
-            .position(|(language_code, _)| *language_code == "en")
-            .unwrap();
-        catalogs
-            .iter()
-            .find(|(l, _)| l == &lang)
-            .unwrap_or(&catalogs[english_position])
-            .clone()
-            .1
-    };
-}
-
-#[wasm_bindgen(start)]
-pub fn main() -> Result<(), JsValue> {
-    extern crate console_error_panic_hook;
-    use std::panic;
-    panic::set_hook(Box::new(console_error_panic_hook::hook));
-
-    menu();
-    search();
-    editor::init()
-        .map_err(|e| console::error_1(&format!("Editor error: {:?}", e).into()))
-        .ok();
-    Ok(())
-}
-
-/// Toggle menu on mobile devices
-///
-/// It should normally be working fine even without this code
-/// But :focus-within is not yet supported by Webkit/Blink
-fn menu() {
-    let document = document();
-    if let Ok(Some(button)) = document.query_selector("#menu a") {
-        if let Some(menu) = document.get_element_by_id("content") {
-            let show_menu = Closure::wrap(Box::new(|_: TouchEvent| {
-                self::document()
-                    .get_element_by_id("menu")
-                    .map(|menu| {
-                        menu.set_attribute("aria-expanded", "true")
-                            .map(|_| menu.class_list().add_1("show"))
-                    })
-                    .unwrap()
-                    .unwrap()
-                    .unwrap();
-            }) as Box<dyn FnMut(TouchEvent)>);
-            button
-                .add_event_listener_with_callback("touchend", show_menu.as_ref().unchecked_ref())
-                .unwrap();
-            show_menu.forget();
-
-            let close_menu = Closure::wrap(Box::new(|evt: TouchEvent| {
-                if evt
-                    .target()
-                    .unwrap()
-                    .dyn_ref::<Element>()
-                    .unwrap()
-                    .closest("a")
-                    .unwrap()
-                    .is_some()
-                {
-                    return;
-                }
-                self::document()
-                    .get_element_by_id("menu")
-                    .map(|menu| {
-                        menu.set_attribute("aria-expanded", "false")
-                            .map(|_| menu.class_list().remove_1("show"))
-                    })
-                    .unwrap()
-                    .unwrap()
-                    .unwrap()
-            }) as Box<dyn FnMut(TouchEvent)>);
-            menu.add_event_listener_with_callback("touchend", close_menu.as_ref().unchecked_ref())
-                .unwrap();
-            close_menu.forget();
-        }
-    }
-}
-
-/// Clear the URL of the search page before submitting request
-fn search() {
-    if let Some(form) = document().get_element_by_id("form") {
-        let normalize_query = Closure::wrap(Box::new(|_: Event| {
-            document()
-                .query_selector_all("#form input")
-                .map(|inputs| {
-                    for i in 0..inputs.length() {
-                        let input = inputs.get(i).unwrap();
-                        let input = input.dyn_ref::<HtmlInputElement>().unwrap();
-                        if input.name().is_empty() {
-                            input.set_name(&input.dyn_ref::<Element>().unwrap().id());
-                        }
-                        if !input.name().is_empty() && input.value().is_empty() {
-                            input.set_name("");
-                        }
-                    }
-                })
-                .unwrap();
-        }) as Box<dyn FnMut(Event)>);
-        form.add_event_listener_with_callback("submit", normalize_query.as_ref().unchecked_ref())
-            .unwrap();
-        normalize_query.forget();
-    }
-}
-
-fn document() -> Document {
-    window().unwrap().document().unwrap()
-}

plume-front/src/main.rs

@@ -0,0 +1,112 @@
+#![recursion_limit = "128"]
+#![feature(decl_macro, proc_macro_hygiene, try_trait)]
+
+#[macro_use]
+extern crate gettext_macros;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate stdweb;
+use stdweb::web::{event::*, *};
+
+init_i18n!(
+    "plume-front",
+    ar,
+    bg,
+    ca,
+    cs,
+    de,
+    en,
+    eo,
+    es,
+    fa,
+    fr,
+    gl,
+    hi,
+    hr,
+    it,
+    ja,
+    nb,
+    pl,
+    pt,
+    ro,
+    ru,
+    sr,
+    sk,
+    sv
+);
+
+mod editor;
+
+compile_i18n!();
+
+lazy_static! {
+    static ref CATALOG: gettext::Catalog = {
+        let catalogs = include_i18n!();
+        let lang = js! { return navigator.language }.into_string().unwrap();
+        let lang = lang.splitn(2, '-').next().unwrap_or("en");
+
+        let english_position = catalogs
+            .iter()
+            .position(|(language_code, _)| *language_code == "en")
+            .unwrap();
+        catalogs
+            .iter()
+            .find(|(l, _)| l == &lang)
+            .unwrap_or(&catalogs[english_position])
+            .clone()
+            .1
+    };
+}
+
+fn main() {
+    menu();
+    search();
+    editor::init()
+        .map_err(|e| console!(error, format!("Editor error: {:?}", e)))
+        .ok();
+}
+
+/// Toggle menu on mobile devices
+///
+/// It should normally be working fine even without this code
+/// But :focus-within is not yet supported by Webkit/Blink
+fn menu() {
+    if let Some(button) = document().get_element_by_id("menu") {
+        if let Some(menu) = document().get_element_by_id("content") {
+            button.add_event_listener(|_: TouchEnd| {
+                document()
+                    .get_element_by_id("menu")
+                    .map(|menu| menu.class_list().add("show"));
+            });
+            menu.add_event_listener(|_: TouchEnd| {
+                document()
+                    .get_element_by_id("menu")
+                    .map(|menu| menu.class_list().remove("show"));
+            });
+        }
+    }
+}
+
+/// Clear the URL of the search page before submitting request
+fn search() {
+    if let Some(form) = document().get_element_by_id("form") {
+        form.add_event_listener(|_: SubmitEvent| {
+            document()
+                .query_selector_all("#form input")
+                .map(|inputs| {
+                    for input in inputs {
+                        js! {
+                            if (@{&input}.name === "") {
+                                @{&input}.name = @{&input}.id
+                            }
+                            if (@{&input}.name && !@{&input}.value) {
+                                @{&input}.name = "";
+                            }
+                        }
+                    }
+                })
+                .ok();
+        });
+    }
+}

plume-macro/Cargo.toml

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

plume-macro/release.toml

@@ -1,2 +0,0 @@
-pre-release-hook = ["cargo", "fmt"]
-pre-release-replacements = []

plume-macro/src/lib.rs

@@ -58,7 +58,7 @@ pub fn import_migrations(input: TokenStream) -> TokenStream {
             (name, up_sql, down_sql)
         })
         .collect::<Vec<_>>();
-    let migrations_name = migrations.iter().map(|m| &m.0);
+    let migrations_name = migrations.iter().map(|m| &m.0).collect::<Vec<_>>();
     let migrations_up = migrations
         .iter()
         .map(|m| m.1.as_str())
@@ -89,12 +89,12 @@ fn file_to_migration(file: &str) -> TokenStream2 {
     let mut actions = vec![];
     for line in file.lines() {
         if sql {
-            if let Some(acc_str) = line.strip_prefix("--#!") {
+            if line.starts_with("--#!") {
                 if !acc.trim().is_empty() {
                     actions.push(quote!(Action::Sql(#acc)));
                 }
                 sql = false;
-                acc = acc_str.to_string();
+                acc = line[4..].to_string();
                 acc.push('\n');
             } else if line.starts_with("--") {
                 continue;
@@ -102,8 +102,8 @@ fn file_to_migration(file: &str) -> TokenStream2 {
                 acc.push_str(line);
                 acc.push('\n');
             }
-        } else if let Some(acc_str) = line.strip_prefix("--#!") {
+        } else if line.starts_with("--#!") {
-            acc.push_str(acc_str);
+            acc.push_str(&line[4..]);
             acc.push('\n');
         } else if line.starts_with("--") {
             continue;

plume-models/Cargo.toml

@@ -1,40 +1,36 @@
 [package]
 name = "plume-models"
-version = "0.7.1"
+version = "0.4.0"
 authors = ["Plume contributors"]
 edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
-ammonia = "3.1.2"
+ammonia = "2.1.1"
-bcrypt = "0.10.1"
+askama_escape = "0.1"
-guid-create = "0.2"
+bcrypt = "0.5"
-itertools = "0.10.3"
+guid-create = "0.1"
+heck = "0.3.0"
+itertools = "0.8.0"
 lazy_static = "1.0"
-ldap3 = "0.9.3"
 migrations_internals= "1.4.0"
 openssl = "0.10.22"
-rocket = "0.4.6"
+rocket = "0.4.0"
 rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
 reqwest = "0.9"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_derive = "1.0"
-serde_json = "1.0.70"
+serde_json = "1.0"
-tantivy = "0.13.3"
+tantivy = "0.12.0"
 url = "2.1"
 walkdir = "2.2"
 webfinger = "0.4.1"
-whatlang = "0.13.0"
+whatlang = "0.7.1"
-shrinkwraprs = "0.3.0"
+shrinkwraprs = "0.2.1"
 diesel-derive-newtype = "0.1.2"
 glob = "0.3.0"
-lindera-tantivy = { version = "0.7.1", optional = true }
+lindera-tantivy = { version = "0.1.2", optional = true }
-tracing = "0.1.22"
-riker = "0.4.2"
-once_cell = "1.5.2"
-lettre = "0.9.6"
-native-tls = "0.2.8"
 
 [dependencies.chrono]
 features = ["serde"]
@@ -42,7 +38,7 @@ version = "0.4"
 
 [dependencies.diesel]
 features = ["r2d2", "chrono"]
-version = "1.4.5"
+version = "1.4.2"
 
 [dependencies.plume-api]
 path = "../plume-api"

plume-models/release.toml

@@ -1,2 +0,0 @@
-pre-release-hook = ["cargo", "fmt"]
-pre-release-replacements = []

plume-models/src/api_tokens.rs

@@ -86,18 +86,14 @@ impl<'a, 'r> FromRequest<'a, 'r> for ApiToken {
         }
 
         let mut parsed_header = headers[0].split(' ');
-        let auth_type = parsed_header
+        let auth_type = parsed_header.next().map_or_else(
-            .next()
+            || Outcome::Failure((Status::BadRequest, TokenError::NoType)),
-            .map_or_else::<rocket::Outcome<&str, _, ()>, _, _>(
+            Outcome::Success,
-                || Outcome::Failure((Status::BadRequest, TokenError::NoType)),
+        )?;
-                Outcome::Success,
+        let val = parsed_header.next().map_or_else(
-            )?;
+            || Outcome::Failure((Status::BadRequest, TokenError::NoValue)),
-        let val = parsed_header
+            Outcome::Success,
-            .next()
+        )?;
-            .map_or_else::<rocket::Outcome<&str, _, ()>, _, _>(
-                || Outcome::Failure((Status::BadRequest, TokenError::NoValue)),
-                Outcome::Success,
-            )?;
 
         if auth_type == "Bearer" {
             let conn = request

plume-models/src/blocklisted_emails.rs

@@ -28,7 +28,7 @@ impl BlocklistedEmail {
     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)?;
+            let be: BlocklistedEmail = BlocklistedEmail::find_by_id(&conn, i)?;
             delete(&be).execute(conn)?;
         }
         Ok(true)
@@ -87,7 +87,7 @@ impl BlocklistedEmail {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::{instance::tests as instance_tests, tests::db, Connection as Conn};
+    use crate::{instance::tests as instance_tests, tests::rockets, Connection as Conn};
     use diesel::Connection;
 
     pub(crate) fn fill_database(conn: &Conn) -> Vec<BlocklistedEmail> {
@@ -106,28 +106,29 @@ pub(crate) mod tests {
     }
     #[test]
     fn test_match() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let various = fill_database(&conn);
+            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)
+                BlocklistedEmail::matches_blocklist(conn, match1)
                     .unwrap()
                     .unwrap()
                     .id,
                 various[0].id
             );
             assert_eq!(
-                BlocklistedEmail::matches_blocklist(&conn, match2)
+                BlocklistedEmail::matches_blocklist(conn, match2)
                     .unwrap()
                     .unwrap()
                     .id,
                 various[1].id
             );
             assert_eq!(
-                BlocklistedEmail::matches_blocklist(&conn, no_match)
+                BlocklistedEmail::matches_blocklist(conn, no_match)
                     .unwrap()
                     .is_none(),
                 true

plume-models/src/blogs.rs

@@ -1,6 +1,6 @@
 use crate::{
-    ap_url, db_conn::DbConn, instance::*, medias::Media, posts::Post, safe_string::SafeString,
+    ap_url, instance::*, medias::Media, posts::Post, safe_string::SafeString, schema::blogs,
-    schema::blogs, users::User, Connection, Error, PlumeRocket, Result, CONFIG, ITEMS_PER_PAGE,
+    search::Searcher, users::User, Connection, Error, PlumeRocket, Result, ITEMS_PER_PAGE,
 };
 use activitypub::{
     actor::Group,
@@ -20,6 +20,7 @@ use plume_common::activity_pub::{
     inbox::{AsActor, FromId},
     sign, ActivityStream, ApSignature, Id, IntoId, PublicKey, Source,
 };
+use serde_json;
 use url::Url;
 use webfinger::*;
 
@@ -131,33 +132,25 @@ impl Blog {
             .map_err(Error::from)
     }
 
-    pub fn find_by_fqn(conn: &DbConn, fqn: &str) -> Result<Blog> {
+    pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<Blog> {
         let from_db = blogs::table
             .filter(blogs::fqn.eq(fqn))
-            .first(&**conn)
+            .first(&*c.conn)
             .optional()?;
         if let Some(from_db) = from_db {
             Ok(from_db)
         } else {
-            Blog::fetch_from_webfinger(conn, fqn)
+            Blog::fetch_from_webfinger(c, fqn)
         }
     }
 
-    fn fetch_from_webfinger(conn: &DbConn, acct: &str) -> Result<Blog> {
+    fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> {
         resolve_with_prefix(Prefix::Group, acct.to_owned(), true)?
             .links
             .into_iter()
             .find(|l| l.mime_type == Some(String::from("application/activity+json")))
             .ok_or(Error::Webfinger)
-            .and_then(|l| {
+            .and_then(|l| Blog::from_id(c, &l.href?, None).map_err(|(_, e)| e))
-                Blog::from_id(
-                    conn,
-                    &l.href.ok_or(Error::MissingApProperty)?,
-                    None,
-                    CONFIG.proxy(),
-                )
-                .map_err(|(_, e)| e)
-            })
     }
 
     pub fn to_activity(&self, conn: &Connection) -> Result<CustomGroup> {
@@ -224,16 +217,16 @@ impl Blog {
 
     pub fn outbox(&self, conn: &Connection) -> Result<ActivityStream<OrderedCollection>> {
         let mut coll = OrderedCollection::default();
-        coll.collection_props.items = serde_json::to_value(self.get_activities(conn))?;
+        coll.collection_props.items = serde_json::to_value(self.get_activities(conn)?)?;
         coll.collection_props
-            .set_total_items_u64(self.get_activities(conn).len() as u64)?;
+            .set_total_items_u64(self.get_activities(conn)?.len() as u64)?;
         coll.collection_props
             .set_first_link(Id::new(ap_url(&format!("{}?page=1", &self.outbox_url))))?;
         coll.collection_props
             .set_last_link(Id::new(ap_url(&format!(
                 "{}?page={}",
                 &self.outbox_url,
-                (self.get_activities(conn).len() as u64 + ITEMS_PER_PAGE as u64 - 1) as u64
+                (self.get_activities(conn)?.len() as u64 + ITEMS_PER_PAGE as u64 - 1) as u64
                     / ITEMS_PER_PAGE as u64
             ))))?;
         Ok(ActivityStream::new(coll))
@@ -244,7 +237,7 @@ impl Blog {
         (min, max): (i32, i32),
     ) -> Result<ActivityStream<OrderedCollectionPage>> {
         let mut coll = OrderedCollectionPage::default();
-        let acts = self.get_activity_page(conn, (min, max));
+        let acts = self.get_activity_page(&conn, (min, max))?;
         //This still doesn't do anything because the outbox
         //doesn't do anything yet
         coll.collection_page_props.set_next_link(Id::new(&format!(
@@ -260,23 +253,20 @@ impl Blog {
         coll.collection_props.items = serde_json::to_value(acts)?;
         Ok(ActivityStream::new(coll))
     }
-    fn get_activities(&self, _conn: &Connection) -> Vec<serde_json::Value> {
+    fn get_activities(&self, _conn: &Connection) -> Result<Vec<serde_json::Value>> {
-        vec![]
+        Ok(vec![])
     }
     fn get_activity_page(
         &self,
         _conn: &Connection,
         (_min, _max): (i32, i32),
-    ) -> Vec<serde_json::Value> {
+    ) -> Result<Vec<serde_json::Value>> {
-        vec![]
+        Ok(vec![])
     }
 
     pub fn get_keypair(&self) -> Result<PKey<Private>> {
         PKey::from_rsa(Rsa::private_key_from_pem(
-            self.private_key
+            self.private_key.clone()?.as_ref(),
-                .clone()
-                .ok_or(Error::MissingApProperty)?
-                .as_ref(),
         )?)
         .map_err(Error::from)
     }
@@ -328,9 +318,9 @@ impl Blog {
             .and_then(|c| c.url().ok())
     }
 
-    pub fn delete(&self, conn: &Connection) -> Result<()> {
+    pub fn delete(&self, conn: &Connection, searcher: &Searcher) -> Result<()> {
-        for post in Post::get_for_blog(conn, self)? {
+        for post in Post::get_for_blog(conn, &self)? {
-            post.delete(conn)?;
+            post.delete(conn, searcher)?;
         }
         diesel::delete(self)
             .execute(conn)
@@ -345,20 +335,20 @@ impl IntoId for Blog {
     }
 }
 
-impl FromId<DbConn> for Blog {
+impl FromId<PlumeRocket> for Blog {
     type Error = Error;
     type Object = CustomGroup;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Self::find_by_ap_url(conn, id)
+        Self::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, acct: CustomGroup) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, acct: CustomGroup) -> Result<Self> {
         let url = Url::parse(&acct.object.object_props.id_string()?)?;
-        let inst = url.host_str().ok_or(Error::Url)?;
+        let inst = url.host_str()?;
-        let instance = Instance::find_by_domain(conn, inst).or_else(|_| {
+        let instance = Instance::find_by_domain(&c.conn, inst).or_else(|_| {
             Instance::insert(
-                conn,
+                &c.conn,
                 NewInstance {
                     public_domain: inst.to_owned(),
                     name: inst.to_owned(),
@@ -381,9 +371,9 @@ impl FromId<DbConn> for Blog {
             .and_then(|icon| {
                 let owner = icon.object_props.attributed_to_link::<Id>().ok()?;
                 Media::save_remote(
-                    conn,
+                    &c.conn,
                     icon.object_props.url_string().ok()?,
-                    &User::from_id(conn, &owner, None, CONFIG.proxy()).ok()?,
+                    &User::from_id(c, &owner, None).ok()?,
                 )
                 .ok()
             })
@@ -397,9 +387,9 @@ impl FromId<DbConn> for Blog {
             .and_then(|banner| {
                 let owner = banner.object_props.attributed_to_link::<Id>().ok()?;
                 Media::save_remote(
-                    conn,
+                    &c.conn,
                     banner.object_props.url_string().ok()?,
-                    &User::from_id(conn, &owner, None, CONFIG.proxy()).ok()?,
+                    &User::from_id(c, &owner, None).ok()?,
                 )
                 .ok()
             })
@@ -411,7 +401,7 @@ impl FromId<DbConn> for Blog {
         }
 
         Blog::insert(
-            conn,
+            &c.conn,
             NewBlog {
                 actor_id: name.clone(),
                 title: acct.object.object_props.name_string().unwrap_or(name),
@@ -443,10 +433,6 @@ impl FromId<DbConn> for Blog {
             },
         )
     }
-
-    fn get_sender() -> &'static dyn sign::Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
 impl AsActor<&PlumeRocket> for Blog {
@@ -466,22 +452,24 @@ impl AsActor<&PlumeRocket> for Blog {
 }
 
 impl sign::Signer for Blog {
+    type Error = Error;
+
     fn get_key_id(&self) -> String {
         format!("{}#main-key", self.ap_url)
     }
 
-    fn sign(&self, to_sign: &str) -> sign::Result<Vec<u8>> {
+    fn sign(&self, to_sign: &str) -> Result<Vec<u8>> {
-        let key = self.get_keypair().map_err(|_| sign::Error())?;
+        let key = self.get_keypair()?;
         let mut signer = Signer::new(MessageDigest::sha256(), &key)?;
         signer.update(to_sign.as_bytes())?;
-        signer.sign_to_vec().map_err(sign::Error::from)
+        signer.sign_to_vec().map_err(Error::from)
     }
 
-    fn verify(&self, data: &str, signature: &[u8]) -> sign::Result<bool> {
+    fn verify(&self, data: &str, signature: &[u8]) -> Result<bool> {
         let key = PKey::from_rsa(Rsa::public_key_from_pem(self.public_key.as_ref())?)?;
         let mut verifier = Verifier::new(MessageDigest::sha256(), &key)?;
         verifier.update(data.as_bytes())?;
-        verifier.verify(signature).map_err(sign::Error::from)
+        verifier.verify(&signature).map_err(Error::from)
     }
 }
 
@@ -509,8 +497,14 @@ impl NewBlog {
 pub(crate) mod tests {
     use super::*;
     use crate::{
-        blog_authors::*, instance::tests as instance_tests, medias::NewMedia, tests::db,
+        blog_authors::*,
-        users::tests as usersTests, Connection as Conn,
+        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;
 
@@ -597,10 +591,10 @@ pub(crate) mod tests {
     fn get_instance() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            fill_database(&conn);
+            fill_database(conn);
 
             let blog = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "SomeName".to_owned(),
                     "Some name".to_owned(),
@@ -612,7 +606,7 @@ pub(crate) mod tests {
             .unwrap();
 
             assert_eq!(
-                blog.get_instance(&conn).unwrap().id,
+                blog.get_instance(conn).unwrap().id,
                 Instance::get_local().unwrap().id
             );
             // TODO add tests for remote instance
@@ -624,10 +618,10 @@ pub(crate) mod tests {
     fn authors() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let (user, _) = fill_database(&conn);
+            let (user, _) = fill_database(conn);
 
             let b1 = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "SomeName".to_owned(),
                     "Some name".to_owned(),
@@ -638,7 +632,7 @@ pub(crate) mod tests {
             )
             .unwrap();
             let b2 = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "Blog".to_owned(),
                     "Blog".to_owned(),
@@ -651,7 +645,7 @@ pub(crate) mod tests {
             let blog = vec![b1, b2];
 
             BlogAuthor::insert(
-                &conn,
+                conn,
                 NewBlogAuthor {
                     blog_id: blog[0].id,
                     author_id: user[0].id,
@@ -661,7 +655,7 @@ pub(crate) mod tests {
             .unwrap();
 
             BlogAuthor::insert(
-                &conn,
+                conn,
                 NewBlogAuthor {
                     blog_id: blog[0].id,
                     author_id: user[1].id,
@@ -671,7 +665,7 @@ pub(crate) mod tests {
             .unwrap();
 
             BlogAuthor::insert(
-                &conn,
+                conn,
                 NewBlogAuthor {
                     blog_id: blog[1].id,
                     author_id: user[0].id,
@@ -681,39 +675,39 @@ pub(crate) mod tests {
             .unwrap();
 
             assert!(blog[0]
-                .list_authors(&conn)
+                .list_authors(conn)
                 .unwrap()
                 .iter()
                 .any(|a| a.id == user[0].id));
             assert!(blog[0]
-                .list_authors(&conn)
+                .list_authors(conn)
                 .unwrap()
                 .iter()
                 .any(|a| a.id == user[1].id));
             assert!(blog[1]
-                .list_authors(&conn)
+                .list_authors(conn)
                 .unwrap()
                 .iter()
                 .any(|a| a.id == user[0].id));
             assert!(!blog[1]
-                .list_authors(&conn)
+                .list_authors(conn)
                 .unwrap()
                 .iter()
                 .any(|a| a.id == user[1].id));
 
-            assert!(Blog::find_for_author(&conn, &user[0])
+            assert!(Blog::find_for_author(conn, &user[0])
                 .unwrap()
                 .iter()
                 .any(|b| b.id == blog[0].id));
-            assert!(Blog::find_for_author(&conn, &user[1])
+            assert!(Blog::find_for_author(conn, &user[1])
                 .unwrap()
                 .iter()
                 .any(|b| b.id == blog[0].id));
-            assert!(Blog::find_for_author(&conn, &user[0])
+            assert!(Blog::find_for_author(conn, &user[0])
                 .unwrap()
                 .iter()
                 .any(|b| b.id == blog[1].id));
-            assert!(!Blog::find_for_author(&conn, &user[1])
+            assert!(!Blog::find_for_author(conn, &user[1])
                 .unwrap()
                 .iter()
                 .any(|b| b.id == blog[1].id));
@@ -723,12 +717,13 @@ pub(crate) mod tests {
 
     #[test]
     fn find_local() {
-        let conn = &db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            fill_database(&conn);
+            fill_database(conn);
 
             let blog = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "SomeName".to_owned(),
                     "Some name".to_owned(),
@@ -739,7 +734,7 @@ pub(crate) mod tests {
             )
             .unwrap();
 
-            assert_eq!(Blog::find_by_fqn(&conn, "SomeName").unwrap().id, blog.id);
+            assert_eq!(Blog::find_by_fqn(&r, "SomeName").unwrap().id, blog.id);
             Ok(())
         })
     }
@@ -748,10 +743,10 @@ pub(crate) mod tests {
     fn get_fqn() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            fill_database(&conn);
+            fill_database(conn);
 
             let blog = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "SomeName".to_owned(),
                     "Some name".to_owned(),
@@ -771,10 +766,12 @@ pub(crate) mod tests {
     fn delete() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let (_, blogs) = fill_database(&conn);
+            let (_, blogs) = fill_database(conn);
 
-            blogs[0].delete(&conn).unwrap();
+            blogs[0]
-            assert!(Blog::get(&conn, blogs[0].id).is_err());
+                .delete(conn, &get_searcher(&CONFIG.search_tokenizers))
+                .unwrap();
+            assert!(Blog::get(conn, blogs[0].id).is_err());
             Ok(())
         })
     }
@@ -783,10 +780,11 @@ pub(crate) mod tests {
     fn delete_via_user() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let (user, _) = fill_database(&conn);
+            let searcher = get_searcher(&CONFIG.search_tokenizers);
+            let (user, _) = fill_database(conn);
 
             let b1 = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "SomeName".to_owned(),
                     "Some name".to_owned(),
@@ -797,7 +795,7 @@ pub(crate) mod tests {
             )
             .unwrap();
             let b2 = Blog::insert(
-                &conn,
+                conn,
                 NewBlog::new_local(
                     "Blog".to_owned(),
                     "Blog".to_owned(),
@@ -810,7 +808,7 @@ pub(crate) mod tests {
             let blog = vec![b1, b2];
 
             BlogAuthor::insert(
-                &conn,
+                conn,
                 NewBlogAuthor {
                     blog_id: blog[0].id,
                     author_id: user[0].id,
@@ -820,7 +818,7 @@ pub(crate) mod tests {
             .unwrap();
 
             BlogAuthor::insert(
-                &conn,
+                conn,
                 NewBlogAuthor {
                     blog_id: blog[0].id,
                     author_id: user[1].id,
@@ -830,7 +828,7 @@ pub(crate) mod tests {
             .unwrap();
 
             BlogAuthor::insert(
-                &conn,
+                conn,
                 NewBlogAuthor {
                     blog_id: blog[1].id,
                     author_id: user[0].id,
@@ -839,23 +837,24 @@ pub(crate) mod tests {
             )
             .unwrap();
 
-            user[0].delete(&conn).unwrap();
+            user[0].delete(conn, &searcher).unwrap();
-            assert!(Blog::get(&conn, blog[0].id).is_ok());
+            assert!(Blog::get(conn, blog[0].id).is_ok());
-            assert!(Blog::get(&conn, blog[1].id).is_err());
+            assert!(Blog::get(conn, blog[1].id).is_err());
-            user[1].delete(&conn).unwrap();
+            user[1].delete(conn, &searcher).unwrap();
-            assert!(Blog::get(&conn, blog[0].id).is_err());
+            assert!(Blog::get(conn, blog[0].id).is_err());
             Ok(())
         })
     }
 
     #[test]
     fn self_federation() {
-        let conn = &db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, mut blogs) = fill_database(&conn);
+            let (users, mut blogs) = fill_database(conn);
             blogs[0].icon_id = Some(
                 Media::insert(
-                    &conn,
+                    conn,
                     NewMedia {
                         file_path: "aaa.png".into(),
                         alt_text: String::new(),
@@ -871,7 +870,7 @@ pub(crate) mod tests {
             );
             blogs[0].banner_id = Some(
                 Media::insert(
-                    &conn,
+                    conn,
                     NewMedia {
                         file_path: "bbb.png".into(),
                         alt_text: String::new(),
@@ -885,11 +884,11 @@ pub(crate) mod tests {
                 .unwrap()
                 .id,
             );
-            let _: Blog = blogs[0].save_changes(&**conn).unwrap();
+            let _: Blog = blogs[0].save_changes(conn).unwrap();
 
-            let ap_repr = blogs[0].to_activity(&conn).unwrap();
+            let ap_repr = blogs[0].to_activity(conn).unwrap();
-            blogs[0].delete(&conn).unwrap();
+            blogs[0].delete(conn, &*r.searcher).unwrap();
-            let blog = Blog::from_activity(&conn, ap_repr).unwrap();
+            let blog = Blog::from_activity(&r, ap_repr).unwrap();
 
             assert_eq!(blog.actor_id, blogs[0].actor_id);
             assert_eq!(blog.title, blogs[0].title);
@@ -901,8 +900,8 @@ pub(crate) mod tests {
             assert_eq!(blog.public_key, blogs[0].public_key);
             assert_eq!(blog.fqn, blogs[0].fqn);
             assert_eq!(blog.summary_html, blogs[0].summary_html);
-            assert_eq!(blog.icon_url(&conn), blogs[0].icon_url(&conn));
+            assert_eq!(blog.icon_url(conn), blogs[0].icon_url(conn));
-            assert_eq!(blog.banner_url(&conn), blogs[0].banner_url(&conn));
+            assert_eq!(blog.banner_url(conn), blogs[0].banner_url(conn));
 
             Ok(())
         })

plume-models/src/comments.rs

@@ -1,6 +1,5 @@
 use crate::{
     comment_seers::{CommentSeers, NewCommentSeers},
-    db_conn::DbConn,
     instance::Instance,
     medias::Media,
     mentions::Mention,
@@ -9,7 +8,7 @@ use crate::{
     safe_string::SafeString,
     schema::comments,
     users::User,
-    Connection, Error, Result, CONFIG,
+    Connection, Error, PlumeRocket, Result,
 };
 use activitypub::{
     activity::{Create, Delete},
@@ -21,11 +20,11 @@ use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
 use plume_common::{
     activity_pub::{
         inbox::{AsActor, AsObject, FromId},
-        sign::Signer,
         Id, IntoId, PUBLIC_VISIBILITY,
     },
     utils,
 };
+use serde_json;
 use std::collections::HashSet;
 
 #[derive(Queryable, Identifiable, Clone, AsChangeset)]
@@ -106,13 +105,13 @@ impl Comment {
                 .unwrap_or(false)
     }
 
-    pub fn to_activity(&self, conn: &DbConn) -> Result<Note> {
+    pub fn to_activity(&self, c: &PlumeRocket) -> Result<Note> {
-        let author = User::get(conn, self.author_id)?;
+        let author = User::get(&c.conn, self.author_id)?;
         let (html, mentions, _hashtags) = utils::md_to_html(
             self.content.get().as_ref(),
             Some(&Instance::get_local()?.public_domain),
             true,
-            Some(Media::get_media_processor(conn, vec![&author])),
+            Some(Media::get_media_processor(&c.conn, vec![&author])),
         );
 
         let mut note = Note::default();
@@ -125,8 +124,8 @@ impl Comment {
         note.object_props.set_content_string(html)?;
         note.object_props
             .set_in_reply_to_link(Id::new(self.in_response_to_id.map_or_else(
-                || Ok(Post::get(conn, self.post_id)?.ap_url),
+                || Ok(Post::get(&c.conn, self.post_id)?.ap_url),
-                |id| Ok(Comment::get(conn, id)?.ap_url.unwrap_or_default()) as Result<String>,
+                |id| Ok(Comment::get(&c.conn, id)?.ap_url.unwrap_or_default()) as Result<String>,
             )?))?;
         note.object_props
             .set_published_string(chrono::Utc::now().to_rfc3339())?;
@@ -135,27 +134,25 @@ impl Comment {
         note.object_props.set_tag_link_vec(
             mentions
                 .into_iter()
-                .filter_map(|m| Mention::build_activity(conn, &m).ok())
+                .filter_map(|m| Mention::build_activity(c, &m).ok())
                 .collect::<Vec<link::Mention>>(),
         )?;
         Ok(note)
     }
 
-    pub fn create_activity(&self, conn: &DbConn) -> Result<Create> {
+    pub fn create_activity(&self, c: &PlumeRocket) -> Result<Create> {
-        let author = User::get(conn, self.author_id)?;
+        let author = User::get(&c.conn, self.author_id)?;
 
-        let note = self.to_activity(conn)?;
+        let note = self.to_activity(c)?;
         let mut act = Create::default();
         act.create_props.set_actor_link(author.into_id())?;
         act.create_props.set_object_object(note.clone())?;
-        act.object_props.set_id_string(format!(
+        act.object_props
-            "{}/activity",
+            .set_id_string(format!("{}/activity", self.ap_url.clone()?,))?;
-            self.ap_url.clone().ok_or(Error::MissingApProperty)?,
-        ))?;
         act.object_props
             .set_to_link_vec(note.object_props.to_link_vec::<Id>()?)?;
         act.object_props
-            .set_cc_link_vec(vec![Id::new(self.get_author(conn)?.followers_endpoint)])?;
+            .set_cc_link_vec(vec![Id::new(self.get_author(&c.conn)?.followers_endpoint)])?;
         Ok(act)
     }
 
@@ -185,9 +182,7 @@ impl Comment {
             .set_actor_link(self.get_author(conn)?.into_id())?;
 
         let mut tombstone = Tombstone::default();
-        tombstone
+        tombstone.object_props.set_id_string(self.ap_url.clone()?)?;
-            .object_props
-            .set_id_string(self.ap_url.clone().ok_or(Error::MissingApProperty)?)?;
         act.delete_props.set_object_object(tombstone)?;
 
         act.object_props
@@ -199,23 +194,18 @@ impl Comment {
     }
 }
 
-impl FromId<DbConn> for Comment {
+impl FromId<PlumeRocket> for Comment {
     type Error = Error;
     type Object = Note;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Self::find_by_ap_url(conn, id)
+        Self::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, note: Note) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, note: Note) -> Result<Self> {
+        let conn = &*c.conn;
         let comm = {
-            let previous_url = note
+            let previous_url = note.object_props.in_reply_to.as_ref()?.as_str()?;
-                .object_props
-                .in_reply_to
-                .as_ref()
-                .ok_or(Error::MissingApProperty)?
-                .as_str()
-                .ok_or(Error::MissingApProperty)?;
             let previous_comment = Comment::find_by_ap_url(conn, previous_url);
 
             let is_public = |v: &Option<serde_json::Value>| match v
@@ -246,10 +236,9 @@ impl FromId<DbConn> for Comment {
                         Ok(Post::find_by_ap_url(conn, previous_url)?.id) as Result<i32>
                     })?,
                     author_id: User::from_id(
-                        conn,
+                        c,
                         &note.object_props.attributed_to_link::<Id>()?,
                         None,
-                        CONFIG.proxy(),
                     )
                     .map_err(|(_, e)| e)?
                     .id,
@@ -266,7 +255,9 @@ impl FromId<DbConn> for Comment {
                         .and_then(|m| {
                             let author = &Post::get(conn, comm.post_id)?.get_authors(conn)?[0];
                             let not_author = m.link_props.href_string()? != author.ap_url.clone();
-                            Mention::from_activity(conn, &m, comm.id, false, not_author)
+                            Ok(Mention::from_activity(
+                                conn, &m, comm.id, false, not_author,
+                            )?)
                         })
                         .ok();
                 }
@@ -305,7 +296,7 @@ impl FromId<DbConn> for Comment {
                 .collect::<HashSet<_>>() // remove duplicates (don't do a query more than once)
                 .into_iter()
                 .map(|v| {
-                    if let Ok(user) = User::from_id(conn, &v, None, CONFIG.proxy()) {
+                    if let Ok(user) = User::from_id(c, &v, None) {
                         vec![user]
                     } else {
                         vec![] // TODO try to fetch collection
@@ -329,47 +320,43 @@ impl FromId<DbConn> for Comment {
         comm.notify(conn)?;
         Ok(comm)
     }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
-impl AsObject<User, Create, &DbConn> for Comment {
+impl AsObject<User, Create, &PlumeRocket> for Comment {
     type Error = Error;
     type Output = Self;
 
-    fn activity(self, _conn: &DbConn, _actor: User, _id: &str) -> Result<Self> {
+    fn activity(self, _c: &PlumeRocket, _actor: User, _id: &str) -> Result<Self> {
         // The actual creation takes place in the FromId impl
         Ok(self)
     }
 }
 
-impl AsObject<User, Delete, &DbConn> for Comment {
+impl AsObject<User, Delete, &PlumeRocket> for Comment {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
         if self.author_id != actor.id {
             return Err(Error::Unauthorized);
         }
 
-        for m in Mention::list_for_comment(conn, self.id)? {
+        for m in Mention::list_for_comment(&c.conn, self.id)? {
-            for n in Notification::find_for_mention(conn, &m)? {
+            for n in Notification::find_for_mention(&c.conn, &m)? {
-                n.delete(conn)?;
+                n.delete(&c.conn)?;
             }
-            m.delete(conn)?;
+            m.delete(&c.conn)?;
         }
 
-        for n in Notification::find_for_comment(conn, &self)? {
+        for n in Notification::find_for_comment(&c.conn, &self)? {
-            n.delete(&**conn)?;
+            n.delete(&c.conn)?;
         }
 
         diesel::update(comments::table)
             .filter(comments::in_response_to_id.eq(self.id))
             .set(comments::in_response_to_id.eq(self.in_response_to_id))
-            .execute(&**conn)?;
+            .execute(&*c.conn)?;
-        diesel::delete(&self).execute(&**conn)?;
+        diesel::delete(&self).execute(&*c.conn)?;
         Ok(())
     }
 }
@@ -405,16 +392,17 @@ mod tests {
     use super::*;
     use crate::inbox::{inbox, tests::fill_database, InboxResult};
     use crate::safe_string::SafeString;
-    use crate::tests::db;
+    use crate::tests::rockets;
     use diesel::Connection;
 
     // creates a post, get it's Create activity, delete the post,
     // "send" the Create to the inbox, and check it works
     #[test]
     fn self_federation() {
-        let conn = &db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
 
             let original_comm = Comment::insert(
                 conn,
@@ -430,14 +418,14 @@ mod tests {
                 },
             )
             .unwrap();
-            let act = original_comm.create_activity(&conn).unwrap();
+            let act = original_comm.create_activity(&r).unwrap();
             inbox(
-                &conn,
+                &r,
-                serde_json::to_value(original_comm.build_delete(&conn).unwrap()).unwrap(),
+                serde_json::to_value(original_comm.build_delete(conn).unwrap()).unwrap(),
             )
             .unwrap();
 
-            match inbox(&conn, serde_json::to_value(act).unwrap()).unwrap() {
+            match inbox(&r, serde_json::to_value(act).unwrap()).unwrap() {
                 InboxResult::Commented(c) => {
                     // TODO: one is HTML, the other markdown: assert_eq!(c.content, original_comm.content);
                     assert_eq!(c.in_response_to_id, original_comm.in_response_to_id);

plume-models/src/config.rs

@@ -1,9 +1,6 @@
 use crate::search::TokenizerKind as SearchTokenizer;
-use crate::signups::Strategy as SignupStrategy;
-use crate::smtp::{SMTP_PORT, SUBMISSIONS_PORT, SUBMISSION_PORT};
 use rocket::config::Limits;
 use rocket::Config as RocketConfig;
-use std::collections::HashSet;
 use std::env::{self, var};
 
 #[cfg(not(test))]
@@ -17,39 +14,30 @@ pub struct Config {
     pub db_name: &'static str,
     pub db_max_size: Option<u32>,
     pub db_min_idle: Option<u32>,
-    pub signup: SignupStrategy,
     pub search_index: String,
     pub search_tokenizers: SearchTokenizerConfig,
-    pub rocket: Result<RocketConfig, InvalidRocketConfig>,
+    pub rocket: Result<RocketConfig, RocketError>,
     pub logo: LogoConfig,
     pub default_theme: String,
     pub media_directory: String,
-    pub mail: Option<MailConfig>,
-    pub ldap: Option<LdapConfig>,
-    pub proxy: Option<ProxyConfig>,
-}
-impl Config {
-    pub fn proxy(&self) -> Option<&reqwest::Proxy> {
-        self.proxy.as_ref().map(|p| &p.proxy)
-    }
 }
 
 #[derive(Debug, Clone)]
-pub enum InvalidRocketConfig {
+pub enum RocketError {
-    Env,
+    InvalidEnv,
-    Address,
+    InvalidAddress,
-    SecretKey,
+    InvalidSecretKey,
 }
 
-fn get_rocket_config() -> Result<RocketConfig, InvalidRocketConfig> {
+fn get_rocket_config() -> Result<RocketConfig, RocketError> {
-    let mut c = RocketConfig::active().map_err(|_| InvalidRocketConfig::Env)?;
+    let mut c = RocketConfig::active().map_err(|_| RocketError::InvalidEnv)?;
 
     let address = var("ROCKET_ADDRESS").unwrap_or_else(|_| "localhost".to_owned());
     let port = var("ROCKET_PORT")
         .ok()
         .map(|s| s.parse::<u16>().unwrap())
         .unwrap_or(7878);
-    let secret_key = var("ROCKET_SECRET_KEY").map_err(|_| InvalidRocketConfig::SecretKey)?;
+    let secret_key = var("ROCKET_SECRET_KEY").map_err(|_| RocketError::InvalidSecretKey)?;
     let form_size = var("FORM_SIZE")
         .unwrap_or_else(|_| "128".to_owned())
         .parse::<u64>()
@@ -60,10 +48,10 @@ fn get_rocket_config() -> Result<RocketConfig, InvalidRocketConfig> {
         .unwrap();
 
     c.set_address(address)
-        .map_err(|_| InvalidRocketConfig::Address)?;
+        .map_err(|_| RocketError::InvalidAddress)?;
     c.set_port(port);
     c.set_secret_key(secret_key)
-        .map_err(|_| InvalidRocketConfig::SecretKey)?;
+        .map_err(|_| RocketError::InvalidSecretKey)?;
 
     c.set_limits(
         Limits::new()
@@ -159,7 +147,7 @@ impl Default for LogoConfig {
             .ok()
             .or_else(|| custom_main.clone());
         let other = if let Some(main) = custom_main.clone() {
-            let ext = |path: &str| match path.rsplit_once('.').map(|x| x.1) {
+            let ext = |path: &str| match path.rsplitn(2, '.').next() {
                 Some("png") => Some("image/png".to_owned()),
                 Some("jpg") | Some("jpeg") => Some("image/jpeg".to_owned()),
                 Some("svg") => Some("image/svg+xml".to_owned()),
@@ -168,8 +156,11 @@ impl Default for LogoConfig {
             };
             let mut custom_icons = env::vars()
                 .filter_map(|(var, val)| {
-                    var.strip_prefix("PLUME_LOGO_")
+                    if var.starts_with("PLUME_LOGO_") {
-                        .map(|size| (size.to_owned(), val))
+                        Some((var[11..].to_owned(), val))
+                    } else {
+                        None
+                    }
                 })
                 .filter_map(|(var, val)| var.parse::<u64>().ok().map(|var| (var, val)))
                 .map(|(dim, src)| Icon {
@@ -249,106 +240,6 @@ impl SearchTokenizerConfig {
     }
 }
 
-pub struct MailConfig {
-    pub server: String,
-    pub port: u16,
-    pub helo_name: String,
-    pub username: String,
-    pub password: String,
-}
-
-fn get_mail_config() -> Option<MailConfig> {
-    Some(MailConfig {
-        server: env::var("MAIL_SERVER").ok()?,
-        port: env::var("MAIL_PORT").map_or(SUBMISSIONS_PORT, |port| match port.as_str() {
-            "smtp" => SMTP_PORT,
-            "submissions" => SUBMISSIONS_PORT,
-            "submission" => SUBMISSION_PORT,
-            number => number
-                .parse()
-                .expect(r#"MAIL_PORT must be "smtp", "submissions", "submission" or an integer."#),
-        }),
-        helo_name: env::var("MAIL_HELO_NAME").unwrap_or_else(|_| "localhost".to_owned()),
-        username: env::var("MAIL_USER").ok()?,
-        password: env::var("MAIL_PASSWORD").ok()?,
-    })
-}
-
-pub struct LdapConfig {
-    pub addr: String,
-    pub base_dn: String,
-    pub tls: bool,
-    pub user_name_attr: String,
-    pub mail_attr: String,
-}
-
-fn get_ldap_config() -> Option<LdapConfig> {
-    let addr = var("LDAP_ADDR").ok();
-    let base_dn = var("LDAP_BASE_DN").ok();
-    match (addr, base_dn) {
-        (Some(addr), Some(base_dn)) => {
-            let tls = var("LDAP_TLS").unwrap_or_else(|_| "false".to_owned());
-            let tls = match tls.as_ref() {
-                "1" | "true" | "TRUE" => true,
-                "0" | "false" | "FALSE" => false,
-                _ => panic!("Invalid LDAP configuration : tls"),
-            };
-            let user_name_attr = var("LDAP_USER_NAME_ATTR").unwrap_or_else(|_| "cn".to_owned());
-            let mail_attr = var("LDAP_USER_MAIL_ATTR").unwrap_or_else(|_| "mail".to_owned());
-            Some(LdapConfig {
-                addr,
-                base_dn,
-                tls,
-                user_name_attr,
-                mail_attr,
-            })
-        }
-        (None, None) => None,
-        (_, _) => {
-            panic!("Invalid LDAP configuration : both LDAP_ADDR and LDAP_BASE_DN must be set")
-        }
-    }
-}
-
-pub struct ProxyConfig {
-    pub url: reqwest::Url,
-    pub only_domains: Option<HashSet<String>>,
-    pub proxy: reqwest::Proxy,
-}
-
-fn get_proxy_config() -> Option<ProxyConfig> {
-    let url: reqwest::Url = var("PROXY_URL").ok()?.parse().expect("Invalid PROXY_URL");
-    let proxy_url = url.clone();
-    let only_domains: Option<HashSet<String>> = var("PROXY_DOMAINS")
-        .ok()
-        .map(|ods| ods.split(',').map(str::to_owned).collect());
-    let proxy = if let Some(ref only_domains) = only_domains {
-        let only_domains = only_domains.clone();
-        reqwest::Proxy::custom(move |url| {
-            if let Some(domain) = url.domain() {
-                if only_domains.contains(domain)
-                    || only_domains
-                        .iter()
-                        .any(|target| domain.ends_with(&format!(".{}", target)))
-                {
-                    Some(proxy_url.clone())
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        })
-    } else {
-        reqwest::Proxy::all(proxy_url).expect("Invalid PROXY_URL")
-    };
-    Some(ProxyConfig {
-        url,
-        only_domains,
-        proxy,
-    })
-}
-
 lazy_static! {
     pub static ref CONFIG: Config = Config {
         base_url: var("BASE_URL").unwrap_or_else(|_| format!(
@@ -364,7 +255,6 @@ lazy_static! {
             s.parse::<u32>()
                 .expect("Couldn't parse DB_MIN_IDLE into u32")
         )),
-        signup: var("SIGNUP").map_or(SignupStrategy::default(), |s| s.parse().unwrap()),
         #[cfg(feature = "postgres")]
         database_url: var("DATABASE_URL")
             .unwrap_or_else(|_| format!("postgres://plume:plume@localhost/{}", DB_NAME)),
@@ -377,8 +267,5 @@ lazy_static! {
         default_theme: var("DEFAULT_THEME").unwrap_or_else(|_| "default-light".to_owned()),
         media_directory: var("MEDIA_UPLOAD_DIRECTORY")
             .unwrap_or_else(|_| "static/media".to_owned()),
-        mail: get_mail_config(),
-        ldap: get_ldap_config(),
-        proxy: get_proxy_config(),
     };
 }

plume-models/src/email_signups.rs

@@ -1,143 +0,0 @@
-use crate::{
-    db_conn::DbConn,
-    schema::email_signups,
-    users::{NewUser, Role, User},
-    Error, Result,
-};
-use chrono::{offset::Utc, Duration, NaiveDateTime};
-use diesel::{
-    Connection as _, ExpressionMethods, Identifiable, Insertable, QueryDsl, Queryable, RunQueryDsl,
-};
-use plume_common::utils::random_hex;
-use std::ops::Deref;
-
-const TOKEN_VALIDITY_HOURS: i64 = 2;
-
-#[repr(transparent)]
-pub struct Token(String);
-
-impl From<String> for Token {
-    fn from(string: String) -> Self {
-        Token(string)
-    }
-}
-
-impl From<Token> for String {
-    fn from(token: Token) -> Self {
-        token.0
-    }
-}
-
-impl Deref for Token {
-    type Target = String;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl Token {
-    fn generate() -> Self {
-        Self(random_hex())
-    }
-}
-
-#[derive(Identifiable, Queryable)]
-pub struct EmailSignup {
-    pub id: i32,
-    pub email: String,
-    pub token: String,
-    pub expiration_date: NaiveDateTime,
-}
-
-#[derive(Insertable)]
-#[table_name = "email_signups"]
-pub struct NewEmailSignup<'a> {
-    pub email: &'a str,
-    pub token: &'a str,
-    pub expiration_date: NaiveDateTime,
-}
-
-impl EmailSignup {
-    pub fn start(conn: &DbConn, email: &str) -> Result<Token> {
-        conn.transaction(|| {
-            Self::ensure_user_not_exist_by_email(conn, email)?;
-            let _rows = Self::delete_existings_by_email(conn, email)?;
-            let token = Token::generate();
-            let expiration_date = Utc::now()
-                .naive_utc()
-                .checked_add_signed(Duration::hours(TOKEN_VALIDITY_HOURS))
-                .expect("could not calculate expiration date");
-            let new_signup = NewEmailSignup {
-                email,
-                token: &token,
-                expiration_date,
-            };
-            let _rows = diesel::insert_into(email_signups::table)
-                .values(new_signup)
-                .execute(&**conn)?;
-
-            Ok(token)
-        })
-    }
-
-    pub fn find_by_token(conn: &DbConn, token: Token) -> Result<Self> {
-        let signup = email_signups::table
-            .filter(email_signups::token.eq(token.as_str()))
-            .first::<Self>(&**conn)
-            .map_err(Error::from)?;
-        Ok(signup)
-    }
-
-    pub fn confirm(&self, conn: &DbConn) -> Result<()> {
-        conn.transaction(|| {
-            Self::ensure_user_not_exist_by_email(conn, &self.email)?;
-            if self.expired() {
-                Self::delete_existings_by_email(conn, &self.email)?;
-                return Err(Error::Expired);
-            }
-            Ok(())
-        })
-    }
-
-    pub fn complete(&self, conn: &DbConn, username: String, password: String) -> Result<User> {
-        conn.transaction(|| {
-            Self::ensure_user_not_exist_by_email(conn, &self.email)?;
-            let user = NewUser::new_local(
-                conn,
-                username,
-                "".to_string(),
-                Role::Normal,
-                "",
-                self.email.clone(),
-                Some(User::hash_pass(&password)?),
-            )?;
-            self.delete(conn)?;
-            Ok(user)
-        })
-    }
-
-    fn delete(&self, conn: &DbConn) -> Result<()> {
-        let _rows = diesel::delete(self).execute(&**conn).map_err(Error::from)?;
-        Ok(())
-    }
-
-    fn ensure_user_not_exist_by_email(conn: &DbConn, email: &str) -> Result<()> {
-        if User::email_used(conn, email)? {
-            let _rows = Self::delete_existings_by_email(conn, email)?;
-            return Err(Error::UserAlreadyExists);
-        }
-        Ok(())
-    }
-
-    fn delete_existings_by_email(conn: &DbConn, email: &str) -> Result<usize> {
-        let existing_signups = email_signups::table.filter(email_signups::email.eq(email));
-        diesel::delete(existing_signups)
-            .execute(&**conn)
-            .map_err(Error::from)
-    }
-
-    fn expired(&self) -> bool {
-        self.expiration_date < Utc::now().naive_utc()
-    }
-}

plume-models/src/follows.rs

@@ -1,6 +1,6 @@
 use crate::{
-    ap_url, db_conn::DbConn, instance::Instance, notifications::*, schema::follows, users::User,
+    ap_url, notifications::*, schema::follows, users::User, Connection, Error, PlumeRocket, Result,
-    Connection, Error, Result, CONFIG,
+    CONFIG,
 };
 use activitypub::activity::{Accept, Follow as FollowAct, Undo};
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
@@ -116,12 +116,7 @@ impl Follow {
             .accept_props
             .set_actor_link::<Id>(target.clone().into_id())?;
         accept.accept_props.set_object_object(follow)?;
-        broadcast(
+        broadcast(&*target, accept, vec![from.clone()]);
-            &*target,
-            accept,
-            vec![from.clone()],
-            CONFIG.proxy().cloned(),
-        );
         Ok(res)
     }
 
@@ -141,11 +136,11 @@ impl Follow {
     }
 }
 
-impl AsObject<User, FollowAct, &DbConn> for User {
+impl AsObject<User, FollowAct, &PlumeRocket> for User {
     type Error = Error;
     type Output = Follow;
 
-    fn activity(self, conn: &DbConn, actor: User, id: &str) -> Result<Follow> {
+    fn activity(self, c: &PlumeRocket, actor: User, id: &str) -> Result<Follow> {
         // Mastodon (at least) requires the full Follow object when accepting it,
         // so we rebuilt it here
         let mut follow = FollowAct::default();
@@ -153,54 +148,40 @@ impl AsObject<User, FollowAct, &DbConn> for User {
         follow
             .follow_props
             .set_actor_link::<Id>(actor.clone().into_id())?;
-        Follow::accept_follow(conn, &actor, &self, follow, actor.id, self.id)
+        Follow::accept_follow(&c.conn, &actor, &self, follow, actor.id, self.id)
     }
 }
 
-impl FromId<DbConn> for Follow {
+impl FromId<PlumeRocket> for Follow {
     type Error = Error;
     type Object = FollowAct;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Follow::find_by_ap_url(conn, id)
+        Follow::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, follow: FollowAct) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, follow: FollowAct) -> Result<Self> {
-        let actor = User::from_id(
+        let actor =
-            conn,
+            User::from_id(c, &follow.follow_props.actor_link::<Id>()?, None).map_err(|(_, e)| e)?;
-            &follow.follow_props.actor_link::<Id>()?,
-            None,
-            CONFIG.proxy(),
-        )
-        .map_err(|(_, e)| e)?;
 
-        let target = User::from_id(
+        let target = User::from_id(c, &follow.follow_props.object_link::<Id>()?, None)
-            conn,
+            .map_err(|(_, e)| e)?;
-            &follow.follow_props.object_link::<Id>()?,
+        Follow::accept_follow(&c.conn, &actor, &target, follow, actor.id, target.id)
-            None,
-            CONFIG.proxy(),
-        )
-        .map_err(|(_, e)| e)?;
-        Follow::accept_follow(conn, &actor, &target, follow, actor.id, target.id)
-    }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
     }
 }
 
-impl AsObject<User, Undo, &DbConn> for Follow {
+impl AsObject<User, Undo, &PlumeRocket> for Follow {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
-        let conn = conn;
+        let conn = &*c.conn;
         if self.follower_id == actor.id {
-            diesel::delete(&self).execute(&**conn)?;
+            diesel::delete(&self).execute(conn)?;
 
             // delete associated notification if any
             if let Ok(notif) = Notification::find(conn, notification_kind::FOLLOW, self.id) {
-                diesel::delete(&notif).execute(&**conn)?;
+                diesel::delete(&notif).execute(conn)?;
             }
 
             Ok(())

plume-models/src/inbox.rs

@@ -1,13 +1,13 @@
 use activitypub::activity::*;
+use serde_json;
 
 use crate::{
     comments::Comment,
-    db_conn::DbConn,
     follows, likes,
     posts::{Post, PostUpdate},
     reshares::Reshare,
     users::User,
-    Error, CONFIG,
+    Error, PlumeRocket,
 };
 use plume_common::activity_pub::inbox::Inbox;
 
@@ -46,20 +46,20 @@ impl_into_inbox_result! {
     Reshare => Reshared
 }
 
-pub fn inbox(conn: &DbConn, act: serde_json::Value) -> Result<InboxResult, Error> {
+pub fn inbox(ctx: &PlumeRocket, act: serde_json::Value) -> Result<InboxResult, Error> {
-    Inbox::handle(conn, act)
+    Inbox::handle(ctx, act)
-        .with::<User, Announce, Post>(CONFIG.proxy())
+        .with::<User, Announce, Post>()
-        .with::<User, Create, Comment>(CONFIG.proxy())
+        .with::<User, Create, Comment>()
-        .with::<User, Create, Post>(CONFIG.proxy())
+        .with::<User, Create, Post>()
-        .with::<User, Delete, Comment>(CONFIG.proxy())
+        .with::<User, Delete, Comment>()
-        .with::<User, Delete, Post>(CONFIG.proxy())
+        .with::<User, Delete, Post>()
-        .with::<User, Delete, User>(CONFIG.proxy())
+        .with::<User, Delete, User>()
-        .with::<User, Follow, User>(CONFIG.proxy())
+        .with::<User, Follow, User>()
-        .with::<User, Like, Post>(CONFIG.proxy())
+        .with::<User, Like, Post>()
-        .with::<User, Undo, Reshare>(CONFIG.proxy())
+        .with::<User, Undo, Reshare>()
-        .with::<User, Undo, follows::Follow>(CONFIG.proxy())
+        .with::<User, Undo, follows::Follow>()
-        .with::<User, Undo, likes::Like>(CONFIG.proxy())
+        .with::<User, Undo, likes::Like>()
-        .with::<User, Update, PostUpdate>(CONFIG.proxy())
+        .with::<User, Update, PostUpdate>()
         .done()
 }
 
@@ -67,13 +67,13 @@ pub fn inbox(conn: &DbConn, act: serde_json::Value) -> Result<InboxResult, Error
 pub(crate) mod tests {
     use super::InboxResult;
     use crate::blogs::tests::fill_database as blog_fill_db;
-    use crate::db_conn::DbConn;
     use crate::safe_string::SafeString;
-    use crate::tests::db;
+    use crate::tests::rockets;
+    use crate::PlumeRocket;
     use diesel::Connection;
 
     pub fn fill_database(
-        conn: &DbConn,
+        rockets: &PlumeRocket,
     ) -> (
         Vec<crate::posts::Post>,
         Vec<crate::users::User>,
@@ -82,9 +82,9 @@ pub(crate) mod tests {
         use crate::post_authors::*;
         use crate::posts::*;
 
-        let (users, blogs) = blog_fill_db(&conn);
+        let (users, blogs) = blog_fill_db(&rockets.conn);
         let post = Post::insert(
-            &conn,
+            &rockets.conn,
             NewPost {
                 blog_id: blogs[0].id,
                 slug: "testing".to_owned(),
@@ -98,11 +98,12 @@ pub(crate) mod tests {
                 source: String::new(),
                 cover_id: None,
             },
+            &rockets.searcher,
         )
         .unwrap();
 
         PostAuthor::insert(
-            &conn,
+            &rockets.conn,
             NewPostAuthor {
                 post_id: post.id,
                 author_id: users[0].id,
@@ -115,9 +116,10 @@ pub(crate) mod tests {
 
     #[test]
     fn announce_post() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
             let act = json!({
                 "id": "https://plu.me/announce/1",
                 "actor": users[0].ap_url,
@@ -125,7 +127,7 @@ pub(crate) mod tests {
                 "type": "Announce",
             });
 
-            match super::inbox(&conn, act).unwrap() {
+            match super::inbox(&r, act).unwrap() {
                 super::InboxResult::Reshared(r) => {
                     assert_eq!(r.post_id, posts[0].id);
                     assert_eq!(r.user_id, users[0].id);
@@ -139,9 +141,10 @@ pub(crate) mod tests {
 
     #[test]
     fn create_comment() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
             let act = json!({
                 "id": "https://plu.me/comment/1/activity",
                 "actor": users[0].ap_url,
@@ -156,7 +159,7 @@ pub(crate) mod tests {
                 "type": "Create",
             });
 
-            match super::inbox(&conn, act).unwrap() {
+            match super::inbox(&r, act).unwrap() {
                 super::InboxResult::Commented(c) => {
                     assert_eq!(c.author_id, users[0].id);
                     assert_eq!(c.post_id, posts[0].id);
@@ -170,99 +173,12 @@ pub(crate) mod tests {
         });
     }
 
-    #[test]
-    fn spoof_comment() {
-        let conn = db();
-        conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
-            let act = json!({
-                "id": "https://plu.me/comment/1/activity",
-                "actor": users[0].ap_url,
-                "object": {
-                    "type": "Note",
-                    "id": "https://plu.me/comment/1",
-                    "attributedTo": users[1].ap_url,
-                    "inReplyTo": posts[0].ap_url,
-                    "content": "Hello.",
-                    "to": [plume_common::activity_pub::PUBLIC_VISIBILITY]
-                },
-                "type": "Create",
-            });
-
-            assert!(matches!(
-                super::inbox(&conn, act.clone()),
-                Err(super::Error::Inbox(
-                    box plume_common::activity_pub::inbox::InboxError::InvalidObject(_),
-                ))
-            ));
-            Ok(())
-        });
-    }
-
-    #[test]
-    fn spoof_comment_by_object_with_id() {
-        let conn = db();
-        conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
-            let act = json!({
-                "id": "https://plu.me/comment/1/activity",
-                "actor": users[0].ap_url,
-                "object": {
-                    "type": "Note",
-                    "id": "https://plu.me/comment/1",
-                    "attributedTo": {
-                        "id": users[1].ap_url
-                    },
-                    "inReplyTo": posts[0].ap_url,
-                    "content": "Hello.",
-                    "to": [plume_common::activity_pub::PUBLIC_VISIBILITY]
-                },
-                "type": "Create",
-            });
-
-            assert!(matches!(
-                super::inbox(&conn, act.clone()),
-                Err(super::Error::Inbox(
-                    box plume_common::activity_pub::inbox::InboxError::InvalidObject(_),
-                ))
-            ));
-            Ok(())
-        });
-    }
-    #[test]
-    fn spoof_comment_by_object_without_id() {
-        let conn = db();
-        conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
-            let act = json!({
-                "id": "https://plu.me/comment/1/activity",
-                "actor": users[0].ap_url,
-                "object": {
-                    "type": "Note",
-                    "id": "https://plu.me/comment/1",
-                    "attributedTo": {},
-                    "inReplyTo": posts[0].ap_url,
-                    "content": "Hello.",
-                    "to": [plume_common::activity_pub::PUBLIC_VISIBILITY]
-                },
-                "type": "Create",
-            });
-
-            assert!(matches!(
-                super::inbox(&conn, act.clone()),
-                Err(super::Error::Inbox(
-                    box plume_common::activity_pub::inbox::InboxError::InvalidObject(_),
-                ))
-            ));
-            Ok(())
-        });
-    }
-
     #[test]
     fn create_post() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (_, users, blogs) = fill_database(&conn);
+            let (_, users, blogs) = fill_database(&r);
             let act = json!({
                 "id": "https://plu.me/comment/1/activity",
                 "actor": users[0].ap_url,
@@ -283,9 +199,9 @@ pub(crate) mod tests {
                 "type": "Create",
             });
 
-            match super::inbox(&conn, act).unwrap() {
+            match super::inbox(&r, act).unwrap() {
                 super::InboxResult::Post(p) => {
-                    assert!(p.is_author(&conn, users[0].id).unwrap());
+                    assert!(p.is_author(conn, users[0].id).unwrap());
                     assert_eq!(p.source, "Hello.".to_owned());
                     assert_eq!(p.blog_id, blogs[0].id);
                     assert_eq!(p.content, SafeString::new("Hello."));
@@ -298,123 +214,16 @@ pub(crate) mod tests {
         });
     }
 
-    #[test]
-    fn spoof_post() {
-        let conn = db();
-        conn.test_transaction::<_, (), _>(|| {
-            let (_, users, blogs) = fill_database(&conn);
-            let act = json!({
-                "id": "https://plu.me/comment/1/activity",
-                "actor": users[0].ap_url,
-                "object": {
-                    "type": "Article",
-                    "id": "https://plu.me/~/Blog/my-article",
-                    "attributedTo": [users[1].ap_url, blogs[0].ap_url],
-                    "content": "Hello.",
-                    "name": "My Article",
-                    "summary": "Bye.",
-                    "source": {
-                        "content": "Hello.",
-                        "mediaType": "text/markdown"
-                    },
-                    "published": "2014-12-12T12:12:12Z",
-                    "to": [plume_common::activity_pub::PUBLIC_VISIBILITY]
-                },
-                "type": "Create",
-            });
-
-            assert!(matches!(
-                super::inbox(&conn, act.clone()),
-                Err(super::Error::Inbox(
-                    box plume_common::activity_pub::inbox::InboxError::InvalidObject(_),
-                ))
-            ));
-            Ok(())
-        });
-    }
-
-    #[test]
-    fn spoof_post_by_object_with_id() {
-        let conn = db();
-        conn.test_transaction::<_, (), _>(|| {
-            let (_, users, blogs) = fill_database(&conn);
-            let act = json!({
-                "id": "https://plu.me/comment/1/activity",
-                "actor": users[0].ap_url,
-                "object": {
-                    "type": "Article",
-                    "id": "https://plu.me/~/Blog/my-article",
-                    "attributedTo": [
-                        {"id": users[1].ap_url},
-                        blogs[0].ap_url
-                    ],
-                    "content": "Hello.",
-                    "name": "My Article",
-                    "summary": "Bye.",
-                    "source": {
-                        "content": "Hello.",
-                        "mediaType": "text/markdown"
-                    },
-                    "published": "2014-12-12T12:12:12Z",
-                    "to": [plume_common::activity_pub::PUBLIC_VISIBILITY]
-                },
-                "type": "Create",
-            });
-
-            assert!(matches!(
-                super::inbox(&conn, act.clone()),
-                Err(super::Error::Inbox(
-                    box plume_common::activity_pub::inbox::InboxError::InvalidObject(_),
-                ))
-            ));
-            Ok(())
-        });
-    }
-
-    #[test]
-    fn spoof_post_by_object_without_id() {
-        let conn = db();
-        conn.test_transaction::<_, (), _>(|| {
-            let (_, users, blogs) = fill_database(&conn);
-            let act = json!({
-                "id": "https://plu.me/comment/1/activity",
-                "actor": users[0].ap_url,
-                "object": {
-                    "type": "Article",
-                    "id": "https://plu.me/~/Blog/my-article",
-                    "attributedTo": [{}, blogs[0].ap_url],
-                    "content": "Hello.",
-                    "name": "My Article",
-                    "summary": "Bye.",
-                    "source": {
-                        "content": "Hello.",
-                        "mediaType": "text/markdown"
-                    },
-                    "published": "2014-12-12T12:12:12Z",
-                    "to": [plume_common::activity_pub::PUBLIC_VISIBILITY]
-                },
-                "type": "Create",
-            });
-
-            assert!(matches!(
-                super::inbox(&conn, act.clone()),
-                Err(super::Error::Inbox(
-                    box plume_common::activity_pub::inbox::InboxError::InvalidObject(_),
-                ))
-            ));
-            Ok(())
-        });
-    }
-
     #[test]
     fn delete_comment() {
         use crate::comments::*;
 
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
             Comment::insert(
-                &conn,
+                conn,
                 NewComment {
                     content: SafeString::new("My comment"),
                     in_response_to_id: None,
@@ -434,7 +243,7 @@ pub(crate) mod tests {
                 "object": "https://plu.me/comment/1",
                 "type": "Delete",
             });
-            assert!(super::inbox(&conn, fail_act).is_err());
+            assert!(super::inbox(&r, fail_act).is_err());
 
             let ok_act = json!({
                 "id": "https://plu.me/comment/1/delete",
@@ -442,16 +251,17 @@ pub(crate) mod tests {
                 "object": "https://plu.me/comment/1",
                 "type": "Delete",
             });
-            assert!(super::inbox(&conn, ok_act).is_ok());
+            assert!(super::inbox(&r, ok_act).is_ok());
             Ok(())
         })
     }
 
     #[test]
     fn delete_post() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
 
             let fail_act = json!({
                 "id": "https://plu.me/comment/1/delete",
@@ -459,7 +269,7 @@ pub(crate) mod tests {
                 "object": posts[0].ap_url,
                 "type": "Delete",
             });
-            assert!(super::inbox(&conn, fail_act).is_err());
+            assert!(super::inbox(&r, fail_act).is_err());
 
             let ok_act = json!({
                 "id": "https://plu.me/comment/1/delete",
@@ -467,16 +277,17 @@ pub(crate) mod tests {
                 "object": posts[0].ap_url,
                 "type": "Delete",
             });
-            assert!(super::inbox(&conn, ok_act).is_ok());
+            assert!(super::inbox(&r, ok_act).is_ok());
             Ok(())
         });
     }
 
     #[test]
     fn delete_user() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (_, users, _) = fill_database(&conn);
+            let (_, users, _) = fill_database(&r);
 
             let fail_act = json!({
                 "id": "https://plu.me/@/Admin#delete",
@@ -484,7 +295,7 @@ pub(crate) mod tests {
                 "object": users[0].ap_url,
                 "type": "Delete",
             });
-            assert!(super::inbox(&conn, fail_act).is_err());
+            assert!(super::inbox(&r, fail_act).is_err());
 
             let ok_act = json!({
                 "id": "https://plu.me/@/Admin#delete",
@@ -492,8 +303,8 @@ pub(crate) mod tests {
                 "object": users[0].ap_url,
                 "type": "Delete",
             });
-            assert!(super::inbox(&conn, ok_act).is_ok());
+            assert!(super::inbox(&r, ok_act).is_ok());
-            assert!(crate::users::User::get(&conn, users[0].id).is_err());
+            assert!(crate::users::User::get(conn, users[0].id).is_err());
 
             Ok(())
         });
@@ -501,9 +312,10 @@ pub(crate) mod tests {
 
     #[test]
     fn follow() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (_, users, _) = fill_database(&conn);
+            let (_, users, _) = fill_database(&r);
 
             let act = json!({
                 "id": "https://plu.me/follow/1",
@@ -511,7 +323,7 @@ pub(crate) mod tests {
                 "object": users[1].ap_url,
                 "type": "Follow",
             });
-            match super::inbox(&conn, act).unwrap() {
+            match super::inbox(&r, act).unwrap() {
                 InboxResult::Followed(f) => {
                     assert_eq!(f.follower_id, users[0].id);
                     assert_eq!(f.following_id, users[1].id);
@@ -525,9 +337,10 @@ pub(crate) mod tests {
 
     #[test]
     fn like() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
 
             let act = json!({
                 "id": "https://plu.me/like/1",
@@ -535,7 +348,7 @@ pub(crate) mod tests {
                 "object": posts[0].ap_url,
                 "type": "Like",
             });
-            match super::inbox(&conn, act).unwrap() {
+            match super::inbox(&r, act).unwrap() {
                 InboxResult::Liked(l) => {
                     assert_eq!(l.user_id, users[1].id);
                     assert_eq!(l.post_id, posts[0].id);
@@ -551,12 +364,13 @@ pub(crate) mod tests {
     fn undo_reshare() {
         use crate::reshares::*;
 
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
 
             let announce = Reshare::insert(
-                &conn,
+                conn,
                 NewReshare {
                     post_id: posts[0].id,
                     user_id: users[1].id,
@@ -571,7 +385,7 @@ pub(crate) mod tests {
                 "object": announce.ap_url,
                 "type": "Undo",
             });
-            assert!(super::inbox(&conn, fail_act).is_err());
+            assert!(super::inbox(&r, fail_act).is_err());
 
             let ok_act = json!({
                 "id": "https://plu.me/undo/1",
@@ -579,7 +393,7 @@ pub(crate) mod tests {
                 "object": announce.ap_url,
                 "type": "Undo",
             });
-            assert!(super::inbox(&conn, ok_act).is_ok());
+            assert!(super::inbox(&r, ok_act).is_ok());
             Ok(())
         });
     }
@@ -588,12 +402,13 @@ pub(crate) mod tests {
     fn undo_follow() {
         use crate::follows::*;
 
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (_, users, _) = fill_database(&conn);
+            let (_, users, _) = fill_database(&r);
 
             let follow = Follow::insert(
-                &conn,
+                conn,
                 NewFollow {
                     follower_id: users[0].id,
                     following_id: users[1].id,
@@ -608,7 +423,7 @@ pub(crate) mod tests {
                 "object": follow.ap_url,
                 "type": "Undo",
             });
-            assert!(super::inbox(&conn, fail_act).is_err());
+            assert!(super::inbox(&r, fail_act).is_err());
 
             let ok_act = json!({
                 "id": "https://plu.me/undo/1",
@@ -616,7 +431,7 @@ pub(crate) mod tests {
                 "object": follow.ap_url,
                 "type": "Undo",
             });
-            assert!(super::inbox(&conn, ok_act).is_ok());
+            assert!(super::inbox(&r, ok_act).is_ok());
             Ok(())
         });
     }
@@ -625,12 +440,13 @@ pub(crate) mod tests {
     fn undo_like() {
         use crate::likes::*;
 
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
 
             let like = Like::insert(
-                &conn,
+                conn,
                 NewLike {
                     post_id: posts[0].id,
                     user_id: users[1].id,
@@ -645,7 +461,7 @@ pub(crate) mod tests {
                 "object": like.ap_url,
                 "type": "Undo",
             });
-            assert!(super::inbox(&conn, fail_act).is_err());
+            assert!(super::inbox(&r, fail_act).is_err());
 
             let ok_act = json!({
                 "id": "https://plu.me/undo/1",
@@ -653,16 +469,17 @@ pub(crate) mod tests {
                 "object": like.ap_url,
                 "type": "Undo",
             });
-            assert!(super::inbox(&conn, ok_act).is_ok());
+            assert!(super::inbox(&r, ok_act).is_ok());
             Ok(())
         });
     }
 
     #[test]
     fn update_post() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (posts, users, _) = fill_database(&conn);
+            let (posts, users, _) = fill_database(&r);
 
             let act = json!({
                 "id": "https://plu.me/update/1",
@@ -681,7 +498,7 @@ pub(crate) mod tests {
                 "type": "Update",
             });
 
-            super::inbox(&conn, act).unwrap();
+            super::inbox(&r, act).unwrap();
             Ok(())
         });
     }

plume-models/src/instance.rs

@@ -3,12 +3,11 @@ use crate::{
     medias::Media,
     safe_string::SafeString,
     schema::{instances, users},
-    users::{NewUser, Role, User},
+    users::{Role, User},
     Connection, Error, Result,
 };
 use chrono::NaiveDateTime;
-use diesel::{self, result::Error::NotFound, ExpressionMethods, QueryDsl, RunQueryDsl};
+use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
-use once_cell::sync::OnceCell;
 use plume_common::utils::md_to_html;
 use std::sync::RwLock;
 
@@ -46,9 +45,6 @@ lazy_static! {
     static ref LOCAL_INSTANCE: RwLock<Option<Instance>> = RwLock::new(None);
 }
 
-const LOCAL_INSTANCE_USERNAME: &str = "__instance__";
-static LOCAL_INSTANCE_USER: OnceCell<User> = OnceCell::new();
-
 impl Instance {
     pub fn set_local(self) {
         LOCAL_INSTANCE.write().unwrap().replace(self);
@@ -80,42 +76,6 @@ impl Instance {
             .map_err(Error::from)
     }
 
-    pub fn create_local_instance_user(conn: &Connection) -> Result<User> {
-        let instance = Instance::get_local()?;
-        let email = format!("{}@{}", LOCAL_INSTANCE_USERNAME, &instance.public_domain);
-        NewUser::new_local(
-            conn,
-            LOCAL_INSTANCE_USERNAME.into(),
-            instance.public_domain,
-            Role::Instance,
-            "Local instance",
-            email,
-            None,
-        )
-    }
-
-    pub fn get_local_instance_user() -> Option<&'static User> {
-        LOCAL_INSTANCE_USER.get()
-    }
-
-    pub fn get_local_instance_user_uncached(conn: &Connection) -> Result<User> {
-        users::table
-            .filter(users::role.eq(3))
-            .first(conn)
-            .or_else(|err| match err {
-                NotFound => Self::create_local_instance_user(conn),
-                _ => Err(Error::Db(err)),
-            })
-    }
-
-    pub fn cache_local_instance_user(conn: &Connection) {
-        let _ = LOCAL_INSTANCE_USER.get_or_init(|| {
-            Self::get_local_instance_user_uncached(conn)
-                .or_else(|_| Self::create_local_instance_user(conn))
-                .expect("Failed to cache local instance user")
-        });
-    }
-
     pub fn page(conn: &Connection, (min, max): (i32, i32)) -> Result<Vec<Instance>> {
         instances::table
             .order(instances::public_domain.asc())
@@ -287,7 +247,6 @@ pub(crate) mod tests {
     use diesel::Connection;
 
     pub(crate) fn fill_database(conn: &Conn) -> Vec<(NewInstance, Instance)> {
-        diesel::delete(instances::table).execute(conn).unwrap();
         let res = vec![
             NewInstance {
                 default_license: "WTFPL".to_string(),
@@ -344,7 +303,6 @@ pub(crate) mod tests {
         })
         .collect();
         Instance::cache_local(conn);
-        Instance::cache_local_instance_user(conn);
         res
     }
 
@@ -530,14 +488,12 @@ pub(crate) mod tests {
             );
             assert_eq!(
                 inst.long_description_html,
-                SafeString::new(
+                SafeString::new("<p><a href=\"/with_link\">long_description</a></p>\n")
-                    "<p dir=\"auto\"><a href=\"/with_link\">long_description</a></p>\n"
-                )
             );
             assert_eq!(inst.short_description.get(), "[short](#link)");
             assert_eq!(
                 inst.short_description_html,
-                SafeString::new("<p dir=\"auto\"><a href=\"#link\">short</a></p>\n")
+                SafeString::new("<p><a href=\"#link\">short</a></p>\n")
             );
             assert_eq!(inst.default_license, "CC-BY-SAO".to_owned());
             Ok(())

plume-models/src/lib.rs

@@ -1,6 +1,6 @@
+#![feature(try_trait)]
 #![feature(never_type)]
 #![feature(proc_macro_hygiene)]
-#![feature(box_patterns)]
 
 #[macro_use]
 extern crate diesel;
@@ -10,19 +10,14 @@ extern crate lazy_static;
 extern crate plume_macro;
 #[macro_use]
 extern crate rocket;
+#[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 #[macro_use]
 extern crate tantivy;
 
-pub use lettre;
+use plume_common::activity_pub::inbox::InboxError;
-pub use lettre::smtp;
-use once_cell::sync::Lazy;
-use plume_common::activity_pub::{inbox::InboxError, request, sign};
-use posts::PostEvent;
-use riker::actors::{channel, ActorSystem, ChannelRef, SystemBuilder};
-use users::UserEvent;
 
 #[cfg(not(any(feature = "sqlite", feature = "postgres")))]
 compile_error!("Either feature \"sqlite\" or \"postgres\" must be enabled for this crate.");
@@ -35,19 +30,6 @@ pub type Connection = diesel::SqliteConnection;
 #[cfg(all(not(feature = "sqlite"), feature = "postgres"))]
 pub type Connection = diesel::PgConnection;
 
-pub(crate) static ACTOR_SYS: Lazy<ActorSystem> = Lazy::new(|| {
-    SystemBuilder::new()
-        .name("plume")
-        .create()
-        .expect("Failed to create actor system")
-});
-
-pub(crate) static USER_CHAN: Lazy<ChannelRef<UserEvent>> =
-    Lazy::new(|| channel("user_events", &*ACTOR_SYS).expect("Failed to create user channel"));
-
-pub(crate) static POST_CHAN: Lazy<ChannelRef<PostEvent>> =
-    Lazy::new(|| channel("post_events", &*ACTOR_SYS).expect("Failed to create post channel"));
-
 /// All the possible errors that can be encoutered in this crate
 #[derive(Debug)]
 pub enum Error {
@@ -67,7 +49,6 @@ pub enum Error {
     Url,
     Webfinger,
     Expired,
-    UserAlreadyExists,
 }
 
 impl From<bcrypt::BcryptError> for Error {
@@ -82,18 +63,18 @@ impl From<openssl::error::ErrorStack> for Error {
     }
 }
 
-impl From<sign::Error> for Error {
-    fn from(_: sign::Error) -> Self {
-        Error::Signature
-    }
-}
-
 impl From<diesel::result::Error> for Error {
     fn from(err: diesel::result::Error) -> Self {
         Error::Db(err)
     }
 }
 
+impl From<std::option::NoneError> for Error {
+    fn from(_: std::option::NoneError) -> Self {
+        Error::NotFound
+    }
+}
+
 impl From<url::ParseError> for Error {
     fn from(_: url::ParseError) -> Self {
         Error::Url
@@ -160,12 +141,6 @@ impl From<InboxError<Error>> for Error {
     }
 }
 
-impl From<request::Error> for Error {
-    fn from(_err: request::Error) -> Error {
-        Error::Request
-    }
-}
-
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// Adds a function to a model, that returns the first
@@ -303,40 +278,15 @@ pub fn ap_url(url: &str) -> String {
     format!("https://{}", url)
 }
 
-pub trait SmtpNewWithAddr {
-    fn new_with_addr(
-        addr: (&str, u16),
-    ) -> std::result::Result<smtp::SmtpClient, smtp::error::Error>;
-}
-
-impl SmtpNewWithAddr for smtp::SmtpClient {
-    // Stolen from lettre::smtp::SmtpClient::new_simple()
-    fn new_with_addr(addr: (&str, u16)) -> std::result::Result<Self, smtp::error::Error> {
-        use native_tls::TlsConnector;
-        use smtp::{
-            client::net::{ClientTlsParameters, DEFAULT_TLS_PROTOCOLS},
-            ClientSecurity, SmtpClient,
-        };
-
-        let (domain, port) = addr;
-
-        let mut tls_builder = TlsConnector::builder();
-        tls_builder.min_protocol_version(Some(DEFAULT_TLS_PROTOCOLS[0]));
-
-        let tls_parameters =
-            ClientTlsParameters::new(domain.to_string(), tls_builder.build().unwrap());
-
-        SmtpClient::new((domain, port), ClientSecurity::Wrapper(tls_parameters))
-    }
-}
-
 #[cfg(test)]
 #[macro_use]
 mod tests {
-    use crate::{db_conn, migrations::IMPORTED_MIGRATIONS, Connection as Conn, CONFIG};
+    use crate::{db_conn, migrations::IMPORTED_MIGRATIONS, search, Connection as Conn, CONFIG};
     use diesel::r2d2::ConnectionManager;
     use plume_common::utils::random_hex;
+    use scheduled_thread_pool::ScheduledThreadPool;
     use std::env::temp_dir;
+    use std::sync::Arc;
 
     #[macro_export]
     macro_rules! part_eq {
@@ -366,6 +316,15 @@ mod tests {
             pool
         };
     }
+
+    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)),
+            worker: Arc::new(ScheduledThreadPool::new(2)),
+            user: None,
+        }
+    }
 }
 
 pub mod admin;
@@ -377,7 +336,6 @@ pub mod blogs;
 pub mod comment_seers;
 pub mod comments;
 pub mod db_conn;
-pub mod email_signups;
 pub mod follows;
 pub mod headers;
 pub mod inbox;
@@ -392,13 +350,11 @@ pub mod password_reset_requests;
 pub mod plume_rocket;
 pub mod post_authors;
 pub mod posts;
-pub mod remote_fetch_actor;
 pub mod reshares;
 pub mod safe_string;
 #[allow(unused_imports)]
 pub mod schema;
 pub mod search;
-pub mod signups;
 pub mod tags;
 pub mod timeline;
 pub mod users;

plume-models/src/likes.rs

@@ -1,13 +1,12 @@
 use crate::{
-    db_conn::DbConn, instance::Instance, notifications::*, posts::Post, schema::likes, timeline::*,
+    notifications::*, posts::Post, schema::likes, timeline::*, users::User, Connection, Error,
-    users::User, Connection, Error, Result, CONFIG,
+    PlumeRocket, Result,
 };
 use activitypub::activity;
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use plume_common::activity_pub::{
     inbox::{AsActor, AsObject, FromId},
-    sign::Signer,
     Id, IntoId, PUBLIC_VISIBILITY,
 };
 
@@ -84,77 +83,64 @@ impl Like {
     }
 }
 
-impl AsObject<User, activity::Like, &DbConn> for Post {
+impl AsObject<User, activity::Like, &PlumeRocket> for Post {
     type Error = Error;
     type Output = Like;
 
-    fn activity(self, conn: &DbConn, actor: User, id: &str) -> Result<Like> {
+    fn activity(self, c: &PlumeRocket, actor: User, id: &str) -> Result<Like> {
         let res = Like::insert(
-            conn,
+            &c.conn,
             NewLike {
                 post_id: self.id,
                 user_id: actor.id,
                 ap_url: id.to_string(),
             },
         )?;
-        res.notify(conn)?;
+        res.notify(&c.conn)?;
 
-        Timeline::add_to_all_timelines(conn, &self, Kind::Like(&actor))?;
+        Timeline::add_to_all_timelines(c, &self, Kind::Like(&actor))?;
         Ok(res)
     }
 }
 
-impl FromId<DbConn> for Like {
+impl FromId<PlumeRocket> for Like {
     type Error = Error;
     type Object = activity::Like;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Like::find_by_ap_url(conn, id)
+        Like::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, act: activity::Like) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, act: activity::Like) -> Result<Self> {
         let res = Like::insert(
-            conn,
+            &c.conn,
             NewLike {
-                post_id: Post::from_id(
+                post_id: Post::from_id(c, &act.like_props.object_link::<Id>()?, None)
-                    conn,
+                    .map_err(|(_, e)| e)?
-                    &act.like_props.object_link::<Id>()?,
+                    .id,
-                    None,
+                user_id: User::from_id(c, &act.like_props.actor_link::<Id>()?, None)
-                    CONFIG.proxy(),
+                    .map_err(|(_, e)| e)?
-                )
+                    .id,
-                .map_err(|(_, e)| e)?
-                .id,
-                user_id: User::from_id(
-                    conn,
-                    &act.like_props.actor_link::<Id>()?,
-                    None,
-                    CONFIG.proxy(),
-                )
-                .map_err(|(_, e)| e)?
-                .id,
                 ap_url: act.object_props.id_string()?,
             },
         )?;
-        res.notify(conn)?;
+        res.notify(&c.conn)?;
         Ok(res)
     }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
-impl AsObject<User, activity::Undo, &DbConn> for Like {
+impl AsObject<User, activity::Undo, &PlumeRocket> for Like {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
+        let conn = &*c.conn;
         if actor.id == self.user_id {
-            diesel::delete(&self).execute(&**conn)?;
+            diesel::delete(&self).execute(conn)?;
 
             // delete associated notification if any
             if let Ok(notif) = Notification::find(conn, notification_kind::LIKE, self.id) {
-                diesel::delete(&notif).execute(&**conn)?;
+                diesel::delete(&notif).execute(conn)?;
             }
             Ok(())
         } else {

plume-models/src/lists.rs

@@ -30,9 +30,9 @@ impl TryFrom<i32> for ListType {
     }
 }
 
-impl From<ListType> for i32 {
+impl Into<i32> for ListType {
-    fn from(list_type: ListType) -> Self {
+    fn into(self) -> i32 {
-        match list_type {
+        match self {
             ListType::User => 0,
             ListType::Blog => 1,
             ListType::Word => 2,
@@ -143,7 +143,6 @@ macro_rules! func {
     }
 }
 
-#[allow(dead_code)]
 #[derive(Clone, Queryable, Identifiable)]
 struct ListElem {
     pub id: i32,
@@ -247,22 +246,22 @@ impl List {
         private::ListElem::prefix_in_list(conn, self, word)
     }
 
-    // Insert new users in a list
+    /// Insert new users in a list
     func! {add: add_users, User}
 
-    // Insert new blogs in a list
+    /// Insert new blogs in a list
     func! {add: add_blogs, Blog}
 
-    // Insert new words in a list
+    /// Insert new words in a list
     func! {add: add_words, Word}
 
-    // Insert new prefixes in a list
+    /// Insert new prefixes in a list
     func! {add: add_prefixes, Prefix}
 
-    // Get all users in the list
+    /// Get all users in the list
     func! {list: list_users, User, users}
 
-    // Get all blogs in the list
+    /// Get all blogs in the list
     func! {list: list_blogs, Blog, blogs}
 
     /// Get all words in the list
@@ -286,8 +285,7 @@ impl List {
             .select(list_elems::word)
             .load::<Option<String>>(conn)
             .map_err(Error::from)
-            // .map(|r| r.into_iter().filter_map(|o| o).collect::<Vec<String>>())
+            .map(|r| r.into_iter().filter_map(|o| o).collect::<Vec<String>>())
-            .map(|r| r.into_iter().flatten().collect::<Vec<String>>())
     }
 
     pub fn clear(&self, conn: &Connection) -> Result<()> {

plume-models/src/medias.rs

@@ -1,24 +1,19 @@
 use crate::{
-    ap_url, db_conn::DbConn, instance::Instance, safe_string::SafeString, schema::medias,
+    ap_url, instance::Instance, safe_string::SafeString, schema::medias, users::User, Connection,
-    users::User, Connection, Error, Result, CONFIG,
+    Error, PlumeRocket, Result,
 };
 use activitypub::object::Image;
+use askama_escape::escape;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use guid_create::GUID;
 use plume_common::{
-    activity_pub::{inbox::FromId, request, Id},
+    activity_pub::{inbox::FromId, Id},
-    utils::{escape, MediaProcessor},
+    utils::MediaProcessor,
 };
-use std::{
+use reqwest;
-    fs::{self, DirBuilder},
+use std::{fs, path::Path};
-    path::{self, Path, PathBuf},
-};
-use tracing::warn;
-use url::Url;
 
-const REMOTE_MEDIA_DIRECTORY: &str = "remote";
+#[derive(Clone, Identifiable, Queryable)]
-
-#[derive(Clone, Identifiable, Queryable, AsChangeset)]
 pub struct Media {
     pub id: i32,
     pub file_path: String,
@@ -64,7 +59,6 @@ impl MediaCategory {
 impl Media {
     insert!(medias, NewMedia);
     get!(medias);
-    find_by!(medias, find_by_file_path, file_path as &str);
 
     pub fn for_user(conn: &Connection, owner: i32) -> Result<Vec<Media>> {
         medias::table
@@ -103,8 +97,8 @@ impl Media {
     pub fn category(&self) -> MediaCategory {
         match &*self
             .file_path
-            .rsplit_once('.')
+            .rsplitn(2, '.')
-            .map(|x| x.1)
+            .next()
             .expect("Media::category: extension error")
             .to_lowercase()
         {
@@ -155,15 +149,12 @@ impl Media {
         if self.is_remote {
             Ok(self.remote_url.clone().unwrap_or_default())
         } else {
-            let file_path = self.file_path.replace(path::MAIN_SEPARATOR, "/").replacen(
+            let p = Path::new(&self.file_path);
-                &CONFIG.media_directory,
+            let filename: String = p.file_name().unwrap().to_str().unwrap().to_owned();
-                "static/media",
-                1,
-            ); // "static/media" from plume::routs::plume_media_files()
             Ok(ap_url(&format!(
-                "{}/{}",
+                "{}/static/media/{}",
                 Instance::get_local()?.public_domain,
-                &file_path
+                &filename
             )))
         }
     }
@@ -206,92 +197,50 @@ impl Media {
     }
 
     // TODO: merge with save_remote?
-    pub fn from_activity(conn: &DbConn, image: &Image) -> Result<Media> {
+    pub fn from_activity(c: &PlumeRocket, image: &Image) -> Result<Media> {
-        let remote_url = image
+        let conn = &*c.conn;
-            .object_props
+        let remote_url = image.object_props.url_string().ok()?;
-            .url_string()
+        let ext = remote_url
-            .or(Err(Error::MissingApProperty))?;
+            .rsplit('.')
-        let path = determine_mirror_file_path(&remote_url);
+            .next()
-        let parent = path.parent().ok_or(Error::InvalidValue)?;
+            .map(ToOwned::to_owned)
-        if !parent.is_dir() {
+            .unwrap_or_else(|| String::from("png"));
-            DirBuilder::new().recursive(true).create(parent)?;
+        let path = Path::new(&super::CONFIG.media_directory).join(format!(
-        }
+            "{}.{}",
+            GUID::rand().to_string(),
+            ext
+        ));
 
-        let mut dest = fs::File::create(path.clone())?;
+        let mut dest = fs::File::create(path.clone()).ok()?;
-        // TODO: conditional GET
+        reqwest::get(remote_url.as_str())
-        request::get(
+            .ok()?
-            remote_url.as_str(),
+            .copy_to(&mut dest)
-            User::get_sender(),
+            .ok()?;
-            CONFIG.proxy().cloned(),
-        )?
-        .copy_to(&mut dest)?;
 
-        Media::find_by_file_path(conn, path.to_str().ok_or(Error::InvalidValue)?)
+        Media::insert(
-            .and_then(|mut media| {
+            conn,
-                let mut updated = false;
+            NewMedia {
-
+                file_path: path.to_str()?.to_string(),
-                let alt_text = image
+                alt_text: image.object_props.content_string().ok()?,
-                    .object_props
+                is_remote: false,
-                    .content_string()
+                remote_url: None,
-                    .or(Err(Error::NotFound))?;
+                sensitive: image.object_props.summary_string().is_ok(),
-                let sensitive = image.object_props.summary_string().is_ok();
+                content_warning: image.object_props.summary_string().ok(),
-                let content_warning = image.object_props.summary_string().ok();
+                owner_id: User::from_id(
-                if media.alt_text != alt_text {
+                    c,
-                    media.alt_text = alt_text;
+                    image
-                    updated = true;
+                        .object_props
-                }
+                        .attributed_to_link_vec::<Id>()
-                if media.is_remote {
+                        .ok()?
-                    media.is_remote = false;
+                        .into_iter()
-                    updated = true;
+                        .next()?
-                }
+                        .as_ref(),
-                if media.remote_url.is_some() {
+                    None,
-                    media.remote_url = None;
-                    updated = true;
-                }
-                if media.sensitive != sensitive {
-                    media.sensitive = sensitive;
-                    updated = true;
-                }
-                if media.content_warning != content_warning {
-                    media.content_warning = content_warning;
-                    updated = true;
-                }
-                if updated {
-                    diesel::update(&media).set(&media).execute(&**conn)?;
-                }
-                Ok(media)
-            })
-            .or_else(|_| {
-                Media::insert(
-                    conn,
-                    NewMedia {
-                        file_path: path.to_str().ok_or(Error::InvalidValue)?.to_string(),
-                        alt_text: image
-                            .object_props
-                            .content_string()
-                            .or(Err(Error::NotFound))?,
-                        is_remote: false,
-                        remote_url: None,
-                        sensitive: image.object_props.summary_string().is_ok(),
-                        content_warning: image.object_props.summary_string().ok(),
-                        owner_id: User::from_id(
-                            conn,
-                            image
-                                .object_props
-                                .attributed_to_link_vec::<Id>()
-                                .or(Err(Error::NotFound))?
-                                .into_iter()
-                                .next()
-                                .ok_or(Error::NotFound)?
-                                .as_ref(),
-                            None,
-                            CONFIG.proxy(),
-                        )
-                        .map_err(|(_, e)| e)?
-                        .id,
-                    },
                 )
-            })
+                .map_err(|(_, e)| e)?
+                .id,
+            },
+        )
     }
 
     pub fn get_media_processor<'a>(conn: &'a Connection, user: Vec<&User>) -> MediaProcessor<'a> {
@@ -308,33 +257,6 @@ impl Media {
     }
 }
 
-fn determine_mirror_file_path(url: &str) -> PathBuf {
-    let mut file_path = Path::new(&super::CONFIG.media_directory).join(REMOTE_MEDIA_DIRECTORY);
-    Url::parse(url)
-        .map(|url| {
-            if !url.has_host() {
-                return;
-            }
-            file_path.push(url.host_str().unwrap());
-            for segment in url.path_segments().expect("FIXME") {
-                file_path.push(segment);
-            }
-            // TODO: handle query
-            // HINT: Use characters which must be percent-encoded in path as separator between path and query
-            // HINT: handle extension
-        })
-        .unwrap_or_else(|err| {
-            warn!("Failed to parse url: {} {}", &url, err);
-            let ext = url
-                .rsplit('.')
-                .next()
-                .map(ToOwned::to_owned)
-                .unwrap_or_else(|| String::from("png"));
-            file_path.push(format!("{}.{}", GUID::rand(), ext));
-        });
-    file_path
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;

plume-models/src/mentions.rs

@@ -1,6 +1,6 @@
 use crate::{
-    comments::Comment, db_conn::DbConn, notifications::*, posts::Post, schema::mentions,
+    comments::Comment, notifications::*, posts::Post, schema::mentions, users::User, Connection,
-    users::User, Connection, Error, Result,
+    Error, PlumeRocket, Result,
 };
 use activitypub::link;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
@@ -47,17 +47,13 @@ impl Mention {
 
     pub fn get_user(&self, conn: &Connection) -> Result<User> {
         match self.get_post(conn) {
-            Ok(p) => Ok(p
+            Ok(p) => Ok(p.get_authors(conn)?.into_iter().next()?),
-                .get_authors(conn)?
-                .into_iter()
-                .next()
-                .ok_or(Error::NotFound)?),
             Err(_) => self.get_comment(conn).and_then(|c| c.get_author(conn)),
         }
     }
 
-    pub fn build_activity(conn: &DbConn, ment: &str) -> Result<link::Mention> {
+    pub fn build_activity(c: &PlumeRocket, ment: &str) -> Result<link::Mention> {
-        let user = User::find_by_fqn(conn, ment)?;
+        let user = User::find_by_fqn(c, ment)?;
         let mut mention = link::Mention::default();
         mention.link_props.set_href_string(user.ap_url)?;
         mention.link_props.set_name_string(format!("@{}", ment))?;
@@ -81,7 +77,7 @@ impl Mention {
         in_post: bool,
         notify: bool,
     ) -> Result<Self> {
-        let ap_url = ment.link_props.href_string().or(Err(Error::NotFound))?;
+        let ap_url = ment.link_props.href_string().ok()?;
         let mentioned = User::find_by_ap_url(conn, &ap_url)?;
 
         if in_post {

plume-models/src/migrations.rs

@@ -2,7 +2,6 @@ use crate::{Connection, Error, Result};
 use diesel::connection::{Connection as Conn, SimpleConnection};
 use migrations_internals::{setup_database, MigrationConnection};
 use std::path::Path;
-use tracing::info;
 
 #[allow(dead_code)] //variants might not be constructed if not required by current migrations
 enum Action {
@@ -27,7 +26,7 @@ struct ComplexMigration {
 
 impl ComplexMigration {
     fn run(&self, conn: &Connection, path: &Path) -> Result<()> {
-        info!("Running migration {}", self.name);
+        println!("Running migration {}", self.name);
         for step in self.up {
             step.run(conn, path)?
         }
@@ -35,7 +34,7 @@ impl ComplexMigration {
     }
 
     fn revert(&self, conn: &Connection, path: &Path) -> Result<()> {
-        info!("Reverting migration {}", self.name);
+        println!("Reverting migration {}", self.name);
         for step in self.down {
             step.run(conn, path)?
         }
@@ -105,8 +104,7 @@ impl ImportedMigrations {
     pub fn rerun_last_migration(&self, conn: &Connection, path: &Path) -> Result<()> {
         let latest_migration = conn.latest_run_migration_version()?;
         let id = latest_migration
-            .and_then(|m| self.0.binary_search_by_key(&m.as_str(), |m| m.name).ok())
+            .and_then(|m| self.0.binary_search_by_key(&m.as_str(), |m| m.name).ok())?;
-            .ok_or(Error::NotFound)?;
         let migration = &self.0[id];
         conn.transaction(|| {
             migration.revert(conn, path)?;

plume-models/src/password_reset_requests.rs

@@ -61,7 +61,7 @@ impl PasswordResetRequest {
     }
 
     pub fn find_and_delete_by_token(conn: &Connection, token: &str) -> Result<Self> {
-        let request = Self::find_by_token(conn, token)?;
+        let request = Self::find_by_token(&conn, &token)?;
 
         let filter =
             password_reset_requests::table.filter(password_reset_requests::id.eq(request.id));

plume-models/src/plume_rocket.rs

@@ -2,7 +2,7 @@ pub use self::module::PlumeRocket;
 
 #[cfg(not(test))]
 mod module {
-    use crate::{search, users};
+    use crate::{db_conn::DbConn, search, users};
     use rocket::{
         request::{self, FlashMessage, FromRequest, Request},
         Outcome, State,
@@ -12,6 +12,7 @@ mod module {
 
     /// Common context needed by most routes and operations on models
     pub struct PlumeRocket {
+        pub conn: DbConn,
         pub intl: rocket_i18n::I18n,
         pub user: Option<users::User>,
         pub searcher: Arc<search::Searcher>,
@@ -23,12 +24,14 @@ mod module {
         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();
             Outcome::Success(PlumeRocket {
+                conn,
                 intl,
                 user,
                 flash_msg: flash_msg.map(|f| (f.name().into(), f.msg().into())),
@@ -41,7 +44,7 @@ mod module {
 
 #[cfg(test)]
 mod module {
-    use crate::{search, users};
+    use crate::{db_conn::DbConn, search, users};
     use rocket::{
         request::{self, FromRequest, Request},
         Outcome, State,
@@ -51,6 +54,7 @@ mod module {
 
     /// Common context needed by most routes and operations on models
     pub struct PlumeRocket {
+        pub conn: DbConn,
         pub user: Option<users::User>,
         pub searcher: Arc<search::Searcher>,
         pub worker: Arc<ScheduledThreadPool>,
@@ -60,10 +64,12 @@ mod module {
         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>>>()?;
             Outcome::Success(PlumeRocket {
+                conn,
                 user,
                 worker: worker.clone(),
                 searcher: searcher.clone(),

plume-models/src/posts.rs

@@ -1,7 +1,7 @@
 use crate::{
-    ap_url, blogs::Blog, db_conn::DbConn, instance::Instance, medias::Media, mentions::Mention,
+    ap_url, blogs::Blog, instance::Instance, medias::Media, mentions::Mention, post_authors::*,
-    post_authors::*, safe_string::SafeString, schema::posts, tags::*, timeline::*, users::User,
+    safe_string::SafeString, schema::posts, search::Searcher, tags::*, timeline::*, users::User,
-    Connection, Error, PostEvent::*, Result, CONFIG, POST_CHAN,
+    Connection, Error, PlumeRocket, Result, CONFIG,
 };
 use activitypub::{
     activity::{Create, Delete, Update},
@@ -10,25 +10,21 @@ use activitypub::{
     CustomObject,
 };
 use chrono::{NaiveDateTime, TimeZone, Utc};
-use diesel::{self, BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl};
+use diesel::{self, BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
-use once_cell::sync::Lazy;
+use heck::{CamelCase, KebabCase};
 use plume_common::{
     activity_pub::{
-        inbox::{AsActor, AsObject, FromId},
+        inbox::{AsObject, FromId},
-        sign::Signer,
         Hashtag, Id, IntoId, Licensed, Source, PUBLIC_VISIBILITY,
     },
-    utils::{iri_percent_encode_seg, md_to_html},
+    utils::md_to_html,
 };
-use riker::actors::{Publish, Tell};
+use serde_json;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
-use std::sync::{Arc, Mutex};
 
 pub type LicensedArticle = CustomObject<Licensed, Article>;
 
-static BLOG_FQN_CACHE: Lazy<Mutex<HashMap<i32, String>>> = Lazy::new(|| Mutex::new(HashMap::new()));
+#[derive(Queryable, Identifiable, Clone, AsChangeset)]
-
-#[derive(Queryable, Identifiable, Clone, AsChangeset, Debug)]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct Post {
     pub id: i32,
@@ -67,42 +63,38 @@ impl Post {
     find_by!(posts, find_by_ap_url, ap_url as &str);
 
     last!(posts);
-    pub fn insert(conn: &Connection, mut new: NewPost) -> Result<Self> {
+    pub fn insert(conn: &Connection, new: NewPost, searcher: &Searcher) -> Result<Self> {
-        if new.ap_url.is_empty() {
-            let blog = Blog::get(conn, new.blog_id)?;
-            new.ap_url = Self::ap_url(blog, &new.slug);
-        }
         diesel::insert_into(posts::table)
             .values(new)
             .execute(conn)?;
-        let post = Self::last(conn)?;
+        let mut post = Self::last(conn)?;
-
+        if post.ap_url.is_empty() {
-        if post.published {
+            post.ap_url = ap_url(&format!(
-            post.publish_published();
+                "{}/~/{}/{}/",
+                CONFIG.base_url,
+                post.get_blog(conn)?.fqn,
+                post.slug
+            ));
+            let _: Post = post.save_changes(conn)?;
         }
 
+        searcher.add_document(conn, &post)?;
         Ok(post)
     }
 
-    pub fn update(&self, conn: &Connection) -> Result<Self> {
+    pub fn update(&self, conn: &Connection, searcher: &Searcher) -> Result<Self> {
         diesel::update(self).set(self).execute(conn)?;
         let post = Self::get(conn, self.id)?;
-        // TODO: Call publish_published() when newly published
+        searcher.update_document(conn, &post)?;
-        if post.published {
-            let blog = post.get_blog(conn);
-            if blog.is_ok() && blog.unwrap().is_local() {
-                self.publish_updated();
-            }
-        }
         Ok(post)
     }
 
-    pub fn delete(&self, conn: &Connection) -> Result<()> {
+    pub fn delete(&self, conn: &Connection, searcher: &Searcher) -> Result<()> {
-        for m in Mention::list_for_post(conn, self.id)? {
+        for m in Mention::list_for_post(&conn, self.id)? {
             m.delete(conn)?;
         }
         diesel::delete(self).execute(conn)?;
-        self.publish_deleted();
+        searcher.delete_document(self);
         Ok(())
     }
 
@@ -132,7 +124,8 @@ impl Post {
             .filter(posts::published.eq(true))
             .count()
             .load(conn)?
-            .get(0)
+            .iter()
+            .next()
             .cloned()
             .ok_or(Error::NotFound)
     }
@@ -249,20 +242,6 @@ impl Post {
             .map_err(Error::from)
     }
 
-    pub fn ap_url(blog: Blog, slug: &str) -> String {
-        ap_url(&format!(
-            "{}/~/{}/{}/",
-            CONFIG.base_url,
-            blog.fqn,
-            iri_percent_encode_seg(slug)
-        ))
-    }
-
-    // It's better to calc slug in insert and update
-    pub fn slug(title: &str) -> &str {
-        title
-    }
-
     pub fn get_authors(&self, conn: &Connection) -> Result<Vec<User>> {
         use crate::schema::post_authors;
         use crate::schema::users;
@@ -290,24 +269,6 @@ impl Post {
             .map_err(Error::from)
     }
 
-    /// This method exists for use in templates to reduce database access.
-    /// This should not be used for other purpose.
-    ///
-    /// This caches query result. The best way to cache query result is holding it in `Post`s field
-    /// but Diesel doesn't allow it currently.
-    /// If sometime Diesel allow it, this method should be removed.
-    pub fn get_blog_fqn(&self, conn: &Connection) -> String {
-        if let Some(blog_fqn) = BLOG_FQN_CACHE.lock().unwrap().get(&self.blog_id) {
-            return blog_fqn.to_string();
-        }
-        let blog_fqn = self.get_blog(conn).unwrap().fqn;
-        BLOG_FQN_CACHE
-            .lock()
-            .unwrap()
-            .insert(self.blog_id, blog_fqn.clone());
-        blog_fqn
-    }
-
     pub fn count_likes(&self, conn: &Connection) -> Result<i64> {
         use crate::schema::likes;
         likes::table
@@ -327,16 +288,17 @@ impl Post {
     }
 
     pub fn get_receivers_urls(&self, conn: &Connection) -> Result<Vec<String>> {
-        Ok(self
+        let followers = self
             .get_authors(conn)?
             .into_iter()
             .filter_map(|a| a.get_followers(conn).ok())
-            .fold(vec![], |mut acc, f| {
+            .collect::<Vec<Vec<User>>>();
-                for x in f {
+        Ok(followers.into_iter().fold(vec![], |mut acc, f| {
-                    acc.push(x.ap_url);
+            for x in f {
-                }
+                acc.push(x.ap_url);
-                acc
+            }
-            }))
+            acc
+        }))
     }
 
     pub fn to_activity(&self, conn: &Connection) -> Result<LicensedArticle> {
@@ -455,17 +417,23 @@ impl Post {
                     m,
                 )
             })
-            .filter_map(|(id, m)| id.map(|id| (m, id)))
+            .filter_map(|(id, m)| {
+                if let Some(id) = id {
+                    Some((m, id))
+                } else {
+                    None
+                }
+            })
             .collect::<Vec<_>>();
 
-        let old_mentions = Mention::list_for_post(conn, self.id)?;
+        let old_mentions = Mention::list_for_post(&conn, self.id)?;
         let old_user_mentioned = old_mentions
             .iter()
             .map(|m| m.mentioned_id)
             .collect::<HashSet<_>>();
         for (m, id) in &mentions {
-            if !old_user_mentioned.contains(id) {
+            if !old_user_mentioned.contains(&id) {
-                Mention::from_activity(&*conn, m, self.id, true, true)?;
+                Mention::from_activity(&*conn, &m, self.id, true, true)?;
             }
         }
 
@@ -477,7 +445,7 @@ impl Post {
             .iter()
             .filter(|m| !new_mentions.contains(&m.mentioned_id))
         {
-            m.delete(conn)?;
+            m.delete(&conn)?;
         }
         Ok(())
     }
@@ -580,48 +548,19 @@ impl Post {
             .set_to_link_vec(vec![Id::new(PUBLIC_VISIBILITY)])?;
         Ok(act)
     }
-
-    fn publish_published(&self) {
-        POST_CHAN.tell(
-            Publish {
-                msg: PostPublished(Arc::new(self.clone())),
-                topic: "post.published".into(),
-            },
-            None,
-        )
-    }
-
-    fn publish_updated(&self) {
-        POST_CHAN.tell(
-            Publish {
-                msg: PostUpdated(Arc::new(self.clone())),
-                topic: "post.updated".into(),
-            },
-            None,
-        )
-    }
-
-    fn publish_deleted(&self) {
-        POST_CHAN.tell(
-            Publish {
-                msg: PostDeleted(Arc::new(self.clone())),
-                topic: "post.deleted".into(),
-            },
-            None,
-        )
-    }
 }
 
-impl FromId<DbConn> for Post {
+impl FromId<PlumeRocket> for Post {
     type Error = Error;
     type Object = LicensedArticle;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Self::find_by_ap_url(conn, id)
+        Self::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, article: LicensedArticle) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, article: LicensedArticle) -> Result<Self> {
-        let conn = conn;
+        let conn = &*c.conn;
+        let searcher = &c.searcher;
         let license = article.custom_props.license_string().unwrap_or_default();
         let article = article.object;
 
@@ -631,15 +570,12 @@ impl FromId<DbConn> for Post {
             .into_iter()
             .fold((None, vec![]), |(blog, mut authors), link| {
                 let url = link;
-                match User::from_id(conn, &url, None, CONFIG.proxy()) {
+                match User::from_id(&c, &url, None) {
                     Ok(u) => {
                         authors.push(u);
                         (blog, authors)
                     }
-                    Err(_) => (
+                    Err(_) => (blog.or_else(|| Blog::from_id(&c, &url, None).ok()), authors),
-                        blog.or_else(|| Blog::from_id(conn, &url, None, CONFIG.proxy()).ok()),
-                        authors,
-                    ),
                 }
             });
 
@@ -647,93 +583,46 @@ impl FromId<DbConn> for Post {
             .object_props
             .icon_object::<Image>()
             .ok()
-            .and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id));
+            .and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id));
 
         let title = article.object_props.name_string()?;
-        let ap_url = article
+        let post = Post::insert(
-            .object_props
+            conn,
-            .url_string()
+            NewPost {
-            .or_else(|_| article.object_props.id_string())?;
+                blog_id: blog?.id,
-        let post = Post::from_db(conn, &ap_url)
+                slug: title.to_kebab_case(),
-            .and_then(|mut post| {
+                title,
-                let mut updated = false;
+                content: SafeString::new(&article.object_props.content_string()?),
+                published: true,
+                license,
+                // FIXME: This is wrong: with this logic, we may use the display URL as the AP ID. We need two different fields
+                ap_url: article
+                    .object_props
+                    .url_string()
+                    .or_else(|_| article.object_props.id_string())?,
+                creation_date: Some(article.object_props.published_utctime()?.naive_utc()),
+                subtitle: article.object_props.summary_string()?,
+                source: article.ap_object_props.source_object::<Source>()?.content,
+                cover_id: cover,
+            },
+            searcher,
+        )?;
 
-                let slug = Self::slug(&title);
+        for author in authors {
-                let content = SafeString::new(&article.object_props.content_string()?);
+            PostAuthor::insert(
-                let subtitle = article.object_props.summary_string()?;
+                conn,
-                let source = article.ap_object_props.source_object::<Source>()?.content;
+                NewPostAuthor {
-                if post.slug != slug {
+                    post_id: post.id,
-                    post.slug = slug.to_string();
+                    author_id: author.id,
-                    updated = true;
+                },
-                }
+            )?;
-                if post.title != title {
+        }
-                    post.title = title.clone();
-                    updated = true;
-                }
-                if post.content != content {
-                    post.content = content;
-                    updated = true;
-                }
-                if post.license != license {
-                    post.license = license.clone();
-                    updated = true;
-                }
-                if post.subtitle != subtitle {
-                    post.subtitle = subtitle;
-                    updated = true;
-                }
-                if post.source != source {
-                    post.source = source;
-                    updated = true;
-                }
-                if post.cover_id != cover {
-                    post.cover_id = cover;
-                    updated = true;
-                }
-
-                if updated {
-                    post.update(conn)?;
-                }
-
-                Ok(post)
-            })
-            .or_else(|_| {
-                Post::insert(
-                    conn,
-                    NewPost {
-                        blog_id: blog.ok_or(Error::NotFound)?.id,
-                        slug: Self::slug(&title).to_string(),
-                        title,
-                        content: SafeString::new(&article.object_props.content_string()?),
-                        published: true,
-                        license,
-                        // FIXME: This is wrong: with this logic, we may use the display URL as the AP ID. We need two different fields
-                        ap_url,
-                        creation_date: Some(article.object_props.published_utctime()?.naive_utc()),
-                        subtitle: article.object_props.summary_string()?,
-                        source: article.ap_object_props.source_object::<Source>()?.content,
-                        cover_id: cover,
-                    },
-                )
-                .and_then(|post| {
-                    for author in authors {
-                        PostAuthor::insert(
-                            conn,
-                            NewPostAuthor {
-                                post_id: post.id,
-                                author_id: author.id,
-                            },
-                        )?;
-                    }
-
-                    Ok(post)
-                })
-            })?;
 
         // save mentions and tags
         let mut hashtags = md_to_html(&post.source, None, false, None)
             .2
             .into_iter()
+            .map(|s| s.to_camel_case())
             .collect::<HashSet<_>>();
         if let Some(serde_json::Value::Array(tags)) = article.object_props.tag {
             for tag in tags {
@@ -756,37 +645,33 @@ impl FromId<DbConn> for Post {
             }
         }
 
-        Timeline::add_to_all_timelines(conn, &post, Kind::Original)?;
+        Timeline::add_to_all_timelines(c, &post, Kind::Original)?;
 
         Ok(post)
     }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
-impl AsObject<User, Create, &DbConn> for Post {
+impl AsObject<User, Create, &PlumeRocket> for Post {
     type Error = Error;
     type Output = Post;
 
-    fn activity(self, _conn: &DbConn, _actor: User, _id: &str) -> Result<Post> {
+    fn activity(self, _c: &PlumeRocket, _actor: User, _id: &str) -> Result<Post> {
         // TODO: check that _actor is actually one of the author?
         Ok(self)
     }
 }
 
-impl AsObject<User, Delete, &DbConn> for Post {
+impl AsObject<User, Delete, &PlumeRocket> for Post {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
         let can_delete = self
-            .get_authors(conn)?
+            .get_authors(&c.conn)?
             .into_iter()
             .any(|a| actor.id == a.id);
         if can_delete {
-            self.delete(conn).map(|_| ())
+            self.delete(&c.conn, &c.searcher).map(|_| ())
         } else {
             Err(Error::Unauthorized)
         }
@@ -804,16 +689,16 @@ pub struct PostUpdate {
     pub tags: Option<serde_json::Value>,
 }
 
-impl FromId<DbConn> for PostUpdate {
+impl FromId<PlumeRocket> for PostUpdate {
     type Error = Error;
     type Object = LicensedArticle;
 
-    fn from_db(_: &DbConn, _: &str) -> Result<Self> {
+    fn from_db(_: &PlumeRocket, _: &str) -> Result<Self> {
         // Always fail because we always want to deserialize the AP object
         Err(Error::NotFound)
     }
 
-    fn from_activity(conn: &DbConn, updated: LicensedArticle) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, updated: LicensedArticle) -> Result<Self> {
         Ok(PostUpdate {
             ap_url: updated.object.object_props.id_string()?,
             title: updated.object.object_props.name_string().ok(),
@@ -824,7 +709,7 @@ impl FromId<DbConn> for PostUpdate {
                 .object_props
                 .icon_object::<Image>()
                 .ok()
-                .and_then(|img| Media::from_activity(conn, &img).ok().map(|m| m.id)),
+                .and_then(|img| Media::from_activity(&c, &img).ok().map(|m| m.id)),
             source: updated
                 .object
                 .ap_object_props
@@ -835,19 +720,16 @@ impl FromId<DbConn> for PostUpdate {
             tags: updated.object.object_props.tag,
         })
     }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
-impl AsObject<User, Update, &DbConn> for PostUpdate {
+impl AsObject<User, Update, &PlumeRocket> for PostUpdate {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
-        let mut post =
+        let conn = &*c.conn;
-            Post::from_id(conn, &self.ap_url, None, CONFIG.proxy()).map_err(|(_, e)| e)?;
+        let searcher = &c.searcher;
+        let mut post = Post::from_id(c, &self.ap_url, None).map_err(|(_, e)| e)?;
 
         if !post.is_author(conn, actor.id)? {
             // TODO: maybe the author was added in the meantime
@@ -855,7 +737,7 @@ impl AsObject<User, Update, &DbConn> for PostUpdate {
         }
 
         if let Some(title) = self.title {
-            post.slug = Post::slug(&title).to_string();
+            post.slug = title.to_kebab_case();
             post.title = title;
         }
 
@@ -880,6 +762,7 @@ impl AsObject<User, Update, &DbConn> for PostUpdate {
         let mut txt_hashtags = md_to_html(&post.source, None, false, None)
             .2
             .into_iter()
+            .map(|s| s.to_camel_case())
             .collect::<HashSet<_>>();
         if let Some(serde_json::Value::Array(mention_tags)) = self.tags {
             let mut mentions = vec![];
@@ -908,7 +791,7 @@ impl AsObject<User, Update, &DbConn> for PostUpdate {
             post.update_hashtags(conn, hashtags)?;
         }
 
-        post.update(conn)?;
+        post.update(conn, searcher)?;
         Ok(())
     }
 }
@@ -919,42 +802,24 @@ impl IntoId for Post {
     }
 }
 
-#[derive(Clone, Debug)]
-pub enum PostEvent {
-    PostPublished(Arc<Post>),
-    PostUpdated(Arc<Post>),
-    PostDeleted(Arc<Post>),
-}
-
-impl From<PostEvent> for Arc<Post> {
-    fn from(event: PostEvent) -> Self {
-        use PostEvent::*;
-
-        match event {
-            PostPublished(post) => post,
-            PostUpdated(post) => post,
-            PostDeleted(post) => post,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::inbox::{inbox, tests::fill_database, InboxResult};
     use crate::safe_string::SafeString;
-    use crate::tests::db;
+    use crate::tests::rockets;
     use diesel::Connection;
 
     // creates a post, get it's Create activity, delete the post,
     // "send" the Create to the inbox, and check it works
     #[test]
     fn self_federation() {
-        let conn = &db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (_, users, blogs) = fill_database(&conn);
+            let (_, users, blogs) = fill_database(&r);
             let post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "yo".into(),
@@ -968,22 +833,23 @@ mod tests {
                     source: "Hello".into(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
             PostAuthor::insert(
-                &conn,
+                conn,
                 NewPostAuthor {
                     post_id: post.id,
                     author_id: users[0].id,
                 },
             )
             .unwrap();
-            let create = post.create_activity(&conn).unwrap();
+            let create = post.create_activity(conn).unwrap();
-            post.delete(&conn).unwrap();
+            post.delete(conn, &r.searcher).unwrap();
 
-            match inbox(&conn, serde_json::to_value(create).unwrap()).unwrap() {
+            match inbox(&r, serde_json::to_value(create).unwrap()).unwrap() {
                 InboxResult::Post(p) => {
-                    assert!(p.is_author(&conn, users[0].id).unwrap());
+                    assert!(p.is_author(conn, users[0].id).unwrap());
                     assert_eq!(p.source, "Hello".to_owned());
                     assert_eq!(p.blog_id, blogs[0].id);
                     assert_eq!(p.content, SafeString::new("Hello"));

plume-models/src/remote_fetch_actor.rs

@@ -1,123 +0,0 @@
-use crate::{
-    db_conn::{DbConn, DbPool},
-    follows,
-    posts::{LicensedArticle, Post},
-    users::{User, UserEvent},
-    ACTOR_SYS, CONFIG, USER_CHAN,
-};
-use activitypub::activity::Create;
-use plume_common::activity_pub::inbox::FromId;
-use riker::actors::{Actor, ActorFactoryArgs, ActorRefFactory, Context, Sender, Subscribe, Tell};
-use std::sync::Arc;
-use tracing::{error, info, warn};
-
-pub struct RemoteFetchActor {
-    conn: DbPool,
-}
-
-impl RemoteFetchActor {
-    pub fn init(conn: DbPool) {
-        let actor = ACTOR_SYS
-            .actor_of_args::<RemoteFetchActor, _>("remote-fetch", conn)
-            .expect("Failed to initialize remote fetch actor");
-
-        USER_CHAN.tell(
-            Subscribe {
-                actor: Box::new(actor),
-                topic: "*".into(),
-            },
-            None,
-        )
-    }
-}
-
-impl Actor for RemoteFetchActor {
-    type Msg = UserEvent;
-
-    fn recv(&mut self, _ctx: &Context<Self::Msg>, msg: Self::Msg, _sender: Sender) {
-        use UserEvent::*;
-
-        match msg {
-            RemoteUserFound(user) => match self.conn.get() {
-                Ok(conn) => {
-                    let conn = DbConn(conn);
-                    // Don't call these functions in parallel
-                    // for the case database connections limit is too small
-                    fetch_and_cache_articles(&user, &conn);
-                    fetch_and_cache_followers(&user, &conn);
-                    if user.needs_update() {
-                        fetch_and_cache_user(&user, &conn);
-                    }
-                }
-                _ => {
-                    error!("Failed to get database connection");
-                }
-            },
-        }
-    }
-}
-
-impl ActorFactoryArgs<DbPool> for RemoteFetchActor {
-    fn create_args(conn: DbPool) -> Self {
-        Self { conn }
-    }
-}
-
-fn fetch_and_cache_articles(user: &Arc<User>, conn: &DbConn) {
-    let create_acts = user.fetch_outbox::<Create>();
-    match create_acts {
-        Ok(create_acts) => {
-            for create_act in create_acts {
-                match create_act.create_props.object_object::<LicensedArticle>() {
-                    Ok(article) => {
-                        Post::from_activity(conn, article)
-                            .expect("Article from remote user couldn't be saved");
-                        info!("Fetched article from remote user");
-                    }
-                    Err(e) => warn!("Error while fetching articles in background: {:?}", e),
-                }
-            }
-        }
-        Err(err) => {
-            error!("Failed to fetch outboxes: {:?}", err);
-        }
-    }
-}
-
-fn fetch_and_cache_followers(user: &Arc<User>, conn: &DbConn) {
-    let follower_ids = user.fetch_followers_ids();
-    match follower_ids {
-        Ok(user_ids) => {
-            for user_id in user_ids {
-                let follower = User::from_id(conn, &user_id, None, CONFIG.proxy());
-                match follower {
-                    Ok(follower) => {
-                        let inserted = follows::Follow::insert(
-                            conn,
-                            follows::NewFollow {
-                                follower_id: follower.id,
-                                following_id: user.id,
-                                ap_url: String::new(),
-                            },
-                        );
-                        if inserted.is_err() {
-                            error!("Couldn't save follower for remote user: {:?}", user_id);
-                        }
-                    }
-                    Err(err) => {
-                        error!("Couldn't fetch follower: {:?}", err);
-                    }
-                }
-            }
-        }
-        Err(err) => {
-            error!("Failed to fetch follower: {:?}", err);
-        }
-    }
-}
-
-fn fetch_and_cache_user(user: &Arc<User>, conn: &DbConn) {
-    if user.refetch(conn).is_err() {
-        error!("Couldn't update user info: {:?}", user);
-    }
-}

plume-models/src/reshares.rs

@@ -1,13 +1,12 @@
 use crate::{
-    db_conn::DbConn, instance::Instance, notifications::*, posts::Post, schema::reshares,
+    notifications::*, posts::Post, schema::reshares, timeline::*, users::User, Connection, Error,
-    timeline::*, users::User, Connection, Error, Result, CONFIG,
+    PlumeRocket, Result,
 };
 use activitypub::activity::{Announce, Undo};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use plume_common::activity_pub::{
     inbox::{AsActor, AsObject, FromId},
-    sign::Signer,
     Id, IntoId, PUBLIC_VISIBILITY,
 };
 
@@ -108,12 +107,12 @@ impl Reshare {
     }
 }
 
-impl AsObject<User, Announce, &DbConn> for Post {
+impl AsObject<User, Announce, &PlumeRocket> for Post {
     type Error = Error;
     type Output = Reshare;
 
-    fn activity(self, conn: &DbConn, actor: User, id: &str) -> Result<Reshare> {
+    fn activity(self, c: &PlumeRocket, actor: User, id: &str) -> Result<Reshare> {
-        let conn = conn;
+        let conn = &*c.conn;
         let reshare = Reshare::insert(
             conn,
             NewReshare {
@@ -124,62 +123,49 @@ impl AsObject<User, Announce, &DbConn> for Post {
         )?;
         reshare.notify(conn)?;
 
-        Timeline::add_to_all_timelines(conn, &self, Kind::Reshare(&actor))?;
+        Timeline::add_to_all_timelines(c, &self, Kind::Reshare(&actor))?;
         Ok(reshare)
     }
 }
 
-impl FromId<DbConn> for Reshare {
+impl FromId<PlumeRocket> for Reshare {
     type Error = Error;
     type Object = Announce;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Reshare::find_by_ap_url(conn, id)
+        Reshare::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, act: Announce) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, act: Announce) -> Result<Self> {
         let res = Reshare::insert(
-            conn,
+            &c.conn,
             NewReshare {
-                post_id: Post::from_id(
+                post_id: Post::from_id(c, &act.announce_props.object_link::<Id>()?, None)
-                    conn,
+                    .map_err(|(_, e)| e)?
-                    &act.announce_props.object_link::<Id>()?,
+                    .id,
-                    None,
+                user_id: User::from_id(c, &act.announce_props.actor_link::<Id>()?, None)
-                    CONFIG.proxy(),
+                    .map_err(|(_, e)| e)?
-                )
+                    .id,
-                .map_err(|(_, e)| e)?
-                .id,
-                user_id: User::from_id(
-                    conn,
-                    &act.announce_props.actor_link::<Id>()?,
-                    None,
-                    CONFIG.proxy(),
-                )
-                .map_err(|(_, e)| e)?
-                .id,
                 ap_url: act.object_props.id_string()?,
             },
         )?;
-        res.notify(conn)?;
+        res.notify(&c.conn)?;
         Ok(res)
     }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
-impl AsObject<User, Undo, &DbConn> for Reshare {
+impl AsObject<User, Undo, &PlumeRocket> for Reshare {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
+        let conn = &*c.conn;
         if actor.id == self.user_id {
-            diesel::delete(&self).execute(&**conn)?;
+            diesel::delete(&self).execute(conn)?;
 
             // delete associated notification if any
-            if let Ok(notif) = Notification::find(conn, notification_kind::RESHARE, self.id) {
+            if let Ok(notif) = Notification::find(&conn, notification_kind::RESHARE, self.id) {
-                diesel::delete(&notif).execute(&**conn)?;
+                diesel::delete(&notif).execute(conn)?;
             }
 
             Ok(())

plume-models/src/safe_string.rs

@@ -11,13 +11,14 @@ use std::{
     borrow::{Borrow, Cow},
     fmt::{self, Display},
     io::Write,
+    iter,
     ops::Deref,
 };
 
 lazy_static! {
     static ref CLEAN: Builder<'static> = {
         let mut b = Builder::new();
-        b.add_generic_attributes(&["id", "dir"])
+        b.add_generic_attributes(iter::once("id"))
             .add_tags(&["iframe", "video", "audio", "label", "input"])
             .id_prefix(Some("postcontent-"))
             .url_relative(UrlRelative::Custom(Box::new(url_add_prefix)))
@@ -81,7 +82,6 @@ lazy_static! {
     };
 }
 
-#[allow(clippy::unnecessary_wraps)]
 fn url_add_prefix(url: &str) -> Option<Cow<'_, str>> {
     if url.starts_with('#') && !url.starts_with("#postcontent-") {
         //if start with an #
@@ -102,7 +102,7 @@ pub struct SafeString {
 impl SafeString {
     pub fn new(value: &str) -> Self {
         SafeString {
-            value: CLEAN.clean(value).to_string(),
+            value: CLEAN.clean(&value).to_string(),
         }
     }
 
@@ -156,7 +156,7 @@ impl<'de> Deserialize<'de> for SafeString {
     where
         D: Deserializer<'de>,
     {
-        deserializer.deserialize_string(SafeStringVisitor)
+        Ok(deserializer.deserialize_string(SafeStringVisitor)?)
     }
 }
 

plume-models/src/schema.rs

@@ -73,7 +73,6 @@ table! {
         user_id -> Int4,
     }
 }
-
 table! {
     email_blocklist(id){
         id -> Int4,
@@ -84,15 +83,6 @@ table! {
     }
 }
 
-table! {
-    email_signups (id) {
-        id -> Int4,
-        email -> Varchar,
-        token -> Varchar,
-        expiration_date -> Timestamp,
-    }
-}
-
 table! {
     follows (id) {
         id -> Int4,
@@ -316,7 +306,6 @@ allow_tables_to_appear_in_same_query!(
     blogs,
     comments,
     comment_seers,
-    email_signups,
     follows,
     instances,
     likes,

plume-models/src/search/actor.rs

@@ -1,214 +0,0 @@
-use super::Searcher;
-use crate::{db_conn::DbPool, posts::PostEvent, ACTOR_SYS, POST_CHAN};
-use riker::actors::{Actor, ActorFactoryArgs, ActorRefFactory, Context, Sender, Subscribe, Tell};
-use std::sync::Arc;
-use std::thread::sleep;
-use std::time::Duration;
-use tracing::error;
-
-pub struct SearchActor {
-    searcher: Arc<Searcher>,
-    conn: DbPool,
-}
-
-impl SearchActor {
-    pub fn init(searcher: Arc<Searcher>, conn: DbPool) {
-        let actor = ACTOR_SYS
-            .actor_of_args::<SearchActor, _>("search", (searcher, conn))
-            .expect("Failed to initialize searcher actor");
-
-        POST_CHAN.tell(
-            Subscribe {
-                actor: Box::new(actor),
-                topic: "*".into(),
-            },
-            None,
-        )
-    }
-}
-
-impl Actor for SearchActor {
-    type Msg = PostEvent;
-
-    fn recv(&mut self, _ctx: &Context<Self::Msg>, msg: Self::Msg, _sender: Sender) {
-        use PostEvent::*;
-
-        // Wait for transaction commited
-        sleep(Duration::from_millis(500));
-
-        match msg {
-            PostPublished(post) => {
-                let conn = self.conn.get();
-                match conn {
-                    Ok(conn) => {
-                        self.searcher
-                            .add_document(&conn, &post)
-                            .unwrap_or_else(|e| error!("{:?}", e));
-                    }
-                    _ => {
-                        error!("Failed to get database connection");
-                    }
-                }
-            }
-            PostUpdated(post) => {
-                let conn = self.conn.get();
-                match conn {
-                    Ok(_) => {
-                        self.searcher
-                            .update_document(&conn.unwrap(), &post)
-                            .unwrap_or_else(|e| error!("{:?}", e));
-                    }
-                    _ => {
-                        error!("Failed to get database connection");
-                    }
-                }
-            }
-            PostDeleted(post) => self.searcher.delete_document(&post),
-        }
-    }
-}
-
-impl ActorFactoryArgs<(Arc<Searcher>, DbPool)> for SearchActor {
-    fn create_args((searcher, conn): (Arc<Searcher>, DbPool)) -> Self {
-        Self { searcher, conn }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::diesel::Connection;
-    use crate::{
-        blog_authors::{BlogAuthor, NewBlogAuthor},
-        blogs::{Blog, NewBlog},
-        db_conn::{DbPool, PragmaForeignKey},
-        instance::{Instance, NewInstance},
-        post_authors::{NewPostAuthor, PostAuthor},
-        posts::{NewPost, Post},
-        safe_string::SafeString,
-        search::{actor::SearchActor, tests::get_searcher, Query},
-        users::{NewUser, User},
-        Connection as Conn, CONFIG,
-    };
-    use diesel::r2d2::ConnectionManager;
-    use plume_common::utils::random_hex;
-    use std::str::FromStr;
-    use std::sync::Arc;
-    use std::thread::sleep;
-    use std::time::Duration;
-
-    #[test]
-    fn post_updated() {
-        // Need to commit so that searcher on another thread retrieve records.
-        // So, build DbPool instead of using DB_POOL for testing.
-        let manager = ConnectionManager::<Conn>::new(CONFIG.database_url.as_str());
-        let db_pool = DbPool::builder()
-            .connection_customizer(Box::new(PragmaForeignKey))
-            .build(manager)
-            .unwrap();
-
-        let searcher = Arc::new(get_searcher(&CONFIG.search_tokenizers));
-        SearchActor::init(searcher.clone(), db_pool.clone());
-        let conn = db_pool.clone().get().unwrap();
-
-        let title = random_hex()[..8].to_owned();
-        let (_instance, _user, blog) = fill_database(&conn);
-        let author = &blog.list_authors(&conn).unwrap()[0];
-
-        let post = Post::insert(
-            &conn,
-            NewPost {
-                blog_id: blog.id,
-                slug: title.clone(),
-                title: title.clone(),
-                content: SafeString::new(""),
-                published: true,
-                license: "CC-BY-SA".to_owned(),
-                ap_url: "".to_owned(),
-                creation_date: None,
-                subtitle: "".to_owned(),
-                source: "".to_owned(),
-                cover_id: None,
-            },
-        )
-        .unwrap();
-        PostAuthor::insert(
-            &conn,
-            NewPostAuthor {
-                post_id: post.id,
-                author_id: author.id,
-            },
-        )
-        .unwrap();
-        let post_id = post.id;
-
-        // Wait for searcher on another thread add document asynchronously
-        sleep(Duration::from_millis(700));
-        searcher.commit();
-        assert_eq!(
-            searcher.search_document(&conn, Query::from_str(&title).unwrap(), (0, 1))[0].id,
-            post_id
-        );
-    }
-
-    fn fill_database(conn: &Conn) -> (Instance, User, Blog) {
-        conn.transaction::<(Instance, User, Blog), diesel::result::Error, _>(|| {
-            let instance = Instance::insert(
-                conn,
-                NewInstance {
-                    default_license: "CC-0-BY-SA".to_string(),
-                    local: false,
-                    long_description: SafeString::new("Good morning"),
-                    long_description_html: "<p>Good morning</p>".to_string(),
-                    short_description: SafeString::new("Hello"),
-                    short_description_html: "<p>Hello</p>".to_string(),
-                    name: random_hex().to_string(),
-                    open_registrations: true,
-                    public_domain: random_hex().to_string(),
-                },
-            )
-            .unwrap();
-            let user = User::insert(
-                conn,
-                NewUser {
-                    username: random_hex().to_string(),
-                    display_name: random_hex().to_string(),
-                    outbox_url: random_hex().to_string(),
-                    inbox_url: random_hex().to_string(),
-                    summary: "".to_string(),
-                    email: None,
-                    hashed_password: None,
-                    instance_id: instance.id,
-                    ap_url: random_hex().to_string(),
-                    private_key: None,
-                    public_key: "".to_string(),
-                    shared_inbox_url: None,
-                    followers_endpoint: random_hex().to_string(),
-                    avatar_id: None,
-                    summary_html: SafeString::new(""),
-                    role: 0,
-                    fqn: random_hex().to_string(),
-                },
-            )
-            .unwrap();
-            let mut blog = NewBlog::default();
-            blog.instance_id = instance.id;
-            blog.actor_id = random_hex().to_string();
-            blog.ap_url = random_hex().to_string();
-            blog.inbox_url = random_hex().to_string();
-            blog.outbox_url = random_hex().to_string();
-            let blog = Blog::insert(conn, blog).unwrap();
-            BlogAuthor::insert(
-                conn,
-                NewBlogAuthor {
-                    blog_id: blog.id,
-                    author_id: user.id,
-                    is_owner: true,
-                },
-            )
-            .unwrap();
-
-            Ok((instance, user, blog))
-        })
-        .unwrap()
-    }
-}

plume-models/src/search/mod.rs

@@ -1,4 +1,3 @@
-pub mod actor;
 mod query;
 mod searcher;
 mod tokenizer;
@@ -8,7 +7,12 @@ pub use self::tokenizer::TokenizerKind;
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use super::{Query, Searcher};
+    use super::{Query, Searcher, TokenizerKind};
+    use diesel::Connection;
+    use plume_common::utils::random_hex;
+    use std::env::temp_dir;
+    use std::str::FromStr;
+
     use crate::{
         blogs::tests::fill_database,
         config::SearchTokenizerConfig,
@@ -18,10 +22,6 @@ pub(crate) mod tests {
         tests::db,
         CONFIG,
     };
-    use diesel::Connection;
-    use plume_common::utils::random_hex;
-    use std::env::temp_dir;
-    use std::str::FromStr;
 
     pub(crate) fn get_searcher(tokenizers: &SearchTokenizerConfig) -> Searcher {
         let dir = temp_dir().join(&format!("plume-test-{}", random_hex()));
@@ -144,6 +144,7 @@ pub(crate) mod tests {
                     source: "".to_owned(),
                     cover_id: None,
                 },
+                &searcher,
             )
             .unwrap();
             PostAuthor::insert(
@@ -154,7 +155,7 @@ pub(crate) mod tests {
                 },
             )
             .unwrap();
-            searcher.add_document(&conn, &post).unwrap();
+
             searcher.commit();
             assert_eq!(
                 searcher.search_document(conn, Query::from_str(&title).unwrap(), (0, 1))[0].id,
@@ -163,8 +164,7 @@ pub(crate) mod tests {
 
             let newtitle = random_hex()[..8].to_owned();
             post.title = newtitle.clone();
-            post.update(conn).unwrap();
+            post.update(conn, &searcher).unwrap();
-            searcher.update_document(conn, &post).unwrap();
             searcher.commit();
             assert_eq!(
                 searcher.search_document(conn, Query::from_str(&newtitle).unwrap(), (0, 1))[0].id,
@@ -174,7 +174,7 @@ pub(crate) mod tests {
                 .search_document(conn, Query::from_str(&title).unwrap(), (0, 1))
                 .is_empty());
 
-            searcher.delete_document(&post);
+            post.delete(conn, &searcher).unwrap();
             searcher.commit();
             assert!(searcher
                 .search_document(conn, Query::from_str(&newtitle).unwrap(), (0, 1))
@@ -213,6 +213,7 @@ pub(crate) mod tests {
                     source: "".to_owned(),
                     cover_id: None,
                 },
+                &searcher,
             )
             .unwrap();
 

plume-models/src/search/query.rs

@@ -148,7 +148,7 @@ impl PlumeQuery {
 
     /// Parse a query string into this Query
     pub fn parse_query(&mut self, query: &str) -> &mut Self {
-        self.from_str_req(query.trim())
+        self.from_str_req(&query.trim())
     }
 
     /// Convert this Query to a Tantivy Query
@@ -360,7 +360,7 @@ impl std::str::FromStr for PlumeQuery {
     fn from_str(query: &str) -> Result<PlumeQuery, !> {
         let mut res: PlumeQuery = Default::default();
 
-        res.from_str_req(query.trim());
+        res.from_str_req(&query.trim());
         Ok(res)
     }
 }

plume-models/src/search/searcher.rs

@@ -1,17 +1,15 @@
 use crate::{
     config::SearchTokenizerConfig, instance::Instance, posts::Post, schema::posts,
-    search::query::PlumeQuery, tags::Tag, Connection, Error, Result,
+    search::query::PlumeQuery, tags::Tag, Connection, Result,
 };
-use chrono::{Datelike, Utc};
+use chrono::Datelike;
 use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use itertools::Itertools;
-use std::fs;
+use std::{cmp, fs::create_dir_all, path::Path, sync::Mutex};
-use std::{cmp, fs::create_dir_all, io, path::Path, sync::Mutex};
 use tantivy::{
     collector::TopDocs, directory::MmapDirectory, schema::*, Index, IndexReader, IndexWriter,
-    ReloadPolicy, TantivyError, Term,
+    ReloadPolicy, Term,
 };
-use tracing::warn;
 use whatlang::{detect as detect_lang, Lang};
 
 #[derive(Debug)]
@@ -20,7 +18,6 @@ pub enum SearcherError {
     WriteLockAcquisitionError,
     IndexOpeningError,
     IndexEditionError,
-    InvalidIndexDataError,
 }
 
 pub struct Searcher {
@@ -69,58 +66,6 @@ impl Searcher {
         schema_builder.build()
     }
 
-    pub fn open_or_recreate(path: &dyn AsRef<Path>, tokenizers: &SearchTokenizerConfig) -> Self {
-        let mut open_searcher = Self::open(path, tokenizers);
-        if let Err(Error::Search(SearcherError::InvalidIndexDataError)) = open_searcher {
-            if Self::create(path, tokenizers).is_err() {
-                let backup_path = format!("{}.{}", path.as_ref().display(), Utc::now().timestamp());
-                let backup_path = Path::new(&backup_path);
-                fs::rename(path, backup_path)
-                    .expect("main: error on backing up search index directory for recreating");
-                if Self::create(path, tokenizers).is_ok() {
-                    if fs::remove_dir_all(backup_path).is_err() {
-                        warn!(
-                            "error on removing backup directory: {}. it remains",
-                            backup_path.display()
-                        );
-                    }
-                } else {
-                    panic!("main: error on recreating search index in new index format. remove search index and run `plm search init` manually");
-                }
-            }
-            open_searcher = Self::open(path, tokenizers);
-        }
-        match open_searcher {
-            Ok(s) => s,
-            Err(Error::Search(e)) => match e {
-                SearcherError::WriteLockAcquisitionError => panic!(
-                    r#"
-Your search index is locked. Plume can't start. To fix this issue
-make sure no other Plume instance is started, and run:
-
-    plm search unlock
-
-Then try to restart Plume.
-"#
-                ),
-                SearcherError::IndexOpeningError => panic!(
-                    r#"
-Plume was unable to open the search index. If you created the index
-before, make sure to run Plume in the same directory it was created in, or
-to set SEARCH_INDEX accordingly. If you did not yet create the search
-index, run this command:
-
-    plm search init
-
-Then try to restart Plume
-"#
-                ),
-                e => Err(e).unwrap(),
-            },
-            _ => panic!("Unexpected error while opening search index"),
-        }
-    }
-
     pub fn create(path: &dyn AsRef<Path>, tokenizers: &SearchTokenizerConfig) -> Result<Self> {
         let schema = Self::schema();
 
@@ -190,19 +135,7 @@ Then try to restart Plume
                 .reader_builder()
                 .reload_policy(ReloadPolicy::Manual)
                 .try_into()
-                .map_err(|e| {
+                .map_err(|_| SearcherError::IndexCreationError)?,
-                    if let TantivyError::IOError(err) = e {
-                        let err: io::Error = err.into();
-                        if err.kind() == io::ErrorKind::InvalidData {
-                            // Search index was created in older Tantivy format.
-                            SearcherError::InvalidIndexDataError
-                        } else {
-                            SearcherError::IndexCreationError
-                        }
-                    } else {
-                        SearcherError::IndexCreationError
-                    }
-                })?,
             index,
         })
     }

plume-models/src/signups.rs

@@ -1,72 +0,0 @@
-use crate::CONFIG;
-use rocket::request::{FromRequest, Outcome, Request};
-use std::fmt;
-use std::str::FromStr;
-
-pub enum Strategy {
-    Password,
-    Email,
-}
-
-impl Default for Strategy {
-    fn default() -> Self {
-        Self::Password
-    }
-}
-
-impl FromStr for Strategy {
-    type Err = StrategyError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        use self::Strategy::*;
-
-        match s {
-            "password" => Ok(Password),
-            "email" => Ok(Email),
-            s => Err(StrategyError::Unsupported(s.to_string())),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum StrategyError {
-    Unsupported(String),
-}
-
-impl fmt::Display for StrategyError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use self::StrategyError::*;
-
-        match self {
-            // FIXME: Calc option strings from enum
-            Unsupported(s) => write!(f, "Unsupported strategy: {}. Choose password or email", s),
-        }
-    }
-}
-
-impl std::error::Error for StrategyError {}
-
-pub struct Password();
-pub struct Email();
-
-impl<'a, 'r> FromRequest<'a, 'r> for Password {
-    type Error = ();
-
-    fn from_request(_request: &'a Request<'r>) -> Outcome<Self, ()> {
-        match matches!(CONFIG.signup, Strategy::Password) {
-            true => Outcome::Success(Self()),
-            false => Outcome::Forward(()),
-        }
-    }
-}
-
-impl<'a, 'r> FromRequest<'a, 'r> for Email {
-    type Error = ();
-
-    fn from_request(_request: &'a Request<'r>) -> Outcome<Self, ()> {
-        match matches!(CONFIG.signup, Strategy::Email) {
-            true => Outcome::Success(Self()),
-            false => Outcome::Forward(()),
-        }
-    }
-}

plume-models/src/timeline/mod.rs

@@ -1,9 +1,8 @@
 use crate::{
-    db_conn::DbConn,
     lists::List,
     posts::Post,
     schema::{posts, timeline, timeline_definition},
-    Connection, Error, Result,
+    Connection, Error, PlumeRocket, Result,
 };
 use diesel::{self, BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
 use std::ops::Deref;
@@ -209,23 +208,20 @@ impl Timeline {
             .map_err(Error::from)
     }
 
-    pub fn add_to_all_timelines(conn: &DbConn, post: &Post, kind: Kind<'_>) -> Result<()> {
+    pub fn add_to_all_timelines(rocket: &PlumeRocket, post: &Post, kind: Kind<'_>) -> Result<()> {
         let timelines = timeline_definition::table
-            .load::<Self>(conn.deref())
+            .load::<Self>(rocket.conn.deref())
             .map_err(Error::from)?;
 
         for t in timelines {
-            if t.matches(conn, post, kind)? {
+            if t.matches(rocket, post, kind)? {
-                t.add_post(conn, post)?;
+                t.add_post(&rocket.conn, post)?;
             }
         }
         Ok(())
     }
 
     pub fn add_post(&self, conn: &Connection, post: &Post) -> Result<()> {
-        if self.includes_post(conn, post)? {
-            return Ok(());
-        }
         diesel::insert_into(timeline::table)
             .values(TimelineEntry {
                 post_id: post.id,
@@ -235,19 +231,9 @@ impl Timeline {
         Ok(())
     }
 
-    pub fn matches(&self, conn: &DbConn, post: &Post, kind: Kind<'_>) -> Result<bool> {
+    pub fn matches(&self, rocket: &PlumeRocket, post: &Post, kind: Kind<'_>) -> Result<bool> {
         let query = TimelineQuery::parse(&self.query)?;
-        query.matches(conn, self, post, kind)
+        query.matches(rocket, self, post, kind)
-    }
-
-    fn includes_post(&self, conn: &Connection, post: &Post) -> Result<bool> {
-        diesel::dsl::select(diesel::dsl::exists(
-            timeline::table
-                .filter(timeline::timeline_id.eq(self.id))
-                .filter(timeline::post_id.eq(post.id)),
-        ))
-        .get_result(conn)
-        .map_err(Error::from)
     }
 }
 
@@ -262,7 +248,7 @@ mod tests {
         posts::NewPost,
         safe_string::SafeString,
         tags::Tag,
-        tests::db,
+        tests::{db, rockets},
         users::tests as userTests,
     };
     use diesel::Connection;
@@ -271,69 +257,63 @@ mod tests {
     fn test_timeline() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let users = userTests::fill_database(&conn);
+            let users = userTests::fill_database(conn);
 
             let mut tl1_u1 = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "my timeline".to_owned(),
                 "all".to_owned(),
             )
             .unwrap();
-            List::new(
+            List::new(conn, "languages I speak", Some(&users[1]), ListType::Prefix).unwrap();
-                &conn,
-                "languages I speak",
-                Some(&users[1]),
-                ListType::Prefix,
-            )
-            .unwrap();
             let tl2_u1 = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "another timeline".to_owned(),
                 "followed".to_owned(),
             )
             .unwrap();
             let tl1_u2 = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[1].id,
                 "english posts".to_owned(),
                 "lang in \"languages I speak\"".to_owned(),
             )
             .unwrap();
             let tl1_instance = Timeline::new_for_instance(
-                &conn,
+                conn,
                 "english posts".to_owned(),
                 "license in [cc]".to_owned(),
             )
             .unwrap();
 
-            assert_eq!(tl1_u1, Timeline::get(&conn, tl1_u1.id).unwrap());
+            assert_eq!(tl1_u1, Timeline::get(conn, tl1_u1.id).unwrap());
             assert_eq!(
                 tl2_u1,
-                Timeline::find_for_user_by_name(&conn, Some(users[0].id), "another timeline")
+                Timeline::find_for_user_by_name(conn, Some(users[0].id), "another timeline")
                     .unwrap()
             );
             assert_eq!(
                 tl1_instance,
-                Timeline::find_for_user_by_name(&conn, None, "english posts").unwrap()
+                Timeline::find_for_user_by_name(conn, None, "english posts").unwrap()
             );
 
-            let tl_u1 = Timeline::list_for_user(&conn, Some(users[0].id)).unwrap();
+            let tl_u1 = Timeline::list_for_user(conn, Some(users[0].id)).unwrap();
             assert_eq!(3, tl_u1.len()); // it is not 2 because there is a "Your feed" tl created for each user automatically
             assert!(tl_u1.iter().fold(false, |res, tl| { res || *tl == tl1_u1 }));
             assert!(tl_u1.iter().fold(false, |res, tl| { res || *tl == tl2_u1 }));
 
-            let tl_instance = Timeline::list_for_user(&conn, None).unwrap();
+            let tl_instance = Timeline::list_for_user(conn, None).unwrap();
             assert_eq!(3, tl_instance.len()); // there are also the local and federated feed by default
             assert!(tl_instance
                 .iter()
                 .fold(false, |res, tl| { res || *tl == tl1_instance }));
 
             tl1_u1.name = "My Super TL".to_owned();
-            let new_tl1_u2 = tl1_u2.update(&conn).unwrap();
+            let new_tl1_u2 = tl1_u2.update(conn).unwrap();
 
-            let tl_u2 = Timeline::list_for_user(&conn, Some(users[1].id)).unwrap();
+            let tl_u2 = Timeline::list_for_user(conn, Some(users[1].id)).unwrap();
             assert_eq!(2, tl_u2.len()); // same here
             assert!(tl_u2
                 .iter()
@@ -347,48 +327,48 @@ mod tests {
     fn test_timeline_creation_error() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let users = userTests::fill_database(&conn);
+            let users = userTests::fill_database(conn);
 
             assert!(Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "my timeline".to_owned(),
                 "invalid keyword".to_owned(),
             )
             .is_err());
             assert!(Timeline::new_for_instance(
-                &conn,
+                conn,
                 "my timeline".to_owned(),
                 "invalid keyword".to_owned(),
             )
             .is_err());
 
             assert!(Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "my timeline".to_owned(),
                 "author in non_existant_list".to_owned(),
             )
             .is_err());
             assert!(Timeline::new_for_instance(
-                &conn,
+                conn,
                 "my timeline".to_owned(),
                 "lang in dont-exist".to_owned(),
             )
             .is_err());
 
-            List::new(&conn, "friends", Some(&users[0]), ListType::User).unwrap();
+            List::new(conn, "friends", Some(&users[0]), ListType::User).unwrap();
-            List::new(&conn, "idk", None, ListType::Blog).unwrap();
+            List::new(conn, "idk", None, ListType::Blog).unwrap();
 
             assert!(Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "my timeline".to_owned(),
                 "blog in friends".to_owned(),
             )
             .is_err());
             assert!(Timeline::new_for_instance(
-                &conn,
+                conn,
                 "my timeline".to_owned(),
                 "not author in idk".to_owned(),
             )
@@ -400,12 +380,13 @@ mod tests {
 
     #[test]
     fn test_simple_match() {
-        let conn = &db();
+        let r = &rockets();
+        let conn = &r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, blogs) = blogTests::fill_database(&conn);
+            let (users, blogs) = blogTests::fill_database(conn);
 
             let gnu_tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "GNU timeline".to_owned(),
                 "license in [AGPL, LGPL, GPL]".to_owned(),
@@ -413,7 +394,7 @@ mod tests {
             .unwrap();
 
             let gnu_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug".to_string(),
@@ -427,12 +408,13 @@ mod tests {
                     source: "you must say GNU/Linux, not Linux!!!".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
-            assert!(gnu_tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(gnu_tl.matches(r, &gnu_post, Kind::Original).unwrap());
 
             let non_free_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug2".to_string(),
@@ -446,11 +428,10 @@ mod tests {
                     source: "so is Microsoft".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
-            assert!(!gnu_tl
+            assert!(!gnu_tl.matches(r, &non_free_post, Kind::Original).unwrap());
-                .matches(&conn, &non_free_post, Kind::Original)
-                .unwrap());
 
             Ok(())
         });
@@ -458,11 +439,12 @@ mod tests {
 
     #[test]
     fn test_complex_match() {
-        let conn = &db();
+        let r = &rockets();
+        let conn = &r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, blogs) = blogTests::fill_database(&conn);
+            let (users, blogs) = blogTests::fill_database(conn);
             Follow::insert(
-                &conn,
+                conn,
                 NewFollow {
                     follower_id: users[0].id,
                     following_id: users[1].id,
@@ -472,11 +454,11 @@ mod tests {
             .unwrap();
 
             let fav_blogs_list =
-                List::new(&conn, "fav_blogs", Some(&users[0]), ListType::Blog).unwrap();
+                List::new(conn, "fav_blogs", Some(&users[0]), ListType::Blog).unwrap();
-            fav_blogs_list.add_blogs(&conn, &[blogs[0].id]).unwrap();
+            fav_blogs_list.add_blogs(conn, &[blogs[0].id]).unwrap();
 
             let my_tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "My timeline".to_owned(),
                 "blog in fav_blogs and not has_cover or local and followed exclude likes"
@@ -485,7 +467,7 @@ mod tests {
             .unwrap();
 
             let post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "about-linux".to_string(),
@@ -499,12 +481,13 @@ mod tests {
                     subtitle: "".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
-            assert!(my_tl.matches(&conn, &post, Kind::Original).unwrap()); // matches because of "blog in fav_blogs" (and there is no cover)
+            assert!(my_tl.matches(r, &post, Kind::Original).unwrap()); // matches because of "blog in fav_blogs" (and there is no cover)
 
             let post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[1].id,
                     slug: "about-linux-2".to_string(),
@@ -520,9 +503,10 @@ mod tests {
                     subtitle: "".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
-            assert!(!my_tl.matches(&conn, &post, Kind::Like(&users[1])).unwrap());
+            assert!(!my_tl.matches(r, &post, Kind::Like(&users[1])).unwrap());
 
             Ok(())
         });
@@ -530,19 +514,20 @@ mod tests {
 
     #[test]
     fn test_add_to_all_timelines() {
-        let conn = &db();
+        let r = &rockets();
+        let conn = &r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, blogs) = blogTests::fill_database(&conn);
+            let (users, blogs) = blogTests::fill_database(conn);
 
             let gnu_tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "GNU timeline".to_owned(),
                 "license in [AGPL, LGPL, GPL]".to_owned(),
             )
             .unwrap();
             let non_gnu_tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Stallman disapproved timeline".to_owned(),
                 "not license in [AGPL, LGPL, GPL]".to_owned(),
@@ -550,7 +535,7 @@ mod tests {
             .unwrap();
 
             let gnu_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug".to_string(),
@@ -564,11 +549,12 @@ mod tests {
                     source: "you must say GNU/Linux, not Linux!!!".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
 
             let non_free_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug2".to_string(),
@@ -582,16 +568,17 @@ mod tests {
                     source: "so is Microsoft".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
 
-            Timeline::add_to_all_timelines(&conn, &gnu_post, Kind::Original).unwrap();
+            Timeline::add_to_all_timelines(r, &gnu_post, Kind::Original).unwrap();
-            Timeline::add_to_all_timelines(&conn, &non_free_post, Kind::Original).unwrap();
+            Timeline::add_to_all_timelines(r, &non_free_post, Kind::Original).unwrap();
 
-            let res = gnu_tl.get_latest(&conn, 2).unwrap();
+            let res = gnu_tl.get_latest(conn, 2).unwrap();
             assert_eq!(res.len(), 1);
             assert_eq!(res[0].id, gnu_post.id);
-            let res = non_gnu_tl.get_latest(&conn, 2).unwrap();
+            let res = non_gnu_tl.get_latest(conn, 2).unwrap();
             assert_eq!(res.len(), 1);
             assert_eq!(res[0].id, non_free_post.id);
 
@@ -601,12 +588,13 @@ mod tests {
 
     #[test]
     fn test_matches_lists_direct() {
-        let conn = &db();
+        let r = &rockets();
+        let conn = &r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, blogs) = blogTests::fill_database(&conn);
+            let (users, blogs) = blogTests::fill_database(conn);
 
             let gnu_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug".to_string(),
@@ -620,66 +608,65 @@ mod tests {
                     source: "you must say GNU/Linux, not Linux!!!".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
             gnu_post
-                .update_tags(&conn, vec![Tag::build_activity("free".to_owned()).unwrap()])
+                .update_tags(conn, vec![Tag::build_activity("free".to_owned()).unwrap()])
                 .unwrap();
             PostAuthor::insert(
-                &conn,
+                conn,
                 NewPostAuthor {
                     post_id: gnu_post.id,
-                    author_id: blogs[0].list_authors(&conn).unwrap()[0].id,
+                    author_id: blogs[0].list_authors(conn).unwrap()[0].id,
                 },
             )
             .unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "blog timeline".to_owned(),
                 format!("blog in [{}]", blogs[0].fqn),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "blog timeline".to_owned(),
                 "blog in [no_one@nowhere]".to_owned(),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "author timeline".to_owned(),
                 format!(
                     "author in [{}]",
-                    blogs[0].list_authors(&conn).unwrap()[0].fqn
+                    blogs[0].list_authors(conn).unwrap()[0].fqn
                 ),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "author timeline".to_owned(),
                 format!("author in [{}]", users[2].fqn),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            assert!(tl
+            assert!(tl.matches(r, &gnu_post, Kind::Reshare(&users[2])).unwrap());
-                .matches(&conn, &gnu_post, Kind::Reshare(&users[2]))
+            assert!(!tl.matches(r, &gnu_post, Kind::Like(&users[2])).unwrap());
-                .unwrap());
+            tl.delete(conn).unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Like(&users[2])).unwrap());
-            tl.delete(&conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "author timeline".to_owned(),
                 format!(
@@ -688,50 +675,48 @@ mod tests {
                 ),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            assert!(!tl
+            assert!(!tl.matches(r, &gnu_post, Kind::Reshare(&users[2])).unwrap());
-                .matches(&conn, &gnu_post, Kind::Reshare(&users[2]))
+            assert!(tl.matches(r, &gnu_post, Kind::Like(&users[2])).unwrap());
-                .unwrap());
+            tl.delete(conn).unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Like(&users[2])).unwrap());
-            tl.delete(&conn).unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "tag timeline".to_owned(),
                 "tags in [free]".to_owned(),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "tag timeline".to_owned(),
                 "tags in [private]".to_owned(),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "english timeline".to_owned(),
                 "lang in [en]".to_owned(),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "franco-italian timeline".to_owned(),
                 "lang in [fr, it]".to_owned(),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
 
             Ok(())
         });
@@ -741,12 +726,12 @@ mod tests {
     #[test]
     fn test_matches_lists_saved() {
         let r = &rockets();
-        let conn = &db();
+        let conn = &r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, blogs) = blogTests::fill_database(&conn);
+            let (users, blogs) = blogTests::fill_database(conn);
 
             let gnu_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug".to_string(),
@@ -760,10 +745,11 @@ mod tests {
                     source: "you must say GNU/Linux, not Linux!!!".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
-            gnu_post.update_tags(&conn, vec![Tag::build_activity("free".to_owned()).unwrap()]).unwrap();
+            gnu_post.update_tags(conn, vec![Tag::build_activity("free".to_owned()).unwrap()]).unwrap();
-            PostAuthor::insert(&conn, NewPostAuthor {post_id: gnu_post.id, author_id: blogs[0].list_authors(&conn).unwrap()[0].id}).unwrap();
+            PostAuthor::insert(conn, NewPostAuthor {post_id: gnu_post.id, author_id: blogs[0].list_authors(conn).unwrap()[0].id}).unwrap();
 
             unimplemented!();
 
@@ -773,12 +759,13 @@ mod tests {
 
     #[test]
     fn test_matches_keyword() {
-        let conn = &db();
+        let r = &rockets();
+        let conn = &r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let (users, blogs) = blogTests::fill_database(&conn);
+            let (users, blogs) = blogTests::fill_database(conn);
 
             let gnu_post = Post::insert(
-                &conn,
+                conn,
                 NewPost {
                     blog_id: blogs[0].id,
                     slug: "slug".to_string(),
@@ -792,65 +779,66 @@ mod tests {
                     source: "you must say GNU/Linux, not Linux!!!".to_string(),
                     cover_id: None,
                 },
+                &r.searcher,
             )
             .unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Linux title".to_owned(),
                 "title contains Linux".to_owned(),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Microsoft title".to_owned(),
                 "title contains Microsoft".to_owned(),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Linux subtitle".to_owned(),
                 "subtitle contains Stallman".to_owned(),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Microsoft subtitle".to_owned(),
                 "subtitle contains Nadella".to_owned(),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
 
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Linux content".to_owned(),
                 "content contains Linux".to_owned(),
             )
             .unwrap();
-            assert!(tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
             let tl = Timeline::new_for_user(
-                &conn,
+                conn,
                 users[0].id,
                 "Microsoft content".to_owned(),
                 "subtitle contains Windows".to_owned(),
             )
             .unwrap();
-            assert!(!tl.matches(&conn, &gnu_post, Kind::Original).unwrap());
+            assert!(!tl.matches(r, &gnu_post, Kind::Original).unwrap());
-            tl.delete(&conn).unwrap();
+            tl.delete(conn).unwrap();
 
             Ok(())
         });

plume-models/src/timeline/query.rs

@@ -1,12 +1,11 @@
 use crate::{
     blogs::Blog,
-    db_conn::DbConn,
     lists::{self, ListType},
     posts::Post,
     tags::Tag,
     timeline::Timeline,
     users::User,
-    Result,
+    PlumeRocket, Result,
 };
 use plume_common::activity_pub::inbox::AsActor;
 use whatlang::{self, Lang};
@@ -18,6 +17,12 @@ pub enum QueryError {
     RuntimeError(String),
 }
 
+impl From<std::option::NoneError> for QueryError {
+    fn from(_: std::option::NoneError) -> Self {
+        QueryError::UnexpectedEndOfQuery
+    }
+}
+
 pub type QueryResult<T> = std::result::Result<T, QueryError>;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -155,19 +160,19 @@ enum TQ<'a> {
 impl<'a> TQ<'a> {
     fn matches(
         &self,
-        conn: &DbConn,
+        rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
         kind: Kind<'_>,
     ) -> Result<bool> {
         match self {
             TQ::Or(inner) => inner.iter().try_fold(false, |s, e| {
-                e.matches(conn, timeline, post, kind).map(|r| s || r)
+                e.matches(rocket, timeline, post, kind).map(|r| s || r)
             }),
             TQ::And(inner) => inner.iter().try_fold(true, |s, e| {
-                e.matches(conn, timeline, post, kind).map(|r| s && r)
+                e.matches(rocket, timeline, post, kind).map(|r| s && r)
             }),
-            TQ::Arg(inner, invert) => Ok(inner.matches(conn, timeline, post, kind)? ^ invert),
+            TQ::Arg(inner, invert) => Ok(inner.matches(rocket, timeline, post, kind)? ^ invert),
         }
     }
 
@@ -200,15 +205,15 @@ enum Arg<'a> {
 impl<'a> Arg<'a> {
     pub fn matches(
         &self,
-        conn: &DbConn,
+        rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
         kind: Kind<'_>,
     ) -> Result<bool> {
         match self {
-            Arg::In(t, l) => t.matches(conn, timeline, post, l, kind),
+            Arg::In(t, l) => t.matches(rocket, timeline, post, l, kind),
             Arg::Contains(t, v) => t.matches(post, v),
-            Arg::Boolean(t) => t.matches(conn, timeline, post, kind),
+            Arg::Boolean(t) => t.matches(rocket, timeline, post, kind),
         }
     }
 }
@@ -225,7 +230,7 @@ enum WithList {
 impl WithList {
     pub fn matches(
         &self,
-        conn: &DbConn,
+        rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
         list: &List<'_>,
@@ -233,34 +238,39 @@ impl WithList {
     ) -> Result<bool> {
         match list {
             List::List(name) => {
-                let list = lists::List::find_for_user_by_name(conn, timeline.user_id, name)?;
+                let list =
+                    lists::List::find_for_user_by_name(&rocket.conn, timeline.user_id, &name)?;
                 match (self, list.kind()) {
-                    (WithList::Blog, ListType::Blog) => list.contains_blog(conn, post.blog_id),
+                    (WithList::Blog, ListType::Blog) => {
+                        list.contains_blog(&rocket.conn, post.blog_id)
+                    }
                     (WithList::Author { boosts, likes }, ListType::User) => match kind {
                         Kind::Original => Ok(list
-                            .list_users(conn)?
+                            .list_users(&rocket.conn)?
                             .iter()
-                            .any(|a| post.is_author(conn, a.id).unwrap_or(false))),
+                            .any(|a| post.is_author(&rocket.conn, a.id).unwrap_or(false))),
                         Kind::Reshare(u) => {
                             if *boosts {
-                                list.contains_user(conn, u.id)
+                                list.contains_user(&rocket.conn, u.id)
                             } else {
                                 Ok(false)
                             }
                         }
                         Kind::Like(u) => {
                             if *likes {
-                                list.contains_user(conn, u.id)
+                                list.contains_user(&rocket.conn, u.id)
                             } else {
                                 Ok(false)
                             }
                         }
                     },
-                    (WithList::License, ListType::Word) => list.contains_word(conn, &post.license),
+                    (WithList::License, ListType::Word) => {
+                        list.contains_word(&rocket.conn, &post.license)
+                    }
                     (WithList::Tags, ListType::Word) => {
-                        let tags = Tag::for_post(conn, post.id)?;
+                        let tags = Tag::for_post(&rocket.conn, post.id)?;
                         Ok(list
-                            .list_words(conn)?
+                            .list_words(&rocket.conn)?
                             .iter()
                             .any(|s| tags.iter().any(|t| s == &t.tag)))
                     }
@@ -275,7 +285,7 @@ impl WithList {
                             })
                             .unwrap_or(Lang::Eng)
                             .name();
-                        list.contains_prefix(conn, lang)
+                        list.contains_prefix(&rocket.conn, lang)
                     }
                     (_, _) => Err(QueryError::RuntimeError(format!(
                         "The list '{}' is of the wrong type for this usage",
@@ -287,13 +297,13 @@ impl WithList {
             List::Array(list) => match self {
                 WithList::Blog => Ok(list
                     .iter()
-                    .filter_map(|b| Blog::find_by_fqn(conn, b).ok())
+                    .filter_map(|b| Blog::find_by_fqn(rocket, b).ok())
                     .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(&*conn, a).ok())
+                        .filter_map(|a| User::find_by_fqn(rocket, a).ok())
-                        .any(|a| post.is_author(conn, a.id).unwrap_or(false))),
+                        .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))
@@ -311,7 +321,7 @@ impl WithList {
                 },
                 WithList::License => Ok(list.iter().any(|s| s == &post.license)),
                 WithList::Tags => {
-                    let tags = Tag::for_post(conn, post.id)?;
+                    let tags = Tag::for_post(&rocket.conn, post.id)?;
                     Ok(list.iter().any(|s| tags.iter().any(|t| s == &t.tag)))
                 }
                 WithList::Lang => {
@@ -361,7 +371,7 @@ enum Bool {
 impl Bool {
     pub fn matches(
         &self,
-        conn: &DbConn,
+        rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
         kind: Kind<'_>,
@@ -374,19 +384,21 @@ impl Bool {
                 let user = timeline.user_id.unwrap();
                 match kind {
                     Kind::Original => post
-                        .get_authors(conn)?
+                        .get_authors(&rocket.conn)?
                         .iter()
-                        .try_fold(false, |s, a| a.is_followed_by(conn, user).map(|r| s || r)),
+                        .try_fold(false, |s, a| {
+                            a.is_followed_by(&rocket.conn, user).map(|r| s || r)
+                        }),
                     Kind::Reshare(u) => {
                         if *boosts {
-                            u.is_followed_by(conn, user)
+                            u.is_followed_by(&rocket.conn, user)
                         } else {
                             Ok(false)
                         }
                     }
                     Kind::Like(u) => {
                         if *likes {
-                            u.is_followed_by(conn, user)
+                            u.is_followed_by(&rocket.conn, user)
                         } else {
                             Ok(false)
                         }
@@ -394,7 +406,7 @@ impl Bool {
                 }
             }
             Bool::HasCover => Ok(post.cover_id.is_some()),
-            Bool::Local => Ok(post.get_blog(conn)?.is_local() && kind == Kind::Original),
+            Bool::Local => Ok(post.get_blog(&rocket.conn)?.is_local() && kind == Kind::Original),
             Bool::All => Ok(kind == Kind::Original),
         }
     }
@@ -408,7 +420,7 @@ enum List<'a> {
 
 fn parse_s<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], TQ<'a>)> {
     let mut res = Vec::new();
-    let (left, token) = parse_a(stream)?;
+    let (left, token) = parse_a(&stream)?;
     res.push(token);
     stream = left;
     while !stream.is_empty() {
@@ -430,7 +442,7 @@ fn parse_s<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>],
 
 fn parse_a<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], TQ<'a>)> {
     let mut res = Vec::new();
-    let (left, token) = parse_b(stream)?;
+    let (left, token) = parse_b(&stream)?;
     res.push(token);
     stream = left;
     while !stream.is_empty() {
@@ -457,7 +469,7 @@ fn parse_b<'a, 'b>(stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], TQ<
             match left.get(0) {
                 Some(Token::RParent(_)) => Ok((&left[1..], token)),
                 Some(t) => t.get_error(Token::RParent(0)),
-                None => Err(QueryError::UnexpectedEndOfQuery),
+                None => None?,
             }
         }
         _ => parse_c(stream),
@@ -478,13 +490,9 @@ fn parse_c<'a, 'b>(stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], TQ<
 }
 
 fn parse_d<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], Arg<'a>)> {
-    match stream
+    match stream.get(0).map(Token::get_text)? {
-        .get(0)
-        .map(Token::get_text)
-        .ok_or(QueryError::UnexpectedEndOfQuery)?
-    {
         s @ "blog" | s @ "author" | s @ "license" | s @ "tags" | s @ "lang" => {
-            match stream.get(1).ok_or(QueryError::UnexpectedEndOfQuery)? {
+            match stream.get(1)? {
                 Token::Word(_, _, r#in) if r#in == &"in" => {
                     let (mut left, list) = parse_l(&stream[2..])?;
                     let kind = match s {
@@ -496,12 +504,7 @@ fn parse_d<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>],
                                 if *clude != "include" && *clude != "exclude" {
                                     break;
                                 }
-                                match (
+                                match (*clude, left.get(1).map(Token::get_text)?) {
-                                    *clude,
-                                    left.get(1)
-                                        .map(Token::get_text)
-                                        .ok_or(QueryError::UnexpectedEndOfQuery)?,
-                                ) {
                                     ("include", "reshares") | ("include", "reshare") => {
                                         boosts = true
                                     }
@@ -532,10 +535,7 @@ fn parse_d<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>],
                 t => t.get_error(Token::Word(0, 0, "'in'")),
             }
         }
-        s @ "title" | s @ "subtitle" | s @ "content" => match (
+        s @ "title" | s @ "subtitle" | s @ "content" => match (stream.get(1)?, stream.get(2)?) {
-            stream.get(1).ok_or(QueryError::UnexpectedEndOfQuery)?,
-            stream.get(2).ok_or(QueryError::UnexpectedEndOfQuery)?,
-        ) {
             (Token::Word(_, _, contains), Token::Word(_, _, w)) if contains == &"contains" => Ok((
                 &stream[3..],
                 Arg::Contains(
@@ -561,13 +561,7 @@ fn parse_d<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>],
                     if *clude != "include" && *clude != "exclude" {
                         break;
                     }
-                    match (
+                    match (*clude, stream.get(2).map(Token::get_text)?) {
-                        *clude,
-                        stream
-                            .get(2)
-                            .map(Token::get_text)
-                            .ok_or(QueryError::UnexpectedEndOfQuery)?,
-                    ) {
                         ("include", "reshares") | ("include", "reshare") => boosts = true,
                         ("exclude", "reshares") | ("exclude", "reshare") => boosts = false,
                         ("include", "likes") | ("include", "like") => likes = true,
@@ -589,23 +583,20 @@ fn parse_d<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>],
             "all" => Ok((&stream[1..], Arg::Boolean(Bool::All))),
             _ => unreachable!(),
         },
-        _ => stream
+        _ => stream.get(0)?.get_error(Token::Word(
-            .get(0)
+            0,
-            .ok_or(QueryError::UnexpectedEndOfQuery)?
+            0,
-            .get_error(Token::Word(
+            "one of 'blog', 'author', 'license', 'tags', 'lang', \
-                0,
-                0,
-                "one of 'blog', 'author', 'license', 'tags', 'lang', \
              'title', 'subtitle', 'content', 'followed', 'has_cover', 'local' or 'all'",
-            )),
+        )),
     }
 }
 
 fn parse_l<'a, 'b>(stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], List<'a>)> {
-    match stream.get(0).ok_or(QueryError::UnexpectedEndOfQuery)? {
+    match stream.get(0)? {
         Token::LBracket(_) => {
             let (left, list) = parse_m(&stream[1..])?;
-            match left.get(0).ok_or(QueryError::UnexpectedEndOfQuery)? {
+            match left.get(0)? {
                 Token::RBracket(_) => Ok((&left[1..], List::Array(list))),
                 t => t.get_error(Token::Word(0, 0, "one of ']' or ','")),
             }
@@ -616,20 +607,17 @@ fn parse_l<'a, 'b>(stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], Lis
 }
 
 fn parse_m<'a, 'b>(mut stream: &'b [Token<'a>]) -> QueryResult<(&'b [Token<'a>], Vec<&'a str>)> {
-    let mut res: Vec<&str> = vec![
+    let mut res: Vec<&str> = Vec::new();
-        match stream.get(0).ok_or(QueryError::UnexpectedEndOfQuery)? {
+    res.push(match stream.get(0)? {
-            Token::Word(_, _, w) => w,
+        Token::Word(_, _, w) => w,
-            t => return t.get_error(Token::Word(0, 0, "any word")),
+        t => return t.get_error(Token::Word(0, 0, "any word")),
-        },
+    });
-    ];
     stream = &stream[1..];
     while let Token::Comma(_) = stream[0] {
-        res.push(
+        res.push(match stream.get(1)? {
-            match stream.get(1).ok_or(QueryError::UnexpectedEndOfQuery)? {
+            Token::Word(_, _, w) => w,
-                Token::Word(_, _, w) => w,
+            t => return t.get_error(Token::Word(0, 0, "any word")),
-                t => return t.get_error(Token::Word(0, 0, "any word")),
+        });
-            },
-        );
         stream = &stream[2..];
     }
 
@@ -654,12 +642,12 @@ impl<'a> TimelineQuery<'a> {
 
     pub fn matches(
         &self,
-        conn: &DbConn,
+        rocket: &PlumeRocket,
         timeline: &Timeline,
         post: &Post,
         kind: Kind<'_>,
     ) -> Result<bool> {
-        self.0.matches(conn, timeline, post, kind)
+        self.0.matches(rocket, timeline, post, kind)
     }
 
     pub fn list_used_lists(&self) -> Vec<(String, ListType)> {

plume-models/src/users.rs

@@ -1,8 +1,8 @@
 use crate::{
     ap_url, blocklisted_emails::BlocklistedEmail, blogs::Blog, db_conn::DbConn, follows::Follow,
     instance::*, medias::Media, notifications::Notification, post_authors::PostAuthor, posts::Post,
-    safe_string::SafeString, schema::users, timeline::Timeline, Connection, Error, Result,
+    safe_string::SafeString, schema::users, search::Searcher, timeline::Timeline, Connection,
-    UserEvent::*, CONFIG, ITEMS_PER_PAGE, USER_CHAN,
+    Error, PlumeRocket, Result, ITEMS_PER_PAGE,
 };
 use activitypub::{
     activity::Delete,
@@ -11,9 +11,9 @@ use activitypub::{
     object::{Image, Tombstone},
     Activity, CustomObject, Endpoint,
 };
+use bcrypt;
 use chrono::{NaiveDateTime, Utc};
 use diesel::{self, BelongingToDsl, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl};
-use ldap3::{LdapConn, Scope, SearchEntry};
 use openssl::{
     hash::MessageDigest,
     pkey::{PKey, Private},
@@ -22,22 +22,25 @@ use openssl::{
 };
 use plume_common::{
     activity_pub::{
+        ap_accept_header,
         inbox::{AsActor, AsObject, FromId},
-        request::get,
+        sign::{gen_keypair, Signer},
-        sign::{gen_keypair, Error as SignError, Result as SignResult, Signer},
         ActivityStream, ApSignature, Id, IntoId, PublicKey, PUBLIC_VISIBILITY,
     },
     utils,
 };
-use riker::actors::{Publish, Tell};
+use reqwest::{
+    header::{HeaderValue, ACCEPT},
+    ClientBuilder,
+};
 use rocket::{
     outcome::IntoOutcome,
     request::{self, FromRequest, Request},
 };
+use serde_json;
 use std::{
     cmp::PartialEq,
     hash::{Hash, Hasher},
-    sync::Arc,
 };
 use url::Url;
 use webfinger::*;
@@ -48,7 +51,6 @@ pub enum Role {
     Admin = 0,
     Moderator = 1,
     Normal = 2,
-    Instance = 3,
 }
 
 #[derive(Queryable, Identifiable, Clone, Debug, AsChangeset)]
@@ -75,7 +77,6 @@ pub struct User {
     pub summary_html: SafeString,
     /// 0 = admin
     /// 1 = moderator
-    /// 3 = local instance
     /// anything else = normal user
     pub role: i32,
     pub preferred_theme: Option<String>,
@@ -129,14 +130,14 @@ impl User {
             .map_err(Error::from)
     }
 
-    pub fn delete(&self, conn: &Connection) -> Result<()> {
+    pub fn delete(&self, conn: &Connection, searcher: &Searcher) -> Result<()> {
         use crate::schema::post_authors;
 
         for blog in Blog::find_for_author(conn, self)?
             .iter()
             .filter(|b| b.count_authors(conn).map(|c| c <= 1).unwrap_or(false))
         {
-            blog.delete(conn)?;
+            blog.delete(conn, searcher)?;
         }
         // delete the posts if they is the only author
         let all_their_posts_ids: Vec<i32> = post_authors::table
@@ -156,7 +157,7 @@ impl User {
                 .unwrap_or(&0)
                 > &0;
             if !has_other_authors {
-                Post::get(conn, post_id)?.delete(conn)?;
+                Post::get(conn, post_id)?.delete(conn, searcher)?;
             }
         }
 
@@ -186,51 +187,29 @@ impl User {
         users::table
             .filter(users::instance_id.eq(Instance::get_local()?.id))
             .count()
-            .get_result(&*conn)
+            .get_result(conn)
             .map_err(Error::from)
     }
 
-    pub fn find_by_fqn(conn: &DbConn, fqn: &str) -> Result<User> {
+    pub fn find_by_fqn(c: &PlumeRocket, fqn: &str) -> Result<User> {
         let from_db = users::table
             .filter(users::fqn.eq(fqn))
-            .first(&**conn)
+            .first(&*c.conn)
             .optional()?;
         if let Some(from_db) = from_db {
             Ok(from_db)
         } else {
-            User::fetch_from_webfinger(conn, fqn)
+            User::fetch_from_webfinger(c, fqn)
         }
     }
 
-    /**
+    fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<User> {
-     * TODO: Should create user record with normalized(lowercased) email
-     */
-    pub fn email_used(conn: &DbConn, email: &str) -> Result<bool> {
-        use diesel::dsl::{exists, select};
-
-        select(exists(
-            users::table
-                .filter(users::instance_id.eq(Instance::get_local()?.id))
-                .filter(users::email.eq(email))
-                .or_filter(users::email.eq(email.to_ascii_lowercase())),
-        ))
-        .get_result(&**conn)
-        .map_err(Error::from)
-    }
-
-    fn fetch_from_webfinger(conn: &DbConn, acct: &str) -> Result<User> {
         let link = resolve(acct.to_owned(), true)?
             .links
             .into_iter()
             .find(|l| l.mime_type == Some(String::from("application/activity+json")))
             .ok_or(Error::Webfinger)?;
-        User::from_id(
+        User::from_id(c, link.href.as_ref()?, None).map_err(|(_, e)| e)
-            conn,
-            link.href.as_ref().ok_or(Error::Webfinger)?,
-            None,
-            CONFIG.proxy(),
-        )
-        .map_err(|(_, e)| e)
     }
 
     pub fn fetch_remote_interact_uri(acct: &str) -> Result<String> {
@@ -243,7 +222,20 @@ impl User {
     }
 
     fn fetch(url: &str) -> Result<CustomPerson> {
-        let mut res = get(url, Self::get_sender(), CONFIG.proxy().cloned())?;
+        let mut res = ClientBuilder::new()
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+            .build()?
+            .get(url)
+            .header(
+                ACCEPT,
+                HeaderValue::from_str(
+                    &ap_accept_header()
+                        .into_iter()
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                )?,
+            )
+            .send()?;
         let text = &res.text()?;
         // without this workaround, publicKey is not correctly deserialized
         let ap_sign = serde_json::from_str::<ApSignature>(text)?;
@@ -252,8 +244,8 @@ impl User {
         Ok(json)
     }
 
-    pub fn fetch_from_url(conn: &DbConn, url: &str) -> Result<User> {
+    pub fn fetch_from_url(c: &PlumeRocket, url: &str) -> Result<User> {
-        User::fetch(url).and_then(|json| User::from_activity(conn, json))
+        User::fetch(url).and_then(|json| User::from_activity(c, json))
     }
 
     pub fn refetch(&self, conn: &Connection) -> Result<()> {
@@ -262,10 +254,10 @@ impl User {
                 conn,
                 json.object
                     .object_props
-                    .icon_image()? // FIXME: Fails when icon is not set
+                    .icon_image()?
                     .object_props
                     .url_string()?,
-                self,
+                &self,
             )
             .ok();
 
@@ -300,116 +292,11 @@ impl User {
         bcrypt::hash(pass, 10).map_err(Error::from)
     }
 
-    fn ldap_register(conn: &Connection, name: &str, password: &str) -> Result<User> {
+    pub fn auth(&self, pass: &str) -> bool {
-        if CONFIG.ldap.is_none() {
+        self.hashed_password
-            return Err(Error::NotFound);
+            .clone()
-        }
+            .map(|hashed| bcrypt::verify(pass, hashed.as_ref()).unwrap_or(false))
-        let ldap = CONFIG.ldap.as_ref().unwrap();
+            .unwrap_or(false)
-
-        let mut ldap_conn = LdapConn::new(&ldap.addr).map_err(|_| Error::NotFound)?;
-        let ldap_name = format!("{}={},{}", ldap.user_name_attr, name, ldap.base_dn);
-        let bind = ldap_conn
-            .simple_bind(&ldap_name, password)
-            .map_err(|_| Error::NotFound)?;
-
-        if bind.success().is_err() {
-            return Err(Error::NotFound);
-        }
-
-        let search = ldap_conn
-            .search(
-                &ldap_name,
-                Scope::Base,
-                "(|(objectClass=person)(objectClass=user))",
-                vec![&ldap.mail_attr],
-            )
-            .map_err(|_| Error::NotFound)?
-            .success()
-            .map_err(|_| Error::NotFound)?;
-        for entry in search.0 {
-            let entry = SearchEntry::construct(entry);
-            let email = entry.attrs.get("mail").and_then(|vec| vec.first());
-            if let Some(email) = email {
-                let _ = ldap_conn.unbind();
-                return NewUser::new_local(
-                    conn,
-                    name.to_owned(),
-                    name.to_owned(),
-                    Role::Normal,
-                    "",
-                    email.to_owned(),
-                    None,
-                );
-            }
-        }
-        let _ = ldap_conn.unbind();
-        Err(Error::NotFound)
-    }
-
-    fn ldap_login(&self, password: &str) -> bool {
-        if let Some(ldap) = CONFIG.ldap.as_ref() {
-            let mut conn = if let Ok(conn) = LdapConn::new(&ldap.addr) {
-                conn
-            } else {
-                return false;
-            };
-            let name = format!(
-                "{}={},{}",
-                ldap.user_name_attr, &self.username, ldap.base_dn
-            );
-            if let Ok(bind) = conn.simple_bind(&name, password) {
-                bind.success().is_ok()
-            } else {
-                false
-            }
-        } else {
-            false
-        }
-    }
-
-    pub fn login(conn: &Connection, ident: &str, password: &str) -> Result<User> {
-        let local_id = Instance::get_local()?.id;
-        let user = match User::find_by_email(conn, ident) {
-            Ok(user) => Ok(user),
-            _ => User::find_by_name(conn, ident, local_id),
-        }
-        .and_then(|u| {
-            if u.instance_id == local_id {
-                Ok(u)
-            } else {
-                Err(Error::NotFound)
-            }
-        });
-
-        match user {
-            Ok(user) if user.hashed_password.is_some() => {
-                if bcrypt::verify(password, user.hashed_password.as_ref().unwrap()).unwrap_or(false)
-                {
-                    Ok(user)
-                } else {
-                    Err(Error::NotFound)
-                }
-            }
-            Ok(user) => {
-                if user.ldap_login(password) {
-                    Ok(user)
-                } else {
-                    Err(Error::NotFound)
-                }
-            }
-            e => {
-                if let Ok(user) = User::ldap_register(conn, ident, password) {
-                    return Ok(user);
-                }
-                // if no user was found, and we were unable to auto-register from ldap
-                // fake-verify a password, and return an error.
-                let other = User::get(&*conn, 1)
-                    .expect("No user is registered")
-                    .hashed_password;
-                other.map(|pass| bcrypt::verify(password, &pass));
-                e
-            }
-        }
     }
 
     pub fn reset_password(&self, conn: &Connection, pass: &str) -> Result<()> {
@@ -434,12 +321,12 @@ impl User {
         let last = &format!(
             "{}?page={}",
             &self.outbox_url,
-            self.get_activities_count(conn) / i64::from(ITEMS_PER_PAGE) + 1
+            self.get_activities_count(&conn) / i64::from(ITEMS_PER_PAGE) + 1
         );
         coll.collection_props.set_first_link(Id::new(first))?;
         coll.collection_props.set_last_link(Id::new(last))?;
         coll.collection_props
-            .set_total_items_u64(self.get_activities_count(conn) as u64)?;
+            .set_total_items_u64(self.get_activities_count(&conn) as u64)?;
         Ok(ActivityStream::new(coll))
     }
     pub fn outbox_page(
@@ -448,7 +335,7 @@ impl User {
         (min, max): (i32, i32),
     ) -> Result<ActivityStream<OrderedCollectionPage>> {
         let acts = self.get_activities_page(conn, (min, max))?;
-        let n_acts = self.get_activities_count(conn);
+        let n_acts = self.get_activities_count(&conn);
         let mut coll = OrderedCollectionPage::default();
         if n_acts - i64::from(min) >= i64::from(ITEMS_PER_PAGE) {
             coll.collection_page_props.set_next_link(Id::new(&format!(
@@ -470,7 +357,20 @@ impl User {
         Ok(ActivityStream::new(coll))
     }
     fn fetch_outbox_page<T: Activity>(&self, url: &str) -> Result<(Vec<T>, Option<String>)> {
-        let mut res = get(url, Self::get_sender(), CONFIG.proxy().cloned())?;
+        let mut res = ClientBuilder::new()
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+            .build()?
+            .get(url)
+            .header(
+                ACCEPT,
+                HeaderValue::from_str(
+                    &ap_accept_header()
+                        .into_iter()
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                )?,
+            )
+            .send()?;
         let text = &res.text()?;
         let json: serde_json::Value = serde_json::from_str(text)?;
         let items = json["items"]
@@ -480,15 +380,27 @@ impl User {
             .filter_map(|j| serde_json::from_value(j.clone()).ok())
             .collect::<Vec<T>>();
 
-        let next = json.get("next").map(|x| x.as_str().unwrap().to_owned());
+        let next = match json.get("next") {
+            Some(x) => Some(x.as_str().unwrap().to_owned()),
+            None => None,
+        };
         Ok((items, next))
     }
     pub fn fetch_outbox<T: Activity>(&self) -> Result<Vec<T>> {
-        let mut res = get(
+        let mut res = ClientBuilder::new()
-            &self.outbox_url[..],
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
-            Self::get_sender(),
+            .build()?
-            CONFIG.proxy().cloned(),
+            .get(&self.outbox_url[..])
-        )?;
+            .header(
+                ACCEPT,
+                HeaderValue::from_str(
+                    &ap_accept_header()
+                        .into_iter()
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                )?,
+            )
+            .send()?;
         let text = &res.text()?;
         let json: serde_json::Value = serde_json::from_str(text)?;
         if let Some(first) = json.get("first") {
@@ -498,7 +410,7 @@ impl User {
                 if page.is_empty() {
                     break;
                 }
-                items.append(&mut page);
+                items.extend(page.drain(..));
                 if let Some(n) = nxt {
                     if n == next {
                         break;
@@ -520,11 +432,20 @@ impl User {
     }
 
     pub fn fetch_followers_ids(&self) -> Result<Vec<String>> {
-        let mut res = get(
+        let mut res = ClientBuilder::new()
-            &self.followers_endpoint[..],
+            .connect_timeout(Some(std::time::Duration::from_secs(5)))
-            Self::get_sender(),
+            .build()?
-            CONFIG.proxy().cloned(),
+            .get(&self.followers_endpoint[..])
-        )?;
+            .header(
+                ACCEPT,
+                HeaderValue::from_str(
+                    &ap_accept_header()
+                        .into_iter()
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                )?,
+            )
+            .send()?;
         let text = &res.text()?;
         let json: serde_json::Value = serde_json::from_str(text)?;
         Ok(json["items"]
@@ -696,7 +617,7 @@ impl User {
 
     pub fn get_keypair(&self) -> Result<PKey<Private>> {
         PKey::from_rsa(Rsa::private_key_from_pem(
-            self.private_key.clone().ok_or(Error::Signature)?.as_ref(),
+            self.private_key.clone()?.as_ref(),
         )?)
         .map_err(Error::from)
     }
@@ -805,7 +726,11 @@ impl User {
 
     pub fn webfinger(&self, conn: &Connection) -> Result<Webfinger> {
         Ok(Webfinger {
-            subject: format!("acct:{}", self.acct_authority(conn)?),
+            subject: format!(
+                "acct:{}@{}",
+                self.username,
+                self.get_instance(conn)?.public_domain
+            ),
             aliases: vec![self.ap_url.clone()],
             links: vec![
                 Link {
@@ -843,14 +768,6 @@ impl User {
         })
     }
 
-    pub fn acct_authority(&self, conn: &Connection) -> Result<String> {
-        Ok(format!(
-            "{}@{}",
-            self.username,
-            self.get_instance(conn)?.public_domain
-        ))
-    }
-
     pub fn set_avatar(&self, conn: &Connection, id: i32) -> Result<()> {
         diesel::update(self)
             .set(users::avatar_id.eq(id))
@@ -870,21 +787,6 @@ impl User {
             self.fqn.clone()
         }
     }
-
-    pub fn remote_user_found(&self) {
-        tracing::trace!("{:?}", self);
-        self.publish_remote_user_found();
-    }
-
-    fn publish_remote_user_found(&self) {
-        USER_CHAN.tell(
-            Publish {
-                msg: RemoteUserFound(Arc::new(self.clone())),
-                topic: "user.remote_user_found".into(),
-            },
-            None,
-        )
-    }
 }
 
 impl<'a, 'r> FromRequest<'a, 'r> for User {
@@ -909,20 +811,20 @@ impl IntoId for User {
 
 impl Eq for User {}
 
-impl FromId<DbConn> for User {
+impl FromId<PlumeRocket> for User {
     type Error = Error;
     type Object = CustomPerson;
 
-    fn from_db(conn: &DbConn, id: &str) -> Result<Self> {
+    fn from_db(c: &PlumeRocket, id: &str) -> Result<Self> {
-        Self::find_by_ap_url(conn, id)
+        Self::find_by_ap_url(&c.conn, id)
     }
 
-    fn from_activity(conn: &DbConn, acct: CustomPerson) -> Result<Self> {
+    fn from_activity(c: &PlumeRocket, acct: CustomPerson) -> Result<Self> {
         let url = Url::parse(&acct.object.object_props.id_string()?)?;
-        let inst = url.host_str().ok_or(Error::Url)?;
+        let inst = url.host_str()?;
-        let instance = Instance::find_by_domain(conn, inst).or_else(|_| {
+        let instance = Instance::find_by_domain(&c.conn, inst).or_else(|_| {
             Instance::insert(
-                conn,
+                &c.conn,
                 NewInstance {
                     name: inst.to_owned(),
                     public_domain: inst.to_owned(),
@@ -951,7 +853,7 @@ impl FromId<DbConn> for User {
         };
 
         let user = User::insert(
-            conn,
+            &c.conn,
             NewUser {
                 display_name: acct
                     .object
@@ -997,23 +899,19 @@ impl FromId<DbConn> for User {
 
         if let Ok(icon) = acct.object.object_props.icon_image() {
             if let Ok(url) = icon.object_props.url_string() {
-                let avatar = Media::save_remote(conn, url, &user);
+                let avatar = Media::save_remote(&c.conn, url, &user);
 
                 if let Ok(avatar) = avatar {
-                    user.set_avatar(conn, avatar.id)?;
+                    user.set_avatar(&c.conn, avatar.id)?;
                 }
             }
         }
 
         Ok(user)
     }
-
-    fn get_sender() -> &'static dyn Signer {
-        Instance::get_local_instance_user().expect("Failed to local instance user")
-    }
 }
 
-impl AsActor<&DbConn> for User {
+impl AsActor<&PlumeRocket> for User {
     fn get_inbox_url(&self) -> String {
         self.inbox_url.clone()
     }
@@ -1029,13 +927,13 @@ impl AsActor<&DbConn> for User {
     }
 }
 
-impl AsObject<User, Delete, &DbConn> for User {
+impl AsObject<User, Delete, &PlumeRocket> for User {
     type Error = Error;
     type Output = ();
 
-    fn activity(self, conn: &DbConn, actor: User, _id: &str) -> Result<()> {
+    fn activity(self, c: &PlumeRocket, actor: User, _id: &str) -> Result<()> {
         if self.id == actor.id {
-            self.delete(conn).map(|_| ())
+            self.delete(&c.conn, &c.searcher).map(|_| ())
         } else {
             Err(Error::Unauthorized)
         }
@@ -1043,22 +941,24 @@ impl AsObject<User, Delete, &DbConn> for User {
 }
 
 impl Signer for User {
+    type Error = Error;
+
     fn get_key_id(&self) -> String {
         format!("{}#main-key", self.ap_url)
     }
 
-    fn sign(&self, to_sign: &str) -> SignResult<Vec<u8>> {
+    fn sign(&self, to_sign: &str) -> Result<Vec<u8>> {
-        let key = self.get_keypair().map_err(|_| SignError())?;
+        let key = self.get_keypair()?;
         let mut signer = sign::Signer::new(MessageDigest::sha256(), &key)?;
         signer.update(to_sign.as_bytes())?;
-        signer.sign_to_vec().map_err(SignError::from)
+        signer.sign_to_vec().map_err(Error::from)
     }
 
-    fn verify(&self, data: &str, signature: &[u8]) -> SignResult<bool> {
+    fn verify(&self, data: &str, signature: &[u8]) -> Result<bool> {
         let key = PKey::from_rsa(Rsa::public_key_from_pem(self.public_key.as_ref())?)?;
         let mut verifier = sign::Verifier::new(MessageDigest::sha256(), &key)?;
         verifier.update(data.as_bytes())?;
-        verifier.verify(signature).map_err(SignError::from)
+        verifier.verify(&signature).map_err(Error::from)
     }
 }
 
@@ -1083,7 +983,7 @@ impl NewUser {
         role: Role,
         summary: &str,
         email: String,
-        password: Option<String>,
+        password: String,
     ) -> Result<User> {
         let (pub_key, priv_key) = gen_keypair();
         let instance = Instance::get_local()?;
@@ -1099,9 +999,9 @@ impl NewUser {
                 display_name,
                 role: role as i32,
                 summary: summary.to_owned(),
-                summary_html: SafeString::new(&utils::md_to_html(summary, None, false, None).0),
+                summary_html: SafeString::new(&utils::md_to_html(&summary, None, false, None).0),
                 email: Some(email),
-                hashed_password: password,
+                hashed_password: Some(password),
                 instance_id: instance.id,
                 public_key: String::from_utf8(pub_key).or(Err(Error::Signature))?,
                 private_key: Some(String::from_utf8(priv_key).or(Err(Error::Signature))?),
@@ -1122,27 +1022,14 @@ impl NewUser {
     }
 }
 
-#[derive(Clone, Debug)]
-pub enum UserEvent {
-    RemoteUserFound(Arc<User>),
-}
-
-impl From<UserEvent> for Arc<User> {
-    fn from(event: UserEvent) -> Self {
-        use UserEvent::*;
-
-        match event {
-            RemoteUserFound(user) => user,
-        }
-    }
-}
-
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
     use crate::{
+        config::CONFIG,
         instance::{tests as instance_tests, Instance},
-        tests::db,
+        search::tests::get_searcher,
+        tests::{db, rockets},
         Connection as Conn,
     };
     use diesel::Connection;
@@ -1156,7 +1043,7 @@ pub(crate) mod tests {
             Role::Admin,
             "Hello there, I'm the admin",
             "admin@example.com".to_owned(),
-            Some("invalid_admin_password".to_owned()),
+            "invalid_admin_password".to_owned(),
         )
         .unwrap();
         let user = NewUser::new_local(
@@ -1166,7 +1053,7 @@ pub(crate) mod tests {
             Role::Normal,
             "Hello there, I'm no one",
             "user@example.com".to_owned(),
-            Some("invalid_user_password".to_owned()),
+            "invalid_user_password".to_owned(),
         )
         .unwrap();
         let other = NewUser::new_local(
@@ -1176,7 +1063,7 @@ pub(crate) mod tests {
             Role::Normal,
             "Hello there, I'm someone else",
             "other@example.com".to_owned(),
-            Some("invalid_other_password".to_owned()),
+            "invalid_other_password".to_owned(),
         )
         .unwrap();
         vec![admin, user, other]
@@ -1184,37 +1071,38 @@ pub(crate) mod tests {
 
     #[test]
     fn find_by() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            fill_database(&conn);
+            fill_database(conn);
             let test_user = NewUser::new_local(
-                &conn,
+                conn,
                 "test".to_owned(),
                 "test user".to_owned(),
                 Role::Normal,
                 "Hello I'm a test",
                 "test@example.com".to_owned(),
-                Some(User::hash_pass("test_password").unwrap()),
+                User::hash_pass("test_password").unwrap(),
             )
             .unwrap();
             assert_eq!(
                 test_user.id,
-                User::find_by_name(&conn, "test", Instance::get_local().unwrap().id)
+                User::find_by_name(conn, "test", Instance::get_local().unwrap().id)
                     .unwrap()
                     .id
             );
             assert_eq!(
                 test_user.id,
-                User::find_by_fqn(&conn, &test_user.fqn).unwrap().id
+                User::find_by_fqn(&r, &test_user.fqn).unwrap().id
             );
             assert_eq!(
                 test_user.id,
-                User::find_by_email(&conn, "test@example.com").unwrap().id
+                User::find_by_email(conn, "test@example.com").unwrap().id
             );
             assert_eq!(
                 test_user.id,
                 User::find_by_ap_url(
-                    &conn,
+                    conn,
                     &format!(
                         "https://{}/@/{}/",
                         Instance::get_local().unwrap().public_domain,
@@ -1232,11 +1120,13 @@ pub(crate) mod tests {
     fn delete() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let inserted = fill_database(&conn);
+            let inserted = fill_database(conn);
 
-            assert!(User::get(&conn, inserted[0].id).is_ok());
+            assert!(User::get(conn, inserted[0].id).is_ok());
-            inserted[0].delete(&conn).unwrap();
+            inserted[0]
-            assert!(User::get(&conn, inserted[0].id).is_err());
+                .delete(conn, &get_searcher(&CONFIG.search_tokenizers))
+                .unwrap();
+            assert!(User::get(conn, inserted[0].id).is_err());
             Ok(())
         });
     }
@@ -1245,20 +1135,20 @@ pub(crate) mod tests {
     fn admin() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            let inserted = fill_database(&conn);
+            let inserted = fill_database(conn);
             let local_inst = Instance::get_local().unwrap();
             let mut i = 0;
-            while local_inst.has_admin(&conn).unwrap() {
+            while local_inst.has_admin(conn).unwrap() {
                 assert!(i < 100); //prevent from looping indefinitelly
                 local_inst
-                    .main_admin(&conn)
+                    .main_admin(conn)
                     .unwrap()
-                    .set_role(&conn, Role::Normal)
+                    .set_role(conn, Role::Normal)
                     .unwrap();
                 i += 1;
             }
-            inserted[0].set_role(&conn, Role::Admin).unwrap();
+            inserted[0].set_role(conn, Role::Admin).unwrap();
-            assert_eq!(inserted[0].id, local_inst.main_admin(&conn).unwrap().id);
+            assert_eq!(inserted[0].id, local_inst.main_admin(conn).unwrap().id);
             Ok(())
         });
     }
@@ -1267,23 +1157,20 @@ pub(crate) mod tests {
     fn auth() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            fill_database(&conn);
+            fill_database(conn);
             let test_user = NewUser::new_local(
-                &conn,
+                conn,
                 "test".to_owned(),
                 "test user".to_owned(),
                 Role::Normal,
                 "Hello I'm a test",
                 "test@example.com".to_owned(),
-                Some(User::hash_pass("test_password").unwrap()),
+                User::hash_pass("test_password").unwrap(),
             )
             .unwrap();
 
-            assert_eq!(
+            assert!(test_user.auth("test_password"));
-                User::login(&conn, "test", "test_password").unwrap().id,
+            assert!(!test_user.auth("other_password"));
-                test_user.id
-            );
-            assert!(User::login(&conn, "test", "other_password").is_err());
             Ok(())
         });
     }
@@ -1292,26 +1179,26 @@ pub(crate) mod tests {
     fn get_local_page() {
         let conn = &db();
         conn.test_transaction::<_, (), _>(|| {
-            fill_database(&conn);
+            fill_database(conn);
 
-            let page = User::get_local_page(&conn, (0, 2)).unwrap();
+            let page = User::get_local_page(conn, (0, 2)).unwrap();
             assert_eq!(page.len(), 2);
             assert!(page[0].username <= page[1].username);
 
-            let mut last_username = User::get_local_page(&conn, (0, 1)).unwrap()[0]
+            let mut last_username = User::get_local_page(conn, (0, 1)).unwrap()[0]
                 .username
                 .clone();
-            for i in 1..User::count_local(&conn).unwrap() as i32 {
+            for i in 1..User::count_local(conn).unwrap() as i32 {
-                let page = User::get_local_page(&conn, (i, i + 1)).unwrap();
+                let page = User::get_local_page(conn, (i, i + 1)).unwrap();
                 assert_eq!(page.len(), 1);
                 assert!(last_username <= page[0].username);
                 last_username = page[0].username.clone();
             }
             assert_eq!(
-                User::get_local_page(&conn, (0, User::count_local(&conn).unwrap() as i32 + 10))
+                User::get_local_page(conn, (0, User::count_local(conn).unwrap() as i32 + 10))
                     .unwrap()
                     .len() as i64,
-                User::count_local(&conn).unwrap()
+                User::count_local(conn).unwrap()
             );
             Ok(())
         });
@@ -1319,13 +1206,14 @@ pub(crate) mod tests {
 
     #[test]
     fn self_federation() {
-        let conn = db();
+        let r = rockets();
+        let conn = &*r.conn;
         conn.test_transaction::<_, (), _>(|| {
-            let users = fill_database(&conn);
+            let users = fill_database(conn);
 
-            let ap_repr = users[0].to_activity(&conn).unwrap();
+            let ap_repr = users[0].to_activity(conn).unwrap();
-            users[0].delete(&conn).unwrap();
+            users[0].delete(conn, &*r.searcher).unwrap();
-            let user = User::from_activity(&conn, ap_repr).unwrap();
+            let user = User::from_activity(&r, ap_repr).unwrap();
 
             assert_eq!(user.username, users[0].username);
             assert_eq!(user.display_name, users[0].display_name);
@@ -1336,7 +1224,7 @@ pub(crate) mod tests {
             assert_eq!(user.public_key, users[0].public_key);
             assert_eq!(user.shared_inbox_url, users[0].shared_inbox_url);
             assert_eq!(user.followers_endpoint, users[0].followers_endpoint);
-            assert_eq!(user.avatar_url(&conn), users[0].avatar_url(&conn));
+            assert_eq!(user.avatar_url(conn), users[0].avatar_url(conn));
             assert_eq!(user.fqn, users[0].fqn);
             assert_eq!(user.summary_html, users[0].summary_html);
             Ok(())

po/plume-front/af.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:06\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans\n"
 "Language: af_ZA\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: af\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr ""
 

po/plume-front/ar.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:06\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic\n"
 "Language: ar_SA\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "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"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: ar\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr "فتح محرر النصوص الغني"
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr "العنوان"
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr "العنوان الثانوي أو الملخص"
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr "اكتب مقالك هنا. ماركداون مُدَعَّم."
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr "يتبقا {} حرفا تقريبا"
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr "الوسوم"
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr "الرخصة"
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr "الغلاف"
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr "هذه مسودة"
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr "نشر كتابا"
 

po/plume-front/bg.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:06\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian\n"
 "Language: bg_BG\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: bg\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr "Искате ли да активирате локално автоматично запаметяване, последно редактирано в {}?"
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr "Отворете редактора с богат текст"
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr "Заглавие"
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr "Подзаглавие или резюме"
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr "Напишете статията си тук. Поддържа се Markdown."
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr "Остават {} знака вляво"
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr "Етикети"
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr "Лиценз"
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr "Основно изображение"
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr "Това е проект"
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr "Публикувай"
 

po/plume-front/ca.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:06\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan\n"
 "Language: ca_ES\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: ca\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr "Obre l’editor de text enriquit"
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr "Títol"
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr "Subtítol o resum"
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr "Escriviu el vostre article ací. Podeu fer servir el Markdown."
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr "Queden uns {} caràcters"
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr "Etiquetes"
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr "Llicència"
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr "Coberta"
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr "Açò és un esborrany"
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr "Publica"
 

po/plume-front/cs.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:06\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: cs\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr "Otevřít editor formátovaného textu"
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr "Nadpis"
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr "Podnadpis, nebo shrnutí"
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr "Sem napište svůj článek. Markdown je podporován."
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr "Zbývá kolem {} znaků"
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr "Tagy"
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr "Licence"
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr "Titulka"
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr "Tohle je koncept"
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr "Zveřejnit"
 

po/plume-front/cy.po

@@ -10,17 +10,12 @@ 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) ? "
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n == 3) ? 3 : ((n == 6) ? 4 : 5))));\n"
-"2 : ((n == 3) ? 3 : ((n == 6) ? 4 : 5))));\n"
 "X-Generator: crowdin.com\n"
 "X-Crowdin-Project: plume\n"
 "X-Crowdin-Language: cy\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
 
-# plume-front/src/editor.rs:189
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
 # plume-front/src/editor.rs:114
 msgid "Open the rich text editor"
 msgstr ""
@@ -29,8 +24,8 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:319
+# plume-front/src/editor.rs:147
-msgid "Subtitle, or summary"
+msgid "Subtitle or summary"
 msgstr ""
 
 # plume-front/src/editor.rs:154
@@ -60,3 +55,4 @@ msgstr ""
 # plume-front/src/editor.rs:259
 msgid "Publish"
 msgstr ""
+

po/plume-front/da.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:06\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: da\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr ""
 

po/plume-front/de.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:07\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: de\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr "Möchten Sie die lokale automatische Speicherung laden, die zuletzt um {} bearbeitet wurde?"
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr " Rich Text Editor (RTE) öffnen"
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr "Titel"
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr "Untertitel oder Zusammenfassung"
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr "Schreiben  deinen Artikel hier. Markdown wird unterstützt."
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr "Ungefähr {} Zeichen übrig"
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr "Schlagwörter"
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr "Lizenz"
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr "Einband"
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr "Dies ist ein Entwurf"
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr "Veröffentlichen"
 

po/plume-front/el.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:07\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: el\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr ""
 

po/plume-front/en.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:07\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: en\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr ""
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr ""
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr ""
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr ""
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr ""
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr ""
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr ""
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr ""
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr ""
 

po/plume-front/eo.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: plume\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-15 16:33-0700\n"
-"PO-Revision-Date: 2022-01-12 01:20\n"
+"PO-Revision-Date: 2019-12-16 21:07\n"
-"Last-Translator: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto\n"
 "Language: eo_UY\n"
 "MIME-Version: 1.0\n"
@@ -12,52 +12,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: plume\n"
-"X-Crowdin-Project-ID: 352097\n"
 "X-Crowdin-Language: eo\n"
 "X-Crowdin-File: /master/po/plume-front/plume-front.pot\n"
-"X-Crowdin-File-ID: 12\n"
 
-# plume-front/src/editor.rs:172
+# plume-front/src/editor.rs:115
-msgid "Do you want to load the local autosave last edited at {}?"
-msgstr ""
-
-# plume-front/src/editor.rs:326
 msgid "Open the rich text editor"
 msgstr "Malfermi la riĉan redaktilon"
 
-# plume-front/src/editor.rs:385
+# plume-front/src/editor.rs:145
 msgid "Title"
 msgstr "Titolo"
 
-# plume-front/src/editor.rs:389
+# plume-front/src/editor.rs:149
 msgid "Subtitle, or summary"
 msgstr ""
 
-# plume-front/src/editor.rs:396
+# plume-front/src/editor.rs:156
 msgid "Write your article here. Markdown is supported."
 msgstr "Verku vian artikolon ĉi tie. Markdown estas subtenita."
 
-# plume-front/src/editor.rs:407
+# plume-front/src/editor.rs:167
 msgid "Around {} characters left"
 msgstr "Proksimume {} signoj restantaj"
 
-# plume-front/src/editor.rs:517
+# plume-front/src/editor.rs:243
 msgid "Tags"
 msgstr "Etikedoj"
 
-# plume-front/src/editor.rs:518
+# plume-front/src/editor.rs:244
 msgid "License"
 msgstr "Permesilo"
 
-# plume-front/src/editor.rs:524
+# plume-front/src/editor.rs:247
 msgid "Cover"
 msgstr "Kovro"
 
-# plume-front/src/editor.rs:564
+# plume-front/src/editor.rs:267
 msgid "This is a draft"
 msgstr "Malfinias"
 
-# plume-front/src/editor.rs:575
+# plume-front/src/editor.rs:274
 msgid "Publish"
 msgstr "Eldoni"