Define From<PreferredUsernameError> for Error

% diesel migration generate add_unique_constraint_to_activity_pub_related_fields

.cargo/config.toml

@@ -0,0 +1,10 @@
+[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,8 +10,8 @@ executors:
         type: boolean
         default: false
     docker:
-    - image: plumeorg/plume-buildenv:v0.0.9
-    - image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
+    - image: plumeorg/plume-buildenv:v0.8.0
+    - image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
       environment:
         POSTGRES_USER: postgres
         POSTGRES_DB: plume
@@ -21,6 +21,7 @@ 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:
@@ -37,7 +38,7 @@ commands:
     - restore_cache:
         keys:
         - v0-<< parameters.cache >>-{{ checksum "Cargo.lock" }}-{{ .Branch }}
-        - v0-<< parameters.cache >>-{{ checksum "Cargo.lock" }}-master
+        - v0-<< parameters.cache >>-{{ checksum "Cargo.lock" }}-main
 
   cache:
     description: push cache
@@ -62,6 +63,7 @@ commands:
         type: boolean
         default: false
     steps:
+    - run: rustup component add clippy --toolchain nightly-2022-07-19-x86_64-unknown-linux-gnu
     - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings
 
   run_with_coverage:
@@ -71,7 +73,7 @@ commands:
         type: string
     steps:
     - run: |
-       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 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 CARGO_INCREMENTAL=0
        << parameters.cmd >>
 
@@ -99,7 +101,7 @@ commands:
     steps:
     - run: |
             cmd="cargo build <<#parameters.release>>--release<</parameters.release>> --no-default-features --features="${FEATURES}" -p <<parameters.package>> -j"
-            for i in 36 4 2 1 1; do
+            for i in 16 4 2 1 1; do
                 $cmd $i && exit 0
             done
             exit 1
@@ -110,6 +112,7 @@ jobs:
       name: default
     steps:
     - restore_env
+    - run: rustup component add rustfmt --toolchain nightly-2022-07-19-x86_64-unknown-linux-gnu
     - run: cargo fmt --all -- --check
 
   clippy:
@@ -143,11 +146,14 @@ 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 36 4 2 1 1; do
+          for i in 16 4 2 1 1; do
               $cmd $i && break
           done
-          cargo test --all --exclude plume-front --exclude plume-macro --no-default-features --features="${FEATURES}" -j1 -- --test-threads=1
+          cargo test --all --exclude plume-front --exclude plume-macro --no-default-features --features="${FEATURES}" -j1
     - upload_coverage:
         type: unit
     - cache:
@@ -164,18 +170,18 @@ jobs:
     steps:
     - restore_env:
         cache: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
-    - run: cargo web deploy -p plume-front
+    - run: wasm-pack build --target web --release plume-front
     - run_with_coverage:
         cmd: |
             cmd="cargo install --debug --no-default-features --features="${FEATURES}",test --force --path . -j"
-            for i in 36 4 2 1 1; do
+            for i in 16 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 36 4 2 1 1; do
+            for i in 16 4 2 1 1; do
                 $cmd $i && exit 0
             done
             exit 1
@@ -199,7 +205,7 @@ jobs:
     steps:
     - restore_env:
         cache: release-<<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
-    - run: cargo web deploy -p plume-front --release
+    - run: wasm-pack build --target web --release plume-front
     - build:
         package: plume
         release: true
@@ -254,4 +260,4 @@ workflows:
         filters:
           branches:
             only:
-              - /^master/
+              - /^main/

.circleci/images/plume-buildenv/Caddyfile

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

.circleci/images/plume-buildenv/Dockerfile

@@ -1,21 +1,24 @@
-FROM debian:stretch-20190326
+FROM rust:1
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 #install native/circleci/build dependancies
 RUN apt update &&\
     apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\
-    apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip libclang-dev&&\
+    echo "deb [trusted=yes] https://apt.fury.io/caddy/ /" \
+    | tee -a /etc/apt/sources.list.d/caddy-fury.list &&\
+    wget -qO - https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | apt-key add - &&\
+    echo "deb https://artifacts.crowdin.com/repo/deb/ /" > /etc/apt/sources.list.d/crowdin.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-dev python3-pip python3-setuptools zip unzip libclang-dev clang caddy crowdin3 &&\
     rm -rf /var/lib/apt/lists/*
 
-#install and configure rust
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-01-15 -y &&\
-    rustup component add rustfmt clippy &&\
-    rustup component add rust-std --target wasm32-unknown-unknown
+#stick rust environment
+COPY rust-toolchain ./
+RUN rustup component add rustfmt clippy
 
 #compile some deps
-RUN cargo install cargo-web &&\
+RUN cargo install wasm-pack &&\
     cargo install grcov &&\
-    strip /root/.cargo/bin/* &&\
     rm -fr ~/.cargo/registry
 
 #set some compilation parametters
@@ -24,14 +27,5 @@ COPY cargo_config /root/.cargo/config
 #install selenium for front end tests
 RUN pip3 install selenium
 
-#install and configure caddy
-RUN curl https://getcaddy.com | bash -s personal
+#configure caddy
 COPY Caddyfile /Caddyfile
-
-#install crowdin
-RUN mkdir /crowdin && cd /crowdin &&\
-    curl -O https://downloads.crowdin.com/cli/v2/crowdin-cli.zip &&\
-    unzip crowdin-cli.zip && rm crowdin-cli.zip &&\
-    cd * && mv crowdin-cli.jar /usr/local/bin && cd && rm -rf /crowdin &&\
-    /bin/echo -e '#!/bin/sh\njava -jar /usr/local/bin/crowdin-cli.jar $@' > /usr/local/bin/crowdin &&\
-    chmod +x /usr/local/bin/crowdin

.circleci/images/plume-buildenv/rust-toolchain

@@ -0,0 +1 @@
+nightly-2022-07-19

.dockerignore

@@ -3,3 +3,5 @@ data
 Dockerfile
 docker-compose.yml
 .env
+target
+data

.env.sample

@@ -15,6 +15,9 @@ 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=
@@ -45,3 +48,12 @@ 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,6 +7,16 @@ 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,6 +7,15 @@ 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/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: daily

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+<!--
+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

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

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

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

.gitignore

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

CHANGELOG.md

@@ -0,0 +1,292 @@
+# Changelog
+
+<!-- next-header -->
+
+## [Unreleased] - ReleaseDate
+
+### Added
+
+- Add 'My feed' to i18n timeline name (#1084)
+- Bidirectional support for user page header (#1092)
+
+### Changed
+
+- Use blog title as slug (#1094, #1126, #1127)
+- Bump Rust to nightly 2022-07-19 (#1119)
+
+### Fixed
+
+- Malfunction while creating a blog post in Persian (#1116)
+- Email block list is ignored when email sign-up (#1122)
+- Bug that some Activity Sytreams properties are not parsed properly (#1129)
+- Allow empty avatar for remote users (#1129)
+- Percent encode blog FQN for federation interoperability (#1129)
+- The same to `preferredUsername` (#1129)
+
+## [[0.7.2]] - 2022-05-11
+
+### Added
+
+- Basque language (#1013)
+- Unit tests for ActivityPub (#1021)
+- Move to action area after liking/boosting/commenting (#1074)
+
+### Changed
+
+- Bump Rust to nightly 2022-01-26 (#1015)
+- Remove "Latest articles" timeline (#1069)
+- Change order of timeline tabs (#1069, #1070, #1072)
+- Migrate ActivityPub-related crates from activitypub 0.1 to activitystreams 0.7 (#1022)
+
+### Fixed
+
+- Add explanation of sign-up step at sign-up page when email sign-up mode (#1012)
+- Add NOT NULL constraint to email_blocklist table fields (#1016)
+- Don't fill empty content when switching rich editor (#1017)
+- Fix accept header (#1058)
+- Render 404 page instead of 500 when data is not found (#1062)
+- Reuse reqwest client on broadcasting (#1059)
+- Reduce broadcasting HTTP request at once to prevent them being timed out (#1068, #1071)
+- Some ActivityPub data (#1021)
+
+## [[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.2...HEAD
+[[0.7.2]]: https://github.com/Plume-org/Plume/compare/0.7.1...0.7.2
+[[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,38 +1,33 @@
 [package]
 authors = ["Plume contributors"]
 name = "plume"
-version = "0.4.0"
+version = "0.7.3-dev"
 repository = "https://github.com/Plume-org/Plume"
 edition = "2018"
 
 [dependencies]
-activitypub = "0.1.3"
-askama_escape = "0.1"
-atom_syndication = "0.6"
+atom_syndication = "0.11.0"
 clap = "2.33"
-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.1"
-heck = "0.3.0"
-lettre = "0.9.2"
+dotenv = "0.15.0"
+gettext = "0.4.0"
+gettext-macros = "0.6.1"
+gettext-utils = "0.1.0"
+guid-create = "0.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
-rocket = "0.4.2"
-rocket_contrib = { version = "0.4.2", features = ["json"] }
-rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
-rpassword = "4.0"
-scheduled-thread-pool = "0.2.2"
-serde = "1.0"
-serde_json = "1.0"
-serde_qs = "0.5"
-shrinkwraprs = "0.2.1"
-syntect = "3.3"
-validator = "0.8"
-validator_derive = "0.8"
+rocket = "0.4.11"
+rocket_contrib = { version = "0.4.11", features = ["json"] }
+rocket_i18n = "0.4.1"
+scheduled-thread-pool = "0.2.6"
+serde = "1.0.137"
+serde_json = "1.0.81"
+shrinkwraprs = "0.3.0"
+validator = { version = "0.15", features = ["derive"] }
 webfinger = "0.4.1"
+tracing = "0.1.35"
+tracing-subscriber = "0.3.10"
+riker = "0.4.2"
+activitystreams = "=0.7.0-alpha.20"
 
 [[bin]]
 name = "plume"
@@ -44,16 +39,16 @@ version = "0.4"
 
 [dependencies.ctrlc]
 features = ["termination"]
-version = "3.1.2"
+version = "3.2.2"
 
 [dependencies.diesel]
 features = ["r2d2", "chrono"]
-version = "*"
+version = "1.4.5"
 
 [dependencies.multipart]
 default-features = false
 features = ["server"]
-version = "0.16"
+version = "0.18"
 
 [dependencies.plume-api]
 path = "plume-api"
@@ -65,12 +60,12 @@ path = "plume-common"
 path = "plume-models"
 
 [dependencies.rocket_csrf]
-git = "https://github.com/fdb-hiroshima/rocket_csrf"
-rev = "29910f2829e7e590a540da3804336577b48c7b31"
+git = "https://git.joinplu.me/plume/rocket_csrf"
+rev = "0.1.2"
 
 [build-dependencies]
-ructe = "0.9.0"
-rsass = "0.9"
+ructe = "0.14.0"
+rsass = "0.25"
 
 [features]
 default = ["postgres"]

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1-stretch as builder
+FROM rust:1 as builder
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -18,17 +18,15 @@ COPY script/wasm-deps.sh .
 RUN chmod a+x ./wasm-deps.sh && sleep 1 && ./wasm-deps.sh
 
 WORKDIR /app
-COPY Cargo.toml Cargo.lock rust-toolchain ./
-RUN cargo install cargo-web
 
 COPY . .
-
+RUN cargo install wasm-pack
 RUN chmod a+x ./script/plume-front.sh && sleep 1 && ./script/plume-front.sh
 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:stretch-slim
+FROM debian:stable-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM rust:1-stretch
+FROM rust:1-buster
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -10,7 +10,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     gcc \
     make \
     openssl \
-    libssl-dev
+    libssl-dev\
+    clang
 
 WORKDIR /scratch
 COPY script/wasm-deps.sh .
@@ -19,7 +20,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 cargo-web
+RUN cargo install wasm-pack
 
 COPY . .
 

README.md

@@ -1,10 +1,10 @@
 <h1 align="center">
-  <img src="https://raw.githubusercontent.com/Plume-org/Plume/master/assets/icons/trwnh/feather/plumeFeather64.png" alt="Plume's logo">
+  <img src="https://raw.githubusercontent.com/Plume-org/Plume/main/assets/icons/trwnh/feather/plumeFeather64.png" alt="Plume's logo">
   Plume
 </h1>
 <p align="center">
   <a href="https://github.com/Plume-org/Plume/"><img alt="CircleCI" src="https://img.shields.io/circleci/build/gh/Plume-org/Plume.svg"></a>
-  <a href="https://codecov.io/gh/Plume-org/Plume"><img src="https://codecov.io/gh/Plume-org/Plume/branch/master/graph/badge.svg" alt="Code coverage"></a>
+  <a href="https://codecov.io/gh/Plume-org/Plume"><img src="https://codecov.io/gh/Plume-org/Plume/branch/main/graph/badge.svg" alt="Code coverage"></a>
   <a title="Crowdin" target="_blank" href="https://crowdin.com/project/plume"><img src="https://d322cqt584bo4o.cloudfront.net/plume/localized.svg"></a>
   <a href="https://hub.docker.com/r/plumeorg/plume"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/plumeorg/plume.svg"></a>
   <a href="https://liberapay.com/Plume"><img alt="Liberapay patrons" src="https://img.shields.io/liberapay/patrons/Plume.svg"></a>
@@ -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.
+- **Collaborative writing**: invite other people to your blogs, and write articles together. (Not implemented yet, but will be in 1.0)
 
 ## 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:disroot.org`](https://riot.im/app/#/room/#plume:disroot.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-blog:matrix.org`](https://matrix.to/#/#plume-blog:matrix.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:
 
@@ -53,3 +53,4 @@ As we want the various spaces related to the project (GitHub, Matrix, Loomio, et
 
 We provide various way to install Plume: from source, with pre-built binaries, with Docker or with YunoHost.
 For detailed explanations, please refer to [the documentation](https://docs.joinplu.me/installation/).
+

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: end;
+    justify-content: flex-end;
 
     h1, .article-info {
       text-align: center;
@@ -64,41 +64,41 @@ main header.article {
 }
 
 main .article-info {
- 	margin: 0 auto 3em;
- 	font-size: 0.95em;
- 	font-weight: 400;
+  margin: 0 auto 3em;
+  font-size: 0.95em;
+  font-weight: 400;
 
- 	.author, .author a {
- 	  font-weight: 600;
- 	}
+  .author, .author a {
+    font-weight: 600;
+  }
 }
 
 /* The article itself */
 main article {
   max-width: $article-width;
- 	margin: 2.5em auto;
- 	font-family: $lora;
- 	font-size: 1.2em;
- 	line-height: 1.7;
+  margin: 2.5em auto;
+  font-family: $lora;
+  font-size: 1.2em;
+  line-height: 1.7;
 
- 	a:hover {
- 	  text-decoration: underline;
- 	}
+  a:hover {
+    text-decoration: underline;
+  }
 
- 	img {
-   	display: block;
-   	margin: 3em auto;
-   	max-width: 100%;
+  img {
+    display: block;
+    margin: 3em auto;
+    max-width: 100%;
   }
 
   pre {
-   	padding: 1em;
-   	background: $gray;
-   	overflow: auto;
+    padding: 1em;
+    background: $gray;
+    overflow: auto;
   }
 
   blockquote {
-    border-left: 5px solid $gray;
+    border-inline-start: 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;
-   	justify-content: space-around;
+    flex-direction: row;
+    justify-content: space-around;
   }
 
   .likes, .reshares {
     display: flex;
-   	flex-direction: column;
-   	align-items: center;
-   	padding: 0.5em 0;
+    flex-direction: column;
+    align-items: center;
+    padding: 0.5em 0;
 
     p {
       font-size: 1.5em;
@@ -175,34 +175,34 @@ main .article-meta {
 
     .action {
       display: flex;
-     	flex-direction: column;
-     	align-items: center;
-     	justify-content: center;
-     	margin: 0;
-     	padding: 0;
-     	background: none;
-     	color: $text-color;
-     	border: none;
-     	font-size: 1.1em;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      margin: 0;
+      padding: 0;
+      background: none;
+      color: $text-color;
+      border: none;
+      font-size: 1.1em;
       cursor: pointer;
 
-     	svg.feather {
-       	transition: background 0.1s ease-in;
-       	display: flex;
-       	align-items: center;
-       	justify-content: center;
+      svg.feather {
+        transition: background 0.1s ease-in;
+        display: flex;
+        align-items: center;
+        justify-content: center;
 
-       	margin: 0.5em 0;
-       	width: 2.5em;
-       	height: 2.5em;
+        margin: 0.5em 0;
+        width: 2.5em;
+        height: 2.5em;
 
-       	border-radius: 50%;
+        border-radius: 50%;
       }
 
       &.reshared, &.liked {
         svg.feather {
-         	color: $background;
-         	font-weight: 900;
+          color: $background;
+          font-weight: 900;
         }
       }
     }
@@ -213,14 +213,14 @@ main .article-meta {
 
     .action svg.feather {
       padding: 0.7em;
-     	box-sizing: border-box;
-     	color: $red;
-     	fill: none;
-     	border: solid $red thin;
+      box-sizing: border-box;
+      color: $red;
+      fill: none;
+      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;
-     	color: $primary;
-     	border: solid $primary thin;
-     	font-weight: 600;
+      box-sizing: border-box;
+      color: $primary;
+      border: solid $primary thin;
+      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)
-     	color: $primary;
+      background: transparentize($primary, 0.75)
+      color: $primary;
     }
   }
 
@@ -262,9 +262,9 @@ main .article-meta {
     margin: 0 $horizontal-margin;
 
     h2 {
-     	color: $primary;
-     	font-size: 1.5em;
-     	font-weight: 600;
+      color: $primary;
+      font-size: 1.5em;
+      font-weight: 600;
     }
 
     summary {
@@ -279,16 +279,16 @@ main .article-meta {
 
     // Respond & delete comment buttons
     a.button, form.inline, form.inline input {
-     	padding: 0;
-     	background: none;
-     	color: $text-color;
-     	margin-right: 2em;
-     	font-family: $route159;
+      padding: 0;
+      background: none;
+      color: $text-color;
+      margin-right: 2em;
+      font-family: $route159;
       font-weight: normal;
 
-     	&::before {
-     	  color: $primary;
-     	  padding-right: 0.5em;
+      &::before {
+        color: $primary;
+        padding-right: 0.5em;
       }
 
       &:hover { color: $primary; }
@@ -296,8 +296,8 @@ main .article-meta {
 
     .comment {
       margin: 1em 0;
-     	font-size: 1em;
-     	border: none;
+      font-size: 1em;
+      border: none;
 
       .content {
         background: $gray;
@@ -328,36 +328,36 @@ main .article-meta {
         color: transparentize($text-color, 0.6);
       }
 
-     	.author {
-     	  display: flex;
-       	flex-direction: row;
-       	align-items: center;
-       	align-content: center;
+      .author {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        align-content: center;
 
-       	* {
-       	  transition: all 0.1s ease-in;
-       	}
+        * {
+          transition: all 0.1s ease-in;
+        }
 
-       	.display-name {
-         	color: $text-color;
+        .display-name {
+          color: $text-color;
         }
 
         &:hover {
           .display-name { color: $primary; }
           small { opacity: 1; }
         }
-     	}
+      }
 
       & > .comment {
           padding-left: 2em;
       }
 
-     	.text {
-       	padding: 1.25em 0;
-       	font-family: $lora;
-       	font-size: 1.1em;
-       	line-height: 1.4;
-       	text-align: left;
+      .text {
+        padding: 1.25em 0;
+        font-family: $lora;
+        font-size: 1.1em;
+        line-height: 1.4;
+        text-align: left;
       }
     }
   }
@@ -490,3 +490,37 @@ 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;
- 	margin: 2em auto .5em;
- 	font-size: 1.2em;
+  display: block;
+  margin: 2em auto .5em;
+  font-size: 1.2em;
 }
 input, textarea, select {
- 	transition: all 0.1s ease-in;
- 	display: block;
- 	width: 100%;
- 	margin: auto;
- 	padding: 1em;
- 	box-sizing: border-box;
+  transition: all 0.1s ease-in;
+  display: block;
+  width: 100%;
+  margin: auto;
+  padding: 1em;
+  box-sizing: border-box;
   -webkit-appearance: textarea;
 
- 	background: $form-input-background;
- 	color: $text-color;
- 	border: solid $form-input-border thin;
+  background: $form-input-background;
+  color: $text-color;
+  border: solid $form-input-border thin;
 
- 	font-size: 1.2em;
- 	font-weight: 400;
+  font-size: 1.2em;
+  font-weight: 400;
 
- 	&:focus {
- 	  border-color: $primary;
- 	}
+  &:focus {
+    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-size: 1.1em;
- 	line-height: 1.5;
+  font-family: $lora;
+  font-size: 1.1em;
+  line-height: 1.5;
 }
 
 input[type="checkbox"] {
- 	display: inline;
- 	margin: initial;
- 	min-width: initial;
- 	width: initial;
+  display: inline;
+  margin: initial;
+  min-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;
- 	display: inline-block;
+  transition: all 0.1s ease-in;
+  display: inline-block;
   -webkit-appearance: none;
 
- 	margin: 0.5em auto;
- 	padding: 0.75em 1em;
+  margin: 0.5em auto;
+  padding: 0.75em 1em;
 
- 	background: $primary;
- 	color: $primary-text-color;
+  background: $primary;
+  color: $primary-text-color;
   font-weight: bold;
   border: none;
 
- 	cursor: pointer;
+  cursor: pointer;
 
- 	&:hover {
- 	  background: transparentize($primary, 0.1);
- 	}
+  &:hover {
+    background: transparentize($primary, 0.1);
+  }
 
- 	&.destructive {
- 	  background: $red;
+  &.destructive {
+    background: $red;
 
     &:hover {
       background: transparentize($red, 0.1);
     }
- 	}
+  }
 
   &.secondary {
     background: $gray;
@@ -115,26 +115,27 @@ input[type="submit"] {
 form.new-post {
   max-width: 60em;
   .title {
-   	margin: 0 auto;
-   	padding: 0.75em 0;
+    margin: 0 auto;
+    padding: 0.75em 0;
 
-   	background: none;
-   	border: none;
+    background: none;
+    border: none;
 
-   	font-family: $playfair;
-   	font-size: 2em;
-   	text-align: left;
+    font-family: $playfair;
+    font-size: 2em;
+    text-align: left;
   }
   textarea {
-   	min-height: 20em;
-   	overflow-y: scroll;
-   	resize: none;
+    min-height: 20em;
+    overflow-y: scroll;
+    resize: none;
    -webkit-appearance: textarea;
   }
 }
 
 .button + .button {
   margin-left: 1em;
+  margin-inline-start: 1em;
 }
 
 .split {

assets/themes/default/_global.scss

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

assets/themes/default/_header.scss

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

assets/themes/default/_variables.scss

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

assets/themes/default/dark.scss

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

assets/themes/default/fonts/Shabnam_WOL/LICENSE

@@ -0,0 +1,94 @@
+Copyright (c) 2015, Saber Rastikerdar (saber.rastikerdar@gmail.com),
+Glyphs and data from Roboto font are licensed under the Apache License, Version 2.0.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

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

@@ -0,0 +1,49 @@
+@font-face {
+    font-family: Shabnam;
+    src: url("Shabnam-WOL.eot");
+    src: url("Shabnam-WOL.eot?#iefix") format("embedded-opentype"),
+        url("Shabnam-WOL.woff2") format("woff2"),
+        url("Shabnam-WOL.woff") format("woff"),
+        url("Shabnam-WOL.ttf") format("truetype");
+    font-weight: normal;
+}
+
+@font-face {
+    font-family: Shabnam;
+    src: url("Shabnam-Bold-WOL.eot");
+    src: url("Shabnam-Bold-WOL.eot?#iefix") format("embedded-opentype"),
+        url("Shabnam-Bold-WOL.woff2") format("woff2"),
+        url("Shabnam-Bold-WOL.woff") format("woff"),
+        url("Shabnam-Bold-WOL.ttf") format("truetype");
+    font-weight: bold;
+}
+
+@font-face {
+    font-family: Shabnam;
+    src: url("Shabnam-Thin-WOL.eot");
+    src: url("Shabnam-Thin-WOL.eot?#iefix") format("embedded-opentype"),
+        url("Shabnam-Thin-WOL.woff2") format("woff2"),
+        url("Shabnam-Thin-WOL.woff") format("woff"),
+        url("Shabnam-Thin-WOL.ttf") format("truetype");
+    font-weight: 100;
+}
+
+@font-face {
+    font-family: Shabnam;
+    src: url("Shabnam-Light-WOL.eot");
+    src: url("Shabnam-Light-WOL.eot?#iefix") format("embedded-opentype"),
+        url("Shabnam-Light-WOL.woff2") format("woff2"),
+        url("Shabnam-Light-WOL.woff") format("woff"),
+        url("Shabnam-Light-WOL.ttf") format("truetype");
+    font-weight: 300;
+}
+
+@font-face {
+    font-family: Shabnam;
+    src: url("Shabnam-Medium-WOL.eot");
+    src: url("Shabnam-Medium-WOL.eot?#iefix") format("embedded-opentype"),
+        url("Shabnam-Medium-WOL.woff2") format("woff2"),
+        url("Shabnam-Medium-WOL.woff") format("woff"),
+        url("Shabnam-Medium-WOL.ttf") format("truetype");
+    font-weight: 500;
+}

assets/themes/default/fonts/Vazir_WOL/LICENSE

@@ -0,0 +1,51 @@
+Changes by Saber Rastikerdar (saber.rastikerdar@gmail.com) are in public domain.
+Glyphs and data from Roboto font are licensed under the Apache License, Version 2.0.
+
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. 
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 

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

@@ -0,0 +1,65 @@
+@font-face {
+    font-family: Vazir;
+    src: url('Vazir-WOL.eot');
+    src: url('Vazir-WOL.eot?#iefix') format('embedded-opentype'),
+        url('Vazir-WOL.woff2') format('woff2'),
+        url('Vazir-WOL.woff') format('woff'),
+        url('Vazir-WOL.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: Vazir;
+    src: url('Vazir-Bold-WOL.eot');
+    src: url('Vazir-Bold-WOL.eot?#iefix') format('embedded-opentype'),
+        url('Vazir-Bold-WOL.woff2') format('woff2'),
+        url('Vazir-Bold-WOL.woff') format('woff'),
+        url('Vazir-Bold-WOL.ttf') format('truetype');
+    font-weight: bold;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: Vazir;
+    src: url('Vazir-Black-WOL.eot');
+    src: url('Vazir-Black-WOL.eot?#iefix') format('embedded-opentype'),
+        url('Vazir-Black-WOL.woff2') format('woff2'),
+        url('Vazir-Black-WOL.woff') format('woff'),
+        url('Vazir-Black-WOL.ttf') format('truetype');
+    font-weight: 900;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: Vazir;
+    src: url('Vazir-Medium-WOL.eot');
+    src: url('Vazir-Medium-WOL.eot?#iefix') format('embedded-opentype'),
+        url('Vazir-Medium-WOL.woff2') format('woff2'),
+        url('Vazir-Medium-WOL.woff') format('woff'),
+        url('Vazir-Medium-WOL.ttf') format('truetype');
+    font-weight: 500;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: Vazir;
+    src: url('Vazir-Light-WOL.eot');
+    src: url('Vazir-Light-WOL.eot?#iefix') format('embedded-opentype'),
+        url('Vazir-Light-WOL.woff2') format('woff2'),
+        url('Vazir-Light-WOL.woff') format('woff'),
+        url('Vazir-Light-WOL.ttf') format('truetype');
+    font-weight: 300;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: Vazir;
+    src: url('Vazir-Thin-WOL.eot');
+    src: url('Vazir-Thin-WOL.eot?#iefix') format('embedded-opentype'),
+        url('Vazir-Thin-WOL.woff2') format('woff2'),
+        url('Vazir-Thin-WOL.woff') format('woff'),
+        url('Vazir-Thin-WOL.ttf') format('truetype');
+    font-weight: 100;
+    font-style: normal;
+}

assets/themes/default/light.scss

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

build.rs

@@ -1,5 +1,3 @@
-use rsass;
-
 use ructe::Ructe;
 use std::process::{Command, Stdio};
 use std::{ffi::OsStr, fs::*, io::Write, path::*};
@@ -43,26 +41,20 @@ 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=target/deploy/plume-front.wasm");
-    copy("target/deploy/plume-front.wasm", "static/plume-front.wasm")
-        .and_then(|_| read_to_string("target/deploy/plume-front.js"))
-        .and_then(|js| {
-            write(
-                "static/plume-front.js",
-                js.replace(
-                    "\"plume-front.wasm\"",
-                    &format!("\"/static/cached/{}/plume-front.wasm\"", cache_id),
-                ),
-            )
-        })
-        .ok();
+    println!("cargo:rerun-if-changed=plume-front/pkg/plume_front_bg.wasm");
+    copy(
+        "plume-front/pkg/plume_front_bg.wasm",
+        "static/plume_front_bg.wasm",
+    )
+    .and_then(|_| copy("plume-front/pkg/plume_front.js", "static/plume_front.js"))
+    .ok();
 
     println!("cargo:rustc-env=CACHE_ID={}", cache_id)
 }
@@ -105,12 +97,12 @@ fn compile_theme(path: &Path, out_dir: &Path) -> std::io::Result<()> {
         .components()
         .skip_while(|c| *c != Component::Normal(OsStr::new("themes")))
         .skip(1)
-        .filter_map(|c| {
+        .map(|c| {
             c.as_os_str()
                 .to_str()
                 .unwrap_or_default()
-                .splitn(2, '.')
-                .next()
+                .split_once('.')
+                .map_or(c.as_os_str().to_str().unwrap_or_default(), |x| x.0)
         })
         .collect::<Vec<_>>()
         .join("-");
@@ -128,8 +120,14 @@ 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_file(path, rsass::OutputStyle::Compressed)
-            .expect("SCSS compilation error"),
+        &rsass::compile_scss_path(
+            path,
+            rsass::output::Format {
+                style: rsass::output::Style::Compressed,
+                ..rsass::output::Format::default()
+            },
+        )
+        .expect("SCSS compilation error"),
     )?;
 
     Ok(())

crowdin.yml

@@ -1,5 +1,5 @@
-"project_identifier": "plume"
-"api_key_env": CROWDIN_API_KEY
+"project_id": 352097
+"api_token_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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+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/postgres/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/down.sql

@@ -0,0 +1,4 @@
+ALTER TABLE email_blocklist ALTER COLUMN notification_text DROP NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN notify_user DROP NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN note DROP NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN email_address DROP NOT NULL;

migrations/postgres/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/up.sql

@@ -0,0 +1,4 @@
+ALTER TABLE email_blocklist ALTER COLUMN email_address SET NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN note SET NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN notify_user SET NOT NULL;
+ALTER TABLE email_blocklist ALTER COLUMN notification_text SET NOT NULL;

migrations/postgres/2023-01-09-070959_add_unique_constraint_to_activity_pub_related_fields/down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE users DROP CONSTRAINT users_fqn;
+ALTER TABLE blogs DROP CONSTRAINT blogs_actor_id;
+ALTER TABLE blogs DROP CONSTRAINT blogs_fqn;

migrations/postgres/2023-01-09-070959_add_unique_constraint_to_activity_pub_related_fields/up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE users ADD CONSTRAINT users_fqn UNIQUE (fqn);
+ALTER TABLE blogs ADD CONSTRAINT blogs_actor_id UNIQUE (actor_id);
+ALTER TABLE blogs ADD CONSTRAINT blogs_fqn UNIQUE (fqn);

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+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);

migrations/sqlite/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/down.sql

@@ -0,0 +1,9 @@
+CREATE TABLE email_blocklist2(id INTEGER PRIMARY KEY,
+                              email_address TEXT UNIQUE,
+                              note TEXT,
+                              notify_user BOOLEAN DEFAULT FALSE,
+                              notification_text TEXT);
+
+INSERT INTO email_blocklist2 SELECT * FROM email_blocklist;
+DROP TABLE email_blocklist;
+ALTER TABLE email_blocklist2 RENAME TO email_blocklist;

migrations/sqlite/2022-01-29-154457_add_not_null_constraint_to_email_blocklist/up.sql

@@ -0,0 +1,9 @@
+CREATE TABLE email_blocklist2(id INTEGER PRIMARY KEY,
+                              email_address TEXT UNIQUE NOT NULL,
+                              note TEXT NOT NULL,
+                              notify_user BOOLEAN DEFAULT FALSE NOT NULL,
+                              notification_text TEXT NOT NULL);
+
+INSERT INTO email_blocklist2 SELECT * FROM email_blocklist;
+DROP TABLE email_blocklist;
+ALTER TABLE email_blocklist2 RENAME TO email_blocklist;

migrations/sqlite/2023-01-09-070959_add_unique_constraint_to_activity_pub_related_fields/down.sql

@@ -0,0 +1,3 @@
+DROP INDEX users_fqn;
+DROP INDEX blogs_actor_id;
+DROP INDEX blogs_fqn;

migrations/sqlite/2023-01-09-070959_add_unique_constraint_to_activity_pub_related_fields/up.sql

@@ -0,0 +1,3 @@
+CREATE UNIQUE INDEX users_fqn ON users (fqn);
+CREATE UNIQUE INDEX blogs_actor_id ON blogs (actor_id);
+CREATE UNIQUE INDEX blogs_fqn ON blogs (fqn);

plume-api/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "plume-api"
-version = "0.4.0"
+version = "0.7.2"
 authors = ["Plume contributors"]
 edition = "2018"
 
 [dependencies]
-serde = "1.0"
+serde = "1.0.137"
 serde_derive = "1.0"

plume-api/release.toml

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

plume-cli/Cargo.toml

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

plume-cli/release.toml

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

plume-cli/src/instance.rs

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