.dockerignore

@@ -1,4 +1,5 @@
 ui/node_modules
 ui/dist
 server/target
+docs
 .git

.gitignore

@@ -1,6 +1,4 @@
 ansible/inventory
 ansible/passwords/
-docker/lemmy_mine.hjson
-docker/dev/env_deploy.sh
 build/
 .idea/

.travis.yml

@@ -5,31 +5,21 @@ matrix:
   allow_failures:
     - rust: nightly
   fast_finish: true
-cache: cargo
+cache:
+  directories:
+    - /home/travis/.cargo
 before_cache:
-  - rm -rfv target/debug/incremental/lemmy_server-*
-  - rm -rfv target/debug/.fingerprint/lemmy_server-*
-  - rm -rfv target/debug/build/lemmy_server-*
-  - rm -rfv target/debug/deps/lemmy_server-*
-  - rm -rfv target/debug/lemmy_server.d
-  - cargo clean
+  - rm -rf /home/travis/.cargo/registry
 before_script:
-  - psql -c "create user lemmy with password 'password' superuser;" -U postgres
-  - psql -c 'create database lemmy with owner lemmy;' -U postgres
-  - rustup component add clippy --toolchain stable-x86_64-unknown-linux-gnu
+  - psql -c "create user rrr with password 'rrr' superuser;" -U postgres
+  - psql -c 'create database rrr with owner rrr;' -U postgres
 before_install:
   - cd server
 script:
-  # Default checks, but fail if anything is detected
-  - cargo build
-  - cargo clippy -- -D clippy::style -D clippy::correctness -D clippy::complexity -D clippy::perf
-  - cargo install diesel_cli --no-default-features --features postgres --force
   - diesel migration run
+  - cargo build
   - cargo test
 env:
-  global:
-    - DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
-    - RUST_TEST_THREADS=1
-
+  - DATABASE_URL=postgres://rrr:rrr@localhost/rrr
 addons:
   postgresql: "9.4"

CODE_OF_CONDUCT.md

@@ -1,35 +0,0 @@
-# Code of Conduct
-
-- We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
-- Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all.
-- Please be kind and courteous. There’s no need to be mean or rude.
-- Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
-- Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
-- We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term “harassment” as including the definition in the Citizen Code of Conduct; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
-- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the Lemmy moderation team immediately. Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back.
-- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
-
-[**Message the Moderation Team on Mastodon**](https://mastodon.social/@LemmyDev)
-
-[**Email The Moderation Team**](mailto:contact@lemmy.ml)
-
-## Moderation
-
-These are the policies for upholding our community’s standards of conduct. If you feel that a thread needs moderation, please contact the Lemmy moderation team .
-
-1. Remarks that violate the Lemmy standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
-2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
-3. Moderators will first respond to such remarks with a warning.
-4. If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
-5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
-6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
-7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed.
-8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.
-
-In the Lemmy community we strive to go the extra step to look out for each other. Don’t just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.
-
-And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make others comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
-
-The enforcement policies listed above apply to all official Lemmy venues; including git repositories under [github.com/dessalines/lemmy](https://github.com/dessalines/lemmy) and [yerbamate.dev/dessalines/lemmy](https://yerbamate.dev/dessalines/lemmy), the [Matrix channel](https://matrix.to/#/!BZVTUuEiNmRcbFeLeI:matrix.org?via=matrix.org&via=privacytools.io&via=permaweb.io); and all instances under lemmy.ml. For other projects adopting the Rust Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.
-
-Adapted from the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which is based on the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).

CONTRIBUTING.md

@@ -1,4 +0,0 @@
-# Contributing
-
-See [here](https://dev.lemmy.ml/docs/contributing.html) for contributing Instructions.
-

README.md

@@ -7,8 +7,10 @@
 
 <div align="center">
 
+[![Github](https://img.shields.io/badge/-Github-blue)](https://github.com/dessalines/lemmy)
+[![Gitlab](https://img.shields.io/badge/-Gitlab-yellowgreen)](https://gitlab.com/dessalines/lemmy)
+![Mastodon Follow](https://img.shields.io/mastodon/follow/810572?domain=https%3A%2F%2Fmastodon.social&style=social)
 ![GitHub stars](https://img.shields.io/github/stars/dessalines/lemmy?style=social)
-[![Mastodon Follow](https://img.shields.io/mastodon/follow/810572?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@LemmyDev)
 [![Matrix](https://img.shields.io/matrix/rust-reddit-fediverse:matrix.org.svg?label=matrix-chat)](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org)
 ![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/dessalines/lemmy.svg)
 [![Build Status](https://travis-ci.org/dessalines/lemmy.svg?branch=master)](https://travis-ci.org/dessalines/lemmy)
@@ -26,7 +28,7 @@
     <br> 
 </p>
 
-[Lemmy Dev instance](https://dev.lemmy.ml) *This data is being backed up, and once federation is working, it will be the basis for a main instance.*
+[Lemmy Dev instance](https://dev.lemmy.ml) *for testing purposes only*
 
 This is a **very early beta version**, and a lot of features are currently broken or in active development, such as federation.
 
@@ -34,25 +36,30 @@ Front Page|Post
 ---|---
 ![main screen](https://i.imgur.com/kZSRcRu.png)|![chat screen](https://i.imgur.com/4XghNh6.png)
 
-[Lemmy](https://github.com/dessalines/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse).
+## 📝 Table of Contents
 
-For a link aggregator, this means a user registered on one server can subscribe to forums on any other server, and can have discussions with users registered elsewhere.
+<!-- toc -->
 
-The overall goal is to create an easily self-hostable, decentralized alternative to reddit and other link aggregators, outside of their corporate control and meddling.
+- [Features](#features)
+- [About](#about)
+  * [Why's it called Lemmy?](#whys-it-called-lemmy)
+- [Install](#install)
+  * [Docker](#docker)
+    + [Updating](#updating)
+  * [Ansible](#ansible)
+  * [Kubernetes](#kubernetes)
+- [Develop](#develop)
+  * [Docker Development](#docker-development)
+  * [Local Development](#local-development)
+    + [Requirements](#requirements)
+    + [Set up Postgres DB](#set-up-postgres-db)
+    + [Running](#running)
+- [Documentation](#documentation)
+- [Support](#support)
+- [Translations](#translations)
+- [Credits](#credits)
 
-Each lemmy server can set its own moderation policy; appointing site-wide admins, and community moderators to keep out the trolls, and foster a healthy, non-toxic environment where all can feel comfortable contributing.
-
-Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Inferno](https://infernojs.org), [Typescript](https://www.typescriptlang.org/) and [Diesel](http://diesel.rs/).
-
-- [Documentation](https://dev.lemmy.ml/docs/index.html)
-- [Releases / Changelog](/RELEASES.md)
-- [Contributing](https://dev.lemmy.ml/docs/contributing.html)
-
-## Repository Mirrors
-
-- [GitHub](https://github.com/dessalines/lemmy)
-- [Gitea](https://yerbamate.dev/dessalines/lemmy)
-- [GitLab](https://gitlab.com/dessalines/lemmy)
+<!-- tocstop -->
 
 ## Features
 
@@ -60,24 +67,18 @@ Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Infern
 - Self hostable, easy to deploy.
   - Comes with [Docker](#docker), [Ansible](#ansible), [Kubernetes](#kubernetes).
 - Clean, mobile-friendly interface.
-  - Only a minimum of a username and password is required to sign up!
-  - User avatar support.
   - Live-updating Comment threads.
   - Full vote scores `(+/-)` like old reddit.
   - Themes, including light, dark, and solarized.
   - Emojis with autocomplete support. Start typing `:`
   - User tagging using `@`, Community tagging using `#`.
-  - Integrated image uploading in both posts and comments.
-  - A post can consist of a title and any combination of self text, a URL, or nothing else.
   - Notifications, on comment replies and when you're tagged.
-    - Notifications can be sent via email.
   - i18n / internationalization support.
   - RSS / Atom feeds for `All`, `Subscribed`, `Inbox`, `User`, and `Community`.
 - Cross-posting support.
   - A *similar post search* when creating new posts. Great for question / answer communities.
 - Moderation abilities.
   - Public Moderation Logs.
-  - Can sticky posts to the top of communities.
   - Both site admins, and community moderators, who can appoint other moderators.
   - Can lock, remove, and restore posts and comments.
   - Can ban and unban users from communities and the site.
@@ -89,13 +90,25 @@ Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Infern
   - Front end is `~80kB` gzipped.
   - Supports arm64 / Raspberry Pi.
 
-## Why's it called Lemmy?
+## About
+
+[Lemmy](https://github.com/dessalines/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse).
+
+For a link aggregator, this means a user registered on one server can subscribe to forums on any other server, and can have discussions with users registered elsewhere.
+
+The overall goal is to create an easily self-hostable, decentralized alternative to reddit and other link aggregators, outside of their corporate control and meddling.
+
+Each lemmy server can set its own moderation policy; appointing site-wide admins, and community moderators to keep out the trolls, and foster a healthy, non-toxic environment where all can feel comfortable contributing.
+
+### Why's it called Lemmy?
 
 - Lead singer from [Motörhead](https://invidio.us/watch?v=pWB5JZRGl0U).
 - The old school [video game](<https://en.wikipedia.org/wiki/Lemmings_(video_game)>).
 - The [Koopa from Super Mario](https://www.mariowiki.com/Lemmy_Koopa).
 - The [furry rodents](http://sunchild.fpwc.org/lemming-the-little-giant-of-the-north/).
 
+Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Inferno](https://www.infernojs.org), [Typescript](https://www.typescriptlang.org/) and [Diesel](http://diesel.rs/).
+
 ## Install
 
 ### Docker
@@ -106,8 +119,8 @@ Make sure you have both docker and docker-compose(>=`1.24.0`) installed:
 mkdir lemmy/
 cd lemmy/
 wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
-wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/lemmy.hjson
-# Edit lemmy.hjson to do more configuration
+wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/.env
+# Edit the .env if you want custom passwords
 docker-compose up -d
 ```
 
@@ -143,16 +156,85 @@ nano inventory # enter your server, domain, contact email
 ansible-playbook lemmy.yml --become
 ```
 
-## Support / Donate
+### Kubernetes
+
+You'll need to have an existing Kubernetes cluster and [storage class](https://kubernetes.io/docs/concepts/storage/storage-classes/).
+Setting this up will vary depending on your provider.
+To try it locally, you can use [MicroK8s](https://microk8s.io/) or [Minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/).
+
+Once you have a working cluster, edit the environment variables and volume sizes in `docker/k8s/*.yml`.
+You may also want to change the service types to use `LoadBalancer`s depending on where you're running your cluster (add `type: LoadBalancer` to `ports)`, or `NodePort`s.
+By default they will use `ClusterIP`s, which will allow access only within the cluster. See the [docs](https://kubernetes.io/docs/concepts/services-networking/service/) for more on networking in Kubernetes.
+
+**Important** Running a database in Kubernetes will work, but is generally not recommended.
+If you're deploying on any of the common cloud providers, you should consider using their managed database service instead (RDS, Cloud SQL, Azure Databse, etc.).
+
+Now you can deploy:
+
+```bash
+# Add `-n foo` if you want to deploy into a specific namespace `foo`;
+# otherwise your resources will be created in the `default` namespace.
+kubectl apply -f docker/k8s/db.yml
+kubectl apply -f docker/k8s/pictshare.yml
+kubectl apply -f docker/k8s/lemmy.yml
+```
+
+If you used a `LoadBalancer`, you should see it in your cloud provider's console.
+
+## Develop
+
+### Docker Development
+
+Run:
+
+```bash
+git clone https://github.com/dessalines/lemmy
+cd lemmy/docker/dev
+./docker_update.sh # This builds and runs it, updating for your changes
+```
+
+and go to http://localhost:8536.
+
+### Local Development
+
+#### Requirements
+
+- [Rust](https://www.rust-lang.org/)
+- [Yarn](https://yarnpkg.com/en/)
+- [Postgres](https://www.postgresql.org/)
+
+#### Set up Postgres DB
+
+```bash
+ psql -c "create user lemmy with password 'password' superuser;" -U postgres
+ psql -c 'create database lemmy with owner lemmy;' -U postgres
+ export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
+```
+
+#### Running
+
+```bash
+git clone https://github.com/dessalines/lemmy
+cd lemmy
+./install.sh
+# For live coding, where both the front and back end, automagically reload on any save, do:
+# cd ui && yarn start
+# cd server && cargo watch -x run
+```
+
+## Documentation
+
+- [Websocket API for App developers](docs/api.md)
+- [ActivityPub API.md](docs/apub_api_outline.md)
+- [Goals](docs/goals.md)
+- [Ranking Algorithm](docs/ranking.md)
+
+## Support
 
 Lemmy is free, open-source software, meaning no advertising, monetizing, or venture capital, ever. Your donations directly support full-time development of the project.
 
 - [Support on Patreon](https://www.patreon.com/dessalines).
-- [List of Sponsors](https://dev.lemmy.ml/sponsors).
-- Soon to add either liberapay or opencollective.
-
-### Crypto
-
+- [Sponsor List](https://dev.lemmy.ml/sponsors).
 - bitcoin: `1Hefs7miXS5ff5Ck5xvmjKjXf5242KzRtK`
 - ethereum: `0x400c96c96acbC6E7B3B43B1dc1BB446540a88A01`
 - monero: `41taVyY6e1xApqKyMVDRVxJ76sPkfZhALLTjRvVKpaAh2pBd4wv9RgYj1tSPrx8wc6iE1uWUfjtQdTmTy2FGMeChGVKPQuV`
@@ -161,30 +243,26 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
 
 If you'd like to add translations, take a look a look at the [English translation file](ui/src/translations/en.ts).
 
-- Languages supported: Catalan, (`ca`), English (`en`), Chinese (`zh`), Dutch (`nl`), Esperanto (`eo`), Finnish (`fi`), French (`fr`), Spanish (`es`), Swedish (`sv`), German (`de`), Russian (`ru`), Italian (`it`).
-
-<!-- translations -->
+- Languages supported: English (`en`), Chinese (`zh`), Dutch (`nl`), Esperanto (`eo`), French (`fr`), Spanish (`es`), Swedish (`sv`), German (`de`), Russian (`ru`), Italian (`it`).
 
 lang | done | missing
----- | ---- | -------
-ca | 100% | 
-de | 88% | create_private_message,send_secure_message,send_message,message,avatar,upload_avatar,show_avatars,docs,message_sent,messages,old_password,matrix_user_id,private_message_disclaimer,send_notifications_to_email,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,donate_to_lemmy,donate,from,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-eo | 76% | number_of_communities,create_private_message,send_secure_message,send_message,message,preview,upload_image,avatar,upload_avatar,show_avatars,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,docs,replies,mentions,message_sent,messages,old_password,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,matrix_user_id,private_message_disclaimer,send_notifications_to_email,language,browser_default,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,theme,donate_to_lemmy,donate,from,are_you_sure,yes,no,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-es | 100% | 
-fi | 100% | 
-fr | 83% | create_private_message,send_secure_message,send_message,message,avatar,upload_avatar,show_avatars,archive_link,docs,replies,mentions,message_sent,messages,old_password,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,matrix_user_id,private_message_disclaimer,send_notifications_to_email,language,browser_default,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,donate_to_lemmy,donate,from,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-it | 84% | create_private_message,send_secure_message,send_message,message,avatar,upload_avatar,show_avatars,archive_link,docs,message_sent,messages,old_password,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,matrix_user_id,private_message_disclaimer,send_notifications_to_email,language,browser_default,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,donate_to_lemmy,donate,from,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-nl | 93% | create_private_message,send_secure_message,send_message,message,message_sent,messages,matrix_user_id,private_message_disclaimer,donate_to_lemmy,donate,from,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-ru | 72% | cross_posts,cross_post,number_of_communities,create_private_message,send_secure_message,send_message,message,preview,upload_image,avatar,upload_avatar,show_avatars,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,docs,replies,mentions,message_sent,messages,old_password,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,matrix_user_id,private_message_disclaimer,send_notifications_to_email,language,browser_default,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,recent_comments,theme,donate_to_lemmy,donate,monero,by,to,from,transfer_community,transfer_site,are_you_sure,yes,no,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-sv | 83% | create_private_message,send_secure_message,send_message,message,avatar,upload_avatar,show_avatars,archive_link,docs,replies,mentions,message_sent,messages,old_password,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,matrix_user_id,private_message_disclaimer,send_notifications_to_email,language,browser_default,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,donate_to_lemmy,donate,from,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-zh | 70% | cross_posts,cross_post,users,number_of_communities,create_private_message,send_secure_message,send_message,message,preview,upload_image,avatar,upload_avatar,show_avatars,formatting_help,view_source,sticky,unsticky,archive_link,settings,stickied,delete_account,delete_account_confirm,banned,creator,number_online,docs,replies,mentions,message_sent,messages,old_password,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,matrix_user_id,private_message_disclaimer,send_notifications_to_email,language,browser_default,downvotes_disabled,enable_downvotes,open_registration,registration_closed,enable_nsfw,recent_comments,nsfw,show_nsfw,theme,donate_to_lemmy,donate,monero,by,to,from,transfer_community,transfer_site,are_you_sure,yes,no,logged_in,email_already_exists,couldnt_create_private_message,no_private_message_edit_allowed,couldnt_update_private_message
-<!-- translationsstop -->
+--- | --- | ---
+de | 100% |  
+eo | 86% | number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,theme,are_you_sure,yes,no 
+es | 95% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default 
+fr | 95% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default 
+it | 96% | archive_link,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default 
+nl | 88% | preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,theme 
+ru | 82% | cross_posts,cross_post,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,recent_comments,theme,monero,by,to,transfer_community,transfer_site,are_you_sure,yes,no 
+sv | 95% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default 
+zh | 80% | cross_posts,cross_post,users,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,settings,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,recent_comments,nsfw,show_nsfw,theme,monero,by,to,transfer_community,transfer_site,are_you_sure,yes,no 
+
 
 If you'd like to update this report, run:
 
 ```bash 
 cd ui
-ts-node translation_report.ts
+ts-node translation_report.ts > tmp # And replace the text above.
 ```
 
 ## Credits

RELEASES.md

@@ -1,22 +0,0 @@
-# Lemmy v0.6.0 Release (2020-01-16)
-
-`v0.6.0` is here, and we've closed [41 issues!](https://github.com/dessalines/lemmy/milestone/15?closed=1) 
-
-This is the biggest release by far:
-
-- Avatars!
-- Optional Email notifications for username mentions, post and comment replies.
-- Ability to change your password and email address.
-- Can set a custom language.
-- Lemmy-wide settings to disable downvotes, and close registration.
-- A better documentation system, hosted in lemmy itself.
-- [Huge DB performance gains](https://github.com/dessalines/lemmy/issues/411) (everthing down to < `30ms`) by using materialized views. 
-- Fixed major issue with similar post URL and title searching.
-- Upgraded to Actix `2.0`
-- Faster comment / post voting.
-- Better small screen support.
-- Lots of bug fixes, refactoring of back end code.
-
-Another major announcement is that Lemmy now has another lead developer besides me, [@felix@radical.town](https://radical.town/@felix). Theyve created a better documentation system, implemented RSS feeds, simplified docker and project configs, upgraded actix, working on federation, a whole lot else.
-
-https://dev.lemmy.ml

ansible/inventory.example

@@ -1,6 +1,6 @@
 [lemmy]
 # define the username and hostname that you use for ssh connection, and specify the domain
-myuser@example.com  domain=example.com  letsencrypt_contact_email=your@email.com smtp_server=smtp@example.com smtp_login=your@email.com smtp_password=pass smtp_from_address="Example.com Admin <notifications@example.com>"
+myuser@example.com  domain=example.com  letsencrypt_contact_email=your@email.com
 
 [all:vars]
 ansible_connection=ssh

ansible/lemmy.yml

@@ -32,13 +32,21 @@
   - name:  add all template files
     template: src={{item.src}} dest={{item.dest}}
     with_items:
+      - { src: 'templates/env', dest: '/lemmy/.env' }
       - { src: '../docker/prod/docker-compose.yml', dest: '/lemmy/docker-compose.yml' }
-      - { src: 'templates/config.hjson', dest: '/lemmy/lemmy.hjson' }
       - { src: 'templates/nginx.conf', dest: '/etc/nginx/sites-enabled/lemmy.conf' }
     vars:
       postgres_password: "{{ lookup('password', 'passwords/{{ inventory_hostname }}/postgres chars=ascii_letters,digits') }}"
       jwt_password: "{{ lookup('password', 'passwords/{{ inventory_hostname }}/jwt chars=ascii_letters,digits') }}"
 
+  - name: set env file permissions
+    file:
+      path: "/lemmy/.env"
+      state: touch
+      mode: 0600
+      access_time: preserve
+      modification_time: preserve
+
   - name: enable and start docker service
     systemd:
       name: docker

ansible/templates/config.hjson

@@ -1,15 +0,0 @@
-{
-  database: {
-    password: "{{ postgres_password }}"
-    host: "lemmy_db"
-  }
-  hostname: "{{ domain }}"
-  jwt_secret: "{{ jwt_password }}"
-  front_end_dir: "/app/dist"
-  email: {
-    smtp_server: "{{ smtp_server }}"
-    smtp_login: "{{ smtp_login }}"
-    smtp_password: "{{ smtp_password }}"
-    smtp_from_address: "{{ smtp_from_address }}"
-  }
-}

ansible/templates/env

@@ -0,0 +1,14 @@
+DOMAIN={{ domain }}
+DATABASE_PASSWORD={{ postgres_password }}
+DATABASE_URL=postgres://lemmy:{{ postgres_password }}@lemmy_db:5432/lemmy
+JWT_SECRET={{ jwt_password }}
+RATE_LIMIT_MESSAGE=30
+RATE_LIMIT_MESSAGE_PER_SECOND=60
+RATE_LIMIT_POST=3
+RATE_LIMIT_POST_PER_SECOND=600
+RATE_LIMIT_REGISTER=3
+RATE_LIMIT_REGISTER_PER_SECOND=3600
+SMTP_SERVER={{ smtp_server }}
+SMTP_LOGIN={{ smtp_login }}
+SMTP_PASSWORD={{ smtp_password }}
+SMTP_FROM_ADDRESS={{ smtp_from_address }}

ansible/templates/nginx.conf

@@ -1,5 +1,3 @@
-proxy_cache_path /var/cache/lemmy_frontend levels=1:2 keys_zone=lemmy_frontend_cache:10m max_size=100m                 use_temp_path=off;
-
 server {
     listen 80;
     server_name {{ domain }};
@@ -61,13 +59,6 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-
-        # Proxy Cache
-        proxy_cache             lemmy_frontend_cache;
-        proxy_cache_use_stale   error timeout http_500 http_502 http_503 http_504;
-        proxy_cache_revalidate  on;
-        proxy_cache_lock        on;
-        proxy_cache_min_uses    5;
     }    
 
     location /pictshare/ {
@@ -77,7 +68,8 @@ server {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
       if ($request_uri ~ \.(?:ico|gif|jpe?g|png|webp|bmp|mp4)$) {
-        add_header Cache-Control "public, max-age=31536000, immutable";
+        add_header Cache-Control "public";
+        expires max;
       }   
     }
 }

docker/dev/.env

@@ -0,0 +1,17 @@
+DOMAIN=my_domain
+DATABASE_PASSWORD=password
+DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy
+JWT_SECRET=changeme
+
+RATE_LIMIT_MESSAGE=30
+RATE_LIMIT_MESSAGE_PER_SECOND=60
+RATE_LIMIT_POST=6
+RATE_LIMIT_POST_PER_SECOND=600
+RATE_LIMIT_REGISTER=3
+RATE_LIMIT_REGISTER_PER_SECOND=3600
+
+# Optional email fields
+SMTP_SERVER=
+SMTP_LOGIN=
+SMTP_PASSWORD=
+SMTP_FROM_ADDRESS=Domain.com Lemmy Admin <notifications@domain.com>

docker/dev/Dockerfile

@@ -10,7 +10,7 @@ RUN yarn install --pure-lockfile
 COPY ui /app/ui
 RUN yarn build
 
-FROM ekidd/rust-musl-builder:1.40.0-openssl11 as rust
+FROM ekidd/rust-musl-builder:1.38.0-openssl11 as rust
 
 # Cache deps
 WORKDIR /app
@@ -32,25 +32,14 @@ RUN cargo build --frozen --release
 # Get diesel-cli on there just in case
 # RUN cargo install diesel_cli --no-default-features --features postgres
 
-
-FROM ekidd/rust-musl-builder:1.40.0-openssl11 as docs
-WORKDIR /app
-COPY docs ./docs
-RUN sudo chown -R rust:rust .
-RUN mdbook build docs/
-
-
 FROM alpine:3.10
 
 # Install libpq for postgres
 RUN apk add libpq
 
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy
-COPY --from=docs /app/docs/book/ /app/dist/documentation/
 COPY --from=node /app/ui/dist /app/dist
-
 RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
 RUN chown lemmy:lemmy /app/lemmy

docker/dev/Dockerfile.aarch64

@@ -15,7 +15,7 @@ RUN yarn build
 FROM multiarch/qemu-user-static as qemu
 
 
-FROM arm64v8/rust:1.40-buster as rust
+FROM arm64v8/rust:1.37-buster as rust
 
 COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
 #COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
@@ -69,7 +69,6 @@ RUN addgroup --gid 1000 lemmy
 RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
 
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/ready /app/lemmy
 COPY --from=node /app/ui/dist /app/dist
 

docker/dev/Dockerfile.armv7hf

@@ -69,7 +69,6 @@ RUN addgroup --gid 1000 lemmy
 RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
 
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/ready /app/lemmy
 COPY --from=node /app/ui/dist /app/dist
 

docker/dev/Dockerfile.libc

@@ -65,10 +65,8 @@ RUN addgroup --gid 1000 lemmy
 RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
 
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/ready /app/lemmy
 COPY --from=node /app/ui/dist /app/dist
-
 RUN chown lemmy:lemmy /app/lemmy
 USER lemmy
 EXPOSE 8536

docker/dev/deploy.sh

@@ -5,14 +5,12 @@ git checkout master
 new_tag="$1"
 git tag $new_tag
 
-third_semver=$(echo $new_tag | cut -d "." -f 3)
-
 # Setting the version on the front end
 cd ../../
-echo "export const version: string = '$(git describe --tags)';" > "ui/src/version.ts"
+echo "export let version: string = '$(git describe --tags)';" > "ui/src/version.ts"
 git add "ui/src/version.ts"
 # Setting the version on the backend
-echo "pub const VERSION: &str = \"$(git describe --tags)\";" > "server/src/version.rs"
+echo "pub const VERSION: &'static str = \"$(git describe --tags)\";" > "server/src/version.rs"
 git add "server/src/version.rs"
 
 cd docker/dev
@@ -24,6 +22,9 @@ git add ../prod/docker-compose.yml
 # The commit
 git commit -m"Version $new_tag"
 
+# Registering qemu binaries
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+
 # Rebuilding docker
 docker-compose build
 docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag
@@ -37,25 +38,14 @@ docker push dessalines/lemmy:x64-$new_tag
 # docker push dessalines/lemmy:armv7hf-$new_tag
 
 # aarch64
-# Only do this on major releases (IE the third semver is 0)
-if [ $third_semver -eq 0 ]; then
-  # Registering qemu binaries
-  docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
 docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
 docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag
 docker push dessalines/lemmy:arm64-$new_tag
-fi
 
 # Creating the manifest for the multi-arch build
-if [ $third_semver -eq 0 ]; then
 docker manifest create dessalines/lemmy:$new_tag \
   dessalines/lemmy:x64-$new_tag \
   dessalines/lemmy:arm64-$new_tag
-else
-  docker manifest create dessalines/lemmy:$new_tag \
-  dessalines/lemmy:x64-$new_tag
-fi
 
 docker manifest push dessalines/lemmy:$new_tag
 

docker/dev/dev_deploy.sh

@@ -7,6 +7,3 @@ git checkout dev
 docker-compose build
 docker tag dev_lemmy:latest dessalines/lemmy:dev
 docker push dessalines/lemmy:dev
-
-# SSH and pull it
-ssh $LEMMY_USER@$LEMMY_HOST "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d"

docker/dev/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: postgres:12-alpine
     environment:
       - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
       - POSTGRES_DB=lemmy
     volumes:
       - lemmy_db:/var/lib/postgresql/data
@@ -16,9 +16,22 @@ services:
       dockerfile: docker/dev/Dockerfile
     ports:
       - "127.0.0.1:8536:8536"
+    environment:
+      - LEMMY_FRONT_END_DIR=/app/dist
+      - DATABASE_URL=${DATABASE_URL}
+      - JWT_SECRET=${JWT_SECRET}
+      - HOSTNAME=${DOMAIN}
+      - RATE_LIMIT_MESSAGE=${RATE_LIMIT_MESSAGE}
+      - RATE_LIMIT_MESSAGE_PER_SECOND=${RATE_LIMIT_MESSAGE_PER_SECOND}
+      - RATE_LIMIT_POST=${RATE_LIMIT_POST}
+      - RATE_LIMIT_POST_PER_SECOND=${RATE_LIMIT_POST_PER_SECOND}
+      - RATE_LIMIT_REGISTER=${RATE_LIMIT_REGISTER}
+      - RATE_LIMIT_REGISTER_PER_SECOND=${RATE_LIMIT_REGISTER_PER_SECOND}
+      - SMTP_SERVER=${SMTP_SERVER}
+      - SMTP_LOGIN=${SMTP_LOGIN}
+      - SMTP_PASSWORD=${SMTP_PASSWORD}
+      - SMTP_FROM_ADDRESS=${SMTP_FROM_ADDRESS}
     restart: always
-    volumes:
-      - ../lemmy.hjson:/config/config.hjson:ro
     depends_on: 
       - lemmy_db
   lemmy_pictshare:

docker/k8s/lemmy.yml

@@ -14,13 +14,13 @@ spec:
     spec:
       containers:
       - env:
-        - name: LEMMY_DATABASE_URL
+        - name: DATABASE_URL
           # example: 'postgres://lemmy:password@db:5432/lemmy'
           value: CHANGE_ME
-        - name: LEMMY_HOSTNAME
+        - name: HOSTNAME
           # example: 'lemmy.example.com'
           value: CHANGE_ME
-        - name: LEMMY_JWT_SECRET
+        - name: JWT_SECRET
           # example: 'very-super-good-secret'
           value: CHANGE_ME
         - name: LEMMY_FRONT_END_DIR

docker/lemmy.hjson

@@ -1,56 +0,0 @@
-{
-  database: {
-    # username to connect to postgres
-    user: "lemmy"
-    # password to connect to postgres
-    password: "password"
-    # host where postgres is running
-    host: "lemmy_db"
-    # port where postgres can be accessed
-    port: 5432
-    # name of the postgres database for lemmy
-    database: "lemmy"
-    # maximum number of active sql connections
-    pool_size: 5
-  }
-  # the domain name of your instance (eg "dev.lemmy.ml")
-  hostname: "my_domain"
-  # address where lemmy should listen for incoming requests
-  bind: "0.0.0.0"
-  # port where lemmy should listen for incoming requests
-  port: 8536
-  # json web token for authorization between server and client
-  jwt_secret: "changeme"
-  # The dir for the front end
-  front_end_dir: "/app/dist"
-  # whether to enable activitypub federation. this feature is in alpha, do not enable in production, as might
-  # cause problems like remote instances fetching and permanently storing bad data.
-  federation_enabled: false
-  # rate limits for various user actions, by user ip
-  rate_limit: {
-    # maximum number of messages created in interval
-    message: 30
-    # interval length for message limit
-    message_per_second: 60
-    # maximum number of posts created in interval
-    post: 6
-    # interval length for post limit
-    post_per_second: 600
-    # maximum number of registrations in interval
-    register: 3
-    # interval length for registration limit
-    register_per_second: 3600
-  }
-#  # email sending configuration
-#  email: {
-#    # hostname of the smtp server
-#    smtp_server: ""
-#    # login name for smtp server
-#    smtp_login: ""
-#    # password to login to the smtp server
-#    smtp_password: ""
-#    # address to send emails from, eg "info@your-instance.com"
-#    smtp_from_address: ""
-#  }
-}
-

docker/prod/.env

@@ -0,0 +1,17 @@
+DOMAIN=my_domain
+DATABASE_PASSWORD=password
+DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy
+JWT_SECRET=changeme
+
+RATE_LIMIT_MESSAGE=30
+RATE_LIMIT_MESSAGE_PER_SECOND=60
+RATE_LIMIT_POST=6
+RATE_LIMIT_POST_PER_SECOND=600
+RATE_LIMIT_REGISTER=3
+RATE_LIMIT_REGISTER_PER_SECOND=3600
+
+# Optional email fields
+SMTP_SERVER=
+SMTP_LOGIN=
+SMTP_PASSWORD=
+SMTP_FROM_ADDRESS=Domain.com Lemmy Admin <notifications@domain.com>

docker/prod/docker-compose.yml

@@ -5,18 +5,31 @@ services:
     image: postgres:12-alpine
     environment:
       - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
       - POSTGRES_DB=lemmy
     volumes:
       - lemmy_db:/var/lib/postgresql/data
     restart: always
   lemmy:
-    image: dessalines/lemmy:v0.6.5
+    image: dessalines/lemmy:v0.5.0.3
     ports:
       - "127.0.0.1:8536:8536"
+    environment:
+      - LEMMY_FRONT_END_DIR=/app/dist
+      - DATABASE_URL=${DATABASE_URL}
+      - JWT_SECRET=${JWT_SECRET}
+      - HOSTNAME=${DOMAIN}
+      - RATE_LIMIT_MESSAGE=${RATE_LIMIT_MESSAGE}
+      - RATE_LIMIT_MESSAGE_PER_SECOND=${RATE_LIMIT_MESSAGE_PER_SECOND}
+      - RATE_LIMIT_POST=${RATE_LIMIT_POST}
+      - RATE_LIMIT_POST_PER_SECOND=${RATE_LIMIT_POST_PER_SECOND}
+      - RATE_LIMIT_REGISTER=${RATE_LIMIT_REGISTER}
+      - RATE_LIMIT_REGISTER_PER_SECOND=${RATE_LIMIT_REGISTER_PER_SECOND}
+      - SMTP_SERVER=${SMTP_SERVER}
+      - SMTP_LOGIN=${SMTP_LOGIN}
+      - SMTP_PASSWORD=${SMTP_PASSWORD}
+      - SMTP_FROM_ADDRESS=${SMTP_FROM_ADDRESS}
     restart: always
-    volumes:
-      - ./lemmy.hjson:/config/config.hjson:ro
     depends_on:
       - lemmy_db
   lemmy_pictshare:

docs/.gitignore

@@ -1 +0,0 @@
-book

docs/api.md

@@ -5,171 +5,126 @@
 
 - [Data types](#data-types)
 - [Basic usage](#basic-usage)
-  * [WebSocket](#websocket)
-    + [Testing with Websocat](#testing-with-websocat)
-    + [Testing with the WebSocket JavaScript API](#testing-with-the-websocket-javascript-api)
-  * [HTTP](#http)
-    + [Testing with Curl](#testing-with-curl)
-      - [Get Example](#get-example)
-      - [Post Example](#post-example)
+  * [WebSocket Endpoint](#websocket-endpoint)
+  * [Testing with Websocat](#testing-with-websocat)
+  * [Testing with the WebSocket JavaScript API](#testing-with-the-websocket-javascript-api)
 - [Rate limits](#rate-limits)
 - [Errors](#errors)
 - [API documentation](#api-documentation)
   * [Sort Types](#sort-types)
-  * [Websocket vs HTTP](#websocket-vs-http)
   * [User / Authentication / Admin actions](#user--authentication--admin-actions)
     + [Login](#login)
       - [Request](#request)
       - [Response](#response)
-      - [HTTP](#http-1)
     + [Register](#register)
       - [Request](#request-1)
       - [Response](#response-1)
-      - [HTTP](#http-2)
     + [Get User Details](#get-user-details)
       - [Request](#request-2)
       - [Response](#response-2)
-      - [HTTP](#http-3)
     + [Save User Settings](#save-user-settings)
       - [Request](#request-3)
       - [Response](#response-3)
-      - [HTTP](#http-4)
     + [Get Replies / Inbox](#get-replies--inbox)
       - [Request](#request-4)
       - [Response](#response-4)
-      - [HTTP](#http-5)
     + [Get User Mentions](#get-user-mentions)
       - [Request](#request-5)
       - [Response](#response-5)
-      - [HTTP](#http-6)
-    + [Edit User Mention](#edit-user-mention)
+    + [Mark All As Read](#mark-all-as-read)
       - [Request](#request-6)
       - [Response](#response-6)
-      - [HTTP](#http-7)
-    + [Mark All As Read](#mark-all-as-read)
+    + [Delete Account](#delete-account)
       - [Request](#request-7)
       - [Response](#response-7)
-      - [HTTP](#http-8)
-    + [Delete Account](#delete-account)
+    + [Add admin](#add-admin)
       - [Request](#request-8)
       - [Response](#response-8)
-      - [HTTP](#http-9)
-    + [Add admin](#add-admin)
+    + [Ban user](#ban-user)
       - [Request](#request-9)
       - [Response](#response-9)
-      - [HTTP](#http-10)
-    + [Ban user](#ban-user)
-      - [Request](#request-10)
-      - [Response](#response-10)
-      - [HTTP](#http-11)
   * [Site](#site)
     + [List Categories](#list-categories)
+      - [Request](#request-10)
+      - [Response](#response-10)
+    + [Search](#search)
       - [Request](#request-11)
       - [Response](#response-11)
-      - [HTTP](#http-12)
-    + [Search](#search)
+    + [Get Modlog](#get-modlog)
       - [Request](#request-12)
       - [Response](#response-12)
-      - [HTTP](#http-13)
-    + [Get Modlog](#get-modlog)
+    + [Create Site](#create-site)
       - [Request](#request-13)
       - [Response](#response-13)
-      - [HTTP](#http-14)
-    + [Create Site](#create-site)
+    + [Edit Site](#edit-site)
       - [Request](#request-14)
       - [Response](#response-14)
-      - [HTTP](#http-15)
-    + [Edit Site](#edit-site)
+    + [Get Site](#get-site)
       - [Request](#request-15)
       - [Response](#response-15)
-      - [HTTP](#http-16)
-    + [Get Site](#get-site)
+    + [Transfer Site](#transfer-site)
       - [Request](#request-16)
       - [Response](#response-16)
-      - [HTTP](#http-17)
-    + [Transfer Site](#transfer-site)
-      - [Request](#request-17)
-      - [Response](#response-17)
-      - [HTTP](#http-18)
   * [Community](#community)
     + [Get Community](#get-community)
+      - [Request](#request-17)
+      - [Response](#response-17)
+    + [Create Community](#create-community)
       - [Request](#request-18)
       - [Response](#response-18)
-      - [HTTP](#http-19)
-    + [Create Community](#create-community)
+    + [List Communities](#list-communities)
       - [Request](#request-19)
       - [Response](#response-19)
-      - [HTTP](#http-20)
-    + [List Communities](#list-communities)
+    + [Ban from Community](#ban-from-community)
       - [Request](#request-20)
       - [Response](#response-20)
-      - [HTTP](#http-21)
-    + [Ban from Community](#ban-from-community)
+    + [Add Mod to Community](#add-mod-to-community)
       - [Request](#request-21)
       - [Response](#response-21)
-      - [HTTP](#http-22)
-    + [Add Mod to Community](#add-mod-to-community)
+    + [Edit Community](#edit-community)
       - [Request](#request-22)
       - [Response](#response-22)
-      - [HTTP](#http-23)
-    + [Edit Community](#edit-community)
+    + [Follow Community](#follow-community)
       - [Request](#request-23)
       - [Response](#response-23)
-      - [HTTP](#http-24)
-    + [Follow Community](#follow-community)
+    + [Get Followed Communities](#get-followed-communities)
       - [Request](#request-24)
       - [Response](#response-24)
-      - [HTTP](#http-25)
-    + [Get Followed Communities](#get-followed-communities)
+    + [Transfer Community](#transfer-community)
       - [Request](#request-25)
       - [Response](#response-25)
-      - [HTTP](#http-26)
-    + [Transfer Community](#transfer-community)
-      - [Request](#request-26)
-      - [Response](#response-26)
-      - [HTTP](#http-27)
   * [Post](#post)
     + [Create Post](#create-post)
+      - [Request](#request-26)
+      - [Response](#response-26)
+    + [Get Post](#get-post)
       - [Request](#request-27)
       - [Response](#response-27)
-      - [HTTP](#http-28)
-    + [Get Post](#get-post)
+    + [Get Posts](#get-posts)
       - [Request](#request-28)
       - [Response](#response-28)
-      - [HTTP](#http-29)
-    + [Get Posts](#get-posts)
+    + [Create Post Like](#create-post-like)
       - [Request](#request-29)
       - [Response](#response-29)
-      - [HTTP](#http-30)
-    + [Create Post Like](#create-post-like)
+    + [Edit Post](#edit-post)
       - [Request](#request-30)
       - [Response](#response-30)
-      - [HTTP](#http-31)
-    + [Edit Post](#edit-post)
+    + [Save Post](#save-post)
       - [Request](#request-31)
       - [Response](#response-31)
-      - [HTTP](#http-32)
-    + [Save Post](#save-post)
-      - [Request](#request-32)
-      - [Response](#response-32)
-      - [HTTP](#http-33)
   * [Comment](#comment)
     + [Create Comment](#create-comment)
+      - [Request](#request-32)
+      - [Response](#response-32)
+    + [Edit Comment](#edit-comment)
       - [Request](#request-33)
       - [Response](#response-33)
-      - [HTTP](#http-34)
-    + [Edit Comment](#edit-comment)
+    + [Save Comment](#save-comment)
       - [Request](#request-34)
       - [Response](#response-34)
-      - [HTTP](#http-35)
-    + [Save Comment](#save-comment)
+    + [Create Comment Like](#create-comment-like)
       - [Request](#request-35)
       - [Response](#response-35)
-      - [HTTP](#http-36)
-    + [Create Comment Like](#create-comment-like)
-      - [Request](#request-36)
-      - [Response](#response-36)
-      - [HTTP](#http-37)
   * [RSS / Atom feeds](#rss--atom-feeds)
     + [All](#all)
     + [Community](#community-1)
@@ -189,13 +144,13 @@
 
 Request and response strings are in [JSON format](https://www.json.org).
 
-### WebSocket
+### WebSocket Endpoint
 
 Connect to <code>ws://***host***/api/v1/ws</code> to get started.
 
 If the ***`host`*** supports secure connections, you can use <code>wss://***host***/api/v1/ws</code>.
 
-#### Testing with Websocat
+### Testing with Websocat
 
 [Websocat link](https://github.com/vi/websocat)
 
@@ -204,7 +159,7 @@ If the ***`host`*** supports secure connections, you can use <code>wss://***host
 A simple test command:
 `{"op": "ListCategories"}`
 
-#### Testing with the WebSocket JavaScript API
+### Testing with the WebSocket JavaScript API
 
 [WebSocket JavaScript API](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API)
 ```javascript
@@ -216,32 +171,6 @@ ws.onopen = function () {
   }));
 };
 ```
-### HTTP
-
-Endpoints are at <code>http://***host***/api/v1/***endpoint***</code>. They'll be listed below for each action.
-
-#### Testing with Curl
-
-##### Get Example
-
-```
-curl /community/list?sort=Hot
-```
-
-##### Post Example
-
-```
-curl -i -H \
-"Content-Type: application/json" \
--X POST \
--d '{
-  "comment_id": X,
-  "post_id": X,
-  "score": X,
-  "auth": "..."
-}' \
-/comment/like
-```
 
 ## Rate limits
 
@@ -272,11 +201,6 @@ These go wherever there is a `sort` field. The available sort types are:
 - `TopYear` - the most upvoted posts/communities of the current year.
 - `TopAll` - the most upvoted posts/communities on the current instance.
 
-### Websocket vs HTTP
-
-- Below are the websocket JSON requests / responses. For HTTP, ignore all fields except those inside `data`.
-- For example, an http login will be a `POST` `{username_or_email: X, password: X}`
-
 ### User / Authentication / Admin actions
 
 #### Login
@@ -296,19 +220,13 @@ The `jwt` string should be stored and used anywhere `auth` is called for.
 ##### Response
 ```rust
 {
-  op: "Login",
-  data: {
-    jwt: String,
-  }
+  op: String,
+  jwt: String
 }
 ```
 
-##### HTTP
-
-`POST /user/login`
 
 #### Register
-
 Only the first user will be able to be the admin.
 
 ##### Request
@@ -327,17 +245,11 @@ Only the first user will be able to be the admin.
 ##### Response
 ```rust
 {
-  op: "Register",
-  data: {
-    jwt: String,
-  }
+  op: String,
+  jwt: String
 }
 ```
 
-##### HTTP
-
-`POST /user/register`
-
 #### Get User Details
 ##### Request
 ```rust
@@ -358,20 +270,14 @@ Only the first user will be able to be the admin.
 ##### Response
 ```rust
 {
-  op: "GetUserDetails",
-  data: {
+  op: String,
   user: UserView,
   follows: Vec<CommunityFollowerView>,
   moderates: Vec<CommunityModeratorView>,
   comments: Vec<CommentView>,
   posts: Vec<PostView>,
 }
-}
 ```
-##### HTTP
-
-`GET /user`
-
 #### Save User Settings
 ##### Request
 ```rust
@@ -389,16 +295,10 @@ Only the first user will be able to be the admin.
 ##### Response
 ```rust
 {
-  op: "SaveUserSettings",
-  data: {
+  op: String,
   jwt: String
 }
-}
 ```
-##### HTTP
-
-`PUT /save_user_settings`
-
 #### Get Replies / Inbox
 ##### Request
 ```rust
@@ -416,16 +316,10 @@ Only the first user will be able to be the admin.
 ##### Response
 ```rust
 {
-  op: "GetReplies",
-  data: {
+  op: String,
   replies: Vec<ReplyView>,
 }
-}
 ```
-##### HTTP
-
-`GET /user/replies`
-
 
 #### Get User Mentions
 ##### Request
@@ -444,42 +338,11 @@ Only the first user will be able to be the admin.
 ##### Response
 ```rust
 {
-  op: "GetUserMentions",
-  data: {
+  op: String,
   mentions: Vec<UserMentionView>,
 }
-}
 ```
 
-##### HTTP
-
-`GET /user/mentions`
-
-#### Edit User Mention
-##### Request
-```rust
-{
-  op: "EditUserMention",
-  data: {
-    user_mention_id: i32,
-    read: Option<bool>,
-    auth: String,
-  }
-}
-```
-##### Response
-```rust
-{
-  op: "EditUserMention",
-  data: {
-    mention: UserMentionView,
-  }
-}
-```
-##### HTTP
-
-`PUT /user/mention`
-
 #### Mark All As Read
 
 Marks all user replies and mentions as read.
@@ -496,17 +359,11 @@ Marks all user replies and mentions as read.
 ##### Response
 ```rust
 {
-  op: "MarkAllAsRead",
-  data: {
+  op: String,
   replies: Vec<ReplyView>,
 }
-}
 ```
 
-##### HTTP
-
-`POST /user/mark_all_as_read`
-
 #### Delete Account
 
 *Permananently deletes your posts and comments*
@@ -524,17 +381,11 @@ Marks all user replies and mentions as read.
 ##### Response
 ```rust
 {
-  op: "DeleteAccount",
-  data: {
+  op: String,
   jwt: String,
 }
-}
 ```
 
-##### HTTP
-
-`POST /user/delete_account`
-
 #### Add admin
 ##### Request
 ```rust
@@ -550,15 +401,10 @@ Marks all user replies and mentions as read.
 ##### Response
 ```rust
 {
-  op: "AddAdmin",
-  data: {
+  op: String,
   admins: Vec<UserView>,
 }
-}
 ```
-##### HTTP
-
-`POST /admin/add`
 
 #### Ban user
 ##### Request
@@ -577,16 +423,11 @@ Marks all user replies and mentions as read.
 ##### Response
 ```rust
 {
-  op: "BanUser",
-  data: {
+  op: String,
   user: UserView,
   banned: bool,
 }
-}
 ```
-##### HTTP
-
-`POST /user/ban`
 
 ### Site
 #### List Categories
@@ -599,19 +440,13 @@ Marks all user replies and mentions as read.
 ##### Response
 ```rust
 {
-  op: "ListCategories",
-  data: {
+  op: String,
   categories: Vec<Category>
 }
-}
 ```
-##### HTTP
-
-`GET /categories`
 
 #### Search
-
-Search types are `All, Comments, Posts, Communities, Users, Url`
+Search types are `Both, Comments, Posts`.
 
 ##### Request
 ```rust
@@ -624,26 +459,17 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
     sort: String,
     page: Option<i64>,
     limit: Option<i64>,
-    auth?: Option<String>,
   }
 }
 ```
 ##### Response
 ```rust
 {
-  op: "Search",
-  data: {
-    type_: String,
+  op: String,
   comments: Vec<CommentView>,
   posts: Vec<PostView>,
-    communities: Vec<CommunityView>,
-    users: Vec<UserView>,
-  }
 }
 ```
-##### HTTP
-
-`POST /search`
 
 #### Get Modlog
 ##### Request
@@ -661,8 +487,7 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "GetModlog",
-  data: {
+  op: String,
   removed_posts: Vec<ModRemovePostView>,
   locked_posts: Vec<ModLockPostView>,
   removed_comments: Vec<ModRemoveCommentView>,
@@ -672,13 +497,8 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
   added_to_community: Vec<ModAddCommunityView>,
   added: Vec<ModAddView>,
 }
-}
 ```
 
-##### HTTP
-
-`GET /modlog`
-
 #### Create Site
 ##### Request
 ```rust
@@ -694,17 +514,11 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "CreateSite",
-    data: {
+  op: String,
   site: SiteView,
 }
-}
 ```
 
-##### HTTP
-
-`POST /site`
-
 #### Edit Site
 ##### Request
 ```rust
@@ -720,15 +534,10 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "EditSite",
-  data: {
+  op: String,
   site: SiteView,
 }
-}
 ```
-##### HTTP
-
-`PUT /site`
 
 #### Get Site
 ##### Request
@@ -740,17 +549,12 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "GetSite",
-  data: {
+  op: String,
   site: Option<SiteView>,
   admins: Vec<UserView>,
   banned: Vec<UserView>,
 }
-}
 ```
-##### HTTP
-
-`GET /site`
 
 #### Transfer Site
 ##### Request
@@ -766,17 +570,12 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "TransferSite",
-  data: {
+  op: String,
   site: Option<SiteView>,
   admins: Vec<UserView>,
   banned: Vec<UserView>,
 }
-}
 ```
-##### HTTP
-
-`POST /site/transfer`
 
 ### Community
 #### Get Community
@@ -794,17 +593,12 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "GetCommunity",
-  data: {
+  op: String,
   community: CommunityView,
   moderators: Vec<CommunityModeratorView>,
   admins: Vec<UserView>,
 }
-}
 ```
-##### HTTP
-
-`GET /community`
 
 #### Create Community
 ##### Request
@@ -823,15 +617,10 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "CreateCommunity",
-  data: {
+  op: String,
   community: CommunityView
 }
-}
 ```
-##### HTTP
-
-`POST /community`
 
 #### List Communities
 ##### Request
@@ -849,15 +638,10 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "ListCommunities",
-  data: {
+  op: String,
   communities: Vec<CommunityView>
 }
-}
 ```
-##### HTTP
-
-`GET /community/list`
 
 #### Ban from Community
 ##### Request
@@ -877,16 +661,11 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "BanFromCommunity",
-  data: {
+  op: String,
   user: UserView,
   banned: bool,
 }
-}
 ```
-##### HTTP
-
-`POST /community/ban_user`
 
 #### Add Mod to Community
 ##### Request
@@ -904,15 +683,10 @@ Search types are `All, Comments, Posts, Communities, Users, Url`
 ##### Response
 ```rust
 {
-  op: "AddModToCommunity",
-  data: {
+  op: String,
   moderators: Vec<CommunityModeratorView>,
 }
-}
 ```
-##### HTTP
-
-`POST /community/mod`
 
 #### Edit Community
 Mods and admins can remove and lock a community, creators can delete it.
@@ -938,15 +712,10 @@ Mods and admins can remove and lock a community, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "EditCommunity",
-  data: {
+  op: String,
   community: CommunityView
 }
-}
 ```
-##### HTTP
-
-`PUT /community`
 
 #### Follow Community
 ##### Request
@@ -963,15 +732,10 @@ Mods and admins can remove and lock a community, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "FollowCommunity",
-  data: {
+  op: String,
   community: CommunityView
 }
-}
 ```
-##### HTTP
-
-`POST /community/follow`
 
 #### Get Followed Communities
 ##### Request
@@ -986,15 +750,10 @@ Mods and admins can remove and lock a community, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "GetFollowedCommunities",
-  data: {
+  op: String,
   communities: Vec<CommunityFollowerView>
 }
-}
 ```
-##### HTTP
-
-`GET /user/followed_communities`
 
 #### Transfer Community
 ##### Request
@@ -1011,17 +770,12 @@ Mods and admins can remove and lock a community, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "TransferCommunity",
-  data: {
+  op: String,
   community: CommunityView,
   moderators: Vec<CommunityModeratorView>,
   admins: Vec<UserView>,
 }
-}
 ```
-##### HTTP
-
-`POST /community/transfer`
 
 ### Post
 #### Create Post
@@ -1041,15 +795,10 @@ Mods and admins can remove and lock a community, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "CreatePost",
-  data: {
+  op: String,
   post: PostView
 }
-}
 ```
-##### HTTP
-
-`POST /post`
 
 #### Get Post
 ##### Request
@@ -1065,22 +814,16 @@ Mods and admins can remove and lock a community, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "GetPost",
-  data: {
+  op: String,
   post: PostView,
   comments: Vec<CommentView>,
   community: CommunityView,
   moderators: Vec<CommunityModeratorView>,
   admins: Vec<UserView>,
 }
-}
 ```
-##### HTTP
-
-`GET /post`
 
 #### Get Posts
-
 Post listing types are `All, Subscribed, Community`
 
 ##### Request
@@ -1100,18 +843,12 @@ Post listing types are `All, Subscribed, Community`
 ##### Response
 ```rust
 {
-  op: "GetPosts",
-  data: {
+  op: String,
   posts: Vec<PostView>,
 }
-}
 ```
-##### HTTP
-
-`GET /post/list`
 
 #### Create Post Like
-
 `score` can be 0, -1, or 1
 
 ##### Request
@@ -1128,18 +865,12 @@ Post listing types are `All, Subscribed, Community`
 ##### Response
 ```rust
 {
-  op: "CreatePostLike",
-  data: {
+  op: String,
   post: PostView
 }
-}
 ```
-##### HTTP
-
-`POST /post/like`
 
 #### Edit Post
-
 Mods and admins can remove and lock a post, creators can delete it.
 
 ##### Request
@@ -1164,17 +895,11 @@ Mods and admins can remove and lock a post, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "EditPost",
-  data: {
+  op: String,
   post: PostView
 }
-}
 ```
 
-##### HTTP
-
-`PUT /post`
-
 #### Save Post
 ##### Request
 ```rust
@@ -1190,15 +915,10 @@ Mods and admins can remove and lock a post, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "SavePost",
-  data: {
+  op: String,
   post: PostView
 }
-}
 ```
-##### HTTP
-
-`POST /post/save`
 
 ### Comment
 #### Create Comment
@@ -1218,19 +938,12 @@ Mods and admins can remove and lock a post, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "CreateComment",
-  data: {
+  op: String,
   comment: CommentView
 }
-}
 ```
 
-##### HTTP
-
-`POST /comment`
-
 #### Edit Comment
-
 Mods and admins can remove a comment, creators can delete it.
 
 ##### Request
@@ -1254,15 +967,10 @@ Mods and admins can remove a comment, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "EditComment",
-  data: {
+  op: String,
   comment: CommentView
 }
-}
 ```
-##### HTTP
-
-`PUT /comment`
 
 #### Save Comment
 ##### Request
@@ -1279,18 +987,12 @@ Mods and admins can remove a comment, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "SaveComment",
-  data: {
+  op: String,
   comment: CommentView
 }
-}
 ```
-##### HTTP
-
-`POST /comment/save`
 
 #### Create Comment Like
-
 `score` can be 0, -1, or 1
 
 ##### Request
@@ -1308,15 +1010,10 @@ Mods and admins can remove a comment, creators can delete it.
 ##### Response
 ```rust
 {
-  op: "CreateCommentLike",
-  data: {
+  op: String,
   comment: CommentView
 }
-}
 ```
-##### HTTP
-
-`POST /comment/like`
 
 ### RSS / Atom feeds
 

docs/book.toml

@@ -1,6 +0,0 @@
-[book]
-authors = ["Felix Ableitner"]
-language = "en"
-multilingual = false
-src = "src"
-title = "Lemmy Documentation"

docs/src/SUMMARY.md

@@ -1,16 +0,0 @@
-# Summary
-
-- [About](about.md)
-  - [Features](about_features.md)
-  - [Goals](about_goals.md)
-  - [Post and Comment Ranking](about_ranking.md)
-- [Administration](administration.md)
-  - [Install with Docker](administration_install_docker.md)
-  - [Install with Ansible](administration_install_ansible.md)
-  - [Install with Kubernetes](administration_install_kubernetes.md)
-  - [Configuration](administration_configuration.md)
-- [Contributing](contributing.md)
-  - [Docker Development](contributing_docker_development.md)
-  - [Local Development](contributing_local_development.md)
-  - [Websocket/HTTP API](contributing_websocket_http_api.md)
-  - [ActivityPub API Outline](contributing_apub_api_outline.md)

docs/src/about.md

@@ -1,20 +0,0 @@
-# Lemmy - A link aggregator / reddit clone for the fediverse.
-
-[Lemmy Dev instance](https://dev.lemmy.ml) *for testing purposes only*
-
-[Lemmy](https://github.com/dessalines/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse).
-
-For a link aggregator, this means a user registered on one server can subscribe to forums on any other server, and can have discussions with users registered elsewhere.
-
-The overall goal is to create an easily self-hostable, decentralized alternative to reddit and other link aggregators, outside of their corporate control and meddling.
-
-Each lemmy server can set its own moderation policy; appointing site-wide admins, and community moderators to keep out the trolls, and foster a healthy, non-toxic environment where all can feel comfortable contributing.
-
-### Why's it called Lemmy?
-
-- Lead singer from [Motörhead](https://invidio.us/watch?v=pWB5JZRGl0U).
-- The old school [video game](<https://en.wikipedia.org/wiki/Lemmings_(video_game)>).
-- The [Koopa from Super Mario](https://www.mariowiki.com/Lemmy_Koopa).
-- The [furry rodents](http://sunchild.fpwc.org/lemming-the-little-giant-of-the-north/).
-
-Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Inferno](https://infernojs.org), [Typescript](https://www.typescriptlang.org/) and [Diesel](http://diesel.rs/).

docs/src/about_features.md

@@ -1,27 +0,0 @@
-# Features
-- Open source, [AGPL License](/LICENSE).
-- Self hostable, easy to deploy.
-  - Comes with [Docker](#docker), [Ansible](#ansible), [Kubernetes](#kubernetes).
-- Clean, mobile-friendly interface.
-  - Live-updating Comment threads.
-  - Full vote scores `(+/-)` like old reddit.
-  - Themes, including light, dark, and solarized.
-  - Emojis with autocomplete support. Start typing `:`
-  - User tagging using `@`, Community tagging using `#`.
-  - Notifications, on comment replies and when you're tagged.
-  - i18n / internationalization support.
-  - RSS / Atom feeds for `All`, `Subscribed`, `Inbox`, `User`, and `Community`.
-- Cross-posting support.
-  - A *similar post search* when creating new posts. Great for question / answer communities.
-- Moderation abilities.
-  - Public Moderation Logs.
-  - Both site admins, and community moderators, who can appoint other moderators.
-  - Can lock, remove, and restore posts and comments.
-  - Can ban and unban users from communities and the site.
-  - Can transfer site and communities to others.
-- Can fully erase your data, replacing all posts and comments.
-- NSFW post / community support.
-- High performance.
-  - Server is written in rust.
-  - Front end is `~80kB` gzipped.
-  - Supports arm64 / Raspberry Pi.

docs/src/administration.md

@@ -1 +0,0 @@
-Information for Lemmy instance admins, and those who want to start an instance.

docs/src/administration_configuration.md

@@ -1,6 +0,0 @@
-The configuration is based on the file [defaults.hjson](server/config/defaults.hjson). This file also contains documentation for all the available options. To override the defaults, you can copy the options you want to change into your local `config.hjson` file. 
-
-Additionally, you can override any config files with environment variables. These have the same name as the config options, and are prefixed with `LEMMY_`. For example, you can override the `database.password` with 
-`LEMMY__DATABASE__POOL_SIZE=10`.
-
-An additional option `LEMMY_DATABASE_URL` is available, which can be used with a PostgreSQL connection string like `postgres://lemmy:password@lemmy_db:5432/lemmy`, passing all connection details at once.

docs/src/administration_install_ansible.md

@@ -1,11 +0,0 @@
-First, you need to [install Ansible on your local computer](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) (e.g. using `sudo apt install ansible`) or the equivalent for you platform.
-
-Then run the following commands on your local computer:
-
-```bash
-git clone https://github.com/dessalines/lemmy.git
-cd lemmy/ansible/
-cp inventory.example inventory
-nano inventory # enter your server, domain, contact email
-ansible-playbook lemmy.yml --become
-```

docs/src/administration_install_docker.md

@@ -1,28 +0,0 @@
-Make sure you have both docker and docker-compose(>=`1.24.0`) installed:
-
-```bash
-mkdir lemmy/
-cd lemmy/
-wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
-wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/lemmy.hjson
-# Edit lemmy.hjson to do more configuration
-docker-compose up -d
-```
-
-and go to http://localhost:8536.
-
-[A sample nginx config](/ansible/templates/nginx.conf), could be setup with:
-
-```bash
-wget https://raw.githubusercontent.com/dessalines/lemmy/master/ansible/templates/nginx.conf
-# Replace the {{ vars }}
-sudo mv nginx.conf /etc/nginx/sites-enabled/lemmy.conf
-```
-#### Updating
-
-To update to the newest version, run:
-
-```bash
-wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
-docker-compose up -d
-```

docs/src/administration_install_kubernetes.md

@@ -1,22 +0,0 @@
-You'll need to have an existing Kubernetes cluster and [storage class](https://kubernetes.io/docs/concepts/storage/storage-classes/).
-Setting this up will vary depending on your provider.
-To try it locally, you can use [MicroK8s](https://microk8s.io/) or [Minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/).
-
-Once you have a working cluster, edit the environment variables and volume sizes in `docker/k8s/*.yml`.
-You may also want to change the service types to use `LoadBalancer`s depending on where you're running your cluster (add `type: LoadBalancer` to `ports)`, or `NodePort`s.
-By default they will use `ClusterIP`s, which will allow access only within the cluster. See the [docs](https://kubernetes.io/docs/concepts/services-networking/service/) for more on networking in Kubernetes.
-
-**Important** Running a database in Kubernetes will work, but is generally not recommended.
-If you're deploying on any of the common cloud providers, you should consider using their managed database service instead (RDS, Cloud SQL, Azure Databse, etc.).
-
-Now you can deploy:
-
-```bash
-# Add `-n foo` if you want to deploy into a specific namespace `foo`;
-# otherwise your resources will be created in the `default` namespace.
-kubectl apply -f docker/k8s/db.yml
-kubectl apply -f docker/k8s/pictshare.yml
-kubectl apply -f docker/k8s/lemmy.yml
-```
-
-If you used a `LoadBalancer`, you should see it in your cloud provider's console.

docs/src/contributing.md

@@ -1,32 +0,0 @@
-# Contributing
-
-Information about contributing to Lemmy, whether it is translating, testing, designing or programming.
-
-## Translating
-
-Go [here](https://github.com/dessalines/lemmy#translations) for translation instructions.
-
-## Architecture
-
-### Front end
-
-- The front end is written in `typescript`, using a react-like framework called [inferno](https://infernojs.org/). All UI elements are reusable `.tsx` components.
-- The main page and routing are in `ui/src/index.tsx`.
-- The components are located in `ui/src/components`.
-
-### Back end
-
-- The back end is written in `rust`, using `diesel`, and `actix`.
-- The server source code is split into main sections in `server/src`. These include: 
-  - `db` - The low level database actions.
-    - Database additions are done using diesel migrations. Run `diesel migration generate xxxxx` to add new things.
-  - `api` - The high level user interactions (things like `CreateComment`)
-  - `routes` - The server endpoints .
-  - `apub` - The activitypub conversions.
-  - `websocket` - Creates the websocket server. 
-
-## Linting / Formatting
-
-- Every front and back end commit is automatically formatted then linted using `husky`, and `lint-staged`.
-- Rust with `cargo fmt` and `cargo clippy`.
-- Typescript with `prettier` and `eslint`.

docs/src/contributing_docker_development.md

@@ -1,11 +0,0 @@
-Run:
-
-```bash
-git clone https://github.com/dessalines/lemmy
-cd lemmy/docker/dev
-./docker_update.sh # This builds and runs it, updating for your changes
-```
-
-and go to http://localhost:8536.
-
-Note that compile times are relatively long with Docker, because builds can't be properly cached. If this is a problem for you, you should use [Local Development](contributing_local_development.md).

docs/src/contributing_local_development.md

@@ -1,24 +0,0 @@
-#### Requirements
-
-- [Rust](https://www.rust-lang.org/)
-- [Yarn](https://yarnpkg.com/en/)
-- [Postgres](https://www.postgresql.org/)
-
-#### Set up Postgres DB
-
-```bash
- psql -c "create user lemmy with password 'password' superuser;" -U postgres
- psql -c 'create database lemmy with owner lemmy;' -U postgres
- export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
-```
-
-#### Running
-
-```bash
-git clone https://github.com/dessalines/lemmy
-cd lemmy
-./install.sh
-# For live coding, where both the front and back end, automagically reload on any save, do:
-# cd ui && yarn start
-# cd server && cargo watch -x run
-```

install.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
+export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
 export JWT_SECRET=changeme
 export HOSTNAME=rrr
 

server/.gitignore

@@ -2,5 +2,3 @@
 .env
 .idea
 env_setup.sh
-query_testing/*.json
-query_testing/*.json.old

server/.rustfmt.toml

@@ -1,2 +1 @@
 tab_spaces = 2
-edition="2018"

server/Cargo.toml

@@ -5,31 +5,28 @@ authors = ["Dessalines <happydooby@gmail.com>"]
 edition = "2018"
 
 [dependencies]
-diesel = { version = "1.4.2", features = ["postgres","chrono", "r2d2"] }
+diesel = { version = "1.4.2", features = ["postgres","chrono"] }
 diesel_migrations = "1.4.0"
-dotenv = "0.15.0"
-bcrypt = "0.6.1"
-activitypub = "0.2.0"
+dotenv = "0.14.1"
+bcrypt = "0.5.0"
+activitypub = "0.1.5"
 chrono = { version = "0.4.7", features = ["serde"] }
 failure = "0.1.5"
 serde_json = { version = "1.0.40", features = ["preserve_order"]}
 serde = { version = "1.0.94", features = ["derive"] }
-actix = "0.9.0"
-actix-web = "2.0.0"
-actix-files = "0.2.1"
-actix-web-actors = "2.0.0"
-actix-rt = "1.0.0"
-env_logger = "0.7.1"
+actix = "0.8.3"
+actix-web = "1.0"
+actix-files = "0.1.3"
+actix-web-actors = "1.0"
+env_logger = "0.6.2"
 rand = "0.7.0"
-strum = "0.17.1"
-strum_macros = "0.17.1"
+strum = "0.15.0"
+strum_macros = "0.15.0"
 jsonwebtoken = "6.0.1"
 regex = "1.1.9"
 lazy_static = "1.3.0"
 lettre = "0.9.2"
 lettre_email = "0.9.2"
-sha2 = "0.8.0"
+rust-crypto = "^0.2"
 rss = "1.8.0"
 htmlescape = "0.3.1"
-config = "0.10.1"
-hjson = "0.8.2"

server/clean.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cargo update
-cargo fmt
-cargo check
-cargo clippy
-cargo outdated -R

server/config/defaults.hjson

@@ -1,56 +0,0 @@
-{
-  # settings related to the postgresql database
-  database: {
-    # username to connect to postgres
-    user: "lemmy"
-    # password to connect to postgres
-    password: "password"
-    # host where postgres is running
-    host: "localhost"
-    # port where postgres can be accessed
-    port: 5432
-    # name of the postgres database for lemmy
-    database: "lemmy"
-    # maximum number of active sql connections
-    pool_size: 5
-  }
-  # the domain name of your instance (eg "dev.lemmy.ml")
-  hostname: "my_domain"
-  # address where lemmy should listen for incoming requests
-  bind: "0.0.0.0"
-  # port where lemmy should listen for incoming requests
-  port: 8536
-  # json web token for authorization between server and client
-  jwt_secret: "changeme"
-  # The dir for the front end
-  front_end_dir: "../ui/dist"
-  # whether to enable activitypub federation. this feature is in alpha, do not enable in production, as might
-  # cause problems like remote instances fetching and permanently storing bad data.
-  federation_enabled: false
-  # rate limits for various user actions, by user ip
-  rate_limit: {
-    # maximum number of messages created in interval
-    message: 30
-    # interval length for message limit
-    message_per_second: 60
-    # maximum number of posts created in interval
-    post: 6
-    # interval length for post limit
-    post_per_second: 600
-    # maximum number of registrations in interval
-    register: 3
-    # interval length for registration limit
-    register_per_second: 3600
-  }
-#  # email sending configuration
-#  email: {
-#    # hostname of the smtp server
-#    smtp_server: ""
-#    # login name for smtp server
-#    smtp_login: ""
-#    # password to login to the smtp server
-#    smtp_password: ""
-#    # address to send emails from, eg "info@your-instance.com"
-#    smtp_from_address: ""
-#  }
-}

server/migrations/2019-12-29-164820_add_avatar/down.sql

@@ -1,224 +0,0 @@
--- the views
-drop view user_mention_view;
-drop view reply_view;
-drop view comment_view;
-drop view user_view;
-
--- user
-create view user_view as 
-select id,
-name,
-fedi_name,
-admin,
-banned,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
--- post
--- Recreate the view
-drop view post_view;
-create view post_view as
-with all_post as
-(
-  select        
-  p.*,
-  (select u.banned from user_ u where p.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where p.creator_id = user_.id) as creator_name,
-  (select name from community where p.community_id = community.id) as community_name,
-  (select removed from community c where p.community_id = c.id) as community_removed,
-  (select deleted from community c where p.community_id = c.id) as community_deleted,
-  (select nsfw from community c where p.community_id = c.id) as community_nsfw,
-  (select count(*) from comment where comment.post_id = p.id) as number_of_comments,
-  coalesce(sum(pl.score), 0) as score,
-  count (case when pl.score = 1 then 1 else null end) as upvotes,
-  count (case when pl.score = -1 then 1 else null end) as downvotes,
-  hot_rank(coalesce(sum(pl.score) , 0), p.published) as hot_rank
-  from post p
-  left join post_like pl on p.id = pl.post_id
-  group by p.id
-)
-
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-;
-
--- community
-
-drop view community_view;
-create view community_view as 
-with all_community as
-(
-  select *,
-  (select name from user_ u where c.creator_id = u.id) as creator_name,
-  (select name from category ct where c.category_id = ct.id) as category_name,
-  (select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
-  (select count(*) from post p where p.community_id = c.id) as number_of_posts,
-  (select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
-  hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
-  from community c
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
--- Reply and comment view
-create view comment_view as
-with all_comment as
-(
-  select        
-  c.*,
-  (select community_id from post p where p.id = c.post_id),
-  (select u.banned from user_ u where c.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where c.creator_id = user_.id) as creator_name,
-  coalesce(sum(cl.score), 0) as score,
-  count (case when cl.score = 1 then 1 else null end) as upvotes,
-  count (case when cl.score = -1 then 1 else null end) as downvotes
-  from comment c
-  left join comment_like cl on c.id = cl.comment_id
-  group by c.id
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create view reply_view as 
-with closereply as (
-    select 
-    c2.id, 
-    c2.creator_id as sender_id, 
-    c.creator_id as recipient_id
-    from comment c
-    inner join comment c2 on c.id = c2.parent_id
-    where c2.creator_id != c.creator_id
-    -- Do union where post is null
-    union
-    select
-    c.id,
-    c.creator_id as sender_id,
-    p.creator_id as recipient_id
-    from comment c, post p
-    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
-)
-select cv.*,
-closereply.recipient_id
-from comment_view cv, closereply
-where closereply.id = cv.id
-;
-
--- user mention
-create view user_mention_view as
-select 
-    c.id,
-    um.id as user_mention_id,
-    c.creator_id,
-    c.post_id,
-    c.parent_id,
-    c.content,
-    c.removed,
-    um.read,
-    c.published,
-    c.updated,
-    c.deleted,
-    c.community_id,
-    c.banned,
-    c.banned_from_community,
-    c.creator_name,
-    c.score,
-    c.upvotes,
-    c.downvotes,
-    c.user_id,
-    c.my_vote,
-    c.saved,
-    um.recipient_id
-from user_mention um, comment_view c
-where um.comment_id = c.id;
-
--- community tables
-drop view community_moderator_view;
-drop view community_follower_view;
-drop view community_user_ban_view;
-drop view site_view;
-
-create view community_moderator_view as 
-select *,
-(select name from user_ u where cm.user_id = u.id) as user_name,
-(select name from community c where cm.community_id = c.id) as community_name
-from community_moderator cm;
-
-create view community_follower_view as 
-select *,
-(select name from user_ u where cf.user_id = u.id) as user_name,
-(select name from community c where cf.community_id = c.id) as community_name
-from community_follower cf;
-
-create view community_user_ban_view as 
-select *,
-(select name from user_ u where cm.user_id = u.id) as user_name,
-(select name from community c where cm.community_id = c.id) as community_name
-from community_user_ban cm;
-
-create view site_view as 
-select *,
-(select name from user_ u where s.creator_id = u.id) as creator_name,
-(select count(*) from user_) as number_of_users,
-(select count(*) from post) as number_of_posts,
-(select count(*) from comment) as number_of_comments,
-(select count(*) from community) as number_of_communities
-from site s;
-
-alter table user_ rename column avatar to icon;
-alter table user_ alter column icon type bytea using icon::bytea;

server/migrations/2019-12-29-164820_add_avatar/up.sql

@@ -1,234 +0,0 @@
--- Rename to avatar
-alter table user_ rename column icon to avatar;
-alter table user_ alter column avatar type text;
-
--- Rebuild nearly all the views, to include the creator avatars
-
--- user
-drop view user_view;
-create view user_view as 
-select id,
-name,
-avatar,
-fedi_name,
-admin,
-banned,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
--- post
--- Recreate the view
-drop view post_view;
-create view post_view as
-with all_post as
-(
-  select        
-  p.*,
-  (select u.banned from user_ u where p.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where p.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where p.creator_id = user_.id) as creator_avatar,
-  (select name from community where p.community_id = community.id) as community_name,
-  (select removed from community c where p.community_id = c.id) as community_removed,
-  (select deleted from community c where p.community_id = c.id) as community_deleted,
-  (select nsfw from community c where p.community_id = c.id) as community_nsfw,
-  (select count(*) from comment where comment.post_id = p.id) as number_of_comments,
-  coalesce(sum(pl.score), 0) as score,
-  count (case when pl.score = 1 then 1 else null end) as upvotes,
-  count (case when pl.score = -1 then 1 else null end) as downvotes,
-  hot_rank(coalesce(sum(pl.score) , 0), p.published) as hot_rank
-  from post p
-  left join post_like pl on p.id = pl.post_id
-  group by p.id
-)
-
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-;
-
-
--- community
-drop view community_view;
-create view community_view as 
-with all_community as
-(
-  select *,
-  (select name from user_ u where c.creator_id = u.id) as creator_name,
-  (select avatar from user_ u where c.creator_id = u.id) as creator_avatar,
-  (select name from category ct where c.category_id = ct.id) as category_name,
-  (select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
-  (select count(*) from post p where p.community_id = c.id) as number_of_posts,
-  (select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
-  hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
-  from community c
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
--- reply and comment view
-drop view reply_view;
-drop view user_mention_view;
-drop view comment_view;
-create view comment_view as
-with all_comment as
-(
-  select        
-  c.*,
-  (select community_id from post p where p.id = c.post_id),
-  (select u.banned from user_ u where c.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where c.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where c.creator_id = user_.id) as creator_avatar,
-  coalesce(sum(cl.score), 0) as score,
-  count (case when cl.score = 1 then 1 else null end) as upvotes,
-  count (case when cl.score = -1 then 1 else null end) as downvotes
-  from comment c
-  left join comment_like cl on c.id = cl.comment_id
-  group by c.id
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create view reply_view as 
-with closereply as (
-    select 
-    c2.id, 
-    c2.creator_id as sender_id, 
-    c.creator_id as recipient_id
-    from comment c
-    inner join comment c2 on c.id = c2.parent_id
-    where c2.creator_id != c.creator_id
-    -- Do union where post is null
-    union
-    select
-    c.id,
-    c.creator_id as sender_id,
-    p.creator_id as recipient_id
-    from comment c, post p
-    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
-)
-select cv.*,
-closereply.recipient_id
-from comment_view cv, closereply
-where closereply.id = cv.id
-;
-
--- user mention
-create view user_mention_view as
-select 
-    c.id,
-    um.id as user_mention_id,
-    c.creator_id,
-    c.post_id,
-    c.parent_id,
-    c.content,
-    c.removed,
-    um.read,
-    c.published,
-    c.updated,
-    c.deleted,
-    c.community_id,
-    c.banned,
-    c.banned_from_community,
-    c.creator_name,
-    c.creator_avatar,
-    c.score,
-    c.upvotes,
-    c.downvotes,
-    c.user_id,
-    c.my_vote,
-    c.saved,
-    um.recipient_id
-from user_mention um, comment_view c
-where um.comment_id = c.id;
-
--- community views
-drop view community_moderator_view;
-drop view community_follower_view;
-drop view community_user_ban_view;
-drop view site_view;
-
-create view community_moderator_view as 
-select *,
-(select name from user_ u where cm.user_id = u.id) as user_name,
-(select avatar from user_ u where cm.user_id = u.id),
-(select name from community c where cm.community_id = c.id) as community_name
-from community_moderator cm;
-
-create view community_follower_view as 
-select *,
-(select name from user_ u where cf.user_id = u.id) as user_name,
-(select avatar from user_ u where cf.user_id = u.id),
-(select name from community c where cf.community_id = c.id) as community_name
-from community_follower cf;
-
-create view community_user_ban_view as 
-select *,
-(select name from user_ u where cm.user_id = u.id) as user_name,
-(select avatar from user_ u where cm.user_id = u.id),
-(select name from community c where cm.community_id = c.id) as community_name
-from community_user_ban cm;
-
-create view site_view as 
-select *,
-(select name from user_ u where s.creator_id = u.id) as creator_name,
-(select avatar from user_ u where s.creator_id = u.id) as creator_avatar,
-(select count(*) from user_) as number_of_users,
-(select count(*) from post) as number_of_posts,
-(select count(*) from comment) as number_of_comments,
-(select count(*) from community) as number_of_communities
-from site s;

server/migrations/2020-01-01-200418_add_email_to_user_view/down.sql

@@ -1,15 +0,0 @@
--- user
-drop view user_view;
-create view user_view as 
-select id,
-name,
-avatar,
-fedi_name,
-admin,
-banned,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;

server/migrations/2020-01-01-200418_add_email_to_user_view/up.sql

@@ -1,16 +0,0 @@
--- user
-drop view user_view;
-create view user_view as 
-select id,
-name,
-avatar,
-email,
-fedi_name,
-admin,
-banned,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;

server/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/down.sql

@@ -1,20 +0,0 @@
--- Drop the columns
-drop view user_view;
-alter table user_ drop column show_avatars;
-alter table user_ drop column send_notifications_to_email;
-
--- Rebuild the view
-create view user_view as 
-select id,
-name,
-avatar,
-email,
-fedi_name,
-admin,
-banned,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;

server/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/up.sql

@@ -1,22 +0,0 @@
--- Add columns
-alter table user_ add column show_avatars boolean default true not null;
-alter table user_ add column send_notifications_to_email boolean default false not null;
-
--- Rebuild the user_view
-drop view user_view;
-create view user_view as 
-select id,
-name,
-avatar,
-email,
-fedi_name,
-admin,
-banned,
-show_avatars,
-send_notifications_to_email,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;

server/migrations/2020-01-11-012452_add_indexes/down.sql

@@ -1,16 +0,0 @@
-drop index idx_post_creator;
-drop index idx_post_community;
-
-drop index idx_post_like_post;
-drop index idx_post_like_user;
-
-drop index idx_comment_creator;
-drop index idx_comment_parent;
-drop index idx_comment_post;
-
-drop index idx_comment_like_comment;
-drop index idx_comment_like_user;
-drop index idx_comment_like_post;
-
-drop index idx_community_creator;
-drop index idx_community_category;

server/migrations/2020-01-11-012452_add_indexes/up.sql

@@ -1,17 +0,0 @@
--- Go through all the tables joins, optimize every view, CTE, etc.
-create index idx_post_creator on post (creator_id);
-create index idx_post_community on post (community_id);
-
-create index idx_post_like_post on post_like (post_id);
-create index idx_post_like_user on post_like (user_id);
-
-create index idx_comment_creator on comment (creator_id);
-create index idx_comment_parent on comment (parent_id);
-create index idx_comment_post on comment (post_id);
-
-create index idx_comment_like_comment on comment_like (comment_id);
-create index idx_comment_like_user on comment_like (user_id);
-create index idx_comment_like_post on comment_like (post_id);
-
-create index idx_community_creator on community (creator_id);
-create index idx_community_category on community (category_id);

server/migrations/2020-01-13-025151_create_materialized_views/down.sql

@@ -1,223 +0,0 @@
--- functions and triggers
-drop trigger refresh_user on user_;
-drop function refresh_user();
-drop trigger refresh_post on post;
-drop function refresh_post();
-drop trigger refresh_post_like on post_like;
-drop function refresh_post_like();
-drop trigger refresh_community on community;
-drop function refresh_community();
-drop trigger refresh_community_follower on community_follower;
-drop function refresh_community_follower();
-drop trigger refresh_community_user_ban on community_user_ban;
-drop function refresh_community_user_ban();
-drop trigger refresh_comment on comment;
-drop function refresh_comment();
-drop trigger refresh_comment_like on comment_like;
-drop function refresh_comment_like();
-
--- post
--- Recreate the view
-drop view post_view;
-create view post_view as
-with all_post as
-(
-  select        
-  p.*,
-  (select u.banned from user_ u where p.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where p.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where p.creator_id = user_.id) as creator_avatar,
-  (select name from community where p.community_id = community.id) as community_name,
-  (select removed from community c where p.community_id = c.id) as community_removed,
-  (select deleted from community c where p.community_id = c.id) as community_deleted,
-  (select nsfw from community c where p.community_id = c.id) as community_nsfw,
-  (select count(*) from comment where comment.post_id = p.id) as number_of_comments,
-  coalesce(sum(pl.score), 0) as score,
-  count (case when pl.score = 1 then 1 else null end) as upvotes,
-  count (case when pl.score = -1 then 1 else null end) as downvotes,
-  hot_rank(coalesce(sum(pl.score) , 0), p.published) as hot_rank
-  from post p
-  left join post_like pl on p.id = pl.post_id
-  group by p.id
-)
-
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-;
-
-drop view post_mview;
-drop materialized view post_aggregates_mview;
-drop view post_aggregates_view;
-
--- user
-drop materialized view user_mview;
-drop view user_view;
-create view user_view as 
-select id,
-name,
-avatar,
-email,
-fedi_name,
-admin,
-banned,
-show_avatars,
-send_notifications_to_email,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
--- community
-drop view community_mview;
-drop materialized view community_aggregates_mview;
-drop view community_view;
-drop view community_aggregates_view;
-create view community_view as 
-with all_community as
-(
-  select *,
-  (select name from user_ u where c.creator_id = u.id) as creator_name,
-  (select avatar from user_ u where c.creator_id = u.id) as creator_avatar,
-  (select name from category ct where c.category_id = ct.id) as category_name,
-  (select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
-  (select count(*) from post p where p.community_id = c.id) as number_of_posts,
-  (select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
-  hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
-  from community c
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
--- reply and comment view
-drop view reply_view;
-drop view user_mention_view;
-drop view comment_view;
-drop view comment_mview;
-drop materialized view comment_aggregates_mview;
-drop view comment_aggregates_view;
-create view comment_view as
-with all_comment as
-(
-  select        
-  c.*,
-  (select community_id from post p where p.id = c.post_id),
-  (select u.banned from user_ u where c.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where c.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where c.creator_id = user_.id) as creator_avatar,
-  coalesce(sum(cl.score), 0) as score,
-  count (case when cl.score = 1 then 1 else null end) as upvotes,
-  count (case when cl.score = -1 then 1 else null end) as downvotes
-  from comment c
-  left join comment_like cl on c.id = cl.comment_id
-  group by c.id
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create view reply_view as 
-with closereply as (
-    select 
-    c2.id, 
-    c2.creator_id as sender_id, 
-    c.creator_id as recipient_id
-    from comment c
-    inner join comment c2 on c.id = c2.parent_id
-    where c2.creator_id != c.creator_id
-    -- Do union where post is null
-    union
-    select
-    c.id,
-    c.creator_id as sender_id,
-    p.creator_id as recipient_id
-    from comment c, post p
-    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
-)
-select cv.*,
-closereply.recipient_id
-from comment_view cv, closereply
-where closereply.id = cv.id
-;
-
--- user mention
-create view user_mention_view as
-select 
-    c.id,
-    um.id as user_mention_id,
-    c.creator_id,
-    c.post_id,
-    c.parent_id,
-    c.content,
-    c.removed,
-    um.read,
-    c.published,
-    c.updated,
-    c.deleted,
-    c.community_id,
-    c.banned,
-    c.banned_from_community,
-    c.creator_name,
-    c.creator_avatar,
-    c.score,
-    c.upvotes,
-    c.downvotes,
-    c.user_id,
-    c.my_vote,
-    c.saved,
-    um.recipient_id
-from user_mention um, comment_view c
-where um.comment_id = c.id;
-

server/migrations/2020-01-13-025151_create_materialized_views/up.sql

@@ -1,437 +0,0 @@
--- post
-create view post_aggregates_view as
-select        
-p.*,
-(select u.banned from user_ u where p.creator_id = u.id) as banned,
-(select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
-(select name from user_ where p.creator_id = user_.id) as creator_name,
-(select avatar from user_ where p.creator_id = user_.id) as creator_avatar,
-(select name from community where p.community_id = community.id) as community_name,
-(select removed from community c where p.community_id = c.id) as community_removed,
-(select deleted from community c where p.community_id = c.id) as community_deleted,
-(select nsfw from community c where p.community_id = c.id) as community_nsfw,
-(select count(*) from comment where comment.post_id = p.id) as number_of_comments,
-coalesce(sum(pl.score), 0) as score,
-count (case when pl.score = 1 then 1 else null end) as upvotes,
-count (case when pl.score = -1 then 1 else null end) as downvotes,
-hot_rank(coalesce(sum(pl.score) , 0), p.published) as hot_rank
-from post p
-left join post_like pl on p.id = pl.post_id
-group by p.id;
-
-create materialized view post_aggregates_mview as select * from post_aggregates_view;
-
-create unique index idx_post_aggregates_mview_id on post_aggregates_mview (id);
-
-drop view post_view;
-create view post_view as 
-with all_post as (
-  select
-  pa.*
-  from post_aggregates_view pa
-)
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-;
-
-create view post_mview as 
-with all_post as (
-  select
-  pa.*
-  from post_aggregates_mview pa
-)
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-;
-
-
--- user_view
-drop view user_view;
-create view user_view as 
-select 
-u.id,
-u.name,
-u.avatar,
-u.email,
-u.fedi_name,
-u.admin,
-u.banned,
-u.show_avatars,
-u.send_notifications_to_email,
-u.published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
-create materialized view user_mview as select * from user_view;
-
-create unique index idx_user_mview_id on user_mview (id);
-
--- community
-create view community_aggregates_view as
-select c.*,
-(select name from user_ u where c.creator_id = u.id) as creator_name,
-(select avatar from user_ u where c.creator_id = u.id) as creator_avatar,
-(select name from category ct where c.category_id = ct.id) as category_name,
-(select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
-(select count(*) from post p where p.community_id = c.id) as number_of_posts,
-(select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
-hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
-from community c;
-
-create materialized view community_aggregates_mview as select * from community_aggregates_view;
-
-create unique index idx_community_aggregates_mview_id on community_aggregates_mview (id);
-
-drop view community_view;
-create view community_view as
-with all_community as
-(
-  select
-  ca.*
-  from community_aggregates_view ca
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
-create view community_mview as
-with all_community as
-(
-  select
-  ca.*
-  from community_aggregates_mview ca
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
-
--- reply and comment view
-create view comment_aggregates_view as
-select        
-c.*,
-(select community_id from post p where p.id = c.post_id),
-(select u.banned from user_ u where c.creator_id = u.id) as banned,
-(select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
-(select name from user_ where c.creator_id = user_.id) as creator_name,
-(select avatar from user_ where c.creator_id = user_.id) as creator_avatar,
-coalesce(sum(cl.score), 0) as score,
-count (case when cl.score = 1 then 1 else null end) as upvotes,
-count (case when cl.score = -1 then 1 else null end) as downvotes
-from comment c
-left join comment_like cl on c.id = cl.comment_id
-group by c.id;
-
-create materialized view comment_aggregates_mview as select * from comment_aggregates_view;
-
-create unique index idx_comment_aggregates_mview_id on comment_aggregates_mview (id);
-
-drop view reply_view;
-drop view user_mention_view;
-drop view comment_view;
-
-create view comment_view as
-with all_comment as
-(
-  select
-  ca.*
-  from comment_aggregates_view ca
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create view comment_mview as
-with all_comment as
-(
-  select
-  ca.*
-  from comment_aggregates_mview ca
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create view reply_view as 
-with closereply as (
-    select 
-    c2.id, 
-    c2.creator_id as sender_id, 
-    c.creator_id as recipient_id
-    from comment c
-    inner join comment c2 on c.id = c2.parent_id
-    where c2.creator_id != c.creator_id
-    -- Do union where post is null
-    union
-    select
-    c.id,
-    c.creator_id as sender_id,
-    p.creator_id as recipient_id
-    from comment c, post p
-    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
-)
-select cv.*,
-closereply.recipient_id
-from comment_view cv, closereply
-where closereply.id = cv.id
-;
-
--- user mention
-create view user_mention_view as
-select 
-    c.id,
-    um.id as user_mention_id,
-    c.creator_id,
-    c.post_id,
-    c.parent_id,
-    c.content,
-    c.removed,
-    um.read,
-    c.published,
-    c.updated,
-    c.deleted,
-    c.community_id,
-    c.banned,
-    c.banned_from_community,
-    c.creator_name,
-    c.creator_avatar,
-    c.score,
-    c.upvotes,
-    c.downvotes,
-    c.user_id,
-    c.my_vote,
-    c.saved,
-    um.recipient_id
-from user_mention um, comment_view c
-where um.comment_id = c.id;
-
--- user
-create or replace function refresh_user()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently user_mview;
-  refresh materialized view concurrently comment_aggregates_mview; -- cause of bans
-  refresh materialized view concurrently post_aggregates_mview;
-  return null;
-end $$;
-
-create trigger refresh_user
-after insert or update or delete or truncate
-on user_
-for each statement
-execute procedure refresh_user();
-
--- post
-create or replace function refresh_post()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_aggregates_mview;
-  refresh materialized view concurrently user_mview;
-  return null;
-end $$;
-
-create trigger refresh_post
-after insert or update or delete or truncate
-on post
-for each statement
-execute procedure refresh_post();
-
--- post_like
-create or replace function refresh_post_like()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_aggregates_mview;
-  refresh materialized view concurrently user_mview; 
-  return null;
-end $$;
-
-create trigger refresh_post_like
-after insert or update or delete or truncate
-on post_like
-for each statement
-execute procedure refresh_post_like();
-
--- community
-create or replace function refresh_community()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_aggregates_mview;
-  refresh materialized view concurrently community_aggregates_mview; 
-  refresh materialized view concurrently user_mview;
-  return null;
-end $$;
-
-create trigger refresh_community
-after insert or update or delete or truncate
-on community
-for each statement
-execute procedure refresh_community();
-
--- community_follower
-create or replace function refresh_community_follower()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently community_aggregates_mview;
-  refresh materialized view concurrently post_aggregates_mview;
-  return null;
-end $$;
-
-create trigger refresh_community_follower
-after insert or update or delete or truncate
-on community_follower
-for each statement
-execute procedure refresh_community_follower();
-
--- community_user_ban
-create or replace function refresh_community_user_ban()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently comment_aggregates_mview;
-  refresh materialized view concurrently post_aggregates_mview;
-  return null;
-end $$;
-
-create trigger refresh_community_user_ban
-after insert or update or delete or truncate
-on community_user_ban
-for each statement
-execute procedure refresh_community_user_ban();
-
--- comment
-create or replace function refresh_comment()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_aggregates_mview;
-  refresh materialized view concurrently comment_aggregates_mview; 
-  refresh materialized view concurrently community_aggregates_mview; 
-  refresh materialized view concurrently user_mview; 
-  return null;
-end $$;
-
-create trigger refresh_comment
-after insert or update or delete or truncate
-on comment
-for each statement
-execute procedure refresh_comment();
-
--- comment_like
-create or replace function refresh_comment_like()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently comment_aggregates_mview;
-  refresh materialized view concurrently user_mview;
-  return null;
-end $$;
-
-create trigger refresh_comment_like
-after insert or update or delete or truncate
-on comment_like
-for each statement
-execute procedure refresh_comment_like();

server/migrations/2020-01-21-001001_create_private_message/down.sql

@@ -1,34 +0,0 @@
--- Drop the triggers
-drop trigger refresh_private_message on private_message;
-drop function refresh_private_message();
-
--- Drop the view and table
-drop view private_message_view cascade;
-drop table private_message;
-
--- Rebuild the old views
-drop view user_view cascade;
-create view user_view as 
-select 
-u.id,
-u.name,
-u.avatar,
-u.email,
-u.fedi_name,
-u.admin,
-u.banned,
-u.show_avatars,
-u.send_notifications_to_email,
-u.published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
-create materialized view user_mview as select * from user_view;
-
-create unique index idx_user_mview_id on user_mview (id);
-
--- Drop the columns
-alter table user_ drop column matrix_user_id;

server/migrations/2020-01-21-001001_create_private_message/up.sql

@@ -1,90 +0,0 @@
--- Creating private message
-create table private_message (
-  id serial primary key,
-  creator_id int references user_ on update cascade on delete cascade not null,
-  recipient_id int references user_ on update cascade on delete cascade not null,
-  content text not null,
-  deleted boolean default false not null,
-  read boolean default false not null,
-  published timestamp not null default now(),
-  updated timestamp
-);
-
--- Create the view and materialized view which has the avatar and creator name
-create view private_message_view as 
-select        
-pm.*,
-u.name as creator_name,
-u.avatar as creator_avatar,
-u2.name as recipient_name,
-u2.avatar as recipient_avatar
-from private_message pm
-inner join user_ u on u.id = pm.creator_id
-inner join user_ u2 on u2.id = pm.recipient_id;
-
-create materialized view private_message_mview as select * from private_message_view;
-
-create unique index idx_private_message_mview_id on private_message_mview (id);
-
--- Create the triggers
-create or replace function refresh_private_message()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently private_message_mview;
-  return null;
-end $$;
-
-create trigger refresh_private_message
-after insert or update or delete or truncate
-on private_message
-for each statement
-execute procedure refresh_private_message();
-
--- Update user to include matrix id
-alter table user_ add column matrix_user_id text unique;
-
-drop view user_view cascade;
-create view user_view as 
-select 
-u.id,
-u.name,
-u.avatar,
-u.email,
-u.matrix_user_id,
-u.fedi_name,
-u.admin,
-u.banned,
-u.show_avatars,
-u.send_notifications_to_email,
-u.published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
-create materialized view user_mview as select * from user_view;
-
-create unique index idx_user_mview_id on user_mview (id);
-
--- This is what a group pm table would look like
--- Not going to do it now because of the complications
--- 
--- create table private_message (
---   id serial primary key,
---   creator_id int references user_ on update cascade on delete cascade not null,
---   content text not null,
---   deleted boolean default false not null,
---   published timestamp not null default now(),
---   updated timestamp
--- );
--- 
--- create table private_message_recipient (
---   id serial primary key,
---   private_message_id int references private_message on update cascade on delete cascade not null,
---   recipient_id int references user_ on update cascade on delete cascade not null,
---   read boolean default false not null,
---   published timestamp not null default now(),
---   unique(private_message_id, recipient_id)
--- )

server/migrations_testing/2020-01-13-025151_create_materialized_views/down.sql

@@ -1,211 +0,0 @@
--- functions and triggers
-drop trigger refresh_user on user_;
-drop function refresh_user();
-drop trigger refresh_post on post;
-drop function refresh_post();
-drop trigger refresh_post_like on post_like;
-drop function refresh_post_like();
-drop trigger refresh_community on community;
-drop function refresh_community();
-drop trigger refresh_community_follower on community_follower;
-drop function refresh_community_follower();
-drop trigger refresh_comment on comment;
-drop function refresh_comment();
-drop trigger refresh_comment_like on comment_like;
-drop function refresh_comment_like();
-
--- post
--- Recreate the view
-drop materialized view post_view;
-create view post_view as
-with all_post as
-(
-  select        
-  p.*,
-  (select u.banned from user_ u where p.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where p.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where p.creator_id = user_.id) as creator_avatar,
-  (select name from community where p.community_id = community.id) as community_name,
-  (select removed from community c where p.community_id = c.id) as community_removed,
-  (select deleted from community c where p.community_id = c.id) as community_deleted,
-  (select nsfw from community c where p.community_id = c.id) as community_nsfw,
-  (select count(*) from comment where comment.post_id = p.id) as number_of_comments,
-  coalesce(sum(pl.score), 0) as score,
-  count (case when pl.score = 1 then 1 else null end) as upvotes,
-  count (case when pl.score = -1 then 1 else null end) as downvotes,
-  hot_rank(coalesce(sum(pl.score) , 0), p.published) as hot_rank
-  from post p
-  left join post_like pl on p.id = pl.post_id
-  group by p.id
-)
-
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-;
-
-
-drop materialized view user_view;
-create view user_view as 
-select id,
-name,
-avatar,
-email,
-fedi_name,
-admin,
-banned,
-show_avatars,
-send_notifications_to_email,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
-
--- community
-drop materialized view community_view;
-create view community_view as 
-with all_community as
-(
-  select *,
-  (select name from user_ u where c.creator_id = u.id) as creator_name,
-  (select avatar from user_ u where c.creator_id = u.id) as creator_avatar,
-  (select name from category ct where c.category_id = ct.id) as category_name,
-  (select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
-  (select count(*) from post p where p.community_id = c.id) as number_of_posts,
-  (select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
-  hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
-  from community c
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
--- reply and comment view
-drop view reply_view;
-drop view user_mention_view;
-drop materialized view comment_view;
-create view comment_view as
-with all_comment as
-(
-  select        
-  c.*,
-  (select community_id from post p where p.id = c.post_id),
-  (select u.banned from user_ u where c.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where c.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where c.creator_id = user_.id) as creator_avatar,
-  coalesce(sum(cl.score), 0) as score,
-  count (case when cl.score = 1 then 1 else null end) as upvotes,
-  count (case when cl.score = -1 then 1 else null end) as downvotes
-  from comment c
-  left join comment_like cl on c.id = cl.comment_id
-  group by c.id
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create view reply_view as 
-with closereply as (
-    select 
-    c2.id, 
-    c2.creator_id as sender_id, 
-    c.creator_id as recipient_id
-    from comment c
-    inner join comment c2 on c.id = c2.parent_id
-    where c2.creator_id != c.creator_id
-    -- Do union where post is null
-    union
-    select
-    c.id,
-    c.creator_id as sender_id,
-    p.creator_id as recipient_id
-    from comment c, post p
-    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
-)
-select cv.*,
-closereply.recipient_id
-from comment_view cv, closereply
-where closereply.id = cv.id
-;
-
--- user mention
-create view user_mention_view as
-select 
-    c.id,
-    um.id as user_mention_id,
-    c.creator_id,
-    c.post_id,
-    c.parent_id,
-    c.content,
-    c.removed,
-    um.read,
-    c.published,
-    c.updated,
-    c.deleted,
-    c.community_id,
-    c.banned,
-    c.banned_from_community,
-    c.creator_name,
-    c.creator_avatar,
-    c.score,
-    c.upvotes,
-    c.downvotes,
-    c.user_id,
-    c.my_vote,
-    c.saved,
-    um.recipient_id
-from user_mention um, comment_view c
-where um.comment_id = c.id;
-

server/migrations_testing/2020-01-13-025151_create_materialized_views/up.sql

@@ -1,324 +0,0 @@
--- post
-drop view post_view;
-create materialized view post_view as
-with all_post as
-(
-  select        
-  p.*,
-  (select u.banned from user_ u where p.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where p.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where p.creator_id = user_.id) as creator_avatar,
-  (select name from community where p.community_id = community.id) as community_name,
-  (select removed from community c where p.community_id = c.id) as community_removed,
-  (select deleted from community c where p.community_id = c.id) as community_deleted,
-  (select nsfw from community c where p.community_id = c.id) as community_nsfw,
-  (select count(*) from comment where comment.post_id = p.id) as number_of_comments,
-  coalesce(sum(pl.score), 0) as score,
-  count (case when pl.score = 1 then 1 else null end) as upvotes,
-  count (case when pl.score = -1 then 1 else null end) as downvotes,
-  hot_rank(coalesce(sum(pl.score) , 0), p.published) as hot_rank
-  from post p
-  left join post_like pl on p.id = pl.post_id
-  group by p.id
-)
-
-select
-ap.*,
-u.id as user_id,
-coalesce(pl.score, 0) as my_vote,
-(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed,
-(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read,
-(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved
-from user_ u
-cross join all_post ap
-left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id
-
-union all
-
-select 
-ap.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from all_post ap
-with data
-;
-
-create unique index idx_post_view_unique on post_view (id, user_id); 
-create index idx_post_view_user_id on post_view (user_id);
-create index idx_post_view_hot_rank_published on post_view (hot_rank desc, published desc);
-create index idx_post_view_published on post_view (published desc);
-create index idx_post_view_score on post_view (score desc);
-
--- user_view
-drop view user_view;
-create materialized view user_view as 
-select id,
-name,
-avatar,
-email,
-fedi_name,
-admin,
-banned,
-show_avatars,
-send_notifications_to_email,
-published,
-(select count(*) from post p where p.creator_id = u.id) as number_of_posts,
-(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score,
-(select count(*) from comment c where c.creator_id = u.id) as number_of_comments,
-(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score
-from user_ u;
-
-create unique index idx_user_view_unique on user_view (id); 
-create index idx_user_view_comment_published on user_view (comment_score desc, published desc);
-create index idx_user_view_admin on user_view (admin);
-create index idx_user_view_banned on user_view (banned);
-
--- community
-drop view community_view;
-create materialized view community_view as 
-with all_community as
-(
-  select *,
-  (select name from user_ u where c.creator_id = u.id) as creator_name,
-  (select avatar from user_ u where c.creator_id = u.id) as creator_avatar,
-  (select name from category ct where c.category_id = ct.id) as category_name,
-  (select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers,
-  (select count(*) from post p where p.community_id = c.id) as number_of_posts,
-  (select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments,
-  hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank
-  from community c
-)
-
-select
-ac.*,
-u.id as user_id,
-(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed
-from user_ u
-cross join all_community ac
-
-union all
-
-select 
-ac.*,
-null as user_id,
-null as subscribed
-from all_community ac
-;
-
-create unique index idx_community_view_unique on community_view (id, user_id); 
-create index idx_community_view_user_id on community_view (user_id);
-create index idx_community_view_hot_rank_subscribed on community_view (hot_rank desc, number_of_subscribers desc);
-
-
--- reply and comment view
-drop view reply_view;
-drop view user_mention_view;
-drop view comment_view;
-create materialized view comment_view as
-with all_comment as
-(
-  select        
-  c.*,
-  (select community_id from post p where p.id = c.post_id),
-  (select u.banned from user_ u where c.creator_id = u.id) as banned,
-  (select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community,
-  (select name from user_ where c.creator_id = user_.id) as creator_name,
-  (select avatar from user_ where c.creator_id = user_.id) as creator_avatar,
-  coalesce(sum(cl.score), 0) as score,
-  count (case when cl.score = 1 then 1 else null end) as upvotes,
-  count (case when cl.score = -1 then 1 else null end) as downvotes
-  from comment c
-  left join comment_like cl on c.id = cl.comment_id
-  group by c.id
-)
-
-select
-ac.*,
-u.id as user_id,
-coalesce(cl.score, 0) as my_vote,
-(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved
-from user_ u
-cross join all_comment ac
-left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
-
-union all
-
-select 
-    ac.*,
-    null as user_id, 
-    null as my_vote,
-    null as saved
-from all_comment ac
-;
-
-create unique index idx_comment_view_unique on comment_view (id, user_id); 
-create index idx_comment_view_user_id on comment_view (user_id);
-create index idx_comment_view_creator_id on comment_view (creator_id);
-create index idx_comment_view_post_id on comment_view (post_id);
-create index idx_comment_view_score on comment_view (score desc);
-
-create view reply_view as 
-with closereply as (
-    select 
-    c2.id, 
-    c2.creator_id as sender_id, 
-    c.creator_id as recipient_id
-    from comment c
-    inner join comment c2 on c.id = c2.parent_id
-    where c2.creator_id != c.creator_id
-    -- Do union where post is null
-    union
-    select
-    c.id,
-    c.creator_id as sender_id,
-    p.creator_id as recipient_id
-    from comment c, post p
-    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
-)
-select cv.*,
-closereply.recipient_id
-from comment_view cv, closereply
-where closereply.id = cv.id
-;
-
--- user mention
-create view user_mention_view as
-select 
-    c.id,
-    um.id as user_mention_id,
-    c.creator_id,
-    c.post_id,
-    c.parent_id,
-    c.content,
-    c.removed,
-    um.read,
-    c.published,
-    c.updated,
-    c.deleted,
-    c.community_id,
-    c.banned,
-    c.banned_from_community,
-    c.creator_name,
-    c.creator_avatar,
-    c.score,
-    c.upvotes,
-    c.downvotes,
-    c.user_id,
-    c.my_vote,
-    c.saved,
-    um.recipient_id
-from user_mention um, comment_view c
-where um.comment_id = c.id;
-
--- user
-create or replace function refresh_user()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently comment_view; -- cause of bans
-  refresh materialized view concurrently post_view;
-  return null;
-end $$;
-
-create trigger refresh_user
-after insert or update or delete or truncate
-on user_
-for each statement
-execute procedure refresh_user();
-
--- post
-create or replace function refresh_post()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_view; 
-  return null;
-end $$;
-
-create trigger refresh_post
-after insert or update or delete or truncate
-on post
-for each statement
-execute procedure refresh_post();
-
--- post_like
-create or replace function refresh_post_like()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_view;
-  return null;
-end $$;
-
-create trigger refresh_post_like
-after insert or update or delete or truncate
-on post_like
-for each statement
-execute procedure refresh_post_like();
-
--- community
-create or replace function refresh_community()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_view;
-  refresh materialized view concurrently community_view; 
-  return null;
-end $$;
-
-create trigger refresh_community
-after insert or update or delete or truncate
-on community
-for each statement
-execute procedure refresh_community();
-
--- community_follower
-create or replace function refresh_community_follower()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently community_view;
-  refresh materialized view concurrently post_view;
-  return null;
-end $$;
-
-create trigger refresh_community_follower
-after insert or update or delete or truncate
-on community_follower
-for each statement
-execute procedure refresh_community_follower();
-
--- comment
-create or replace function refresh_comment()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently post_view;
-  refresh materialized view concurrently comment_view; 
-  return null;
-end $$;
-
-create trigger refresh_comment
-after insert or update or delete or truncate
-on comment
-for each statement
-execute procedure refresh_comment();
-
--- comment_like
-create or replace function refresh_comment_like()
-returns trigger language plpgsql
-as $$
-begin
-  refresh materialized view concurrently comment_view;
-  return null;
-end $$;
-
-create trigger refresh_comment_like
-after insert or update or delete or truncate
-on comment_like
-for each statement
-execute procedure refresh_comment_like();

server/query_testing/apache_bench_report.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e
-
-declare -a arr=(
-"https://mastodon.social/"
-"https://peertube.social/"
-"https://dev.lemmy.ml/"
-"https://dev.lemmy.ml/feeds/all.xml"
-"https://dev.lemmy.ml/.well-known/nodeinfo"
-"https://fediverse.blog/.well-known/nodeinfo"
-"https://torrents-csv.ml/service/search?q=wheel&page=1&type_=torrent"
-)
-
-## now loop through the above array
-for i in "${arr[@]}"
-do
-  ab -c 10 -t 10 "$i" > out.abtest
-  grep "Server Hostname:" out.abtest
-  grep "Document Path:" out.abtest
-  grep "Requests per second" out.abtest
-  grep "(mean, across all concurrent requests)" out.abtest
-  grep "Transfer rate:" out.abtest
-  echo "---"
-done
-
-rm *.abtest

server/query_testing/api_benchmark.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-set -e
-
-# By default, this script runs against `http://127.0.0.1:8536`, but you can pass a different Lemmy instance,
-# eg `./api_benchmark.sh "https://example.com"`.
-DOMAIN=${1:-"http://127.0.0.1:8536"}
-
-declare -a arr=(
-"/api/v1/site"
-"/api/v1/categories"
-"/api/v1/modlog"
-"/api/v1/search?q=test&type_=Posts&sort=Hot"
-"/api/v1/community"
-"/api/v1/community/list?sort=Hot"
-"/api/v1/post/list?sort=Hot&type_=All"
-)
-
-## now loop through the above array
-for path in "${arr[@]}"
-do
-  URL="$DOMAIN$path"
-  printf "\n\n\n"
-  echo "testing $URL"
-  curl --show-error --fail --silent "$URL" >/dev/null
-  ab -c 64 -t 10 "$URL" > out.abtest
-  grep "Server Hostname:" out.abtest
-  grep "Document Path:" out.abtest
-  grep "Requests per second" out.abtest
-  grep "(mean, across all concurrent requests)" out.abtest
-  grep "Transfer rate:" out.abtest
-  echo "---"
-done
-
-rm *.abtest

server/query_testing/generate_explain_reports.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-# Do the views first
-
-echo "explain (analyze, format json) select * from user_mview" > explain.sql
-psql -qAt -U lemmy -f explain.sql > user_view.json
-
-echo "explain (analyze, format json) select * from post_mview where user_id is null order by hot_rank desc, published desc" > explain.sql
-psql -qAt -U lemmy -f explain.sql > post_view.json
-
-echo "explain (analyze, format json) select * from comment_mview where user_id is null" > explain.sql
-psql -qAt -U lemmy -f explain.sql > comment_view.json
-
-echo "explain (analyze, format json) select * from community_mview where user_id is null order by hot_rank desc" > explain.sql
-psql -qAt -U lemmy -f explain.sql > community_view.json
-
-echo "explain (analyze, format json) select * from site_view limit 1" > explain.sql
-psql -qAt -U lemmy -f explain.sql > site_view.json
-
-grep "Execution Time" *.json
-
-rm explain.sql

server/src/api/comment.rs

@@ -1,13 +1,10 @@
 use super::*;
-use crate::send_email;
-use crate::settings::Settings;
-use diesel::PgConnection;
 
 #[derive(Serialize, Deserialize)]
 pub struct CreateComment {
   content: String,
   parent_id: Option<i32>,
-  edit_id: Option<i32>, // TODO this isn't used
+  edit_id: Option<i32>,
   pub post_id: i32,
   auth: String,
 }
@@ -15,7 +12,7 @@ pub struct CreateComment {
 #[derive(Serialize, Deserialize)]
 pub struct EditComment {
   content: String,
-  parent_id: Option<i32>, // TODO why are the parent_id, creator_id, post_id, etc fields required? They aren't going to change
+  parent_id: Option<i32>,
   edit_id: i32,
   creator_id: i32,
   pub post_id: i32,
@@ -35,6 +32,7 @@ pub struct SaveComment {
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct CommentResponse {
+  op: String,
   pub comment: CommentView,
 }
 
@@ -47,27 +45,26 @@ pub struct CreateCommentLike {
 }
 
 impl Perform<CommentResponse> for Oper<CreateComment> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> {
+  fn perform(&self) -> Result<CommentResponse, Error> {
     let data: &CreateComment = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
 
-    let hostname = &format!("https://{}", Settings::get().hostname);
-
     // Check for a community ban
     let post = Post::read(&conn, data.post_id)?;
     if CommunityUserBanView::get(&conn, user_id, post.community_id).is_ok() {
-      return Err(APIError::err("community_ban").into());
+      return Err(APIError::err(&self.op, "community_ban"))?;
     }
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     let content_slurs_removed = remove_slurs(&data.content.to_owned());
@@ -85,20 +82,24 @@ impl Perform<CommentResponse> for Oper<CreateComment> {
 
     let inserted_comment = match Comment::create(&conn, &comment_form) {
       Ok(comment) => comment,
-      Err(_e) => return Err(APIError::err("couldnt_create_comment").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_create_comment"))?,
     };
 
     // Scan the comment for user mentions, add those rows
     let extracted_usernames = extract_usernames(&comment_form.content);
 
     for username_mention in &extracted_usernames {
-      if let Ok(mention_user) = User_::read_from_name(&conn, (*username_mention).to_string()) {
+      let mention_user = User_::read_from_name(&conn, username_mention.to_string());
+
+      if mention_user.is_ok() {
+        let mention_user_id = mention_user?.id;
+
         // You can't mention yourself
         // At some point, make it so you can't tag the parent creator either
         // This can cause two notifications, one for reply and the other for mention
-        if mention_user.id != user_id {
+        if mention_user_id != user_id {
           let user_mention_form = UserMentionForm {
-            recipient_id: mention_user.id,
+            recipient_id: mention_user_id,
             comment_id: inserted_comment.id,
             read: None,
           };
@@ -108,79 +109,10 @@ impl Perform<CommentResponse> for Oper<CreateComment> {
           match UserMention::create(&conn, &user_mention_form) {
             Ok(_mention) => (),
             Err(_e) => eprintln!("{}", &_e),
-          };
-
-          // Send an email to those users that have notifications on
-          if mention_user.send_notifications_to_email {
-            if let Some(mention_email) = mention_user.email {
-              let subject = &format!(
-                "{} - Mentioned by {}",
-                Settings::get().hostname,
-                claims.username
-              );
-              let html = &format!(
-                "<h1>User Mention</h1><br><div>{} - {}</div><br><a href={}/inbox>inbox</a>",
-                claims.username, comment_form.content, hostname
-              );
-              match send_email(subject, &mention_email, &mention_user.name, html) {
-                Ok(_o) => _o,
-                Err(e) => eprintln!("{}", e),
-              };
           }
         }
       }
     }
-    }
-
-    // Send notifs to the parent commenter / poster
-    match data.parent_id {
-      Some(parent_id) => {
-        let parent_comment = Comment::read(&conn, parent_id)?;
-        if parent_comment.creator_id != user_id {
-          let parent_user = User_::read(&conn, parent_comment.creator_id)?;
-          if parent_user.send_notifications_to_email {
-            if let Some(comment_reply_email) = parent_user.email {
-              let subject = &format!(
-                "{} - Reply from {}",
-                Settings::get().hostname,
-                claims.username
-              );
-              let html = &format!(
-                "<h1>Comment Reply</h1><br><div>{} - {}</div><br><a href={}/inbox>inbox</a>",
-                claims.username, comment_form.content, hostname
-              );
-              match send_email(subject, &comment_reply_email, &parent_user.name, html) {
-                Ok(_o) => _o,
-                Err(e) => eprintln!("{}", e),
-              };
-            }
-          }
-        }
-      }
-      // Its a post
-      None => {
-        if post.creator_id != user_id {
-          let parent_user = User_::read(&conn, post.creator_id)?;
-          if parent_user.send_notifications_to_email {
-            if let Some(post_reply_email) = parent_user.email {
-              let subject = &format!(
-                "{} - Reply from {}",
-                Settings::get().hostname,
-                claims.username
-              );
-              let html = &format!(
-                "<h1>Post Reply</h1><br><div>{} - {}</div><br><a href={}/inbox>inbox</a>",
-                claims.username, comment_form.content, hostname
-              );
-              match send_email(subject, &post_reply_email, &parent_user.name, html) {
-                Ok(_o) => _o,
-                Err(e) => eprintln!("{}", e),
-              };
-            }
-          }
-        }
-      }
-    };
 
     // You like your own comment by default
     let like_form = CommentLikeForm {
@@ -192,24 +124,26 @@ impl Perform<CommentResponse> for Oper<CreateComment> {
 
     let _inserted_like = match CommentLike::like(&conn, &like_form) {
       Ok(like) => like,
-      Err(_e) => return Err(APIError::err("couldnt_like_comment").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_like_comment"))?,
     };
 
     let comment_view = CommentView::read(&conn, inserted_comment.id, Some(user_id))?;
 
     Ok(CommentResponse {
+      op: self.op.to_string(),
       comment: comment_view,
     })
   }
 }
 
 impl Perform<CommentResponse> for Oper<EditComment> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> {
+  fn perform(&self) -> Result<CommentResponse, Error> {
     let data: &EditComment = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -229,17 +163,17 @@ impl Perform<CommentResponse> for Oper<EditComment> {
       editors.append(&mut UserView::admins(&conn)?.into_iter().map(|a| a.id).collect());
 
       if !editors.contains(&user_id) {
-        return Err(APIError::err("no_comment_edit_allowed").into());
+        return Err(APIError::err(&self.op, "no_comment_edit_allowed"))?;
       }
 
       // Check for a community ban
       if CommunityUserBanView::get(&conn, user_id, orig_comment.community_id).is_ok() {
-        return Err(APIError::err("community_ban").into());
+        return Err(APIError::err(&self.op, "community_ban"))?;
       }
 
       // Check for a site ban
       if UserView::read(&conn, user_id)?.banned {
-        return Err(APIError::err("site_ban").into());
+        return Err(APIError::err(&self.op, "site_ban"))?;
       }
     }
 
@@ -262,14 +196,14 @@ impl Perform<CommentResponse> for Oper<EditComment> {
 
     let _updated_comment = match Comment::update(&conn, data.edit_id, &comment_form) {
       Ok(comment) => comment,
-      Err(_e) => return Err(APIError::err("couldnt_update_comment").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_comment"))?,
     };
 
     // Scan the comment for user mentions, add those rows
     let extracted_usernames = extract_usernames(&comment_form.content);
 
     for username_mention in &extracted_usernames {
-      let mention_user = User_::read_from_name(&conn, (*username_mention).to_string());
+      let mention_user = User_::read_from_name(&conn, username_mention.to_string());
 
       if mention_user.is_ok() {
         let mention_user_id = mention_user?.id;
@@ -308,18 +242,20 @@ impl Perform<CommentResponse> for Oper<EditComment> {
     let comment_view = CommentView::read(&conn, data.edit_id, Some(user_id))?;
 
     Ok(CommentResponse {
+      op: self.op.to_string(),
       comment: comment_view,
     })
   }
 }
 
 impl Perform<CommentResponse> for Oper<SaveComment> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> {
+  fn perform(&self) -> Result<CommentResponse, Error> {
     let data: &SaveComment = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -332,30 +268,32 @@ impl Perform<CommentResponse> for Oper<SaveComment> {
     if data.save {
       match CommentSaved::save(&conn, &comment_saved_form) {
         Ok(comment) => comment,
-        Err(_e) => return Err(APIError::err("couldnt_save_comment").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_save_comment"))?,
       };
     } else {
       match CommentSaved::unsave(&conn, &comment_saved_form) {
         Ok(comment) => comment,
-        Err(_e) => return Err(APIError::err("couldnt_save_comment").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_save_comment"))?,
       };
     }
 
     let comment_view = CommentView::read(&conn, data.comment_id, Some(user_id))?;
 
     Ok(CommentResponse {
+      op: self.op.to_string(),
       comment: comment_view,
     })
   }
 }
 
 impl Perform<CommentResponse> for Oper<CreateCommentLike> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommentResponse, Error> {
+  fn perform(&self) -> Result<CommentResponse, Error> {
     let data: &CreateCommentLike = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -363,20 +301,20 @@ impl Perform<CommentResponse> for Oper<CreateCommentLike> {
     // Don't do a downvote if site has downvotes disabled
     if data.score == -1 {
       let site = SiteView::read(&conn)?;
-      if !site.enable_downvotes {
-        return Err(APIError::err("downvotes_disabled").into());
+      if site.enable_downvotes == false {
+        return Err(APIError::err(&self.op, "downvotes_disabled"))?;
       }
     }
 
     // Check for a community ban
     let post = Post::read(&conn, data.post_id)?;
     if CommunityUserBanView::get(&conn, user_id, post.community_id).is_ok() {
-      return Err(APIError::err("community_ban").into());
+      return Err(APIError::err(&self.op, "community_ban"))?;
     }
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     let like_form = CommentLikeForm {
@@ -390,11 +328,11 @@ impl Perform<CommentResponse> for Oper<CreateCommentLike> {
     CommentLike::remove(&conn, &like_form)?;
 
     // Only add the like if the score isnt 0
-    let do_add = like_form.score != 0 && (like_form.score == 1 || like_form.score == -1);
+    let do_add = &like_form.score != &0 && (&like_form.score == &1 || &like_form.score == &-1);
     if do_add {
       let _inserted_like = match CommentLike::like(&conn, &like_form) {
         Ok(like) => like,
-        Err(_e) => return Err(APIError::err("couldnt_like_comment").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_like_comment"))?,
       };
     }
 
@@ -402,6 +340,7 @@ impl Perform<CommentResponse> for Oper<CreateCommentLike> {
     let liked_comment = CommentView::read(&conn, data.comment_id, Some(user_id))?;
 
     Ok(CommentResponse {
+      op: self.op.to_string(),
       comment: liked_comment,
     })
   }

server/src/api/community.rs

@@ -1,5 +1,4 @@
 use super::*;
-use diesel::PgConnection;
 use std::str::FromStr;
 
 #[derive(Serialize, Deserialize)]
@@ -11,6 +10,7 @@ pub struct GetCommunity {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetCommunityResponse {
+  op: String,
   community: CommunityView,
   moderators: Vec<CommunityModeratorView>,
   admins: Vec<UserView>,
@@ -28,6 +28,7 @@ pub struct CreateCommunity {
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct CommunityResponse {
+  op: String,
   pub community: CommunityView,
 }
 
@@ -41,6 +42,7 @@ pub struct ListCommunities {
 
 #[derive(Serialize, Deserialize)]
 pub struct ListCommunitiesResponse {
+  op: String,
   communities: Vec<CommunityView>,
 }
 
@@ -56,6 +58,7 @@ pub struct BanFromCommunity {
 
 #[derive(Serialize, Deserialize)]
 pub struct BanFromCommunityResponse {
+  op: String,
   user: UserView,
   banned: bool,
 }
@@ -70,6 +73,7 @@ pub struct AddModToCommunity {
 
 #[derive(Serialize, Deserialize)]
 pub struct AddModToCommunityResponse {
+  op: String,
   moderators: Vec<CommunityModeratorView>,
 }
 
@@ -102,6 +106,7 @@ pub struct GetFollowedCommunities {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetFollowedCommunitiesResponse {
+  op: String,
   communities: Vec<CommunityFollowerView>,
 }
 
@@ -113,8 +118,9 @@ pub struct TransferCommunity {
 }
 
 impl Perform<GetCommunityResponse> for Oper<GetCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetCommunityResponse, Error> {
+  fn perform(&self) -> Result<GetCommunityResponse, Error> {
     let data: &GetCommunity = &self.data;
+    let conn = establish_connection();
 
     let user_id: Option<i32> = match &data.auth {
       Some(auth) => match Claims::decode(&auth) {
@@ -130,24 +136,21 @@ impl Perform<GetCommunityResponse> for Oper<GetCommunity> {
     let community_id = match data.id {
       Some(id) => id,
       None => {
-        match Community::read_from_name(
-          &conn,
-          data.name.to_owned().unwrap_or_else(|| "main".to_string()),
-        ) {
+        match Community::read_from_name(&conn, data.name.to_owned().unwrap_or("main".to_string())) {
           Ok(community) => community.id,
-          Err(_e) => return Err(APIError::err("couldnt_find_community").into()),
+          Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_community"))?,
         }
       }
     };
 
     let community_view = match CommunityView::read(&conn, community_id, user_id) {
       Ok(community) => community,
-      Err(_e) => return Err(APIError::err("couldnt_find_community").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_community"))?,
     };
 
     let moderators = match CommunityModeratorView::for_community(&conn, community_id) {
       Ok(moderators) => moderators,
-      Err(_e) => return Err(APIError::err("couldnt_find_community").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_community"))?,
     };
 
     let site_creator_id = Site::read(&conn, 1)?.creator_id;
@@ -158,6 +161,7 @@ impl Perform<GetCommunityResponse> for Oper<GetCommunity> {
 
     // Return the jwt
     Ok(GetCommunityResponse {
+      op: self.op.to_string(),
       community: community_view,
       moderators,
       admins,
@@ -166,26 +170,27 @@ impl Perform<GetCommunityResponse> for Oper<GetCommunity> {
 }
 
 impl Perform<CommunityResponse> for Oper<CreateCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> {
+  fn perform(&self) -> Result<CommunityResponse, Error> {
     let data: &CreateCommunity = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     if has_slurs(&data.name)
       || has_slurs(&data.title)
       || (data.description.is_some() && has_slurs(&data.description.to_owned().unwrap()))
     {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
     let user_id = claims.id;
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     // When you create a community, make sure the user becomes a moderator and a follower
@@ -203,7 +208,7 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> {
 
     let inserted_community = match Community::create(&conn, &community_form) {
       Ok(community) => community,
-      Err(_e) => return Err(APIError::err("community_already_exists").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "community_already_exists"))?,
     };
 
     let community_moderator_form = CommunityModeratorForm {
@@ -214,7 +219,12 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> {
     let _inserted_community_moderator =
       match CommunityModerator::join(&conn, &community_moderator_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_moderator_already_exists").into()),
+        Err(_e) => {
+          return Err(APIError::err(
+            &self.op,
+            "community_moderator_already_exists",
+          ))?
+        }
       };
 
     let community_follower_form = CommunityFollowerForm {
@@ -225,35 +235,38 @@ impl Perform<CommunityResponse> for Oper<CreateCommunity> {
     let _inserted_community_follower =
       match CommunityFollower::follow(&conn, &community_follower_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "community_follower_already_exists"))?,
       };
 
     let community_view = CommunityView::read(&conn, inserted_community.id, Some(user_id))?;
 
     Ok(CommunityResponse {
+      op: self.op.to_string(),
       community: community_view,
     })
   }
 }
 
 impl Perform<CommunityResponse> for Oper<EditCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> {
+  fn perform(&self) -> Result<CommunityResponse, Error> {
     let data: &EditCommunity = &self.data;
 
     if has_slurs(&data.name) || has_slurs(&data.title) {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
+    let conn = establish_connection();
+
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     // Verify its a mod
@@ -266,7 +279,7 @@ impl Perform<CommunityResponse> for Oper<EditCommunity> {
     );
     editors.append(&mut UserView::admins(&conn)?.into_iter().map(|a| a.id).collect());
     if !editors.contains(&user_id) {
-      return Err(APIError::err("no_community_edit_allowed").into());
+      return Err(APIError::err(&self.op, "no_community_edit_allowed"))?;
     }
 
     let community_form = CommunityForm {
@@ -283,7 +296,7 @@ impl Perform<CommunityResponse> for Oper<EditCommunity> {
 
     let _updated_community = match Community::update(&conn, data.edit_id, &community_form) {
       Ok(community) => community,
-      Err(_e) => return Err(APIError::err("couldnt_update_community").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_community"))?,
     };
 
     // Mod tables
@@ -305,14 +318,16 @@ impl Perform<CommunityResponse> for Oper<EditCommunity> {
     let community_view = CommunityView::read(&conn, data.edit_id, Some(user_id))?;
 
     Ok(CommunityResponse {
+      op: self.op.to_string(),
       community: community_view,
     })
   }
 }
 
 impl Perform<ListCommunitiesResponse> for Oper<ListCommunities> {
-  fn perform(&self, conn: &PgConnection) -> Result<ListCommunitiesResponse, Error> {
+  fn perform(&self) -> Result<ListCommunitiesResponse, Error> {
     let data: &ListCommunities = &self.data;
+    let conn = establish_connection();
 
     let user_claims: Option<Claims> = match &data.auth {
       Some(auth) => match Claims::decode(&auth) {
@@ -336,24 +351,28 @@ impl Perform<ListCommunitiesResponse> for Oper<ListCommunities> {
 
     let communities = CommunityQueryBuilder::create(&conn)
       .sort(&sort)
-      .for_user(user_id)
+      .from_user_id(user_id)
       .show_nsfw(show_nsfw)
       .page(data.page)
       .limit(data.limit)
       .list()?;
 
     // Return the jwt
-    Ok(ListCommunitiesResponse { communities })
+    Ok(ListCommunitiesResponse {
+      op: self.op.to_string(),
+      communities,
+    })
   }
 }
 
 impl Perform<CommunityResponse> for Oper<FollowCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<CommunityResponse, Error> {
+  fn perform(&self) -> Result<CommunityResponse, Error> {
     let data: &FollowCommunity = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -366,30 +385,32 @@ impl Perform<CommunityResponse> for Oper<FollowCommunity> {
     if data.follow {
       match CommunityFollower::follow(&conn, &community_follower_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "community_follower_already_exists"))?,
       };
     } else {
       match CommunityFollower::ignore(&conn, &community_follower_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "community_follower_already_exists"))?,
       };
     }
 
     let community_view = CommunityView::read(&conn, data.community_id, Some(user_id))?;
 
     Ok(CommunityResponse {
+      op: self.op.to_string(),
       community: community_view,
     })
   }
 }
 
 impl Perform<GetFollowedCommunitiesResponse> for Oper<GetFollowedCommunities> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetFollowedCommunitiesResponse, Error> {
+  fn perform(&self) -> Result<GetFollowedCommunitiesResponse, Error> {
     let data: &GetFollowedCommunities = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -397,21 +418,25 @@ impl Perform<GetFollowedCommunitiesResponse> for Oper<GetFollowedCommunities> {
     let communities: Vec<CommunityFollowerView> =
       match CommunityFollowerView::for_user(&conn, user_id) {
         Ok(communities) => communities,
-        Err(_e) => return Err(APIError::err("system_err_login").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "system_err_login"))?,
       };
 
     // Return the jwt
-    Ok(GetFollowedCommunitiesResponse { communities })
+    Ok(GetFollowedCommunitiesResponse {
+      op: self.op.to_string(),
+      communities,
+    })
   }
 }
 
 impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<BanFromCommunityResponse, Error> {
+  fn perform(&self) -> Result<BanFromCommunityResponse, Error> {
     let data: &BanFromCommunity = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -424,12 +449,12 @@ impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> {
     if data.ban {
       match CommunityUserBan::ban(&conn, &community_user_ban_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_user_already_banned").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "community_user_already_banned"))?,
       };
     } else {
       match CommunityUserBan::unban(&conn, &community_user_ban_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_user_already_banned").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "community_user_already_banned"))?,
       };
     }
 
@@ -452,6 +477,7 @@ impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> {
     let user_view = UserView::read(&conn, data.user_id)?;
 
     Ok(BanFromCommunityResponse {
+      op: self.op.to_string(),
       user: user_view,
       banned: data.ban,
     })
@@ -459,12 +485,13 @@ impl Perform<BanFromCommunityResponse> for Oper<BanFromCommunity> {
 }
 
 impl Perform<AddModToCommunityResponse> for Oper<AddModToCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<AddModToCommunityResponse, Error> {
+  fn perform(&self) -> Result<AddModToCommunityResponse, Error> {
     let data: &AddModToCommunity = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -477,12 +504,22 @@ impl Perform<AddModToCommunityResponse> for Oper<AddModToCommunity> {
     if data.added {
       match CommunityModerator::join(&conn, &community_moderator_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_moderator_already_exists").into()),
+        Err(_e) => {
+          return Err(APIError::err(
+            &self.op,
+            "community_moderator_already_exists",
+          ))?
+        }
       };
     } else {
       match CommunityModerator::leave(&conn, &community_moderator_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_moderator_already_exists").into()),
+        Err(_e) => {
+          return Err(APIError::err(
+            &self.op,
+            "community_moderator_already_exists",
+          ))?
+        }
       };
     }
 
@@ -497,17 +534,21 @@ impl Perform<AddModToCommunityResponse> for Oper<AddModToCommunity> {
 
     let moderators = CommunityModeratorView::for_community(&conn, data.community_id)?;
 
-    Ok(AddModToCommunityResponse { moderators })
+    Ok(AddModToCommunityResponse {
+      op: self.op.to_string(),
+      moderators,
+    })
   }
 }
 
 impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetCommunityResponse, Error> {
+  fn perform(&self) -> Result<GetCommunityResponse, Error> {
     let data: &TransferCommunity = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -521,8 +562,14 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
     admins.insert(0, creator_user);
 
     // Make sure user is the creator, or an admin
-    if user_id != read_community.creator_id && !admins.iter().map(|a| a.id).any(|x| x == user_id) {
-      return Err(APIError::err("not_an_admin").into());
+    if user_id != read_community.creator_id
+      && !admins
+        .iter()
+        .map(|a| a.id)
+        .collect::<Vec<i32>>()
+        .contains(&user_id)
+    {
+      return Err(APIError::err(&self.op, "not_an_admin"))?;
     }
 
     let community_form = CommunityForm {
@@ -539,7 +586,7 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
 
     let _updated_community = match Community::update(&conn, data.community_id, &community_form) {
       Ok(community) => community,
-      Err(_e) => return Err(APIError::err("couldnt_update_community").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_community"))?,
     };
 
     // You also have to re-do the community_moderator table, reordering it.
@@ -562,7 +609,12 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
       let _inserted_community_moderator =
         match CommunityModerator::join(&conn, &community_moderator_form) {
           Ok(user) => user,
-          Err(_e) => return Err(APIError::err("community_moderator_already_exists").into()),
+          Err(_e) => {
+            return Err(APIError::err(
+              &self.op,
+              "community_moderator_already_exists",
+            ))?
+          }
         };
     }
 
@@ -577,16 +629,17 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
 
     let community_view = match CommunityView::read(&conn, data.community_id, Some(user_id)) {
       Ok(community) => community,
-      Err(_e) => return Err(APIError::err("couldnt_find_community").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_community"))?,
     };
 
     let moderators = match CommunityModeratorView::for_community(&conn, data.community_id) {
       Ok(moderators) => moderators,
-      Err(_e) => return Err(APIError::err("couldnt_find_community").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_community"))?,
     };
 
     // Return the jwt
     Ok(GetCommunityResponse {
+      op: self.op.to_string(),
       community: community_view,
       moderators,
       admins,

server/src/api/mod.rs

@@ -8,8 +8,6 @@ use crate::db::moderator_views::*;
 use crate::db::password_reset_request::*;
 use crate::db::post::*;
 use crate::db::post_view::*;
-use crate::db::private_message::*;
-use crate::db::private_message_view::*;
 use crate::db::site::*;
 use crate::db::site_view::*;
 use crate::db::user::*;
@@ -17,8 +15,7 @@ use crate::db::user_mention::*;
 use crate::db::user_mention_view::*;
 use crate::db::user_view::*;
 use crate::db::*;
-use crate::{extract_usernames, has_slurs, naive_from_unix, naive_now, remove_slurs};
-use diesel::PgConnection;
+use crate::{extract_usernames, has_slurs, naive_from_unix, naive_now, remove_slurs, Settings};
 use failure::Error;
 use serde::{Deserialize, Serialize};
 
@@ -28,32 +25,78 @@ pub mod post;
 pub mod site;
 pub mod user;
 
+#[derive(EnumString, ToString, Debug)]
+pub enum UserOperation {
+  Login,
+  Register,
+  CreateCommunity,
+  CreatePost,
+  ListCommunities,
+  ListCategories,
+  GetPost,
+  GetCommunity,
+  CreateComment,
+  EditComment,
+  SaveComment,
+  CreateCommentLike,
+  GetPosts,
+  CreatePostLike,
+  EditPost,
+  SavePost,
+  EditCommunity,
+  FollowCommunity,
+  GetFollowedCommunities,
+  GetUserDetails,
+  GetReplies,
+  GetUserMentions,
+  EditUserMention,
+  GetModlog,
+  BanFromCommunity,
+  AddModToCommunity,
+  CreateSite,
+  EditSite,
+  GetSite,
+  AddAdmin,
+  BanUser,
+  Search,
+  MarkAllAsRead,
+  SaveUserSettings,
+  TransferCommunity,
+  TransferSite,
+  DeleteAccount,
+  PasswordReset,
+  PasswordChange,
+}
+
 #[derive(Fail, Debug)]
-#[fail(display = "{{\"error\":\"{}\"}}", message)]
+#[fail(display = "{{\"op\":\"{}\", \"error\":\"{}\"}}", op, message)]
 pub struct APIError {
+  pub op: String,
   pub message: String,
 }
 
 impl APIError {
-  pub fn err(msg: &str) -> Self {
+  pub fn err(op: &UserOperation, msg: &str) -> Self {
     APIError {
+      op: op.to_string(),
       message: msg.to_string(),
     }
   }
 }
 
 pub struct Oper<T> {
+  op: UserOperation,
   data: T,
 }
 
 impl<T> Oper<T> {
-  pub fn new(data: T) -> Oper<T> {
-    Oper { data }
+  pub fn new(op: UserOperation, data: T) -> Oper<T> {
+    Oper { op, data }
   }
 }
 
 pub trait Perform<T> {
-  fn perform(&self, conn: &PgConnection) -> Result<T, Error>
+  fn perform(&self) -> Result<T, Error>
   where
     T: Sized;
 }

server/src/api/post.rs

@@ -1,5 +1,4 @@
 use super::*;
-use diesel::PgConnection;
 use std::str::FromStr;
 
 #[derive(Serialize, Deserialize)]
@@ -14,6 +13,7 @@ pub struct CreatePost {
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct PostResponse {
+  op: String,
   pub post: PostView,
 }
 
@@ -25,6 +25,7 @@ pub struct GetPost {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetPostResponse {
+  op: String,
   post: PostView,
   comments: Vec<CommentView>,
   community: CommunityView,
@@ -44,6 +45,7 @@ pub struct GetPosts {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetPostsResponse {
+  op: String,
   posts: Vec<PostView>,
 }
 
@@ -56,6 +58,7 @@ pub struct CreatePostLike {
 
 #[derive(Serialize, Deserialize)]
 pub struct CreatePostLikeResponse {
+  op: String,
   post: PostView,
 }
 
@@ -84,28 +87,29 @@ pub struct SavePost {
 }
 
 impl Perform<PostResponse> for Oper<CreatePost> {
-  fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> {
+  fn perform(&self) -> Result<PostResponse, Error> {
     let data: &CreatePost = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     if has_slurs(&data.name) || (data.body.is_some() && has_slurs(&data.body.to_owned().unwrap())) {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
     let user_id = claims.id;
 
     // Check for a community ban
     if CommunityUserBanView::get(&conn, user_id, data.community_id).is_ok() {
-      return Err(APIError::err("community_ban").into());
+      return Err(APIError::err(&self.op, "community_ban"))?;
     }
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     let post_form = PostForm {
@@ -124,7 +128,7 @@ impl Perform<PostResponse> for Oper<CreatePost> {
 
     let inserted_post = match Post::create(&conn, &post_form) {
       Ok(post) => post,
-      Err(_e) => return Err(APIError::err("couldnt_create_post").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_create_post"))?,
     };
 
     // They like their own post by default
@@ -137,22 +141,26 @@ impl Perform<PostResponse> for Oper<CreatePost> {
     // Only add the like if the score isnt 0
     let _inserted_like = match PostLike::like(&conn, &like_form) {
       Ok(like) => like,
-      Err(_e) => return Err(APIError::err("couldnt_like_post").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_like_post"))?,
     };
 
     // Refetch the view
     let post_view = match PostView::read(&conn, inserted_post.id, Some(user_id)) {
       Ok(post) => post,
-      Err(_e) => return Err(APIError::err("couldnt_find_post").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_post"))?,
     };
 
-    Ok(PostResponse { post: post_view })
+    Ok(PostResponse {
+      op: self.op.to_string(),
+      post: post_view,
+    })
   }
 }
 
 impl Perform<GetPostResponse> for Oper<GetPost> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetPostResponse, Error> {
+  fn perform(&self) -> Result<GetPostResponse, Error> {
     let data: &GetPost = &self.data;
+    let conn = establish_connection();
 
     let user_id: Option<i32> = match &data.auth {
       Some(auth) => match Claims::decode(&auth) {
@@ -167,7 +175,7 @@ impl Perform<GetPostResponse> for Oper<GetPost> {
 
     let post_view = match PostView::read(&conn, data.id, user_id) {
       Ok(post) => post,
-      Err(_e) => return Err(APIError::err("couldnt_find_post").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_post"))?,
     };
 
     let comments = CommentQueryBuilder::create(&conn)
@@ -188,6 +196,7 @@ impl Perform<GetPostResponse> for Oper<GetPost> {
 
     // Return the jwt
     Ok(GetPostResponse {
+      op: self.op.to_string(),
       post: post_view,
       comments,
       community,
@@ -198,8 +207,9 @@ impl Perform<GetPostResponse> for Oper<GetPost> {
 }
 
 impl Perform<GetPostsResponse> for Oper<GetPosts> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetPostsResponse, Error> {
+  fn perform(&self) -> Result<GetPostsResponse, Error> {
     let data: &GetPosts = &self.data;
+    let conn = establish_connection();
 
     let user_claims: Option<Claims> = match &data.auth {
       Some(auth) => match Claims::decode(&auth) {
@@ -233,20 +243,24 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> {
       .list()
     {
       Ok(posts) => posts,
-      Err(_e) => return Err(APIError::err("couldnt_get_posts").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_get_posts"))?,
     };
 
-    Ok(GetPostsResponse { posts })
+    Ok(GetPostsResponse {
+      op: self.op.to_string(),
+      posts,
+    })
   }
 }
 
 impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> {
-  fn perform(&self, conn: &PgConnection) -> Result<CreatePostLikeResponse, Error> {
+  fn perform(&self) -> Result<CreatePostLikeResponse, Error> {
     let data: &CreatePostLike = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -254,20 +268,20 @@ impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> {
     // Don't do a downvote if site has downvotes disabled
     if data.score == -1 {
       let site = SiteView::read(&conn)?;
-      if !site.enable_downvotes {
-        return Err(APIError::err("downvotes_disabled").into());
+      if site.enable_downvotes == false {
+        return Err(APIError::err(&self.op, "downvotes_disabled"))?;
       }
     }
 
     // Check for a community ban
     let post = Post::read(&conn, data.post_id)?;
     if CommunityUserBanView::get(&conn, user_id, post.community_id).is_ok() {
-      return Err(APIError::err("community_ban").into());
+      return Err(APIError::err(&self.op, "community_ban"))?;
     }
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     let like_form = PostLikeForm {
@@ -280,34 +294,39 @@ impl Perform<CreatePostLikeResponse> for Oper<CreatePostLike> {
     PostLike::remove(&conn, &like_form)?;
 
     // Only add the like if the score isnt 0
-    let do_add = like_form.score != 0 && (like_form.score == 1 || like_form.score == -1);
+    let do_add = &like_form.score != &0 && (&like_form.score == &1 || &like_form.score == &-1);
     if do_add {
       let _inserted_like = match PostLike::like(&conn, &like_form) {
         Ok(like) => like,
-        Err(_e) => return Err(APIError::err("couldnt_like_post").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_like_post"))?,
       };
     }
 
     let post_view = match PostView::read(&conn, data.post_id, Some(user_id)) {
       Ok(post) => post,
-      Err(_e) => return Err(APIError::err("couldnt_find_post").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_post"))?,
     };
 
     // just output the score
-    Ok(CreatePostLikeResponse { post: post_view })
+    Ok(CreatePostLikeResponse {
+      op: self.op.to_string(),
+      post: post_view,
+    })
   }
 }
 
 impl Perform<PostResponse> for Oper<EditPost> {
-  fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> {
+  fn perform(&self) -> Result<PostResponse, Error> {
     let data: &EditPost = &self.data;
     if has_slurs(&data.name) || (data.body.is_some() && has_slurs(&data.body.to_owned().unwrap())) {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
+    let conn = establish_connection();
+
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -322,17 +341,17 @@ impl Perform<PostResponse> for Oper<EditPost> {
     );
     editors.append(&mut UserView::admins(&conn)?.into_iter().map(|a| a.id).collect());
     if !editors.contains(&user_id) {
-      return Err(APIError::err("no_post_edit_allowed").into());
+      return Err(APIError::err(&self.op, "no_post_edit_allowed"))?;
     }
 
     // Check for a community ban
     if CommunityUserBanView::get(&conn, user_id, data.community_id).is_ok() {
-      return Err(APIError::err("community_ban").into());
+      return Err(APIError::err(&self.op, "community_ban"))?;
     }
 
     // Check for a site ban
     if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
+      return Err(APIError::err(&self.op, "site_ban"))?;
     }
 
     let post_form = PostForm {
@@ -351,7 +370,7 @@ impl Perform<PostResponse> for Oper<EditPost> {
 
     let _updated_post = match Post::update(&conn, data.edit_id, &post_form) {
       Ok(post) => post,
-      Err(_e) => return Err(APIError::err("couldnt_update_post").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_post"))?,
     };
 
     // Mod tables
@@ -385,17 +404,21 @@ impl Perform<PostResponse> for Oper<EditPost> {
 
     let post_view = PostView::read(&conn, data.edit_id, Some(user_id))?;
 
-    Ok(PostResponse { post: post_view })
+    Ok(PostResponse {
+      op: self.op.to_string(),
+      post: post_view,
+    })
   }
 }
 
 impl Perform<PostResponse> for Oper<SavePost> {
-  fn perform(&self, conn: &PgConnection) -> Result<PostResponse, Error> {
+  fn perform(&self) -> Result<PostResponse, Error> {
     let data: &SavePost = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -408,17 +431,20 @@ impl Perform<PostResponse> for Oper<SavePost> {
     if data.save {
       match PostSaved::save(&conn, &post_saved_form) {
         Ok(post) => post,
-        Err(_e) => return Err(APIError::err("couldnt_save_post").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_save_post"))?,
       };
     } else {
       match PostSaved::unsave(&conn, &post_saved_form) {
         Ok(post) => post,
-        Err(_e) => return Err(APIError::err("couldnt_save_post").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_save_post"))?,
       };
     }
 
     let post_view = PostView::read(&conn, data.post_id, Some(user_id))?;
 
-    Ok(PostResponse { post: post_view })
+    Ok(PostResponse {
+      op: self.op.to_string(),
+      post: post_view,
+    })
   }
 }

server/src/api/site.rs

@@ -1,12 +1,12 @@
 use super::*;
-use diesel::PgConnection;
 use std::str::FromStr;
 
 #[derive(Serialize, Deserialize)]
-pub struct ListCategories {}
+pub struct ListCategories;
 
 #[derive(Serialize, Deserialize)]
 pub struct ListCategoriesResponse {
+  op: String,
   categories: Vec<Category>,
 }
 
@@ -18,11 +18,11 @@ pub struct Search {
   sort: String,
   page: Option<i64>,
   limit: Option<i64>,
-  auth: Option<String>,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct SearchResponse {
+  op: String,
   type_: String,
   comments: Vec<CommentView>,
   posts: Vec<PostView>,
@@ -40,6 +40,7 @@ pub struct GetModlog {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetModlogResponse {
+  op: String,
   removed_posts: Vec<ModRemovePostView>,
   locked_posts: Vec<ModLockPostView>,
   stickied_posts: Vec<ModStickyPostView>,
@@ -72,15 +73,17 @@ pub struct EditSite {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct GetSite {}
+pub struct GetSite;
 
 #[derive(Serialize, Deserialize)]
 pub struct SiteResponse {
+  op: String,
   site: SiteView,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct GetSiteResponse {
+  op: String,
   site: Option<SiteView>,
   admins: Vec<UserView>,
   banned: Vec<UserView>,
@@ -94,19 +97,24 @@ pub struct TransferSite {
 }
 
 impl Perform<ListCategoriesResponse> for Oper<ListCategories> {
-  fn perform(&self, conn: &PgConnection) -> Result<ListCategoriesResponse, Error> {
+  fn perform(&self) -> Result<ListCategoriesResponse, Error> {
     let _data: &ListCategories = &self.data;
+    let conn = establish_connection();
 
     let categories: Vec<Category> = Category::list_all(&conn)?;
 
     // Return the jwt
-    Ok(ListCategoriesResponse { categories })
+    Ok(ListCategoriesResponse {
+      op: self.op.to_string(),
+      categories,
+    })
   }
 }
 
 impl Perform<GetModlogResponse> for Oper<GetModlog> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetModlogResponse, Error> {
+  fn perform(&self) -> Result<GetModlogResponse, Error> {
     let data: &GetModlog = &self.data;
+    let conn = establish_connection();
 
     let removed_posts = ModRemovePostView::list(
       &conn,
@@ -152,18 +160,20 @@ impl Perform<GetModlogResponse> for Oper<GetModlog> {
     )?;
 
     // These arrays are only for the full modlog, when a community isn't given
-    let (removed_communities, banned, added) = if data.community_id.is_none() {
-      (
-        ModRemoveCommunityView::list(&conn, data.mod_user_id, data.page, data.limit)?,
-        ModBanView::list(&conn, data.mod_user_id, data.page, data.limit)?,
-        ModAddView::list(&conn, data.mod_user_id, data.page, data.limit)?,
-      )
-    } else {
-      (Vec::new(), Vec::new(), Vec::new())
-    };
+    let mut removed_communities = Vec::new();
+    let mut banned = Vec::new();
+    let mut added = Vec::new();
+
+    if data.community_id.is_none() {
+      removed_communities =
+        ModRemoveCommunityView::list(&conn, data.mod_user_id, data.page, data.limit)?;
+      banned = ModBanView::list(&conn, data.mod_user_id, data.page, data.limit)?;
+      added = ModAddView::list(&conn, data.mod_user_id, data.page, data.limit)?;
+    }
 
     // Return the jwt
     Ok(GetModlogResponse {
+      op: self.op.to_string(),
       removed_posts,
       locked_posts,
       stickied_posts,
@@ -178,25 +188,26 @@ impl Perform<GetModlogResponse> for Oper<GetModlog> {
 }
 
 impl Perform<SiteResponse> for Oper<CreateSite> {
-  fn perform(&self, conn: &PgConnection) -> Result<SiteResponse, Error> {
+  fn perform(&self) -> Result<SiteResponse, Error> {
     let data: &CreateSite = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     if has_slurs(&data.name)
       || (data.description.is_some() && has_slurs(&data.description.to_owned().unwrap()))
     {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
     let user_id = claims.id;
 
     // Make sure user is an admin
     if !UserView::read(&conn, user_id)?.admin {
-      return Err(APIError::err("not_an_admin").into());
+      return Err(APIError::err(&self.op, "not_an_admin"))?;
     }
 
     let site_form = SiteForm {
@@ -211,35 +222,39 @@ impl Perform<SiteResponse> for Oper<CreateSite> {
 
     match Site::create(&conn, &site_form) {
       Ok(site) => site,
-      Err(_e) => return Err(APIError::err("site_already_exists").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "site_already_exists"))?,
     };
 
     let site_view = SiteView::read(&conn)?;
 
-    Ok(SiteResponse { site: site_view })
+    Ok(SiteResponse {
+      op: self.op.to_string(),
+      site: site_view,
+    })
   }
 }
 
 impl Perform<SiteResponse> for Oper<EditSite> {
-  fn perform(&self, conn: &PgConnection) -> Result<SiteResponse, Error> {
+  fn perform(&self) -> Result<SiteResponse, Error> {
     let data: &EditSite = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     if has_slurs(&data.name)
       || (data.description.is_some() && has_slurs(&data.description.to_owned().unwrap()))
     {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
     let user_id = claims.id;
 
     // Make sure user is an admin
-    if !UserView::read(&conn, user_id)?.admin {
-      return Err(APIError::err("not_an_admin").into());
+    if UserView::read(&conn, user_id)?.admin == false {
+      return Err(APIError::err(&self.op, "not_an_admin"))?;
     }
 
     let found_site = Site::read(&conn, 1)?;
@@ -256,18 +271,22 @@ impl Perform<SiteResponse> for Oper<EditSite> {
 
     match Site::update(&conn, 1, &site_form) {
       Ok(site) => site,
-      Err(_e) => return Err(APIError::err("couldnt_update_site").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_site"))?,
     };
 
     let site_view = SiteView::read(&conn)?;
 
-    Ok(SiteResponse { site: site_view })
+    Ok(SiteResponse {
+      op: self.op.to_string(),
+      site: site_view,
+    })
   }
 }
 
 impl Perform<GetSiteResponse> for Oper<GetSite> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetSiteResponse, Error> {
+  fn perform(&self) -> Result<GetSiteResponse, Error> {
     let _data: &GetSite = &self.data;
+    let conn = establish_connection();
 
     // It can return a null site in order to redirect
     let site_view = match Site::read(&conn, 1) {
@@ -286,6 +305,7 @@ impl Perform<GetSiteResponse> for Oper<GetSite> {
     let banned = UserView::banned(&conn)?;
 
     Ok(GetSiteResponse {
+      op: self.op.to_string(),
       site: site_view,
       admins,
       banned,
@@ -295,19 +315,9 @@ impl Perform<GetSiteResponse> for Oper<GetSite> {
 }
 
 impl Perform<SearchResponse> for Oper<Search> {
-  fn perform(&self, conn: &PgConnection) -> Result<SearchResponse, Error> {
+  fn perform(&self) -> Result<SearchResponse, Error> {
     let data: &Search = &self.data;
-
-    let user_id: Option<i32> = match &data.auth {
-      Some(auth) => match Claims::decode(&auth) {
-        Ok(claims) => {
-          let user_id = claims.claims.id;
-          Some(user_id)
-        }
-        Err(_e) => None,
-      },
-      None => None,
-    };
+    let conn = establish_connection();
 
     let sort = SortType::from_str(&data.sort)?;
     let type_ = SearchType::from_str(&data.type_)?;
@@ -326,7 +336,6 @@ impl Perform<SearchResponse> for Oper<Search> {
           .show_nsfw(true)
           .for_community_id(data.community_id)
           .search_term(data.q.to_owned())
-          .my_user_id(user_id)
           .page(data.page)
           .limit(data.limit)
           .list()?;
@@ -335,7 +344,6 @@ impl Perform<SearchResponse> for Oper<Search> {
         comments = CommentQueryBuilder::create(&conn)
           .sort(&sort)
           .search_term(data.q.to_owned())
-          .my_user_id(user_id)
           .page(data.page)
           .limit(data.limit)
           .list()?;
@@ -362,7 +370,6 @@ impl Perform<SearchResponse> for Oper<Search> {
           .show_nsfw(true)
           .for_community_id(data.community_id)
           .search_term(data.q.to_owned())
-          .my_user_id(user_id)
           .page(data.page)
           .limit(data.limit)
           .list()?;
@@ -370,7 +377,6 @@ impl Perform<SearchResponse> for Oper<Search> {
         comments = CommentQueryBuilder::create(&conn)
           .sort(&sort)
           .search_term(data.q.to_owned())
-          .my_user_id(user_id)
           .page(data.page)
           .limit(data.limit)
           .list()?;
@@ -403,6 +409,7 @@ impl Perform<SearchResponse> for Oper<Search> {
 
     // Return the jwt
     Ok(SearchResponse {
+      op: self.op.to_string(),
       type_: data.type_.to_owned(),
       comments,
       posts,
@@ -413,12 +420,13 @@ impl Perform<SearchResponse> for Oper<Search> {
 }
 
 impl Perform<GetSiteResponse> for Oper<TransferSite> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetSiteResponse, Error> {
+  fn perform(&self) -> Result<GetSiteResponse, Error> {
     let data: &TransferSite = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -427,7 +435,7 @@ impl Perform<GetSiteResponse> for Oper<TransferSite> {
 
     // Make sure user is the creator
     if read_site.creator_id != user_id {
-      return Err(APIError::err("not_an_admin").into());
+      return Err(APIError::err(&self.op, "not_an_admin"))?;
     }
 
     let site_form = SiteForm {
@@ -442,7 +450,7 @@ impl Perform<GetSiteResponse> for Oper<TransferSite> {
 
     match Site::update(&conn, 1, &site_form) {
       Ok(site) => site,
-      Err(_e) => return Err(APIError::err("couldnt_update_site").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_site"))?,
     };
 
     // Mod tables
@@ -467,6 +475,7 @@ impl Perform<GetSiteResponse> for Oper<TransferSite> {
     let banned = UserView::banned(&conn)?;
 
     Ok(GetSiteResponse {
+      op: self.op.to_string(),
       site: Some(site_view),
       admins,
       banned,

server/src/api/user.rs

@@ -1,8 +1,6 @@
 use super::*;
-use crate::settings::Settings;
 use crate::{generate_random_string, send_email};
 use bcrypt::verify;
-use diesel::PgConnection;
 use std::str::FromStr;
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -28,19 +26,12 @@ pub struct SaveUserSettings {
   default_sort_type: i16,
   default_listing_type: i16,
   lang: String,
-  avatar: Option<String>,
-  email: Option<String>,
-  matrix_user_id: Option<String>,
-  new_password: Option<String>,
-  new_password_verify: Option<String>,
-  old_password: Option<String>,
-  show_avatars: bool,
-  send_notifications_to_email: bool,
   auth: String,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct LoginResponse {
+  op: String,
   jwt: String,
 }
 
@@ -58,6 +49,7 @@ pub struct GetUserDetails {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetUserDetailsResponse {
+  op: String,
   user: UserView,
   follows: Vec<CommunityFollowerView>,
   moderates: Vec<CommunityModeratorView>,
@@ -68,11 +60,13 @@ pub struct GetUserDetailsResponse {
 
 #[derive(Serialize, Deserialize)]
 pub struct GetRepliesResponse {
+  op: String,
   replies: Vec<ReplyView>,
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct GetUserMentionsResponse {
+  op: String,
   mentions: Vec<UserMentionView>,
 }
 
@@ -90,6 +84,7 @@ pub struct AddAdmin {
 
 #[derive(Serialize, Deserialize)]
 pub struct AddAdminResponse {
+  op: String,
   admins: Vec<UserView>,
 }
 
@@ -104,6 +99,7 @@ pub struct BanUser {
 
 #[derive(Serialize, Deserialize)]
 pub struct BanUserResponse {
+  op: String,
   user: UserView,
   banned: bool,
 }
@@ -135,6 +131,7 @@ pub struct EditUserMention {
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct UserMentionResponse {
+  op: String,
   mention: UserMentionView,
 }
 
@@ -150,7 +147,9 @@ pub struct PasswordReset {
 }
 
 #[derive(Serialize, Deserialize, Clone)]
-pub struct PasswordResetResponse {}
+pub struct PasswordResetResponse {
+  op: String,
+}
 
 #[derive(Serialize, Deserialize)]
 pub struct PasswordChange {
@@ -159,93 +158,67 @@ pub struct PasswordChange {
   password_verify: String,
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct CreatePrivateMessage {
-  content: String,
-  recipient_id: i32,
-  auth: String,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct EditPrivateMessage {
-  edit_id: i32,
-  content: Option<String>,
-  deleted: Option<bool>,
-  read: Option<bool>,
-  auth: String,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct GetPrivateMessages {
-  unread_only: bool,
-  page: Option<i64>,
-  limit: Option<i64>,
-  auth: String,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct PrivateMessagesResponse {
-  messages: Vec<PrivateMessageView>,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct PrivateMessageResponse {
-  message: PrivateMessageView,
-}
-
 impl Perform<LoginResponse> for Oper<Login> {
-  fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> {
+  fn perform(&self) -> Result<LoginResponse, Error> {
     let data: &Login = &self.data;
+    let conn = establish_connection();
 
     // Fetch that username / email
     let user: User_ = match User_::find_by_email_or_username(&conn, &data.username_or_email) {
       Ok(user) => user,
-      Err(_e) => return Err(APIError::err("couldnt_find_that_username_or_email").into()),
+      Err(_e) => {
+        return Err(APIError::err(
+          &self.op,
+          "couldnt_find_that_username_or_email",
+        ))?
+      }
     };
 
     // Verify the password
     let valid: bool = verify(&data.password, &user.password_encrypted).unwrap_or(false);
     if !valid {
-      return Err(APIError::err("password_incorrect").into());
+      return Err(APIError::err(&self.op, "password_incorrect"))?;
     }
 
     // Return the jwt
-    Ok(LoginResponse { jwt: user.jwt() })
+    Ok(LoginResponse {
+      op: self.op.to_string(),
+      jwt: user.jwt(),
+    })
   }
 }
 
 impl Perform<LoginResponse> for Oper<Register> {
-  fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> {
+  fn perform(&self) -> Result<LoginResponse, Error> {
     let data: &Register = &self.data;
+    let conn = establish_connection();
 
     // Make sure site has open registration
     if let Ok(site) = SiteView::read(&conn) {
       if !site.open_registration {
-        return Err(APIError::err("registration_closed").into());
+        return Err(APIError::err(&self.op, "registration_closed"))?;
       }
     }
 
     // Make sure passwords match
-    if data.password != data.password_verify {
-      return Err(APIError::err("passwords_dont_match").into());
+    if &data.password != &data.password_verify {
+      return Err(APIError::err(&self.op, "passwords_dont_match"))?;
     }
 
     if has_slurs(&data.username) {
-      return Err(APIError::err("no_slurs").into());
+      return Err(APIError::err(&self.op, "no_slurs"))?;
     }
 
     // Make sure there are no admins
-    if data.admin && !UserView::admins(&conn)?.is_empty() {
-      return Err(APIError::err("admin_already_created").into());
+    if data.admin && UserView::admins(&conn)?.len() > 0 {
+      return Err(APIError::err(&self.op, "admin_already_created"))?;
     }
 
     // Register the new user
     let user_form = UserForm {
       name: data.username.to_owned(),
-      fedi_name: Settings::get().hostname.to_owned(),
+      fedi_name: Settings::get().hostname.into(),
       email: data.email.to_owned(),
-      matrix_user_id: None,
-      avatar: None,
       password_encrypted: data.password.to_owned(),
       preferred_username: None,
       updated: None,
@@ -256,24 +229,12 @@ impl Perform<LoginResponse> for Oper<Register> {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     // Create the user
     let inserted_user = match User_::register(&conn, &user_form) {
       Ok(user) => user,
-      Err(e) => {
-        let err_type = if e.to_string()
-          == "duplicate key value violates unique constraint \"user__email_key\""
-        {
-          "email_already_exists"
-        } else {
-          "user_already_exists"
-        };
-
-        return Err(APIError::err(err_type).into());
-      }
+      Err(_e) => return Err(APIError::err(&self.op, "user_already_exists"))?,
     };
 
     // Create the main community if it doesn't exist
@@ -304,7 +265,7 @@ impl Perform<LoginResponse> for Oper<Register> {
     let _inserted_community_follower =
       match CommunityFollower::follow(&conn, &community_follower_form) {
         Ok(user) => user,
-        Err(_e) => return Err(APIError::err("community_follower_already_exists").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "community_follower_already_exists"))?,
       };
 
     // If its an admin, add them as a mod and follower to main
@@ -317,70 +278,42 @@ impl Perform<LoginResponse> for Oper<Register> {
       let _inserted_community_moderator =
         match CommunityModerator::join(&conn, &community_moderator_form) {
           Ok(user) => user,
-          Err(_e) => return Err(APIError::err("community_moderator_already_exists").into()),
+          Err(_e) => {
+            return Err(APIError::err(
+              &self.op,
+              "community_moderator_already_exists",
+            ))?
+          }
         };
     }
 
     // Return the jwt
     Ok(LoginResponse {
+      op: self.op.to_string(),
       jwt: inserted_user.jwt(),
     })
   }
 }
 
 impl Perform<LoginResponse> for Oper<SaveUserSettings> {
-  fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> {
+  fn perform(&self) -> Result<LoginResponse, Error> {
     let data: &SaveUserSettings = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
 
     let read_user = User_::read(&conn, user_id)?;
 
-    let email = match &data.email {
-      Some(email) => Some(email.to_owned()),
-      None => read_user.email,
-    };
-
-    let password_encrypted = match &data.new_password {
-      Some(new_password) => {
-        match &data.new_password_verify {
-          Some(new_password_verify) => {
-            // Make sure passwords match
-            if new_password != new_password_verify {
-              return Err(APIError::err("passwords_dont_match").into());
-            }
-
-            // Check the old password
-            match &data.old_password {
-              Some(old_password) => {
-                let valid: bool =
-                  verify(old_password, &read_user.password_encrypted).unwrap_or(false);
-                if !valid {
-                  return Err(APIError::err("password_incorrect").into());
-                }
-                User_::update_password(&conn, user_id, &new_password)?.password_encrypted
-              }
-              None => return Err(APIError::err("password_incorrect").into()),
-            }
-          }
-          None => return Err(APIError::err("passwords_dont_match").into()),
-        }
-      }
-      None => read_user.password_encrypted,
-    };
-
     let user_form = UserForm {
       name: read_user.name,
       fedi_name: read_user.fedi_name,
-      email,
-      matrix_user_id: data.matrix_user_id.to_owned(),
-      avatar: data.avatar.to_owned(),
-      password_encrypted,
+      email: read_user.email,
+      password_encrypted: read_user.password_encrypted,
       preferred_username: read_user.preferred_username,
       updated: Some(naive_now()),
       admin: read_user.admin,
@@ -390,35 +323,25 @@ impl Perform<LoginResponse> for Oper<SaveUserSettings> {
       default_sort_type: data.default_sort_type,
       default_listing_type: data.default_listing_type,
       lang: data.lang.to_owned(),
-      show_avatars: data.show_avatars,
-      send_notifications_to_email: data.send_notifications_to_email,
     };
 
     let updated_user = match User_::update(&conn, user_id, &user_form) {
       Ok(user) => user,
-      Err(e) => {
-        let err_type = if e.to_string()
-          == "duplicate key value violates unique constraint \"user__email_key\""
-        {
-          "email_already_exists"
-        } else {
-          "user_already_exists"
-        };
-
-        return Err(APIError::err(err_type).into());
-      }
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_user"))?,
     };
 
     // Return the jwt
     Ok(LoginResponse {
+      op: self.op.to_string(),
       jwt: updated_user.jwt(),
     })
   }
 }
 
 impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetUserDetailsResponse, Error> {
+  fn perform(&self) -> Result<GetUserDetailsResponse, Error> {
     let data: &GetUserDetails = &self.data;
+    let conn = establish_connection();
 
     let user_claims: Option<Claims> = match &data.auth {
       Some(auth) => match Claims::decode(&auth) {
@@ -443,16 +366,11 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
     let user_details_id = match data.user_id {
       Some(id) => id,
       None => {
-        match User_::read_from_name(
+        User_::read_from_name(
           &conn,
-          data
-            .username
-            .to_owned()
-            .unwrap_or_else(|| "admin".to_string()),
-        ) {
-          Ok(user) => user.id,
-          Err(_e) => return Err(APIError::err("couldnt_find_that_username_or_email").into()),
-        }
+          data.username.to_owned().unwrap_or("admin".to_string()),
+        )?
+        .id
       }
     };
 
@@ -494,6 +412,7 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
 
     // Return the jwt
     Ok(GetUserDetailsResponse {
+      op: self.op.to_string(),
       user: user_view,
       follows,
       moderates,
@@ -505,30 +424,28 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
 }
 
 impl Perform<AddAdminResponse> for Oper<AddAdmin> {
-  fn perform(&self, conn: &PgConnection) -> Result<AddAdminResponse, Error> {
+  fn perform(&self) -> Result<AddAdminResponse, Error> {
     let data: &AddAdmin = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
 
     // Make sure user is an admin
-    if !UserView::read(&conn, user_id)?.admin {
-      return Err(APIError::err("not_an_admin").into());
+    if UserView::read(&conn, user_id)?.admin == false {
+      return Err(APIError::err(&self.op, "not_an_admin"))?;
     }
 
     let read_user = User_::read(&conn, data.user_id)?;
 
-    // TODO make addadmin easier
     let user_form = UserForm {
       name: read_user.name,
       fedi_name: read_user.fedi_name,
       email: read_user.email,
-      matrix_user_id: read_user.matrix_user_id,
-      avatar: read_user.avatar,
       password_encrypted: read_user.password_encrypted,
       preferred_username: read_user.preferred_username,
       updated: Some(naive_now()),
@@ -539,13 +456,11 @@ impl Perform<AddAdminResponse> for Oper<AddAdmin> {
       default_sort_type: read_user.default_sort_type,
       default_listing_type: read_user.default_listing_type,
       lang: read_user.lang,
-      show_avatars: read_user.show_avatars,
-      send_notifications_to_email: read_user.send_notifications_to_email,
     };
 
     match User_::update(&conn, data.user_id, &user_form) {
       Ok(user) => user,
-      Err(_e) => return Err(APIError::err("couldnt_update_user").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_user"))?,
     };
 
     // Mod tables
@@ -563,35 +478,36 @@ impl Perform<AddAdminResponse> for Oper<AddAdmin> {
     let creator_user = admins.remove(creator_index);
     admins.insert(0, creator_user);
 
-    Ok(AddAdminResponse { admins })
+    Ok(AddAdminResponse {
+      op: self.op.to_string(),
+      admins,
+    })
   }
 }
 
 impl Perform<BanUserResponse> for Oper<BanUser> {
-  fn perform(&self, conn: &PgConnection) -> Result<BanUserResponse, Error> {
+  fn perform(&self) -> Result<BanUserResponse, Error> {
     let data: &BanUser = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
 
     // Make sure user is an admin
-    if !UserView::read(&conn, user_id)?.admin {
-      return Err(APIError::err("not_an_admin").into());
+    if UserView::read(&conn, user_id)?.admin == false {
+      return Err(APIError::err(&self.op, "not_an_admin"))?;
     }
 
     let read_user = User_::read(&conn, data.user_id)?;
 
-    // TODO make bans and addadmins easier
     let user_form = UserForm {
       name: read_user.name,
       fedi_name: read_user.fedi_name,
       email: read_user.email,
-      matrix_user_id: read_user.matrix_user_id,
-      avatar: read_user.avatar,
       password_encrypted: read_user.password_encrypted,
       preferred_username: read_user.preferred_username,
       updated: Some(naive_now()),
@@ -602,13 +518,11 @@ impl Perform<BanUserResponse> for Oper<BanUser> {
       default_sort_type: read_user.default_sort_type,
       default_listing_type: read_user.default_listing_type,
       lang: read_user.lang,
-      show_avatars: read_user.show_avatars,
-      send_notifications_to_email: read_user.send_notifications_to_email,
     };
 
     match User_::update(&conn, data.user_id, &user_form) {
       Ok(user) => user,
-      Err(_e) => return Err(APIError::err("couldnt_update_user").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_user"))?,
     };
 
     // Mod tables
@@ -630,6 +544,7 @@ impl Perform<BanUserResponse> for Oper<BanUser> {
     let user_view = UserView::read(&conn, data.user_id)?;
 
     Ok(BanUserResponse {
+      op: self.op.to_string(),
       user: user_view,
       banned: data.ban,
     })
@@ -637,12 +552,13 @@ impl Perform<BanUserResponse> for Oper<BanUser> {
 }
 
 impl Perform<GetRepliesResponse> for Oper<GetReplies> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetRepliesResponse, Error> {
+  fn perform(&self) -> Result<GetRepliesResponse, Error> {
     let data: &GetReplies = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -656,17 +572,21 @@ impl Perform<GetRepliesResponse> for Oper<GetReplies> {
       .limit(data.limit)
       .list()?;
 
-    Ok(GetRepliesResponse { replies })
+    Ok(GetRepliesResponse {
+      op: self.op.to_string(),
+      replies,
+    })
   }
 }
 
 impl Perform<GetUserMentionsResponse> for Oper<GetUserMentions> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetUserMentionsResponse, Error> {
+  fn perform(&self) -> Result<GetUserMentionsResponse, Error> {
     let data: &GetUserMentions = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -680,17 +600,21 @@ impl Perform<GetUserMentionsResponse> for Oper<GetUserMentions> {
       .limit(data.limit)
       .list()?;
 
-    Ok(GetUserMentionsResponse { mentions })
+    Ok(GetUserMentionsResponse {
+      op: self.op.to_string(),
+      mentions,
+    })
   }
 }
 
 impl Perform<UserMentionResponse> for Oper<EditUserMention> {
-  fn perform(&self, conn: &PgConnection) -> Result<UserMentionResponse, Error> {
+  fn perform(&self) -> Result<UserMentionResponse, Error> {
     let data: &EditUserMention = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -706,24 +630,26 @@ impl Perform<UserMentionResponse> for Oper<EditUserMention> {
     let _updated_user_mention =
       match UserMention::update(&conn, user_mention.id, &user_mention_form) {
         Ok(comment) => comment,
-        Err(_e) => return Err(APIError::err("couldnt_update_comment").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_comment"))?,
       };
 
     let user_mention_view = UserMentionView::read(&conn, user_mention.id, user_id)?;
 
     Ok(UserMentionResponse {
+      op: self.op.to_string(),
       mention: user_mention_view,
     })
   }
 }
 
 impl Perform<GetRepliesResponse> for Oper<MarkAllAsRead> {
-  fn perform(&self, conn: &PgConnection) -> Result<GetRepliesResponse, Error> {
+  fn perform(&self) -> Result<GetRepliesResponse, Error> {
     let data: &MarkAllAsRead = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -748,7 +674,7 @@ impl Perform<GetRepliesResponse> for Oper<MarkAllAsRead> {
 
       let _updated_comment = match Comment::update(&conn, reply.id, &comment_form) {
         Ok(comment) => comment,
-        Err(_e) => return Err(APIError::err("couldnt_update_comment").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_comment"))?,
       };
     }
 
@@ -769,45 +695,25 @@ impl Perform<GetRepliesResponse> for Oper<MarkAllAsRead> {
       let _updated_mention =
         match UserMention::update(&conn, mention.user_mention_id, &mention_form) {
           Ok(mention) => mention,
-          Err(_e) => return Err(APIError::err("couldnt_update_comment").into()),
+          Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_comment"))?,
         };
     }
 
-    // messages
-    let messages = PrivateMessageQueryBuilder::create(&conn, user_id)
-      .page(1)
-      .limit(999)
-      .unread_only(true)
-      .list()?;
-
-    for message in &messages {
-      let private_message_form = PrivateMessageForm {
-        content: None,
-        creator_id: message.to_owned().creator_id,
-        recipient_id: message.to_owned().recipient_id,
-        deleted: None,
-        read: Some(true),
-        updated: None,
-      };
-
-      let _updated_message = match PrivateMessage::update(&conn, message.id, &private_message_form)
-      {
-        Ok(message) => message,
-        Err(_e) => return Err(APIError::err("couldnt_update_private_message").into()),
-      };
-    }
-
-    Ok(GetRepliesResponse { replies: vec![] })
+    Ok(GetRepliesResponse {
+      op: self.op.to_string(),
+      replies: vec![],
+    })
   }
 }
 
 impl Perform<LoginResponse> for Oper<DeleteAccount> {
-  fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> {
+  fn perform(&self) -> Result<LoginResponse, Error> {
     let data: &DeleteAccount = &self.data;
+    let conn = establish_connection();
 
     let claims = match Claims::decode(&data.auth) {
       Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "not_logged_in"))?,
     };
 
     let user_id = claims.id;
@@ -817,7 +723,7 @@ impl Perform<LoginResponse> for Oper<DeleteAccount> {
     // Verify the password
     let valid: bool = verify(&data.password, &user.password_encrypted).unwrap_or(false);
     if !valid {
-      return Err(APIError::err("password_incorrect").into());
+      return Err(APIError::err(&self.op, "password_incorrect"))?;
     }
 
     // Comments
@@ -840,7 +746,7 @@ impl Perform<LoginResponse> for Oper<DeleteAccount> {
 
       let _updated_comment = match Comment::update(&conn, comment.id, &comment_form) {
         Ok(comment) => comment,
-        Err(_e) => return Err(APIError::err("couldnt_update_comment").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_comment"))?,
       };
     }
 
@@ -868,24 +774,31 @@ impl Perform<LoginResponse> for Oper<DeleteAccount> {
 
       let _updated_post = match Post::update(&conn, post.id, &post_form) {
         Ok(post) => post,
-        Err(_e) => return Err(APIError::err("couldnt_update_post").into()),
+        Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_post"))?,
       };
     }
 
     Ok(LoginResponse {
+      op: self.op.to_string(),
       jwt: data.auth.to_owned(),
     })
   }
 }
 
 impl Perform<PasswordResetResponse> for Oper<PasswordReset> {
-  fn perform(&self, conn: &PgConnection) -> Result<PasswordResetResponse, Error> {
+  fn perform(&self) -> Result<PasswordResetResponse, Error> {
     let data: &PasswordReset = &self.data;
+    let conn = establish_connection();
 
     // Fetch that email
     let user: User_ = match User_::find_by_email(&conn, &data.email) {
       Ok(user) => user,
-      Err(_e) => return Err(APIError::err("couldnt_find_that_username_or_email").into()),
+      Err(_e) => {
+        return Err(APIError::err(
+          &self.op,
+          "couldnt_find_that_username_or_email",
+        ))?
+      }
     };
 
     // Generate a random token
@@ -902,172 +815,57 @@ impl Perform<PasswordResetResponse> for Oper<PasswordReset> {
     let html = &format!("<h1>Password Reset Request for {}</h1><br><a href={}/password_change/{}>Click here to reset your password</a>", user.name, hostname, &token);
     match send_email(subject, user_email, &user.name, html) {
       Ok(_o) => _o,
-      Err(_e) => return Err(APIError::err(&_e).into()),
+      Err(_e) => return Err(APIError::err(&self.op, &_e.to_string()))?,
     };
 
-    Ok(PasswordResetResponse {})
+    Ok(PasswordResetResponse {
+      op: self.op.to_string(),
+    })
   }
 }
 
 impl Perform<LoginResponse> for Oper<PasswordChange> {
-  fn perform(&self, conn: &PgConnection) -> Result<LoginResponse, Error> {
+  fn perform(&self) -> Result<LoginResponse, Error> {
     let data: &PasswordChange = &self.data;
+    let conn = establish_connection();
 
     // Fetch the user_id from the token
     let user_id = PasswordResetRequest::read_from_token(&conn, &data.token)?.user_id;
 
     // Make sure passwords match
-    if data.password != data.password_verify {
-      return Err(APIError::err("passwords_dont_match").into());
+    if &data.password != &data.password_verify {
+      return Err(APIError::err(&self.op, "passwords_dont_match"))?;
     }
 
+    // Fetch the user
+    let read_user = User_::read(&conn, user_id)?;
+
     // Update the user with the new password
-    let updated_user = match User_::update_password(&conn, user_id, &data.password) {
+    let user_form = UserForm {
+      name: read_user.name,
+      fedi_name: read_user.fedi_name,
+      email: read_user.email,
+      password_encrypted: data.password.to_owned(),
+      preferred_username: read_user.preferred_username,
+      updated: Some(naive_now()),
+      admin: read_user.admin,
+      banned: read_user.banned,
+      show_nsfw: read_user.show_nsfw,
+      theme: read_user.theme,
+      default_sort_type: read_user.default_sort_type,
+      default_listing_type: read_user.default_listing_type,
+      lang: read_user.lang,
+    };
+
+    let updated_user = match User_::update_password(&conn, user_id, &user_form) {
       Ok(user) => user,
-      Err(_e) => return Err(APIError::err("couldnt_update_user").into()),
+      Err(_e) => return Err(APIError::err(&self.op, "couldnt_update_user"))?,
     };
 
     // Return the jwt
     Ok(LoginResponse {
+      op: self.op.to_string(),
       jwt: updated_user.jwt(),
     })
   }
 }
-
-impl Perform<PrivateMessageResponse> for Oper<CreatePrivateMessage> {
-  fn perform(&self, conn: &PgConnection) -> Result<PrivateMessageResponse, Error> {
-    let data: &CreatePrivateMessage = &self.data;
-
-    let claims = match Claims::decode(&data.auth) {
-      Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
-    };
-
-    let user_id = claims.id;
-
-    let hostname = &format!("https://{}", Settings::get().hostname);
-
-    // Check for a site ban
-    if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
-    }
-
-    let content_slurs_removed = remove_slurs(&data.content.to_owned());
-
-    let private_message_form = PrivateMessageForm {
-      content: Some(content_slurs_removed.to_owned()),
-      creator_id: user_id,
-      recipient_id: data.recipient_id,
-      deleted: None,
-      read: None,
-      updated: None,
-    };
-
-    let inserted_private_message = match PrivateMessage::create(&conn, &private_message_form) {
-      Ok(private_message) => private_message,
-      Err(_e) => {
-        return Err(APIError::err("couldnt_create_private_message").into());
-      }
-    };
-
-    // Send notifications to the recipient
-    let recipient_user = User_::read(&conn, data.recipient_id)?;
-    if recipient_user.send_notifications_to_email {
-      if let Some(email) = recipient_user.email {
-        let subject = &format!(
-          "{} - Private Message from {}",
-          Settings::get().hostname,
-          claims.username
-        );
-        let html = &format!(
-          "<h1>Private Message</h1><br><div>{} - {}</div><br><a href={}/inbox>inbox</a>",
-          claims.username, &content_slurs_removed, hostname
-        );
-        match send_email(subject, &email, &recipient_user.name, html) {
-          Ok(_o) => _o,
-          Err(e) => eprintln!("{}", e),
-        };
-      }
-    }
-
-    let message = PrivateMessageView::read(&conn, inserted_private_message.id)?;
-
-    Ok(PrivateMessageResponse { message })
-  }
-}
-
-impl Perform<PrivateMessageResponse> for Oper<EditPrivateMessage> {
-  fn perform(&self, conn: &PgConnection) -> Result<PrivateMessageResponse, Error> {
-    let data: &EditPrivateMessage = &self.data;
-
-    let claims = match Claims::decode(&data.auth) {
-      Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
-    };
-
-    let user_id = claims.id;
-
-    let orig_private_message = PrivateMessage::read(&conn, data.edit_id)?;
-
-    // Check for a site ban
-    if UserView::read(&conn, user_id)?.banned {
-      return Err(APIError::err("site_ban").into());
-    }
-
-    // Check to make sure they are the creator (or the recipient marking as read
-    if !(data.read.is_some() && orig_private_message.recipient_id.eq(&user_id)
-      || orig_private_message.creator_id.eq(&user_id))
-    {
-      return Err(APIError::err("no_private_message_edit_allowed").into());
-    }
-
-    let content_slurs_removed = match &data.content {
-      Some(content) => Some(remove_slurs(content)),
-      None => None,
-    };
-
-    let private_message_form = PrivateMessageForm {
-      content: content_slurs_removed,
-      creator_id: orig_private_message.creator_id,
-      recipient_id: orig_private_message.recipient_id,
-      deleted: data.deleted.to_owned(),
-      read: data.read.to_owned(),
-      updated: if data.read.is_some() {
-        orig_private_message.updated
-      } else {
-        Some(naive_now())
-      },
-    };
-
-    let _updated_private_message =
-      match PrivateMessage::update(&conn, data.edit_id, &private_message_form) {
-        Ok(private_message) => private_message,
-        Err(_e) => return Err(APIError::err("couldnt_update_private_message").into()),
-      };
-
-    let message = PrivateMessageView::read(&conn, data.edit_id)?;
-
-    Ok(PrivateMessageResponse { message })
-  }
-}
-
-impl Perform<PrivateMessagesResponse> for Oper<GetPrivateMessages> {
-  fn perform(&self, conn: &PgConnection) -> Result<PrivateMessagesResponse, Error> {
-    let data: &GetPrivateMessages = &self.data;
-
-    let claims = match Claims::decode(&data.auth) {
-      Ok(claims) => claims.claims,
-      Err(_e) => return Err(APIError::err("not_logged_in").into()),
-    };
-
-    let user_id = claims.id;
-
-    let messages = PrivateMessageQueryBuilder::create(&conn, user_id)
-      .page(data.page)
-      .limit(data.limit)
-      .unread_only(data.unread_only)
-      .list()?;
-
-    Ok(PrivateMessagesResponse { messages })
-  }
-}

server/src/apub.rs

@@ -0,0 +1,90 @@
+extern crate activitypub;
+use self::activitypub::{actor::Person, context};
+use crate::db::user::User_;
+
+impl User_ {
+  pub fn person(&self) -> Person {
+    use crate::{to_datetime_utc, Settings};
+    let base_url = &format!("{}/user/{}", Settings::get().api_endpoint(), self.name);
+    let mut person = Person::default();
+    person.object_props.set_context_object(context()).ok();
+    person.object_props.set_id_string(base_url.to_string()).ok();
+    person
+      .object_props
+      .set_name_string(self.name.to_owned())
+      .ok();
+    person
+      .object_props
+      .set_published_utctime(to_datetime_utc(self.published))
+      .ok();
+    if let Some(i) = self.updated {
+      person
+        .object_props
+        .set_updated_utctime(to_datetime_utc(i))
+        .ok();
+    }
+    // person.object_props.summary = self.summary;
+
+    person
+      .ap_actor_props
+      .set_inbox_string(format!("{}/inbox", &base_url))
+      .ok();
+    person
+      .ap_actor_props
+      .set_outbox_string(format!("{}/outbox", &base_url))
+      .ok();
+    person
+      .ap_actor_props
+      .set_following_string(format!("{}/following", &base_url))
+      .ok();
+    person
+      .ap_actor_props
+      .set_liked_string(format!("{}/liked", &base_url))
+      .ok();
+    if let Some(i) = &self.preferred_username {
+      person
+        .ap_actor_props
+        .set_preferred_username_string(i.to_string())
+        .ok();
+    }
+
+    person
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::User_;
+  use crate::db::{ListingType, SortType};
+  use crate::naive_now;
+
+  #[test]
+  fn test_person() {
+    let expected_user = User_ {
+      id: 52,
+      name: "thom".into(),
+      fedi_name: "rrf".into(),
+      preferred_username: None,
+      password_encrypted: "here".into(),
+      email: None,
+      icon: None,
+      published: naive_now(),
+      admin: false,
+      banned: false,
+      updated: None,
+      show_nsfw: false,
+      theme: "darkly".into(),
+      default_sort_type: SortType::Hot as i16,
+      default_listing_type: ListingType::Subscribed as i16,
+      lang: "browser".into(),
+    };
+
+    let person = expected_user.person();
+    assert_eq!(
+      "rrr/api/v1/user/thom",
+      person.object_props.id_string().unwrap()
+    );
+    let json = serde_json::to_string_pretty(&person).unwrap();
+    println!("{}", json);
+  }
+}

server/src/apub/community.rs

@@ -1,109 +0,0 @@
-use crate::apub::make_apub_endpoint;
-use crate::db::community::Community;
-use crate::db::community_view::CommunityFollowerView;
-use crate::db::establish_unpooled_connection;
-use crate::to_datetime_utc;
-use activitypub::{actor::Group, collection::UnorderedCollection, context};
-use actix_web::body::Body;
-use actix_web::web::Path;
-use actix_web::HttpResponse;
-use serde::Deserialize;
-
-impl Community {
-  pub fn as_group(&self) -> Group {
-    let base_url = make_apub_endpoint("c", &self.name);
-
-    let mut group = Group::default();
-
-    group.object_props.set_context_object(context()).ok();
-    group.object_props.set_id_string(base_url.to_string()).ok();
-    group
-      .object_props
-      .set_name_string(self.name.to_owned())
-      .ok();
-    group
-      .object_props
-      .set_published_utctime(to_datetime_utc(self.published))
-      .ok();
-    if let Some(updated) = self.updated {
-      group
-        .object_props
-        .set_updated_utctime(to_datetime_utc(updated))
-        .ok();
-    }
-
-    if let Some(description) = &self.description {
-      group
-        .object_props
-        .set_summary_string(description.to_string())
-        .ok();
-    }
-
-    group
-      .ap_actor_props
-      .set_inbox_string(format!("{}/inbox", &base_url))
-      .ok();
-    group
-      .ap_actor_props
-      .set_outbox_string(format!("{}/outbox", &base_url))
-      .ok();
-    group
-      .ap_actor_props
-      .set_followers_string(format!("{}/followers", &base_url))
-      .ok();
-
-    group
-  }
-
-  pub fn followers_as_collection(&self) -> UnorderedCollection {
-    let base_url = make_apub_endpoint("c", &self.name);
-
-    let mut collection = UnorderedCollection::default();
-    collection.object_props.set_context_object(context()).ok();
-    collection.object_props.set_id_string(base_url).ok();
-
-    let connection = establish_unpooled_connection();
-    //As we are an object, we validated that the community id was valid
-    let community_followers = CommunityFollowerView::for_community(&connection, self.id).unwrap();
-
-    let ap_followers = community_followers
-      .iter()
-      .map(|follower| make_apub_endpoint("u", &follower.user_name))
-      .collect();
-
-    collection
-      .collection_props
-      .set_items_string_vec(ap_followers)
-      .unwrap();
-    collection
-  }
-}
-
-#[derive(Deserialize)]
-pub struct CommunityQuery {
-  community_name: String,
-}
-
-pub async fn get_apub_community(info: Path<CommunityQuery>) -> HttpResponse<Body> {
-  let connection = establish_unpooled_connection();
-
-  if let Ok(community) = Community::read_from_name(&connection, info.community_name.to_owned()) {
-    HttpResponse::Ok()
-      .content_type("application/activity+json")
-      .body(serde_json::to_string(&community.as_group()).unwrap())
-  } else {
-    HttpResponse::NotFound().finish()
-  }
-}
-
-pub async fn get_apub_community_followers(info: Path<CommunityQuery>) -> HttpResponse<Body> {
-  let connection = establish_unpooled_connection();
-
-  if let Ok(community) = Community::read_from_name(&connection, info.community_name.to_owned()) {
-    HttpResponse::Ok()
-      .content_type("application/activity+json")
-      .body(serde_json::to_string(&community.followers_as_collection()).unwrap())
-  } else {
-    HttpResponse::NotFound().finish()
-  }
-}

server/src/apub/mod.rs

@@ -1,103 +0,0 @@
-pub mod community;
-pub mod post;
-pub mod user;
-use crate::Settings;
-
-use std::fmt::Display;
-
-#[cfg(test)]
-mod tests {
-  use crate::db::community::Community;
-  use crate::db::post::Post;
-  use crate::db::user::User_;
-  use crate::db::{ListingType, SortType};
-  use crate::{naive_now, Settings};
-
-  #[test]
-  fn test_person() {
-    let user = User_ {
-      id: 52,
-      name: "thom".into(),
-      fedi_name: "rrf".into(),
-      preferred_username: None,
-      password_encrypted: "here".into(),
-      email: None,
-      matrix_user_id: None,
-      avatar: None,
-      published: naive_now(),
-      admin: false,
-      banned: false,
-      updated: None,
-      show_nsfw: false,
-      theme: "darkly".into(),
-      default_sort_type: SortType::Hot as i16,
-      default_listing_type: ListingType::Subscribed as i16,
-      lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
-    };
-
-    let person = user.as_person();
-    assert_eq!(
-      format!("https://{}/federation/u/thom", Settings::get().hostname),
-      person.object_props.id_string().unwrap()
-    );
-  }
-
-  #[test]
-  fn test_community() {
-    let community = Community {
-      id: 42,
-      name: "Test".into(),
-      title: "Test Title".into(),
-      description: Some("Test community".into()),
-      category_id: 32,
-      creator_id: 52,
-      removed: false,
-      published: naive_now(),
-      updated: Some(naive_now()),
-      deleted: false,
-      nsfw: false,
-    };
-
-    let group = community.as_group();
-    assert_eq!(
-      format!("https://{}/federation/c/Test", Settings::get().hostname),
-      group.object_props.id_string().unwrap()
-    );
-  }
-
-  #[test]
-  fn test_post() {
-    let post = Post {
-      id: 62,
-      name: "A test post".into(),
-      url: None,
-      body: None,
-      creator_id: 52,
-      community_id: 42,
-      published: naive_now(),
-      removed: false,
-      locked: false,
-      stickied: false,
-      nsfw: false,
-      deleted: false,
-      updated: None,
-    };
-
-    let page = post.as_page();
-    assert_eq!(
-      format!("https://{}/federation/post/62", Settings::get().hostname),
-      page.object_props.id_string().unwrap()
-    );
-  }
-}
-
-pub fn make_apub_endpoint<S: Display, T: Display>(point: S, value: T) -> String {
-  format!(
-    "https://{}/federation/{}/{}",
-    Settings::get().hostname,
-    point,
-    value
-  )
-}

server/src/apub/post.rs

@@ -1,38 +0,0 @@
-use crate::apub::make_apub_endpoint;
-use crate::db::post::Post;
-use crate::to_datetime_utc;
-use activitypub::{context, object::Page};
-
-impl Post {
-  pub fn as_page(&self) -> Page {
-    let base_url = make_apub_endpoint("post", self.id);
-    let mut page = Page::default();
-
-    page.object_props.set_context_object(context()).ok();
-    page.object_props.set_id_string(base_url).ok();
-    page.object_props.set_name_string(self.name.to_owned()).ok();
-
-    if let Some(body) = &self.body {
-      page.object_props.set_content_string(body.to_owned()).ok();
-    }
-
-    if let Some(url) = &self.url {
-      page.object_props.set_url_string(url.to_owned()).ok();
-    }
-
-    //page.object_props.set_attributed_to_string
-
-    page
-      .object_props
-      .set_published_utctime(to_datetime_utc(self.published))
-      .ok();
-    if let Some(updated) = self.updated {
-      page
-        .object_props
-        .set_updated_utctime(to_datetime_utc(updated))
-        .ok();
-    }
-
-    page
-  }
-}

server/src/apub/user.rs

@@ -1,74 +0,0 @@
-use crate::apub::make_apub_endpoint;
-use crate::db::establish_unpooled_connection;
-use crate::db::user::User_;
-use crate::to_datetime_utc;
-use activitypub::{actor::Person, context};
-use actix_web::body::Body;
-use actix_web::web::Path;
-use actix_web::HttpResponse;
-use serde::Deserialize;
-
-impl User_ {
-  pub fn as_person(&self) -> Person {
-    let base_url = make_apub_endpoint("u", &self.name);
-    let mut person = Person::default();
-    person.object_props.set_context_object(context()).ok();
-    person.object_props.set_id_string(base_url.to_string()).ok();
-    person
-      .object_props
-      .set_name_string(self.name.to_owned())
-      .ok();
-    person
-      .object_props
-      .set_published_utctime(to_datetime_utc(self.published))
-      .ok();
-    if let Some(updated) = self.updated {
-      person
-        .object_props
-        .set_updated_utctime(to_datetime_utc(updated))
-        .ok();
-    }
-
-    person
-      .ap_actor_props
-      .set_inbox_string(format!("{}/inbox", &base_url))
-      .ok();
-    person
-      .ap_actor_props
-      .set_outbox_string(format!("{}/outbox", &base_url))
-      .ok();
-    person
-      .ap_actor_props
-      .set_following_string(format!("{}/following", &base_url))
-      .ok();
-    person
-      .ap_actor_props
-      .set_liked_string(format!("{}/liked", &base_url))
-      .ok();
-    if let Some(i) = &self.preferred_username {
-      person
-        .ap_actor_props
-        .set_preferred_username_string(i.to_string())
-        .ok();
-    }
-
-    person
-  }
-}
-
-#[derive(Deserialize)]
-pub struct UserQuery {
-  user_name: String,
-}
-
-pub async fn get_apub_user(info: Path<UserQuery>) -> HttpResponse<Body> {
-  let connection = establish_unpooled_connection();
-
-  if let Ok(user) = User_::find_by_email_or_username(&connection, &info.user_name) {
-    HttpResponse::Ok()
-      .content_type("application/activity+json")
-      .body(serde_json::to_string(&user.as_person()).unwrap())
-  } else {
-    HttpResponse::NotFound().finish()
-  }
-}

server/src/db/category.rs

@@ -52,7 +52,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let categories = Category::list_all(&conn).unwrap();
     let expected_first_category = Category {

server/src/db/comment.rs

@@ -166,7 +166,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "terry".into(),
@@ -174,8 +174,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -184,8 +182,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();

server/src/db/comment_view.rs

@@ -18,33 +18,6 @@ table! {
     banned -> Bool,
     banned_from_community -> Bool,
     creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
-    score -> BigInt,
-    upvotes -> BigInt,
-    downvotes -> BigInt,
-    user_id -> Nullable<Int4>,
-    my_vote -> Nullable<Int4>,
-    saved -> Nullable<Bool>,
-  }
-}
-
-table! {
-  comment_mview (id) {
-    id -> Int4,
-    creator_id -> Int4,
-    post_id -> Int4,
-    parent_id -> Nullable<Int4>,
-    content -> Text,
-    removed -> Bool,
-    read -> Bool,
-    published -> Timestamp,
-    updated -> Nullable<Timestamp>,
-    deleted -> Bool,
-    community_id -> Int4,
-    banned -> Bool,
-    banned_from_community -> Bool,
-    creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
     score -> BigInt,
     upvotes -> BigInt,
     downvotes -> BigInt,
@@ -73,7 +46,6 @@ pub struct CommentView {
   pub banned: bool,
   pub banned_from_community: bool,
   pub creator_name: String,
-  pub creator_avatar: Option<String>,
   pub score: i64,
   pub upvotes: i64,
   pub downvotes: i64,
@@ -84,7 +56,7 @@ pub struct CommentView {
 
 pub struct CommentQueryBuilder<'a> {
   conn: &'a PgConnection,
-  query: super::comment_view::comment_mview::BoxedQuery<'a, Pg>,
+  query: super::comment_view::comment_view::BoxedQuery<'a, Pg>,
   sort: &'a SortType,
   for_post_id: Option<i32>,
   for_creator_id: Option<i32>,
@@ -97,9 +69,9 @@ pub struct CommentQueryBuilder<'a> {
 
 impl<'a> CommentQueryBuilder<'a> {
   pub fn create(conn: &'a PgConnection) -> Self {
-    use super::comment_view::comment_mview::dsl::*;
+    use super::comment_view::comment_view::dsl::*;
 
-    let query = comment_mview.into_boxed();
+    let query = comment_view.into_boxed();
 
     CommentQueryBuilder {
       conn,
@@ -156,7 +128,7 @@ impl<'a> CommentQueryBuilder<'a> {
   }
 
   pub fn list(self) -> Result<Vec<CommentView>, Error> {
-    use super::comment_view::comment_mview::dsl::*;
+    use super::comment_view::comment_view::dsl::*;
 
     let mut query = self.query;
 
@@ -254,7 +226,6 @@ table! {
     banned -> Bool,
     banned_from_community -> Bool,
     creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
     score -> BigInt,
     upvotes -> BigInt,
     downvotes -> BigInt,
@@ -284,7 +255,6 @@ pub struct ReplyView {
   pub banned: bool,
   pub banned_from_community: bool,
   pub creator_name: String,
-  pub creator_avatar: Option<String>,
   pub score: i64,
   pub upvotes: i64,
   pub downvotes: i64,
@@ -390,7 +360,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "timmy".into(),
@@ -398,8 +368,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -408,8 +376,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();
@@ -481,7 +447,6 @@ mod tests {
       published: inserted_comment.published,
       updated: None,
       creator_name: inserted_user.name.to_owned(),
-      creator_avatar: None,
       score: 1,
       downvotes: 0,
       upvotes: 1,
@@ -505,7 +470,6 @@ mod tests {
       published: inserted_comment.published,
       updated: None,
       creator_name: inserted_user.name.to_owned(),
-      creator_avatar: None,
       score: 1,
       downvotes: 0,
       upvotes: 1,

server/src/db/community.rs

@@ -68,10 +68,6 @@ impl Community {
       .filter(name.eq(community_name))
       .first::<Self>(conn)
   }
-
-  pub fn get_url(&self) -> String {
-    format!("https://{}/c/{}", Settings::get().hostname, self.name)
-  }
 }
 
 #[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
@@ -212,7 +208,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "bobbee".into(),
@@ -220,8 +216,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -230,8 +224,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();

server/src/db/community_view.rs

@@ -1,4 +1,4 @@
-use super::community_view::community_mview::BoxedQuery;
+use super::community_view::community_view::BoxedQuery;
 use super::*;
 use diesel::pg::Pg;
 
@@ -16,32 +16,6 @@ table! {
     deleted -> Bool,
     nsfw -> Bool,
     creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
-    category_name -> Varchar,
-    number_of_subscribers -> BigInt,
-    number_of_posts -> BigInt,
-    number_of_comments -> BigInt,
-    hot_rank -> Int4,
-    user_id -> Nullable<Int4>,
-    subscribed -> Nullable<Bool>,
-  }
-}
-
-table! {
-  community_mview (id) {
-    id -> Int4,
-    name -> Varchar,
-    title -> Varchar,
-    description -> Nullable<Text>,
-    category_id -> Int4,
-    creator_id -> Int4,
-    removed -> Bool,
-    published -> Timestamp,
-    updated -> Nullable<Timestamp>,
-    deleted -> Bool,
-    nsfw -> Bool,
-    creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
     category_name -> Varchar,
     number_of_subscribers -> BigInt,
     number_of_posts -> BigInt,
@@ -59,7 +33,6 @@ table! {
     user_id -> Int4,
     published -> Timestamp,
     user_name -> Varchar,
-    avatar -> Nullable<Text>,
     community_name -> Varchar,
   }
 }
@@ -71,7 +44,6 @@ table! {
     user_id -> Int4,
     published -> Timestamp,
     user_name -> Varchar,
-    avatar -> Nullable<Text>,
     community_name -> Varchar,
   }
 }
@@ -83,7 +55,6 @@ table! {
     user_id -> Int4,
     published -> Timestamp,
     user_name -> Varchar,
-    avatar -> Nullable<Text>,
     community_name -> Varchar,
   }
 }
@@ -105,7 +76,6 @@ pub struct CommunityView {
   pub deleted: bool,
   pub nsfw: bool,
   pub creator_name: String,
-  pub creator_avatar: Option<String>,
   pub category_name: String,
   pub number_of_subscribers: i64,
   pub number_of_posts: i64,
@@ -128,9 +98,9 @@ pub struct CommunityQueryBuilder<'a> {
 
 impl<'a> CommunityQueryBuilder<'a> {
   pub fn create(conn: &'a PgConnection) -> Self {
-    use super::community_view::community_mview::dsl::*;
+    use super::community_view::community_view::dsl::*;
 
-    let query = community_mview.into_boxed();
+    let query = community_view.into_boxed();
 
     CommunityQueryBuilder {
       conn,
@@ -149,7 +119,7 @@ impl<'a> CommunityQueryBuilder<'a> {
     self
   }
 
-  pub fn for_user<T: MaybeOptional<i32>>(mut self, from_user_id: T) -> Self {
+  pub fn from_user_id<T: MaybeOptional<i32>>(mut self, from_user_id: T) -> Self {
     self.from_user_id = from_user_id.get_optional();
     self
   }
@@ -175,7 +145,7 @@ impl<'a> CommunityQueryBuilder<'a> {
   }
 
   pub fn list(self) -> Result<Vec<CommunityView>, Error> {
-    use super::community_view::community_mview::dsl::*;
+    use super::community_view::community_view::dsl::*;
 
     let mut query = self.query;
 
@@ -254,7 +224,6 @@ pub struct CommunityModeratorView {
   pub user_id: i32,
   pub published: chrono::NaiveDateTime,
   pub user_name: String,
-  pub avatar: Option<String>,
   pub community_name: String,
 }
 
@@ -284,7 +253,6 @@ pub struct CommunityFollowerView {
   pub user_id: i32,
   pub published: chrono::NaiveDateTime,
   pub user_name: String,
-  pub avatar: Option<String>,
   pub community_name: String,
 }
 
@@ -314,7 +282,6 @@ pub struct CommunityUserBanView {
   pub user_id: i32,
   pub published: chrono::NaiveDateTime,
   pub user_name: String,
-  pub avatar: Option<String>,
   pub community_name: String,
 }
 

server/src/db/mod.rs

@@ -1,5 +1,4 @@
-extern crate lazy_static;
-use crate::settings::Settings;
+use crate::Settings;
 use diesel::dsl::*;
 use diesel::result::Error;
 use diesel::*;
@@ -15,8 +14,6 @@ pub mod moderator_views;
 pub mod password_reset_request;
 pub mod post;
 pub mod post_view;
-pub mod private_message;
-pub mod private_message_view;
 pub mod site;
 pub mod site_view;
 pub mod user;
@@ -102,19 +99,19 @@ pub trait MaybeOptional<T> {
 
 impl<T> MaybeOptional<T> for T {
   fn get_optional(self) -> Option<T> {
-    Some(self)
+    return Some(self);
   }
 }
 
 impl<T> MaybeOptional<T> for Option<T> {
   fn get_optional(self) -> Option<T> {
-    self
+    return self;
   }
 }
 
-pub fn establish_unpooled_connection() -> PgConnection {
-  let db_url = Settings::get().get_database_url();
-  PgConnection::establish(&db_url).unwrap_or_else(|_| panic!("Error connecting to {}", db_url))
+pub fn establish_connection() -> PgConnection {
+  let db_url = Settings::get().db_url;
+  PgConnection::establish(&db_url).expect(&format!("Error connecting to {}", db_url))
 }
 
 #[derive(EnumString, ToString, Debug, Serialize, Deserialize)]

server/src/db/moderator.rs

@@ -434,7 +434,7 @@ mod tests {
   // use Crud;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_mod = UserForm {
       name: "the mod".into(),
@@ -442,8 +442,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -452,8 +450,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_mod = User_::create(&conn, &new_mod).unwrap();
@@ -464,8 +460,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -474,8 +468,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();

server/src/db/password_reset_request.rs

@@ -1,7 +1,8 @@
 use super::*;
 use crate::schema::password_reset_request;
 use crate::schema::password_reset_request::dsl::*;
-use sha2::{Digest, Sha256};
+use crypto::digest::Digest;
+use crypto::sha2::Sha256;
 
 #[derive(Queryable, Identifiable, PartialEq, Debug)]
 #[table_name = "password_reset_request"]
@@ -48,8 +49,8 @@ impl Crud<PasswordResetRequestForm> for PasswordResetRequest {
 impl PasswordResetRequest {
   pub fn create_token(conn: &PgConnection, from_user_id: i32, token: &str) -> Result<Self, Error> {
     let mut hasher = Sha256::new();
-    hasher.input(token);
-    let token_hash: String = PasswordResetRequest::bytes_to_hex(hasher.result().to_vec());
+    hasher.input_str(token);
+    let token_hash = hasher.result_str();
 
     let form = PasswordResetRequestForm {
       user_id: from_user_id,
@@ -60,21 +61,13 @@ impl PasswordResetRequest {
   }
   pub fn read_from_token(conn: &PgConnection, token: &str) -> Result<Self, Error> {
     let mut hasher = Sha256::new();
-    hasher.input(token);
-    let token_hash: String = PasswordResetRequest::bytes_to_hex(hasher.result().to_vec());
+    hasher.input_str(token);
+    let token_hash = hasher.result_str();
     password_reset_request
       .filter(token_encrypted.eq(token_hash))
       .filter(published.gt(now - 1.days()))
       .first::<Self>(conn)
   }
-
-  fn bytes_to_hex(bytes: Vec<u8>) -> String {
-    let mut str = String::new();
-    for byte in bytes {
-      str = format!("{}{:02x}", str, byte);
-    }
-    str
-  }
 }
 
 #[cfg(test)]
@@ -84,7 +77,7 @@ mod tests {
 
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "thommy prw".into(),
@@ -92,8 +85,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -102,26 +93,27 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();
 
-    let token = "nope";
-    let token_encrypted_ = "ca3704aa0b06f5954c79ee837faa152d84d6b2d42838f0637a15eda8337dbdce";
+    let new_password_reset_request = PasswordResetRequestForm {
+      user_id: inserted_user.id,
+      token_encrypted: "no".into(),
+    };
 
     let inserted_password_reset_request =
-      PasswordResetRequest::create_token(&conn, inserted_user.id, token).unwrap();
+      PasswordResetRequest::create(&conn, &new_password_reset_request).unwrap();
 
     let expected_password_reset_request = PasswordResetRequest {
       id: inserted_password_reset_request.id,
       user_id: inserted_user.id,
-      token_encrypted: token_encrypted_.to_string(),
+      token_encrypted: "no".into(),
       published: inserted_password_reset_request.published,
     };
 
-    let read_password_reset_request = PasswordResetRequest::read_from_token(&conn, token).unwrap();
+    let read_password_reset_request =
+      PasswordResetRequest::read(&conn, inserted_password_reset_request.id).unwrap();
     let num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
 
     assert_eq!(expected_password_reset_request, read_password_reset_request);

server/src/db/post.rs

@@ -179,7 +179,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "jim".into(),
@@ -187,8 +187,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -197,8 +195,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();

server/src/db/post_view.rs

@@ -1,4 +1,4 @@
-use super::post_view::post_mview::BoxedQuery;
+use super::post_view::post_view::BoxedQuery;
 use super::*;
 use diesel::pg::Pg;
 
@@ -21,7 +21,6 @@ table! {
     banned_from_community -> Bool,
     stickied -> Bool,
     creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
     community_name -> Varchar,
     community_removed -> Bool,
     community_deleted -> Bool,
@@ -60,7 +59,6 @@ pub struct PostView {
   pub banned_from_community: bool,
   pub stickied: bool,
   pub creator_name: String,
-  pub creator_avatar: Option<String>,
   pub community_name: String,
   pub community_removed: bool,
   pub community_deleted: bool,
@@ -77,43 +75,6 @@ pub struct PostView {
   pub saved: Option<bool>,
 }
 
-// The faked schema since diesel doesn't do views
-table! {
-  post_mview (id) {
-    id -> Int4,
-    name -> Varchar,
-    url -> Nullable<Text>,
-    body -> Nullable<Text>,
-    creator_id -> Int4,
-    community_id -> Int4,
-    removed -> Bool,
-    locked -> Bool,
-    published -> Timestamp,
-    updated -> Nullable<Timestamp>,
-    deleted -> Bool,
-    nsfw -> Bool,
-    banned -> Bool,
-    banned_from_community -> Bool,
-    stickied -> Bool,
-    creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
-    community_name -> Varchar,
-    community_removed -> Bool,
-    community_deleted -> Bool,
-    community_nsfw -> Bool,
-    number_of_comments -> BigInt,
-    score -> BigInt,
-    upvotes -> BigInt,
-    downvotes -> BigInt,
-    hot_rank -> Int4,
-    user_id -> Nullable<Int4>,
-    my_vote -> Nullable<Int4>,
-    subscribed -> Nullable<Bool>,
-    read -> Nullable<Bool>,
-    saved -> Nullable<Bool>,
-  }
-}
-
 pub struct PostQueryBuilder<'a> {
   conn: &'a PgConnection,
   query: BoxedQuery<'a, Pg>,
@@ -130,9 +91,9 @@ pub struct PostQueryBuilder<'a> {
 
 impl<'a> PostQueryBuilder<'a> {
   pub fn create(conn: &'a PgConnection) -> Self {
-    use super::post_view::post_mview::dsl::*;
+    use super::post_view::post_view::dsl::*;
 
-    let query = post_mview.into_boxed();
+    let query = post_view.into_boxed();
 
     PostQueryBuilder {
       conn,
@@ -160,7 +121,7 @@ impl<'a> PostQueryBuilder<'a> {
   }
 
   pub fn for_community_id<T: MaybeOptional<i32>>(mut self, for_community_id: T) -> Self {
-    use super::post_view::post_mview::dsl::*;
+    use super::post_view::post_view::dsl::*;
     if let Some(for_community_id) = for_community_id.get_optional() {
       self.query = self.query.filter(community_id.eq(for_community_id));
       self.query = self.query.then_order_by(stickied.desc());
@@ -176,7 +137,7 @@ impl<'a> PostQueryBuilder<'a> {
   }
 
   pub fn search_term<T: MaybeOptional<String>>(mut self, search_term: T) -> Self {
-    use super::post_view::post_mview::dsl::*;
+    use super::post_view::post_view::dsl::*;
     if let Some(search_term) = search_term.get_optional() {
       self.query = self.query.filter(name.ilike(fuzzy_search(&search_term)));
     }
@@ -184,7 +145,7 @@ impl<'a> PostQueryBuilder<'a> {
   }
 
   pub fn url_search<T: MaybeOptional<String>>(mut self, url_search: T) -> Self {
-    use super::post_view::post_mview::dsl::*;
+    use super::post_view::post_view::dsl::*;
     if let Some(url_search) = url_search.get_optional() {
       self.query = self.query.filter(url.eq(url_search));
     }
@@ -222,13 +183,16 @@ impl<'a> PostQueryBuilder<'a> {
   }
 
   pub fn list(self) -> Result<Vec<PostView>, Error> {
-    use super::post_view::post_mview::dsl::*;
+    use super::post_view::post_view::dsl::*;
 
     let mut query = self.query;
 
-    if let ListingType::Subscribed = self.listing_type {
+    match self.listing_type {
+      ListingType::Subscribed => {
         query = query.filter(subscribed.eq(true));
       }
+      _ => {}
+    };
 
     query = match self.sort {
       SortType::Hot => query
@@ -327,7 +291,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let user_name = "tegan".to_string();
     let community_name = "test_community_3".to_string();
@@ -339,8 +303,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       updated: None,
       admin: false,
       banned: false,
@@ -349,8 +311,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();
@@ -417,7 +377,6 @@ mod tests {
       body: None,
       creator_id: inserted_user.id,
       creator_name: user_name.to_owned(),
-      creator_avatar: None,
       banned: false,
       banned_from_community: false,
       community_id: inserted_community.id,
@@ -446,7 +405,7 @@ mod tests {
       user_id: Some(inserted_user.id),
       my_vote: Some(1),
       id: inserted_post.id,
-      name: post_name,
+      name: post_name.to_owned(),
       url: None,
       body: None,
       removed: false,
@@ -454,12 +413,11 @@ mod tests {
       locked: false,
       stickied: false,
       creator_id: inserted_user.id,
-      creator_name: user_name,
-      creator_avatar: None,
+      creator_name: user_name.to_owned(),
       banned: false,
       banned_from_community: false,
       community_id: inserted_community.id,
-      community_name,
+      community_name: community_name.to_owned(),
       community_removed: false,
       community_deleted: false,
       community_nsfw: false,

server/src/db/private_message.rs

@@ -1,144 +0,0 @@
-use super::*;
-use crate::schema::private_message;
-
-#[derive(Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
-#[table_name = "private_message"]
-pub struct PrivateMessage {
-  pub id: i32,
-  pub creator_id: i32,
-  pub recipient_id: i32,
-  pub content: String,
-  pub deleted: bool,
-  pub read: bool,
-  pub published: chrono::NaiveDateTime,
-  pub updated: Option<chrono::NaiveDateTime>,
-}
-
-#[derive(Insertable, AsChangeset, Clone)]
-#[table_name = "private_message"]
-pub struct PrivateMessageForm {
-  pub creator_id: i32,
-  pub recipient_id: i32,
-  pub content: Option<String>,
-  pub deleted: Option<bool>,
-  pub read: Option<bool>,
-  pub updated: Option<chrono::NaiveDateTime>,
-}
-
-impl Crud<PrivateMessageForm> for PrivateMessage {
-  fn read(conn: &PgConnection, private_message_id: i32) -> Result<Self, Error> {
-    use crate::schema::private_message::dsl::*;
-    private_message.find(private_message_id).first::<Self>(conn)
-  }
-
-  fn delete(conn: &PgConnection, private_message_id: i32) -> Result<usize, Error> {
-    use crate::schema::private_message::dsl::*;
-    diesel::delete(private_message.find(private_message_id)).execute(conn)
-  }
-
-  fn create(conn: &PgConnection, private_message_form: &PrivateMessageForm) -> Result<Self, Error> {
-    use crate::schema::private_message::dsl::*;
-    insert_into(private_message)
-      .values(private_message_form)
-      .get_result::<Self>(conn)
-  }
-
-  fn update(
-    conn: &PgConnection,
-    private_message_id: i32,
-    private_message_form: &PrivateMessageForm,
-  ) -> Result<Self, Error> {
-    use crate::schema::private_message::dsl::*;
-    diesel::update(private_message.find(private_message_id))
-      .set(private_message_form)
-      .get_result::<Self>(conn)
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::super::user::*;
-  use super::*;
-  #[test]
-  fn test_crud() {
-    let conn = establish_unpooled_connection();
-
-    let creator_form = UserForm {
-      name: "creator_pm".into(),
-      fedi_name: "rrf".into(),
-      preferred_username: None,
-      password_encrypted: "nope".into(),
-      email: None,
-      matrix_user_id: None,
-      avatar: None,
-      admin: false,
-      banned: false,
-      updated: None,
-      show_nsfw: false,
-      theme: "darkly".into(),
-      default_sort_type: SortType::Hot as i16,
-      default_listing_type: ListingType::Subscribed as i16,
-      lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
-    };
-
-    let inserted_creator = User_::create(&conn, &creator_form).unwrap();
-
-    let recipient_form = UserForm {
-      name: "recipient_pm".into(),
-      fedi_name: "rrf".into(),
-      preferred_username: None,
-      password_encrypted: "nope".into(),
-      email: None,
-      matrix_user_id: None,
-      avatar: None,
-      admin: false,
-      banned: false,
-      updated: None,
-      show_nsfw: false,
-      theme: "darkly".into(),
-      default_sort_type: SortType::Hot as i16,
-      default_listing_type: ListingType::Subscribed as i16,
-      lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
-    };
-
-    let inserted_recipient = User_::create(&conn, &recipient_form).unwrap();
-
-    let private_message_form = PrivateMessageForm {
-      content: Some("A test private message".into()),
-      creator_id: inserted_creator.id,
-      recipient_id: inserted_recipient.id,
-      deleted: None,
-      read: None,
-      updated: None,
-    };
-
-    let inserted_private_message = PrivateMessage::create(&conn, &private_message_form).unwrap();
-
-    let expected_private_message = PrivateMessage {
-      id: inserted_private_message.id,
-      content: "A test private message".into(),
-      creator_id: inserted_creator.id,
-      recipient_id: inserted_recipient.id,
-      deleted: false,
-      read: false,
-      updated: None,
-      published: inserted_private_message.published,
-    };
-
-    let read_private_message = PrivateMessage::read(&conn, inserted_private_message.id).unwrap();
-    let updated_private_message =
-      PrivateMessage::update(&conn, inserted_private_message.id, &private_message_form).unwrap();
-    let num_deleted = PrivateMessage::delete(&conn, inserted_private_message.id).unwrap();
-    User_::delete(&conn, inserted_creator.id).unwrap();
-    User_::delete(&conn, inserted_recipient.id).unwrap();
-
-    assert_eq!(expected_private_message, read_private_message);
-    assert_eq!(expected_private_message, updated_private_message);
-    assert_eq!(expected_private_message, inserted_private_message);
-    assert_eq!(1, num_deleted);
-  }
-}

server/src/db/private_message_view.rs

@@ -1,140 +0,0 @@
-use super::*;
-use diesel::pg::Pg;
-
-// The faked schema since diesel doesn't do views
-table! {
-  private_message_view (id) {
-    id -> Int4,
-    creator_id -> Int4,
-    recipient_id -> Int4,
-    content -> Text,
-    deleted -> Bool,
-    read -> Bool,
-    published -> Timestamp,
-    updated -> Nullable<Timestamp>,
-    creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
-    recipient_name -> Varchar,
-    recipient_avatar -> Nullable<Text>,
-  }
-}
-
-table! {
-  private_message_mview (id) {
-    id -> Int4,
-    creator_id -> Int4,
-    recipient_id -> Int4,
-    content -> Text,
-    deleted -> Bool,
-    read -> Bool,
-    published -> Timestamp,
-    updated -> Nullable<Timestamp>,
-    creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
-    recipient_name -> Varchar,
-    recipient_avatar -> Nullable<Text>,
-  }
-}
-
-#[derive(
-  Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone,
-)]
-#[table_name = "private_message_view"]
-pub struct PrivateMessageView {
-  pub id: i32,
-  pub creator_id: i32,
-  pub recipient_id: i32,
-  pub content: String,
-  pub deleted: bool,
-  pub read: bool,
-  pub published: chrono::NaiveDateTime,
-  pub updated: Option<chrono::NaiveDateTime>,
-  pub creator_name: String,
-  pub creator_avatar: Option<String>,
-  pub recipient_name: String,
-  pub recipient_avatar: Option<String>,
-}
-
-pub struct PrivateMessageQueryBuilder<'a> {
-  conn: &'a PgConnection,
-  query: super::private_message_view::private_message_mview::BoxedQuery<'a, Pg>,
-  for_recipient_id: i32,
-  unread_only: bool,
-  page: Option<i64>,
-  limit: Option<i64>,
-}
-
-impl<'a> PrivateMessageQueryBuilder<'a> {
-  pub fn create(conn: &'a PgConnection, for_recipient_id: i32) -> Self {
-    use super::private_message_view::private_message_mview::dsl::*;
-
-    let query = private_message_mview.into_boxed();
-
-    PrivateMessageQueryBuilder {
-      conn,
-      query,
-      for_recipient_id,
-      unread_only: false,
-      page: None,
-      limit: None,
-    }
-  }
-
-  pub fn unread_only(mut self, unread_only: bool) -> Self {
-    self.unread_only = unread_only;
-    self
-  }
-
-  pub fn page<T: MaybeOptional<i64>>(mut self, page: T) -> Self {
-    self.page = page.get_optional();
-    self
-  }
-
-  pub fn limit<T: MaybeOptional<i64>>(mut self, limit: T) -> Self {
-    self.limit = limit.get_optional();
-    self
-  }
-
-  pub fn list(self) -> Result<Vec<PrivateMessageView>, Error> {
-    use super::private_message_view::private_message_mview::dsl::*;
-
-    let mut query = self.query;
-
-    // If its unread, I only want the ones to me
-    if self.unread_only {
-      query = query
-        .filter(read.eq(false))
-        .filter(recipient_id.eq(self.for_recipient_id));
-    }
-    // Otherwise, I want the ALL view to show both sent and received
-    else {
-      query = query.filter(
-        recipient_id
-          .eq(self.for_recipient_id)
-          .or(creator_id.eq(self.for_recipient_id)),
-      )
-    }
-
-    let (limit, offset) = limit_and_offset(self.page, self.limit);
-
-    query
-      .limit(limit)
-      .offset(offset)
-      .order_by(published.desc())
-      .load::<PrivateMessageView>(self.conn)
-  }
-}
-
-impl PrivateMessageView {
-  pub fn read(conn: &PgConnection, from_private_message_id: i32) -> Result<Self, Error> {
-    use super::private_message_view::private_message_view::dsl::*;
-
-    let mut query = private_message_view.into_boxed();
-
-    query = query
-      .filter(id.eq(from_private_message_id))
-      .order_by(published.desc());
-
-    query.first::<Self>(conn)
-  }
-}

server/src/db/site_view.rs

@@ -12,7 +12,6 @@ table! {
     open_registration -> Bool,
     enable_nsfw -> Bool,
     creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
     number_of_users -> BigInt,
     number_of_posts -> BigInt,
     number_of_comments -> BigInt,
@@ -35,7 +34,6 @@ pub struct SiteView {
   pub open_registration: bool,
   pub enable_nsfw: bool,
   pub creator_name: String,
-  pub creator_avatar: Option<String>,
   pub number_of_users: i64,
   pub number_of_posts: i64,
   pub number_of_comments: i64,

server/src/db/user.rs

@@ -14,7 +14,7 @@ pub struct User_ {
   pub preferred_username: Option<String>,
   pub password_encrypted: String,
   pub email: Option<String>,
-  pub avatar: Option<String>,
+  pub icon: Option<Vec<u8>>,
   pub admin: bool,
   pub banned: bool,
   pub published: chrono::NaiveDateTime,
@@ -24,9 +24,6 @@ pub struct User_ {
   pub default_sort_type: i16,
   pub default_listing_type: i16,
   pub lang: String,
-  pub show_avatars: bool,
-  pub send_notifications_to_email: bool,
-  pub matrix_user_id: Option<String>,
 }
 
 #[derive(Insertable, AsChangeset, Clone)]
@@ -39,16 +36,12 @@ pub struct UserForm {
   pub admin: bool,
   pub banned: bool,
   pub email: Option<String>,
-  pub avatar: Option<String>,
   pub updated: Option<chrono::NaiveDateTime>,
   pub show_nsfw: bool,
   pub theme: String,
   pub default_sort_type: i16,
   pub default_listing_type: i16,
   pub lang: String,
-  pub show_avatars: bool,
-  pub send_notifications_to_email: bool,
-  pub matrix_user_id: Option<String>,
 }
 
 impl Crud<UserForm> for User_ {
@@ -81,13 +74,14 @@ impl User_ {
   pub fn update_password(
     conn: &PgConnection,
     user_id: i32,
-    new_password: &str,
+    form: &UserForm,
   ) -> Result<Self, Error> {
-    let password_hash = hash(new_password, DEFAULT_COST).expect("Couldn't hash password");
+    let mut edited_user = form.clone();
+    let password_hash =
+      hash(&form.password_encrypted, DEFAULT_COST).expect("Couldn't hash password");
+    edited_user.password_encrypted = password_hash;
 
-    diesel::update(user_.find(user_id))
-      .set(password_encrypted.eq(password_hash))
-      .get_result::<Self>(conn)
+    Self::update(&conn, user_id, &edited_user)
   }
 
   pub fn read_from_name(conn: &PgConnection, from_user_name: String) -> Result<Self, Error> {
@@ -105,8 +99,6 @@ pub struct Claims {
   pub default_sort_type: i16,
   pub default_listing_type: i16,
   pub lang: String,
-  pub avatar: Option<String>,
-  pub show_avatars: bool,
 }
 
 impl Claims {
@@ -131,8 +123,6 @@ impl User_ {
       default_sort_type: self.default_sort_type,
       default_listing_type: self.default_listing_type,
       lang: self.lang.to_owned(),
-      avatar: self.avatar.to_owned(),
-      show_avatars: self.show_avatars.to_owned(),
     };
     encode(
       &Header::default(),
@@ -142,27 +132,23 @@ impl User_ {
     .unwrap()
   }
 
-  pub fn find_by_username(conn: &PgConnection, username: &str) -> Result<Self, Error> {
-    user_.filter(name.eq(username)).first::<User_>(conn)
-  }
-
-  pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
-    user_.filter(email.eq(from_email)).first::<User_>(conn)
-  }
-
   pub fn find_by_email_or_username(
     conn: &PgConnection,
     username_or_email: &str,
   ) -> Result<Self, Error> {
     if is_email_regex(username_or_email) {
-      User_::find_by_email(conn, username_or_email)
+      user_
+        .filter(email.eq(username_or_email))
+        .first::<User_>(conn)
     } else {
-      User_::find_by_username(conn, username_or_email)
+      user_
+        .filter(name.eq(username_or_email))
+        .first::<User_>(conn)
     }
   }
 
-  pub fn get_profile_url(&self) -> String {
-    format!("https://{}/u/{}", Settings::get().hostname, self.name)
+  pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
+    user_.filter(email.eq(from_email)).first::<User_>(conn)
   }
 
   pub fn find_by_jwt(conn: &PgConnection, jwt: &str) -> Result<Self, Error> {
@@ -178,7 +164,7 @@ mod tests {
 
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "thommy".into(),
@@ -186,8 +172,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -196,8 +180,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();
@@ -209,8 +191,7 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
+      icon: None,
       admin: false,
       banned: false,
       published: inserted_user.published,
@@ -220,8 +201,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let read_user = User_::read(&conn, inserted_user.id).unwrap();

server/src/db/user_mention.rs

@@ -60,7 +60,7 @@ mod tests {
   use super::*;
   #[test]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = establish_connection();
 
     let new_user = UserForm {
       name: "terrylake".into(),
@@ -68,8 +68,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -78,8 +76,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_user = User_::create(&conn, &new_user).unwrap();
@@ -90,8 +86,6 @@ mod tests {
       preferred_username: None,
       password_encrypted: "nope".into(),
       email: None,
-      matrix_user_id: None,
-      avatar: None,
       admin: false,
       banned: false,
       updated: None,
@@ -100,8 +94,6 @@ mod tests {
       default_sort_type: SortType::Hot as i16,
       default_listing_type: ListingType::Subscribed as i16,
       lang: "browser".into(),
-      show_avatars: true,
-      send_notifications_to_email: false,
     };
 
     let inserted_recipient = User_::create(&conn, &recipient_form).unwrap();

server/src/db/user_mention_view.rs

@@ -20,7 +20,6 @@ table! {
     banned -> Bool,
     banned_from_community -> Bool,
     creator_name -> Varchar,
-    creator_avatar -> Nullable<Text>,
     score -> BigInt,
     upvotes -> BigInt,
     downvotes -> BigInt,
@@ -51,7 +50,6 @@ pub struct UserMentionView {
   pub banned: bool,
   pub banned_from_community: bool,
   pub creator_name: String,
-  pub creator_avatar: Option<String>,
   pub score: i64,
   pub upvotes: i64,
   pub downvotes: i64,
@@ -80,7 +78,7 @@ impl<'a> UserMentionQueryBuilder<'a> {
     UserMentionQueryBuilder {
       conn,
       query,
-      for_user_id,
+      for_user_id: for_user_id,
       sort: &SortType::New,
       unread_only: false,
       page: None,

server/src/db/user_view.rs

@@ -1,4 +1,4 @@
-use super::user_view::user_mview::BoxedQuery;
+use super::user_view::user_view::BoxedQuery;
 use super::*;
 use diesel::pg::Pg;
 
@@ -6,34 +6,9 @@ table! {
   user_view (id) {
     id -> Int4,
     name -> Varchar,
-    avatar -> Nullable<Text>,
-    email -> Nullable<Text>,
-    matrix_user_id -> Nullable<Text>,
     fedi_name -> Varchar,
     admin -> Bool,
     banned -> Bool,
-    show_avatars -> Bool,
-    send_notifications_to_email -> Bool,
-    published -> Timestamp,
-    number_of_posts -> BigInt,
-    post_score -> BigInt,
-    number_of_comments -> BigInt,
-    comment_score -> BigInt,
-  }
-}
-
-table! {
-  user_mview (id) {
-    id -> Int4,
-    name -> Varchar,
-    avatar -> Nullable<Text>,
-    email -> Nullable<Text>,
-    matrix_user_id -> Nullable<Text>,
-    fedi_name -> Varchar,
-    admin -> Bool,
-    banned -> Bool,
-    show_avatars -> Bool,
-    send_notifications_to_email -> Bool,
     published -> Timestamp,
     number_of_posts -> BigInt,
     post_score -> BigInt,
@@ -49,14 +24,9 @@ table! {
 pub struct UserView {
   pub id: i32,
   pub name: String,
-  pub avatar: Option<String>,
-  pub email: Option<String>,
-  pub matrix_user_id: Option<String>,
   pub fedi_name: String,
   pub admin: bool,
   pub banned: bool,
-  pub show_avatars: bool,
-  pub send_notifications_to_email: bool,
   pub published: chrono::NaiveDateTime,
   pub number_of_posts: i64,
   pub post_score: i64,
@@ -74,9 +44,9 @@ pub struct UserQueryBuilder<'a> {
 
 impl<'a> UserQueryBuilder<'a> {
   pub fn create(conn: &'a PgConnection) -> Self {
-    use super::user_view::user_mview::dsl::*;
+    use super::user_view::user_view::dsl::*;
 
-    let query = user_mview.into_boxed();
+    let query = user_view.into_boxed();
 
     UserQueryBuilder {
       conn,
@@ -93,7 +63,7 @@ impl<'a> UserQueryBuilder<'a> {
   }
 
   pub fn search_term<T: MaybeOptional<String>>(mut self, search_term: T) -> Self {
-    use super::user_view::user_mview::dsl::*;
+    use super::user_view::user_view::dsl::*;
     if let Some(search_term) = search_term.get_optional() {
       self.query = self.query.filter(name.ilike(fuzzy_search(&search_term)));
     }
@@ -111,7 +81,7 @@ impl<'a> UserQueryBuilder<'a> {
   }
 
   pub fn list(self) -> Result<Vec<UserView>, Error> {
-    use super::user_view::user_mview::dsl::*;
+    use super::user_view::user_view::dsl::*;
 
     let mut query = self.query;
 
@@ -150,12 +120,12 @@ impl UserView {
   }
 
   pub fn admins(conn: &PgConnection) -> Result<Vec<Self>, Error> {
-    use super::user_view::user_mview::dsl::*;
-    user_mview.filter(admin.eq(true)).load::<Self>(conn)
+    use super::user_view::user_view::dsl::*;
+    user_view.filter(admin.eq(true)).load::<Self>(conn)
   }
 
   pub fn banned(conn: &PgConnection) -> Result<Vec<Self>, Error> {
-    use super::user_view::user_mview::dsl::*;
-    user_mview.filter(banned.eq(true)).load::<Self>(conn)
+    use super::user_view::user_view::dsl::*;
+    user_view.filter(banned.eq(true)).load::<Self>(conn)
   }
 }

server/src/feeds.rs

@@ -5,14 +5,12 @@ use crate::db::comment_view::{ReplyQueryBuilder, ReplyView};
 use crate::db::community::Community;
 use crate::db::post_view::{PostQueryBuilder, PostView};
 use crate::db::site_view::SiteView;
-use crate::db::user::{Claims, User_};
+use crate::db::user::User_;
 use crate::db::user_mention_view::{UserMentionQueryBuilder, UserMentionView};
-use crate::db::{ListingType, SortType};
+use crate::db::{establish_connection, ListingType, SortType};
 use crate::Settings;
+use actix_web::body::Body;
 use actix_web::{web, HttpResponse, Result};
-use chrono::{DateTime, Utc};
-use diesel::r2d2::{ConnectionManager, Pool};
-use diesel::PgConnection;
 use failure::Error;
 use rss::{CategoryBuilder, ChannelBuilder, GuidBuilder, Item, ItemBuilder};
 use serde::Deserialize;
@@ -31,79 +29,61 @@ enum RequestType {
   Inbox,
 }
 
-pub fn config(cfg: &mut web::ServiceConfig) {
-  cfg
-    .route("/feeds/{type}/{name}.xml", web::get().to(feeds::get_feed))
-    .route("/feeds/all.xml", web::get().to(feeds::get_all_feed))
-    .route("/feeds/all.xml", web::get().to(feeds::get_all_feed));
-}
+pub fn get_all_feed(info: web::Query<Params>) -> HttpResponse<Body> {
+  let sort_type = match get_sort_type(info) {
+    Ok(sort_type) => sort_type,
+    Err(_) => return HttpResponse::BadRequest().finish(),
+  };
 
-async fn get_all_feed(
-  info: web::Query<Params>,
-  db: web::Data<Pool<ConnectionManager<PgConnection>>>,
-) -> Result<HttpResponse, actix_web::Error> {
-  let res = web::block(move || {
-    let conn = db.get()?;
+  let feed_result = get_feed_all_data(&sort_type);
 
-    let sort_type = get_sort_type(info)?;
-    get_feed_all_data(&conn, &sort_type)
-  })
-  .await
-  .map(|rss| {
-    HttpResponse::Ok()
+  match feed_result {
+    Ok(rss) => HttpResponse::Ok()
       .content_type("application/rss+xml")
-      .body(rss)
-  })
-  .map_err(|_| HttpResponse::InternalServerError())?;
-  Ok(res)
+      .body(rss),
+    Err(_) => HttpResponse::NotFound().finish(),
+  }
 }
 
-async fn get_feed(
-  path: web::Path<(String, String)>,
-  info: web::Query<Params>,
-  db: web::Data<Pool<ConnectionManager<PgConnection>>>,
-) -> Result<HttpResponse, actix_web::Error> {
-  let res = web::block(move || {
-    let conn = db.get()?;
-
-    let sort_type = get_sort_type(info)?;
+pub fn get_feed(path: web::Path<(String, String)>, info: web::Query<Params>) -> HttpResponse<Body> {
+  let sort_type = match get_sort_type(info) {
+    Ok(sort_type) => sort_type,
+    Err(_) => return HttpResponse::BadRequest().finish(),
+  };
 
   let request_type = match path.0.as_ref() {
     "u" => RequestType::User,
     "c" => RequestType::Community,
     "front" => RequestType::Front,
     "inbox" => RequestType::Inbox,
-      _ => return Err(format_err!("wrong_type")),
+    _ => return HttpResponse::NotFound().finish(),
   };
 
   let param = path.1.to_owned();
 
-    match request_type {
-      RequestType::User => get_feed_user(&conn, &sort_type, param),
-      RequestType::Community => get_feed_community(&conn, &sort_type, param),
-      RequestType::Front => get_feed_front(&conn, &sort_type, param),
-      RequestType::Inbox => get_feed_inbox(&conn, param),
-    }
-  })
-  .await
-  .map(|rss| {
-    HttpResponse::Ok()
+  let feed_result = match request_type {
+    RequestType::User => get_feed_user(&sort_type, param),
+    RequestType::Community => get_feed_community(&sort_type, param),
+    RequestType::Front => get_feed_front(&sort_type, param),
+    RequestType::Inbox => get_feed_inbox(param),
+  };
+
+  match feed_result {
+    Ok(rss) => HttpResponse::Ok()
       .content_type("application/rss+xml")
-      .body(rss)
-  })
-  .map_err(|_| HttpResponse::InternalServerError())?;
-  Ok(res)
+      .body(rss),
+    Err(_) => HttpResponse::NotFound().finish(),
+  }
 }
 
 fn get_sort_type(info: web::Query<Params>) -> Result<SortType, ParseError> {
-  let sort_query = info
-    .sort
-    .to_owned()
-    .unwrap_or_else(|| SortType::Hot.to_string());
+  let sort_query = info.sort.to_owned().unwrap_or(SortType::Hot.to_string());
   SortType::from_str(&sort_query)
 }
 
-fn get_feed_all_data(conn: &PgConnection, sort_type: &SortType) -> Result<String, failure::Error> {
+fn get_feed_all_data(sort_type: &SortType) -> Result<String, Error> {
+  let conn = establish_connection();
+
   let site_view = SiteView::read(&conn)?;
 
   let posts = PostQueryBuilder::create(&conn)
@@ -126,14 +106,12 @@ fn get_feed_all_data(conn: &PgConnection, sort_type: &SortType) -> Result<String
   Ok(channel_builder.build().unwrap().to_string())
 }
 
-fn get_feed_user(
-  conn: &PgConnection,
-  sort_type: &SortType,
-  user_name: String,
-) -> Result<String, Error> {
+fn get_feed_user(sort_type: &SortType, user_name: String) -> Result<String, Error> {
+  let conn = establish_connection();
+
   let site_view = SiteView::read(&conn)?;
-  let user = User_::find_by_username(&conn, &user_name)?;
-  let user_url = user.get_profile_url();
+  let user = User_::find_by_email_or_username(&conn, &user_name)?;
+  let user_url = format!("https://{}/u/{}", Settings::get().hostname, user.name);
 
   let posts = PostQueryBuilder::create(&conn)
     .listing_type(ListingType::All)
@@ -152,14 +130,12 @@ fn get_feed_user(
   Ok(channel_builder.build().unwrap().to_string())
 }
 
-fn get_feed_community(
-  conn: &PgConnection,
-  sort_type: &SortType,
-  community_name: String,
-) -> Result<String, Error> {
+fn get_feed_community(sort_type: &SortType, community_name: String) -> Result<String, Error> {
+  let conn = establish_connection();
+
   let site_view = SiteView::read(&conn)?;
   let community = Community::read_from_name(&conn, community_name)?;
-  let community_url = community.get_url();
+  let community_url = format!("https://{}/c/{}", Settings::get().hostname, community.name);
 
   let posts = PostQueryBuilder::create(&conn)
     .listing_type(ListingType::All)
@@ -182,9 +158,11 @@ fn get_feed_community(
   Ok(channel_builder.build().unwrap().to_string())
 }
 
-fn get_feed_front(conn: &PgConnection, sort_type: &SortType, jwt: String) -> Result<String, Error> {
+fn get_feed_front(sort_type: &SortType, jwt: String) -> Result<String, Error> {
+  let conn = establish_connection();
+
   let site_view = SiteView::read(&conn)?;
-  let user_id = Claims::decode(&jwt)?.claims.id;
+  let user_id = db::user::Claims::decode(&jwt)?.claims.id;
 
   let posts = PostQueryBuilder::create(&conn)
     .listing_type(ListingType::Subscribed)
@@ -207,9 +185,11 @@ fn get_feed_front(conn: &PgConnection, sort_type: &SortType, jwt: String) -> Res
   Ok(channel_builder.build().unwrap().to_string())
 }
 
-fn get_feed_inbox(conn: &PgConnection, jwt: String) -> Result<String, Error> {
+fn get_feed_inbox(jwt: String) -> Result<String, Error> {
+  let conn = establish_connection();
+
   let site_view = SiteView::read(&conn)?;
-  let user_id = Claims::decode(&jwt)?.claims.id;
+  let user_id = db::user::Claims::decode(&jwt)?.claims.id;
 
   let sort = SortType::New;
 
@@ -351,7 +331,7 @@ fn create_post_items(posts: Vec<PostView>) -> Vec<Item> {
         "/c/{} <a href=\"{}\">(link)</a>",
         p.community_name, community_url
       ))
-      .domain(Settings::get().hostname.to_owned())
+      .domain(Settings::get().hostname)
       .build();
     i.categories(vec![category.unwrap()]);
 

server/src/lib.rs

@@ -11,6 +11,7 @@ pub extern crate actix;
 pub extern crate actix_web;
 pub extern crate bcrypt;
 pub extern crate chrono;
+pub extern crate crypto;
 pub extern crate dotenv;
 pub extern crate jsonwebtoken;
 pub extern crate lettre;
@@ -19,20 +20,19 @@ pub extern crate rand;
 pub extern crate regex;
 pub extern crate serde;
 pub extern crate serde_json;
-pub extern crate sha2;
 pub extern crate strum;
 
 pub mod api;
 pub mod apub;
 pub mod db;
-pub mod routes;
+pub mod feeds;
+pub mod nodeinfo;
 pub mod schema;
-pub mod settings;
 pub mod version;
 pub mod websocket;
 
-use crate::settings::Settings;
 use chrono::{DateTime, NaiveDateTime, Utc};
+use dotenv::dotenv;
 use lettre::smtp::authentication::{Credentials, Mechanism};
 use lettre::smtp::extension::ClientId;
 use lettre::smtp::ConnectionReuseParameters;
@@ -40,7 +40,91 @@ use lettre::{SmtpClient, Transport};
 use lettre_email::Email;
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
-use regex::{Regex, RegexBuilder};
+use regex::Regex;
+use std::env;
+use std::net::IpAddr;
+
+pub struct Settings {
+  pub db_url: String,
+  pub hostname: String,
+  pub bind: IpAddr,
+  pub port: u16,
+  pub jwt_secret: String,
+  pub rate_limit_message: i32,
+  pub rate_limit_message_per_second: i32,
+  pub rate_limit_post: i32,
+  pub rate_limit_post_per_second: i32,
+  pub rate_limit_register: i32,
+  pub rate_limit_register_per_second: i32,
+  pub email_config: Option<EmailConfig>,
+}
+
+pub struct EmailConfig {
+  smtp_server: String,
+  smtp_login: String,
+  smtp_password: String,
+  smtp_from_address: String,
+}
+
+impl Settings {
+  pub fn get() -> Self {
+    dotenv().ok();
+
+    let email_config =
+      if env::var("SMTP_SERVER").is_ok() && !env::var("SMTP_SERVER").unwrap().eq("") {
+        Some(EmailConfig {
+          smtp_server: env::var("SMTP_SERVER").expect("SMTP_SERVER must be set"),
+          smtp_login: env::var("SMTP_LOGIN").expect("SMTP_LOGIN must be set"),
+          smtp_password: env::var("SMTP_PASSWORD").expect("SMTP_PASSWORD must be set"),
+          smtp_from_address: env::var("SMTP_FROM_ADDRESS").expect("SMTP_FROM_ADDRESS must be set"),
+        })
+      } else {
+        None
+      };
+
+    Settings {
+      db_url: env::var("DATABASE_URL").expect("DATABASE_URL must be set"),
+      hostname: env::var("HOSTNAME").unwrap_or("rrr".to_string()),
+      bind: env::var("BIND")
+        .unwrap_or("0.0.0.0".to_string())
+        .parse()
+        .unwrap(),
+      port: env::var("PORT")
+        .unwrap_or("8536".to_string())
+        .parse()
+        .unwrap(),
+      jwt_secret: env::var("JWT_SECRET").unwrap_or("changeme".to_string()),
+      rate_limit_message: env::var("RATE_LIMIT_MESSAGE")
+        .unwrap_or("30".to_string())
+        .parse()
+        .unwrap(),
+      rate_limit_message_per_second: env::var("RATE_LIMIT_MESSAGE_PER_SECOND")
+        .unwrap_or("60".to_string())
+        .parse()
+        .unwrap(),
+      rate_limit_post: env::var("RATE_LIMIT_POST")
+        .unwrap_or("3".to_string())
+        .parse()
+        .unwrap(),
+      rate_limit_post_per_second: env::var("RATE_LIMIT_POST_PER_SECOND")
+        .unwrap_or("600".to_string())
+        .parse()
+        .unwrap(),
+      rate_limit_register: env::var("RATE_LIMIT_REGISTER")
+        .unwrap_or("1".to_string())
+        .parse()
+        .unwrap(),
+      rate_limit_register_per_second: env::var("RATE_LIMIT_REGISTER_PER_SECOND")
+        .unwrap_or("3600".to_string())
+        .parse()
+        .unwrap(),
+      email_config,
+    }
+  }
+  fn api_endpoint(&self) -> String {
+    format!("{}/api/v1", self.hostname)
+  }
+}
 
 pub fn to_datetime_utc(ndt: NaiveDateTime) -> DateTime<Utc> {
   DateTime::<Utc>::from_utc(ndt, Utc)
@@ -90,13 +174,13 @@ pub fn send_email(
   to_username: &str,
   html: &str,
 ) -> Result<(), String> {
-  let email_config = Settings::get().email.as_ref().ok_or("no_email_setup")?;
+  let email_config = Settings::get().email_config.ok_or("no_email_setup")?;
 
   let email = Email::builder()
     .to((to_email, to_username))
     .from((
       email_config.smtp_login.to_owned(),
-      email_config.smtp_from_address.to_owned(),
+      email_config.smtp_from_address,
     ))
     .subject(subject)
     .html(html)
@@ -105,7 +189,7 @@ pub fn send_email(
 
   let mut mailer = SmtpClient::new_simple(&email_config.smtp_server)
     .unwrap()
-    .hello_name(ClientId::Domain(Settings::get().hostname.to_owned()))
+    .hello_name(ClientId::Domain("localhost".to_string()))
     .credentials(Credentials::new(
       email_config.smtp_login.to_owned(),
       email_config.smtp_password.to_owned(),
@@ -117,8 +201,6 @@ pub fn send_email(
 
   let result = mailer.send(email.into());
 
-  mailer.close();
-
   match result {
     Ok(_) => Ok(()),
     Err(_) => Err("no_email_setup".to_string()),
@@ -127,7 +209,11 @@ pub fn send_email(
 
 #[cfg(test)]
 mod tests {
-  use crate::{extract_usernames, has_slurs, is_email_regex, remove_slurs};
+  use crate::{extract_usernames, has_slurs, is_email_regex, remove_slurs, Settings};
+  #[test]
+  fn test_api() {
+    assert_eq!(Settings::get().api_endpoint(), "rrr/api/v1");
+  }
 
   #[test]
   fn test_email() {
@@ -138,11 +224,11 @@ mod tests {
   #[test]
   fn test_slur_filter() {
     let test =
-      "coons test dindu ladyboy tranny retardeds. Capitalized Niggerz. This is a bunch of other safe text.".to_string();
+      "coons test dindu ladyboy tranny retardeds. This is a bunch of other safe text.".to_string();
     let slur_free = "No slurs here";
     assert_eq!(
       remove_slurs(&test),
-      "*removed* test *removed* *removed* *removed* *removed*. Capitalized *removed*. This is a bunch of other safe text."
+      "*removed* test *removed* *removed* *removed* *removed*. This is a bunch of other safe text."
         .to_string()
     );
     assert!(has_slurs(&test));
@@ -165,6 +251,6 @@ mod tests {
 
 lazy_static! {
   static ref EMAIL_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$").unwrap();
-  static ref SLUR_REGEX: Regex = RegexBuilder::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|nig(\b|g?(a|er)?(s|z)?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btrann?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").case_insensitive(true).build().unwrap();
+  static ref SLUR_REGEX: Regex = Regex::new(r"(fag(g|got|tard)?|maricos?|cock\s?sucker(s|ing)?|nig(\b|g?(a|er)?s?)\b|dindu(s?)|mudslime?s?|kikes?|mongoloids?|towel\s*heads?|\bspi(c|k)s?\b|\bchinks?|niglets?|beaners?|\bnips?\b|\bcoons?\b|jungle\s*bunn(y|ies?)|jigg?aboo?s?|\bpakis?\b|rag\s*heads?|gooks?|cunts?|bitch(es|ing|y)?|puss(y|ies?)|twats?|feminazis?|whor(es?|ing)|\bslut(s|t?y)?|\btrann?(y|ies?)|ladyboy(s?)|\b(b|re|r)tard(ed)?s?)").unwrap();
   static ref USERNAME_MATCHES_REGEX: Regex = Regex::new(r"/u/[a-zA-Z][0-9a-zA-Z_]*").unwrap();
 }

server/src/main.rs

@@ -3,65 +3,259 @@ extern crate lemmy_server;
 extern crate diesel_migrations;
 
 use actix::prelude::*;
+use actix_files::NamedFile;
 use actix_web::*;
-use diesel::r2d2::{ConnectionManager, Pool};
-use diesel::PgConnection;
-use lemmy_server::routes::{api, federation, feeds, index, nodeinfo, webfinger, websocket};
-use lemmy_server::settings::Settings;
+use actix_web_actors::ws;
+use lemmy_server::db::establish_connection;
+use lemmy_server::feeds;
+use lemmy_server::nodeinfo;
 use lemmy_server::websocket::server::*;
-use std::io;
+use lemmy_server::Settings;
+use std::env;
+use std::time::{Duration, Instant};
 
 embed_migrations!();
 
-#[actix_rt::main]
-async fn main() -> io::Result<()> {
-  env_logger::init();
-  let settings = Settings::get();
+/// How often heartbeat pings are sent
+const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
+/// How long before lack of client response causes a timeout
+const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
 
-  // Set up the r2d2 connection pool
-  let manager = ConnectionManager::<PgConnection>::new(&settings.get_database_url());
-  let pool = Pool::builder()
-    .max_size(settings.database.pool_size)
-    .build(manager)
-    .unwrap_or_else(|_| panic!("Error connecting to {}", settings.get_database_url()));
+/// Entry point for our route
+fn chat_route(
+  req: HttpRequest,
+  stream: web::Payload,
+  chat_server: web::Data<Addr<ChatServer>>,
+) -> Result<HttpResponse, Error> {
+  ws::start(
+    WSSession {
+      cs_addr: chat_server.get_ref().to_owned(),
+      id: 0,
+      hb: Instant::now(),
+      ip: req
+        .connection_info()
+        .remote()
+        .unwrap_or("127.0.0.1:12345")
+        .split(":")
+        .next()
+        .unwrap_or("127.0.0.1")
+        .to_string(),
+    },
+    &req,
+    stream,
+  )
+}
+
+struct WSSession {
+  cs_addr: Addr<ChatServer>,
+  /// unique session id
+  id: usize,
+  ip: String,
+  /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
+  /// otherwise we drop connection.
+  hb: Instant,
+}
+
+impl Actor for WSSession {
+  type Context = ws::WebsocketContext<Self>;
+
+  /// Method is called on actor start.
+  /// We register ws session with ChatServer
+  fn started(&mut self, ctx: &mut Self::Context) {
+    // we'll start heartbeat process on session start.
+    self.hb(ctx);
+
+    // register self in chat server. `AsyncContext::wait` register
+    // future within context, but context waits until this future resolves
+    // before processing any other events.
+    // across all routes within application
+    let addr = ctx.address();
+    self
+      .cs_addr
+      .send(Connect {
+        addr: addr.recipient(),
+        ip: self.ip.to_owned(),
+      })
+      .into_actor(self)
+      .then(|res, act, ctx| {
+        match res {
+          Ok(res) => act.id = res,
+          // something is wrong with chat server
+          _ => ctx.stop(),
+        }
+        fut::ok(())
+      })
+      .wait(ctx);
+  }
+
+  fn stopping(&mut self, _ctx: &mut Self::Context) -> Running {
+    // notify chat server
+    self.cs_addr.do_send(Disconnect {
+      id: self.id,
+      ip: self.ip.to_owned(),
+    });
+    Running::Stop
+  }
+}
+
+/// Handle messages from chat server, we simply send it to peer websocket
+/// These are room messages, IE sent to others in the room
+impl Handler<WSMessage> for WSSession {
+  type Result = ();
+
+  fn handle(&mut self, msg: WSMessage, ctx: &mut Self::Context) {
+    // println!("id: {} msg: {}", self.id, msg.0);
+    ctx.text(msg.0);
+  }
+}
+
+/// WebSocket message handler
+impl StreamHandler<ws::Message, ws::ProtocolError> for WSSession {
+  fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
+    // println!("WEBSOCKET MESSAGE: {:?} from id: {}", msg, self.id);
+    match msg {
+      ws::Message::Ping(msg) => {
+        self.hb = Instant::now();
+        ctx.pong(&msg);
+      }
+      ws::Message::Pong(_) => {
+        self.hb = Instant::now();
+      }
+      ws::Message::Text(text) => {
+        let m = text.trim().to_owned();
+        println!("WEBSOCKET MESSAGE: {:?} from id: {}", &m, self.id);
+
+        self
+          .cs_addr
+          .send(StandardMessage {
+            id: self.id,
+            msg: m,
+          })
+          .into_actor(self)
+          .then(|res, _, ctx| {
+            match res {
+              Ok(res) => ctx.text(res),
+              Err(e) => {
+                eprintln!("{}", &e);
+              }
+            }
+            fut::ok(())
+          })
+          .wait(ctx);
+      }
+      ws::Message::Binary(_bin) => println!("Unexpected binary"),
+      ws::Message::Close(_) => {
+        ctx.stop();
+      }
+      _ => {}
+    }
+  }
+}
+
+impl WSSession {
+  /// helper method that sends ping to client every second.
+  ///
+  /// also this method checks heartbeats from client
+  fn hb(&self, ctx: &mut ws::WebsocketContext<Self>) {
+    ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
+      // check client heartbeats
+      if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
+        // heartbeat timed out
+        println!("Websocket Client heartbeat failed, disconnecting!");
+
+        // notify chat server
+        act.cs_addr.do_send(Disconnect {
+          id: act.id,
+          ip: act.ip.to_owned(),
+        });
+
+        // stop actor
+        ctx.stop();
+
+        // don't try to send a ping
+        return;
+      }
+
+      ctx.ping("");
+    });
+  }
+}
+
+fn main() {
+  let _ = env_logger::init();
+  let sys = actix::System::new("lemmy");
 
   // Run the migrations from code
-  let conn = pool.get().unwrap();
+  let conn = establish_connection();
   embedded_migrations::run(&conn).unwrap();
 
-  // Set up websocket server
-  let server = ChatServer::startup(pool.clone()).start();
+  // Start chat server actor in separate thread
+  let server = ChatServer::default().start();
 
-  println!(
-    "Starting http server at {}:{}",
-    settings.bind, settings.port
-  );
+  let settings = Settings::get();
 
   // Create Http server with websocket support
   HttpServer::new(move || {
     App::new()
-      .wrap(middleware::Logger::default())
-      .data(pool.clone())
       .data(server.clone())
-      // The routes
-      .configure(api::config)
-      .configure(federation::config)
-      .configure(feeds::config)
-      .configure(index::config)
-      .configure(nodeinfo::config)
-      .configure(webfinger::config)
-      .configure(websocket::config)
-      // static files
-      .service(actix_files::Files::new(
-        "/static",
-        settings.front_end_dir.to_owned(),
-      ))
-      .service(actix_files::Files::new(
-        "/docs",
-        settings.front_end_dir.to_owned() + "/documentation",
-      ))
+      // Front end routes
+      .service(actix_files::Files::new("/static", front_end_dir()))
+      .route("/", web::get().to(index))
+      .route(
+        "/home/type/{type}/sort/{sort}/page/{page}",
+        web::get().to(index),
+      )
+      .route("/login", web::get().to(index))
+      .route("/create_post", web::get().to(index))
+      .route("/create_community", web::get().to(index))
+      .route("/communities/page/{page}", web::get().to(index))
+      .route("/communities", web::get().to(index))
+      .route("/post/{id}/comment/{id2}", web::get().to(index))
+      .route("/post/{id}", web::get().to(index))
+      .route("/c/{name}/sort/{sort}/page/{page}", web::get().to(index))
+      .route("/c/{name}", web::get().to(index))
+      .route("/community/{id}", web::get().to(index))
+      .route(
+        "/u/{username}/view/{view}/sort/{sort}/page/{page}",
+        web::get().to(index),
+      )
+      .route("/u/{username}", web::get().to(index))
+      .route("/user/{id}", web::get().to(index))
+      .route("/inbox", web::get().to(index))
+      .route("/modlog/community/{community_id}", web::get().to(index))
+      .route("/modlog", web::get().to(index))
+      .route("/setup", web::get().to(index))
+      .route(
+        "/search/q/{q}/type/{type}/sort/{sort}/page/{page}",
+        web::get().to(index),
+      )
+      .route("/search", web::get().to(index))
+      .route("/sponsors", web::get().to(index))
+      .route("/password_change/{token}", web::get().to(index))
+      // Websocket
+      .service(web::resource("/api/v1/ws").to(chat_route))
+      // NodeInfo
+      .route("/nodeinfo/2.0.json", web::get().to(nodeinfo::node_info))
+      .route(
+        "/.well-known/nodeinfo",
+        web::get().to(nodeinfo::node_info_well_known),
+      )
+      // RSS
+      .route("/feeds/{type}/{name}.xml", web::get().to(feeds::get_feed))
+      .route("/feeds/all.xml", web::get().to(feeds::get_all_feed))
   })
-  .bind((settings.bind, settings.port))?
-  .run()
-  .await
+  .bind((settings.bind, settings.port))
+  .unwrap()
+  .start();
+
+  println!("Started http server at {}:{}", settings.bind, settings.port);
+  let _ = sys.run();
+}
+
+fn index() -> Result<NamedFile, actix_web::error::Error> {
+  Ok(NamedFile::open(front_end_dir() + "/index.html")?)
+}
+
+fn front_end_dir() -> String {
+  env::var("LEMMY_FRONT_END_DIR").unwrap_or("../ui/dist".to_string())
 }

server/src/nodeinfo.rs

@@ -0,0 +1,47 @@
+use crate::db::establish_connection;
+use crate::db::site_view::SiteView;
+use crate::version;
+use crate::Settings;
+use actix_web::body::Body;
+use actix_web::HttpResponse;
+use serde_json::json;
+
+pub fn node_info_well_known() -> HttpResponse<Body> {
+  let json = json!({
+    "links": {
+      "rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
+      "href": format!("https://{}/nodeinfo/2.0.json", Settings::get().hostname),
+    }
+  });
+
+  return HttpResponse::Ok()
+    .content_type("application/json")
+    .body(json.to_string());
+}
+
+pub fn node_info() -> HttpResponse<Body> {
+  let conn = establish_connection();
+  let site_view = match SiteView::read(&conn) {
+    Ok(site_view) => site_view,
+    Err(_e) => return HttpResponse::InternalServerError().finish(),
+  };
+  let json = json!({
+    "version": "2.0",
+    "software": {
+      "name": "lemmy",
+      "version": version::VERSION,
+    },
+    "protocols": [],
+    "usage": {
+      "users": {
+        "total": site_view.number_of_users
+      },
+      "localPosts": site_view.number_of_posts,
+      "localComments": site_view.number_of_comments,
+      "openRegistrations": true,
+      }
+  });
+  return HttpResponse::Ok()
+    .content_type("application/json")
+    .body(json.to_string());
+}

server/src/routes/api.rs

@@ -1,103 +0,0 @@
-use crate::api::comment::*;
-use crate::api::community::*;
-use crate::api::post::*;
-use crate::api::site::*;
-use crate::api::user::*;
-use crate::api::{Oper, Perform};
-use actix_web::{web, HttpResponse};
-use diesel::r2d2::{ConnectionManager, Pool};
-use diesel::PgConnection;
-use failure::Error;
-use serde::Serialize;
-
-type DbParam = web::Data<Pool<ConnectionManager<PgConnection>>>;
-
-#[rustfmt::skip]
-pub fn config(cfg: &mut web::ServiceConfig) {
-  cfg
-    // Site
-    .route("/api/v1/site", web::get().to(route_get::<GetSite, GetSiteResponse>))
-    .route("/api/v1/categories", web::get().to(route_get::<ListCategories, ListCategoriesResponse>))
-    .route("/api/v1/modlog", web::get().to(route_get::<GetModlog, GetModlogResponse>))
-    .route("/api/v1/search", web::get().to(route_get::<Search, SearchResponse>))
-    // Community
-    .route("/api/v1/community", web::post().to(route_post::<CreateCommunity, CommunityResponse>))
-    .route("/api/v1/community", web::get().to(route_get::<GetCommunity, GetCommunityResponse>))
-    .route("/api/v1/community", web::put().to(route_post::<EditCommunity, CommunityResponse>))
-    .route("/api/v1/community/list", web::get().to(route_get::<ListCommunities, ListCommunitiesResponse>))
-    .route("/api/v1/community/follow", web::post().to(route_post::<FollowCommunity, CommunityResponse>))
-    // Post
-    .route("/api/v1/post", web::post().to(route_post::<CreatePost, PostResponse>))
-    .route("/api/v1/post", web::put().to(route_post::<EditPost, PostResponse>))
-    .route("/api/v1/post", web::get().to(route_get::<GetPost, GetPostResponse>))
-    .route("/api/v1/post/list", web::get().to(route_get::<GetPosts, GetPostsResponse>))
-    .route("/api/v1/post/like", web::post().to(route_post::<CreatePostLike, CreatePostLikeResponse>))
-    .route("/api/v1/post/save", web::put().to(route_post::<SavePost, PostResponse>))
-    // Comment
-    .route("/api/v1/comment", web::post().to(route_post::<CreateComment, CommentResponse>))
-    .route("/api/v1/comment", web::put().to(route_post::<EditComment, CommentResponse>))
-    .route("/api/v1/comment/like", web::post().to(route_post::<CreateCommentLike, CommentResponse>))
-    .route("/api/v1/comment/save", web::put().to(route_post::<SaveComment, CommentResponse>))
-    // User
-    .route("/api/v1/user", web::get().to(route_get::<GetUserDetails, GetUserDetailsResponse>))
-    .route("/api/v1/user/mention", web::get().to(route_get::<GetUserMentions, GetUserMentionsResponse>))
-    .route("/api/v1/user/mention", web::put().to(route_post::<EditUserMention, UserMentionResponse>))
-    .route("/api/v1/user/replies", web::get().to(route_get::<GetReplies, GetRepliesResponse>))
-    .route("/api/v1/user/followed_communities", web::get().to(route_get::<GetFollowedCommunities, GetFollowedCommunitiesResponse>))
-    // Mod actions
-    .route("/api/v1/community/transfer", web::post().to(route_post::<TransferCommunity, GetCommunityResponse>))
-    .route("/api/v1/community/ban_user", web::post().to(route_post::<BanFromCommunity, BanFromCommunityResponse>))
-    .route("/api/v1/community/mod", web::post().to(route_post::<AddModToCommunity, AddModToCommunityResponse>))
-    // Admin actions
-    .route("/api/v1/site", web::post().to(route_post::<CreateSite, SiteResponse>))
-    .route("/api/v1/site", web::put().to(route_post::<EditSite, SiteResponse>))
-    .route("/api/v1/site/transfer", web::post().to(route_post::<TransferSite, GetSiteResponse>))
-    .route("/api/v1/admin/add", web::post().to(route_post::<AddAdmin, AddAdminResponse>))
-    .route("/api/v1/user/ban", web::post().to(route_post::<BanUser, BanUserResponse>))
-    // User account actions
-    .route("/api/v1/user/login", web::post().to(route_post::<Login, LoginResponse>))
-    .route("/api/v1/user/register", web::post().to(route_post::<Register, LoginResponse>))
-    .route("/api/v1/user/delete_account", web::post().to(route_post::<DeleteAccount, LoginResponse>))
-    .route("/api/v1/user/password_reset", web::post().to(route_post::<PasswordReset, PasswordResetResponse>))
-    .route("/api/v1/user/password_change", web::post().to(route_post::<PasswordChange, LoginResponse>))
-    .route("/api/v1/user/mark_all_as_read", web::post().to(route_post::<MarkAllAsRead, GetRepliesResponse>))
-    .route("/api/v1/user/save_user_settings", web::put().to(route_post::<SaveUserSettings, LoginResponse>));
-}
-
-fn perform<Request, Response>(data: Request, db: DbParam) -> Result<HttpResponse, Error>
-where
-  Response: Serialize,
-  Oper<Request>: Perform<Response>,
-{
-  let conn = match db.get() {
-    Ok(c) => c,
-    Err(e) => return Err(format_err!("{}", e)),
-  };
-  let oper: Oper<Request> = Oper::new(data);
-  let response = oper.perform(&conn);
-  Ok(HttpResponse::Ok().json(response?))
-}
-
-async fn route_get<Data, Response>(
-  data: web::Query<Data>,
-  db: DbParam,
-) -> Result<HttpResponse, Error>
-where
-  Data: Serialize,
-  Response: Serialize,
-  Oper<Data>: Perform<Response>,
-{
-  perform::<Data, Response>(data.0, db)
-}
-
-async fn route_post<Data, Response>(
-  data: web::Json<Data>,
-  db: DbParam,
-) -> Result<HttpResponse, Error>
-where
-  Data: Serialize,
-  Response: Serialize,
-  Oper<Data>: Perform<Response>,
-{
-  perform::<Data, Response>(data.0, db)
-}

server/src/routes/federation.rs

@@ -1,18 +0,0 @@
-use crate::apub;
-use actix_web::web;
-
-pub fn config(cfg: &mut web::ServiceConfig) {
-  cfg
-    .route(
-      "/federation/c/{community_name}",
-      web::get().to(apub::community::get_apub_community),
-    )
-    .route(
-      "/federation/c/{community_name}/followers",
-      web::get().to(apub::community::get_apub_community_followers),
-    )
-    .route(
-      "/federation/u/{user_name}",
-      web::get().to(apub::user::get_apub_user),
-    );
-}

server/src/routes/index.rs

@@ -1,46 +0,0 @@
-use crate::settings::Settings;
-use actix_files::NamedFile;
-use actix_web::web;
-
-pub fn config(cfg: &mut web::ServiceConfig) {
-  cfg
-    .route("/", web::get().to(index))
-    .route(
-      "/home/type/{type}/sort/{sort}/page/{page}",
-      web::get().to(index),
-    )
-    .route("/login", web::get().to(index))
-    .route("/create_post", web::get().to(index))
-    .route("/create_community", web::get().to(index))
-    .route("/create_private_message", web::get().to(index))
-    .route("/communities/page/{page}", web::get().to(index))
-    .route("/communities", web::get().to(index))
-    .route("/post/{id}/comment/{id2}", web::get().to(index))
-    .route("/post/{id}", web::get().to(index))
-    .route("/c/{name}/sort/{sort}/page/{page}", web::get().to(index))
-    .route("/c/{name}", web::get().to(index))
-    .route("/community/{id}", web::get().to(index))
-    .route(
-      "/u/{username}/view/{view}/sort/{sort}/page/{page}",
-      web::get().to(index),
-    )
-    .route("/u/{username}", web::get().to(index))
-    .route("/user/{id}", web::get().to(index))
-    .route("/inbox", web::get().to(index))
-    .route("/modlog/community/{community_id}", web::get().to(index))
-    .route("/modlog", web::get().to(index))
-    .route("/setup", web::get().to(index))
-    .route(
-      "/search/q/{q}/type/{type}/sort/{sort}/page/{page}",
-      web::get().to(index),
-    )
-    .route("/search", web::get().to(index))
-    .route("/sponsors", web::get().to(index))
-    .route("/password_change/{token}", web::get().to(index));
-}
-
-async fn index() -> Result<NamedFile, actix_web::error::Error> {
-  Ok(NamedFile::open(
-    Settings::get().front_end_dir.to_owned() + "/index.html",
-  )?)
-}