Version 0.10.0-rc.7

Merge pull request #1500 from LemmyNet/jwt_revocation_dess
Jwt revocation dess
2021-03-19 11:46:46 -04:00 · 2021-03-19 15:43:47 +00:00 · 2021-03-19 10:02:58 -04:00 · 2021-03-19 13:41:22 +00:00 · 2021-03-19 13:20:23 +00:00 · 2021-03-19 00:31:49 -04:00
149 changed files with 5070 additions and 3684 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -21,7 +21,13 @@ steps:
  - name: cargo clippy
    image: ekidd/rust-musl-builder:1.50.0
    environment:
      CARGO_HOME: /drone/src/.cargo
    commands:
      - whoami
      - ls -la ~/.cargo
      - mv ~/.cargo .
      - ls -la .cargo
      - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
      - cargo clippy --workspace -- -D clippy::unwrap_used
@ -30,6 +36,8 @@ steps:
    environment:
      LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
      RUST_BACKTRACE: 1
      RUST_TEST_THREADS: 1
      CARGO_HOME: /drone/src/.cargo
    commands:
      - sudo apt-get update
      - sudo apt-get -y install --no-install-recommends espeak postgresql-client
@ -37,6 +45,8 @@ steps:
  - name: cargo build
    image: ekidd/rust-musl-builder:1.50.0
    environment:
      CARGO_HOME: /drone/src/.cargo
    commands:
      - cargo build
      - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
@ -107,6 +117,8 @@ steps:
    environment:
      LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
      RUST_BACKTRACE: 1
      RUST_TEST_THREADS: 1
      CARGO_HOME: /drone/src/.cargo
    commands:
      - apt-get update
      - apt-get -y install --no-install-recommends espeak postgresql-client libssl-dev pkg-config libpq-dev
@ -116,6 +128,8 @@ steps:
  # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM.
  - name: cargo build
    image: rust:1.50-slim-buster
    environment:
      CARGO_HOME: /drone/src/.cargo
    commands:
      - apt-get update
      - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev
--- a/Cargo.lock
+++ b/Cargo.lock
@ -144,8 +144,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655"
 dependencies = [
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -333,9 +333,9 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -344,9 +344,9 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b95aceadaf327f18f0df5962fedc1bde2f870566a0b9f65c89508a3b1f79334c"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -406,9 +406,9 @@ version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -916,10 +916,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 dependencies = [
 "fnv",
 "ident_case",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
 "strsim",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -929,8 +929,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
 "darling_core",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -951,9 +951,9 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
 dependencies = [
 "darling",
 "derive_builder_core",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -963,9 +963,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
 dependencies = [
 "darling",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -974,9 +974,9 @@ version = "0.99.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -1003,15 +1003,27 @@ dependencies = [
 "serde_json",
 ]
 [[package]]
 name = "diesel-derive-newtype"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e844e8e6f65dcf27aa0b97d4234f974d93dfbf56816033d71b5e0c7eb701709f"
 dependencies = [
 "diesel",
 "proc-macro2 0.4.30",
 "quote 0.6.13",
 "syn 0.14.9",
 ]
 [[package]]
 name = "diesel_derives"
 version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -1085,9 +1097,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
 dependencies = [
 "heck",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -1253,9 +1265,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
 dependencies = [
 "proc-macro-hack",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -1852,6 +1864,7 @@ version = "0.1.0"
 dependencies = [
 "chrono",
 "diesel",
 "diesel-derive-newtype",
 "log",
 "serde",
 "serde_json",
@ -2144,9 +2157,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
 dependencies = [
 "proc-macro-error",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -2165,9 +2178,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
 dependencies = [
 "migrations_internals",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -2475,9 +2488,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
 "pest",
 "pest_meta",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -2515,9 +2528,9 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -2526,9 +2539,9 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -2589,9 +2602,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
 "proc-macro-error-attr",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 "version_check",
 ]
@ -2601,8 +2614,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
 "version_check",
 ]
@ -2618,13 +2631,22 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 dependencies = [
 "unicode-xid 0.1.0",
 ]
 [[package]]
 name = "proc-macro2"
 version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
- "unicode-xid",
+ "unicode-xid 0.2.1",
 ]
 [[package]]
@ -2643,13 +2665,22 @@ dependencies = [
 "memchr",
 ]
 [[package]]
 name = "quote"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 dependencies = [
 "proc-macro2 0.4.30",
 ]
 [[package]]
 name = "quote"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
 ]
 [[package]]
@ -3032,9 +3063,9 @@ version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -3078,9 +3109,9 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -3211,11 +3242,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
 "serde",
 "serde_derive",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -3225,13 +3256,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
 "base-x",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
 "serde",
 "serde_derive",
 "serde_json",
 "sha1",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -3259,9 +3290,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
 dependencies = [
 "heck",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
 name = "syn"
 version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
 dependencies = [
 "proc-macro2 0.4.30",
 "quote 0.6.13",
 "unicode-xid 0.1.0",
 ]
 [[package]]
@ -3270,9 +3312,9 @@ version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "unicode-xid",
+ "unicode-xid 0.2.1",
 ]
 [[package]]
@ -3319,9 +3361,9 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -3396,10 +3438,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
 "proc-macro-hack",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
 "standback",
- "syn",
+ "syn 1.0.60",
 ]
 [[package]]
@ -3635,6 +3677,12 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 [[package]]
 name = "unicode-xid"
 version = "0.2.1"
@ -3731,9 +3779,9 @@ dependencies = [
 "bumpalo",
 "lazy_static",
 "log",
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 "wasm-bindgen-shared",
 ]
@ -3755,7 +3803,7 @@ version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c"
 dependencies = [
- "quote",
+ "quote 1.0.8",
 "wasm-bindgen-macro-support",
 ]
@ -3765,9 +3813,9 @@ version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
 dependencies = [
- "proc-macro2",
+ "proc-macro2 1.0.24",
- "quote",
+ "quote 1.0.8",
- "syn",
+ "syn 1.0.60",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
--- a/ansible/VERSION
+++ b/ansible/VERSION
@ -1 +1 @@
-0.9.9
+0.10.0-rc.7
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@ -1,4 +1,4 @@
-version: '3.3'
+version: '2.2'
 services:
  lemmy:
@ -38,7 +38,7 @@ services:
    restart: always
  pictrs:
-    image: asonix/pictrs:v0.2.5-r0
+    image: asonix/pictrs:v0.2.6-r1
    user: 991:991
    ports:
      - "127.0.0.1:8537:8080"
--- a/api_tests/package.json
+++ b/api_tests/package.json
@ -16,7 +16,7 @@
    "eslint": "^7.18.0",
    "eslint-plugin-jane": "^9.0.3",
    "jest": "^26.6.3",
-    "lemmy-js-client": "0.9.1-rc.1",
+    "lemmy-js-client": "0.10.0-rc.4",
    "node-fetch": "^2.6.1",
    "prettier": "^2.1.2",
    "ts-jest": "^26.4.4",
--- a/api_tests/src/community.spec.ts
+++ b/api_tests/src/community.spec.ts
@ -33,9 +33,6 @@ function assertCommunityFederation(
  );
  expect(communityOne.creator.actor_id).toBe(communityTwo.creator.actor_id);
  expect(communityOne.community.nsfw).toBe(communityTwo.community.nsfw);
  expect(communityOne.community.category_id).toBe(
    communityTwo.community.category_id
  );
  expect(communityOne.community.removed).toBe(communityTwo.community.removed);
  expect(communityOne.community.deleted).toBe(communityTwo.community.deleted);
 }
--- a/api_tests/src/post.spec.ts
+++ b/api_tests/src/post.spec.ts
@ -20,9 +20,9 @@ import {
  getPost,
  unfollowRemotes,
  searchForUser,
-  banUserFromSite,
+  banPersonFromSite,
  searchPostLocal,
-  banUserFromCommunity,
+  banPersonFromCommunity,
 } from './shared';
 import { PostView, CommunityView } from 'lemmy-js-client';
@ -305,7 +305,7 @@ test('Enforce site ban for federated user', async () => {
  expect(alphaUser).toBeDefined();
  // ban alpha from beta site
-  let banAlpha = await banUserFromSite(beta, alphaUser.user.id, true);
+  let banAlpha = await banPersonFromSite(beta, alphaUser.person.id, true);
  expect(banAlpha.banned).toBe(true);
  // Alpha makes post on beta
@ -321,7 +321,7 @@ test('Enforce site ban for federated user', async () => {
  expect(betaPost).toBeUndefined();
  // Unban alpha
-  let unBanAlpha = await banUserFromSite(beta, alphaUser.user.id, false);
+  let unBanAlpha = await banPersonFromSite(beta, alphaUser.person.id, false);
  expect(unBanAlpha.banned).toBe(false);
 });
@ -332,8 +332,8 @@ test('Enforce community ban for federated user', async () => {
  expect(alphaUser).toBeDefined();
  // ban alpha from beta site
-  await banUserFromCommunity(beta, alphaUser.user.id, 2, false);
+  await banPersonFromCommunity(beta, alphaUser.person.id, 2, false);
-  let banAlpha = await banUserFromCommunity(beta, alphaUser.user.id, 2, true);
+  let banAlpha = await banPersonFromCommunity(beta, alphaUser.person.id, 2, true);
  expect(banAlpha.banned).toBe(true);
  // Alpha makes post on beta
@ -349,9 +349,9 @@ test('Enforce community ban for federated user', async () => {
  expect(betaPost).toBeUndefined();
  // Unban alpha
-  let unBanAlpha = await banUserFromCommunity(
+  let unBanAlpha = await banPersonFromCommunity(
    beta,
-    alphaUser.user.id,
+    alphaUser.person.id,
    2,
    false
  );
--- a/api_tests/src/shared.ts
+++ b/api_tests/src/shared.ts
@ -25,7 +25,7 @@ import {
  CreateCommunity,
  DeleteCommunity,
  RemoveCommunity,
-  GetUserMentions,
+  GetPersonMentions,
  CreateCommentLike,
  CreatePostLike,
  EditPrivateMessage,
@ -36,15 +36,15 @@ import {
  GetPost,
  PrivateMessageResponse,
  PrivateMessagesResponse,
-  GetUserMentionsResponse,
+  GetPersonMentionsResponse,
  SaveUserSettings,
  SortType,
  ListingType,
  GetSiteResponse,
  SearchType,
  LemmyHttp,
-  BanUserResponse,
+  BanPersonResponse,
-  BanUser,
+  BanPerson,
  BanFromCommunity,
  BanFromCommunityResponse,
  Post,
@ -289,32 +289,32 @@ export async function searchForUser(
  return api.client.search(form);
 }
-export async function banUserFromSite(
+export async function banPersonFromSite(
  api: API,
-  user_id: number,
+  person_id: number,
  ban: boolean
-): Promise<BanUserResponse> {
+): Promise<BanPersonResponse> {
  // Make sure lemmy-beta/c/main is cached on lemmy_alpha
  // Use short-hand search url
-  let form: BanUser = {
+  let form: BanPerson = {
-    user_id,
+    person_id,
    ban,
    remove_data: false,
    auth: api.auth,
  };
-  return api.client.banUser(form);
+  return api.client.banPerson(form);
 }
-export async function banUserFromCommunity(
+export async function banPersonFromCommunity(
  api: API,
-  user_id: number,
+  person_id: number,
  community_id: number,
  ban: boolean
 ): Promise<BanFromCommunityResponse> {
  // Make sure lemmy-beta/c/main is cached on lemmy_alpha
  // Use short-hand search url
  let form: BanFromCommunity = {
-    user_id,
+    person_id,
    community_id,
    remove_data: false,
    ban,
@ -413,13 +413,13 @@ export async function removeComment(
  return api.client.removeComment(form);
 }
-export async function getMentions(api: API): Promise<GetUserMentionsResponse> {
+export async function getMentions(api: API): Promise<GetPersonMentionsResponse> {
-  let form: GetUserMentions = {
+  let form: GetPersonMentions = {
    sort: SortType.New,
    unread_only: false,
    auth: api.auth,
  };
-  return api.client.getUserMentions(form);
+  return api.client.getPersonMentions(form);
 }
 export async function likeComment(
@ -448,7 +448,6 @@ export async function createCommunity(
    description,
    icon,
    banner,
    category_id: 1,
    nsfw: false,
    auth: api.auth,
  };
--- a/api_tests/src/user.spec.ts
+++ b/api_tests/src/user.spec.ts
@ -8,7 +8,7 @@ import {
  getSite,
 } from './shared';
 import {
-  UserViewSafe,
+  PersonViewSafe,
  SaveUserSettings,
  SortType,
  ListingType,
@ -17,14 +17,14 @@ import {
 let auth: string;
 let apShortname: string;
-function assertUserFederation(userOne: UserViewSafe, userTwo: UserViewSafe) {
+function assertUserFederation(userOne: PersonViewSafe, userTwo: PersonViewSafe) {
-  expect(userOne.user.name).toBe(userTwo.user.name);
+  expect(userOne.person.name).toBe(userTwo.person.name);
-  expect(userOne.user.preferred_username).toBe(userTwo.user.preferred_username);
+  expect(userOne.person.preferred_username).toBe(userTwo.person.preferred_username);
-  expect(userOne.user.bio).toBe(userTwo.user.bio);
+  expect(userOne.person.bio).toBe(userTwo.person.bio);
-  expect(userOne.user.actor_id).toBe(userTwo.user.actor_id);
+  expect(userOne.person.actor_id).toBe(userTwo.person.actor_id);
-  expect(userOne.user.avatar).toBe(userTwo.user.avatar);
+  expect(userOne.person.avatar).toBe(userTwo.person.avatar);
-  expect(userOne.user.banner).toBe(userTwo.user.banner);
+  expect(userOne.person.banner).toBe(userTwo.person.banner);
-  expect(userOne.user.published).toBe(userTwo.user.published);
+  expect(userOne.person.published).toBe(userTwo.person.published);
 }
 test('Create user', async () => {
@ -34,7 +34,7 @@ test('Create user', async () => {
  let site = await getSite(alpha, auth);
  expect(site.my_user).toBeDefined();
-  apShortname = `@${site.my_user.name}@lemmy-alpha:8541`;
+  apShortname = `@${site.my_user.person.name}@lemmy-alpha:8541`;
 });
 test('Set some user settings, check that they are federated', async () => {
--- a/api_tests/yarn.lock
+++ b/api_tests/yarn.lock
@ -3233,10 +3233,10 @@ language-tags@^1.0.5:
  dependencies:
    language-subtag-registry "~0.3.2"
-lemmy-js-client@0.9.1-rc.1:
+lemmy-js-client@0.10.0-rc.4:
-  version "0.9.1-rc.1"
+  version "0.10.0-rc.4"
-  resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.9.1-rc.1.tgz#afe3cb0d4852f849dd087a4756a3771bc920a907"
+  resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.0-rc.4.tgz#ac6fe6940fc5f73260ddb166ce0ef3c0520901fc"
-  integrity sha512-aVvo4IeJvIPUvypipk4GnyLB6nVQVLfB0arYrMkVV4L7zrZ/0pGtpkMDLaOAj/KpA6O0u9eLmaou5RberZQolA==
+  integrity sha512-yJPnvGaWneOOwjKEqb4qXtQk+4DbRgO+hEzSin2GgUgnxluY43gemwiCPt6EnV+j4ueKoi0+QORVg2RuRC2PaQ==
 leven@^3.1.0:
  version "3.1.0"
--- a/crates/api/src/comment.rs
+++ b/crates/api/src/comment.rs
@ -2,9 +2,9 @@ use crate::{
  check_community_ban,
  check_downvotes_enabled,
  collect_moderated_communities,
  get_local_user_view_from_jwt,
  get_local_user_view_from_jwt_opt,
  get_post,
  get_user_from_jwt,
  get_user_from_jwt_opt,
  is_mod_or_admin,
  Perform,
 };
@ -20,10 +20,14 @@ use lemmy_db_queries::{
  Saveable,
  SortType,
 };
-use lemmy_db_schema::source::{comment::*, comment_report::*, moderator::*};
+use lemmy_db_schema::{
  source::{comment::*, comment_report::*, moderator::*},
  LocalUserId,
 };
 use lemmy_db_views::{
  comment_report_view::{CommentReportQueryBuilder, CommentReportView},
  comment_view::{CommentQueryBuilder, CommentView},
  local_user_view::LocalUserView,
 };
 use lemmy_utils::{
  utils::{remove_slurs, scrape_text_for_mentions},
@ -48,7 +52,7 @@ impl Perform for CreateComment {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &CreateComment = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let content_slurs_removed = remove_slurs(&data.content.to_owned());
@ -56,7 +60,7 @@ impl Perform for CreateComment {
    let post_id = data.post_id;
    let post = get_post(post_id, context.pool()).await?;
-    check_community_ban(user.id, post.community_id, context.pool()).await?;
+    check_community_ban(local_user_view.person.id, post.community_id, context.pool()).await?;
    // Check if post is locked, no new comments
    if post.locked {
@ -80,7 +84,7 @@ impl Perform for CreateComment {
      content: content_slurs_removed,
      parent_id: data.parent_id.to_owned(),
      post_id: data.post_id,
-      creator_id: user.id,
+      creator_id: local_user_view.person.id,
      removed: None,
      deleted: None,
      read: None,
@ -115,7 +119,9 @@ impl Perform for CreateComment {
        Err(_e) => return Err(ApiError::err("couldnt_create_comment").into()),
      };
-    updated_comment.send_create(&user, context).await?;
+    updated_comment
      .send_create(&local_user_view.person, context)
      .await?;
    // Scan the comment for user mentions, add those rows
    let post_id = post.id;
@ -123,7 +129,7 @@ impl Perform for CreateComment {
    let recipient_ids = send_local_notifs(
      mentions,
      updated_comment.clone(),
-      &user,
+      local_user_view.person.clone(),
      post,
      context.pool(),
      true,
@ -134,7 +140,7 @@ impl Perform for CreateComment {
    let like_form = CommentLikeForm {
      comment_id: inserted_comment.id,
      post_id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
      score: 1,
    };
@ -143,17 +149,19 @@ impl Perform for CreateComment {
      return Err(ApiError::err("couldnt_like_comment").into());
    }
-    updated_comment.send_like(&user, context).await?;
+    updated_comment
      .send_like(&local_user_view.person, context)
      .await?;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let mut comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(&conn, inserted_comment.id, Some(user_id))
+      CommentView::read(&conn, inserted_comment.id, Some(person_id))
    })
    .await??;
    // If its a comment to yourself, mark it as read
    let comment_id = comment_view.comment.id;
-    if user.id == comment_view.get_recipient_id() {
+    if local_user_view.person.id == comment_view.get_recipient_id() {
      match blocking(context.pool(), move |conn| {
        Comment::update_read(conn, comment_id, true)
      })
@ -193,7 +201,7 @@ impl Perform for EditComment {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &EditComment = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let comment_id = data.comment_id;
    let orig_comment = blocking(context.pool(), move |conn| {
@ -201,10 +209,15 @@ impl Perform for EditComment {
    })
    .await??;
-    check_community_ban(user.id, orig_comment.community.id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_comment.community.id,
      context.pool(),
    )
    .await?;
    // Verify that only the creator can edit
-    if user.id != orig_comment.creator.id {
+    if local_user_view.person.id != orig_comment.creator.id {
      return Err(ApiError::err("no_comment_edit_allowed").into());
    }
@ -221,7 +234,9 @@ impl Perform for EditComment {
    };
    // Send the apub update
-    updated_comment.send_update(&user, context).await?;
+    updated_comment
      .send_update(&local_user_view.person, context)
      .await?;
    // Do the mentions / recipients
    let updated_comment_content = updated_comment.content.to_owned();
@ -229,7 +244,7 @@ impl Perform for EditComment {
    let recipient_ids = send_local_notifs(
      mentions,
      updated_comment,
-      &user,
+      local_user_view.person.clone(),
      orig_comment.post,
      context.pool(),
      false,
@ -237,9 +252,9 @@ impl Perform for EditComment {
    .await?;
    let comment_id = data.comment_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(user_id))
+      CommentView::read(conn, comment_id, Some(person_id))
    })
    .await??;
@ -269,7 +284,7 @@ impl Perform for DeleteComment {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &DeleteComment = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let comment_id = data.comment_id;
    let orig_comment = blocking(context.pool(), move |conn| {
@ -277,10 +292,15 @@ impl Perform for DeleteComment {
    })
    .await??;
-    check_community_ban(user.id, orig_comment.community.id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_comment.community.id,
      context.pool(),
    )
    .await?;
    // Verify that only the creator can delete
-    if user.id != orig_comment.creator.id {
+    if local_user_view.person.id != orig_comment.creator.id {
      return Err(ApiError::err("no_comment_edit_allowed").into());
    }
@ -297,16 +317,20 @@ impl Perform for DeleteComment {
    // Send the apub message
    if deleted {
-      updated_comment.send_delete(&user, context).await?;
+      updated_comment
        .send_delete(&local_user_view.person, context)
        .await?;
    } else {
-      updated_comment.send_undo_delete(&user, context).await?;
+      updated_comment
        .send_undo_delete(&local_user_view.person, context)
        .await?;
    }
    // Refetch it
    let comment_id = data.comment_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(user_id))
+      CommentView::read(conn, comment_id, Some(person_id))
    })
    .await??;
@ -316,7 +340,7 @@ impl Perform for DeleteComment {
    let recipient_ids = send_local_notifs(
      mentions,
      updated_comment,
-      &user,
+      local_user_view.person.clone(),
      comment_view_2.post,
      context.pool(),
      false,
@ -349,7 +373,7 @@ impl Perform for RemoveComment {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &RemoveComment = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let comment_id = data.comment_id;
    let orig_comment = blocking(context.pool(), move |conn| {
@ -357,10 +381,20 @@ impl Perform for RemoveComment {
    })
    .await??;
-    check_community_ban(user.id, orig_comment.community.id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_comment.community.id,
      context.pool(),
    )
    .await?;
    // Verify that only a mod or admin can remove
-    is_mod_or_admin(context.pool(), user.id, orig_comment.community.id).await?;
+    is_mod_or_admin(
      context.pool(),
      local_user_view.person.id,
      orig_comment.community.id,
    )
    .await?;
    // Do the remove
    let removed = data.removed;
@ -375,7 +409,7 @@ impl Perform for RemoveComment {
    // Mod tables
    let form = ModRemoveCommentForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
      comment_id: data.comment_id,
      removed: Some(removed),
      reason: data.reason.to_owned(),
@ -387,16 +421,20 @@ impl Perform for RemoveComment {
    // Send the apub message
    if removed {
-      updated_comment.send_remove(&user, context).await?;
+      updated_comment
        .send_remove(&local_user_view.person, context)
        .await?;
    } else {
-      updated_comment.send_undo_remove(&user, context).await?;
+      updated_comment
        .send_undo_remove(&local_user_view.person, context)
        .await?;
    }
    // Refetch it
    let comment_id = data.comment_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(user_id))
+      CommentView::read(conn, comment_id, Some(person_id))
    })
    .await??;
@ -407,7 +445,7 @@ impl Perform for RemoveComment {
    let recipient_ids = send_local_notifs(
      mentions,
      updated_comment,
-      &user,
+      local_user_view.person.clone(),
      comment_view_2.post,
      context.pool(),
      false,
@ -440,7 +478,7 @@ impl Perform for MarkCommentAsRead {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &MarkCommentAsRead = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let comment_id = data.comment_id;
    let orig_comment = blocking(context.pool(), move |conn| {
@ -448,10 +486,15 @@ impl Perform for MarkCommentAsRead {
    })
    .await??;
-    check_community_ban(user.id, orig_comment.community.id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_comment.community.id,
      context.pool(),
    )
    .await?;
    // Verify that only the recipient can mark as read
-    if user.id != orig_comment.get_recipient_id() {
+    if local_user_view.person.id != orig_comment.get_recipient_id() {
      return Err(ApiError::err("no_comment_edit_allowed").into());
    }
@ -468,9 +511,9 @@ impl Perform for MarkCommentAsRead {
    // Refetch it
    let comment_id = data.comment_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(user_id))
+      CommentView::read(conn, comment_id, Some(person_id))
    })
    .await??;
@ -494,11 +537,11 @@ impl Perform for SaveComment {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &SaveComment = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let comment_saved_form = CommentSavedForm {
      comment_id: data.comment_id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
    };
    if data.save {
@ -514,9 +557,9 @@ impl Perform for SaveComment {
    }
    let comment_id = data.comment_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(user_id))
+      CommentView::read(conn, comment_id, Some(person_id))
    })
    .await??;
@ -538,9 +581,9 @@ impl Perform for CreateCommentLike {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommentResponse, LemmyError> {
    let data: &CreateCommentLike = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
-    let mut recipient_ids = Vec::new();
+    let mut recipient_ids = Vec::<LocalUserId>::new();
    // Don't do a downvote if site has downvotes disabled
    check_downvotes_enabled(data.score, context.pool()).await?;
@ -551,22 +594,34 @@ impl Perform for CreateCommentLike {
    })
    .await??;
-    check_community_ban(user.id, orig_comment.community.id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_comment.community.id,
      context.pool(),
    )
    .await?;
    // Add parent user to recipients
-    recipient_ids.push(orig_comment.get_recipient_id());
+    let recipient_id = orig_comment.get_recipient_id();
    if let Ok(local_recipient) = blocking(context.pool(), move |conn| {
      LocalUserView::read_person(conn, recipient_id)
    })
    .await?
    {
      recipient_ids.push(local_recipient.local_user.id);
    }
    let like_form = CommentLikeForm {
      comment_id: data.comment_id,
      post_id: orig_comment.post.id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
      score: data.score,
    };
    // Remove any likes first
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    blocking(context.pool(), move |conn| {
-      CommentLike::remove(conn, user_id, comment_id)
+      CommentLike::remove(conn, person_id, comment_id)
    })
    .await??;
@ -581,19 +636,23 @@ impl Perform for CreateCommentLike {
      }
      if like_form.score == 1 {
-        comment.send_like(&user, context).await?;
+        comment.send_like(&local_user_view.person, context).await?;
      } else if like_form.score == -1 {
-        comment.send_dislike(&user, context).await?;
+        comment
          .send_dislike(&local_user_view.person, context)
          .await?;
      }
    } else {
-      comment.send_undo_like(&user, context).await?;
+      comment
        .send_undo_like(&local_user_view.person, context)
        .await?;
    }
    // Have to refetch the comment to get the current state
    let comment_id = data.comment_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let liked_comment = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(user_id))
+      CommentView::read(conn, comment_id, Some(person_id))
    })
    .await??;
@ -623,8 +682,8 @@ impl Perform for GetComments {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetCommentsResponse, LemmyError> {
    let data: &GetComments = &self;
-    let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
-    let user_id = user.map(|u| u.id);
+    let person_id = local_user_view.map(|u| u.person.id);
    let type_ = ListingType::from_str(&data.type_)?;
    let sort = SortType::from_str(&data.sort)?;
@ -639,7 +698,7 @@ impl Perform for GetComments {
        .sort(&sort)
        .community_id(community_id)
        .community_name(community_name)
-        .my_user_id(user_id)
+        .my_person_id(person_id)
        .page(page)
        .limit(limit)
        .list()
@ -665,7 +724,7 @@ impl Perform for CreateCommentReport {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CreateCommentReportResponse, LemmyError> {
    let data: &CreateCommentReport = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // check size of report and check for whitespace
    let reason = data.reason.trim();
@ -676,17 +735,17 @@ impl Perform for CreateCommentReport {
      return Err(ApiError::err("report_too_long").into());
    }
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let comment_id = data.comment_id;
    let comment_view = blocking(context.pool(), move |conn| {
      CommentView::read(&conn, comment_id, None)
    })
    .await??;
-    check_community_ban(user_id, comment_view.community.id, context.pool()).await?;
+    check_community_ban(person_id, comment_view.community.id, context.pool()).await?;
    let report_form = CommentReportForm {
-      creator_id: user_id,
+      creator_id: person_id,
      comment_id,
      original_comment_text: comment_view.comment.content,
      reason: data.reason.to_owned(),
@ -706,7 +765,7 @@ impl Perform for CreateCommentReport {
    context.chat_server().do_send(SendUserRoomMessage {
      op: UserOperation::CreateCommentReport,
      response: res.clone(),
-      recipient_id: user.id,
+      local_recipient_id: local_user_view.local_user.id,
      websocket_id,
    });
@ -732,7 +791,7 @@ impl Perform for ResolveCommentReport {
    websocket_id: Option<ConnectionId>,
  ) -> Result<ResolveCommentReportResponse, LemmyError> {
    let data: &ResolveCommentReport = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let report_id = data.report_id;
    let report = blocking(context.pool(), move |conn| {
@ -740,15 +799,15 @@ impl Perform for ResolveCommentReport {
    })
    .await??;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
-    is_mod_or_admin(context.pool(), user_id, report.community.id).await?;
+    is_mod_or_admin(context.pool(), person_id, report.community.id).await?;
    let resolved = data.resolved;
    let resolve_fun = move |conn: &'_ _| {
      if resolved {
-        CommentReport::resolve(conn, report_id, user_id)
+        CommentReport::resolve(conn, report_id, person_id)
      } else {
-        CommentReport::unresolve(conn, report_id, user_id)
+        CommentReport::unresolve(conn, report_id, person_id)
      }
    };
@ -785,12 +844,12 @@ impl Perform for ListCommentReports {
    websocket_id: Option<ConnectionId>,
  ) -> Result<ListCommentReportsResponse, LemmyError> {
    let data: &ListCommentReports = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_id = data.community;
    let community_ids =
-      collect_moderated_communities(user_id, community_id, context.pool()).await?;
+      collect_moderated_communities(person_id, community_id, context.pool()).await?;
    let page = data.page;
    let limit = data.limit;
@ -808,7 +867,7 @@ impl Perform for ListCommentReports {
    context.chat_server().do_send(SendUserRoomMessage {
      op: UserOperation::ListCommentReports,
      response: res.clone(),
-      recipient_id: user.id,
+      local_recipient_id: local_user_view.local_user.id,
      websocket_id,
    });
--- a/crates/api/src/community.rs
+++ b/crates/api/src/community.rs
@ -1,7 +1,7 @@
 use crate::{
  check_community_ban,
-  get_user_from_jwt,
+  get_local_user_view_from_jwt,
-  get_user_from_jwt_opt,
+  get_local_user_view_from_jwt_opt,
  is_admin,
  is_mod_or_admin,
  Perform,
@ -35,13 +35,14 @@ use lemmy_db_queries::{
 use lemmy_db_schema::{
  naive_now,
  source::{comment::Comment, community::*, moderator::*, post::Post, site::*},
  PersonId,
 };
 use lemmy_db_views::comment_view::CommentQueryBuilder;
 use lemmy_db_views_actor::{
  community_follower_view::CommunityFollowerView,
  community_moderator_view::CommunityModeratorView,
  community_view::{CommunityQueryBuilder, CommunityView},
-  user_view::UserViewSafe,
+  person_view::PersonViewSafe,
 };
 use lemmy_utils::{
  apub::generate_actor_keypair,
@ -68,8 +69,8 @@ impl Perform for GetCommunity {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetCommunityResponse, LemmyError> {
    let data: &GetCommunity = &self;
-    let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
-    let user_id = user.map(|u| u.id);
+    let person_id = local_user_view.map(|u| u.person.id);
    let community_id = match data.id {
      Some(id) => id,
@ -88,7 +89,7 @@ impl Perform for GetCommunity {
    };
    let community_view = match blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, user_id)
+      CommunityView::read(conn, community_id, person_id)
    })
    .await?
    {
@ -132,7 +133,7 @@ impl Perform for CreateCommunity {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<CommunityResponse, LemmyError> {
    let data: &CreateCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    check_slurs(&data.name)?;
    check_slurs(&data.title)?;
@ -166,7 +167,7 @@ impl Perform for CreateCommunity {
      description: data.description.to_owned(),
      icon,
      banner,
-      creator_id: user.id,
+      creator_id: local_user_view.person.id,
      removed: None,
      deleted: None,
      nsfw: data.nsfw,
@ -194,7 +195,7 @@ impl Perform for CreateCommunity {
    // The community creator becomes a moderator
    let community_moderator_form = CommunityModeratorForm {
      community_id: inserted_community.id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
    };
    let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
@ -205,7 +206,7 @@ impl Perform for CreateCommunity {
    // Follow your own community
    let community_follower_form = CommunityFollowerForm {
      community_id: inserted_community.id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
      pending: false,
    };
@ -214,9 +215,9 @@ impl Perform for CreateCommunity {
      return Err(ApiError::err("community_follower_already_exists").into());
    }
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_view = blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, inserted_community.id, Some(user_id))
+      CommunityView::read(conn, inserted_community.id, Some(person_id))
    })
    .await??;
@ -234,19 +235,19 @@ impl Perform for EditCommunity {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommunityResponse, LemmyError> {
    let data: &EditCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    check_slurs(&data.title)?;
    check_slurs_opt(&data.description)?;
    // Verify its a mod (only mods can edit it)
    let community_id = data.community_id;
-    let mods: Vec<i32> = blocking(context.pool(), move |conn| {
+    let mods: Vec<PersonId> = blocking(context.pool(), move |conn| {
      CommunityModeratorView::for_community(conn, community_id)
        .map(|v| v.into_iter().map(|m| m.moderator.id).collect())
    })
    .await??;
-    if !mods.contains(&user.id) {
+    if !mods.contains(&local_user_view.person.id) {
      return Err(ApiError::err("not_a_moderator").into());
    }
@ -295,9 +296,9 @@ impl Perform for EditCommunity {
    // process for communities and users
    let community_id = data.community_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_view = blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, Some(user_id))
+      CommunityView::read(conn, community_id, Some(person_id))
    })
    .await??;
@ -319,7 +320,7 @@ impl Perform for DeleteCommunity {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommunityResponse, LemmyError> {
    let data: &DeleteCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // Verify its the creator (only a creator can delete the community)
    let community_id = data.community_id;
@ -327,7 +328,7 @@ impl Perform for DeleteCommunity {
      Community::read(conn, community_id)
    })
    .await??;
-    if read_community.creator_id != user.id {
+    if read_community.creator_id != local_user_view.person.id {
      return Err(ApiError::err("no_community_edit_allowed").into());
    }
@ -351,9 +352,9 @@ impl Perform for DeleteCommunity {
    }
    let community_id = data.community_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_view = blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, Some(user_id))
+      CommunityView::read(conn, community_id, Some(person_id))
    })
    .await??;
@ -375,10 +376,10 @@ impl Perform for RemoveCommunity {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CommunityResponse, LemmyError> {
    let data: &RemoveCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // Verify its an admin (only an admin can remove a community)
-    is_admin(context.pool(), user.id).await?;
+    is_admin(&local_user_view)?;
    // Do the remove
    let community_id = data.community_id;
@ -398,7 +399,7 @@ impl Perform for RemoveCommunity {
      None => None,
    };
    let form = ModRemoveCommunityForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
      community_id: data.community_id,
      removed: Some(removed),
      reason: data.reason.to_owned(),
@ -417,9 +418,9 @@ impl Perform for RemoveCommunity {
    }
    let community_id = data.community_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_view = blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, Some(user_id))
+      CommunityView::read(conn, community_id, Some(person_id))
    })
    .await??;
@ -441,15 +442,16 @@ impl Perform for ListCommunities {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<ListCommunitiesResponse, LemmyError> {
    let data: &ListCommunities = &self;
-    let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
-    let user_id = match &user {
+    let person_id = match &local_user_view {
-      Some(user) => Some(user.id),
+      Some(uv) => Some(uv.person.id),
      None => None,
    };
-    let show_nsfw = match &user {
+    // Don't show NSFW by default
-      Some(user) => user.show_nsfw,
+    let show_nsfw = match &local_user_view {
      Some(uv) => uv.local_user.show_nsfw,
      None => false,
    };
@ -463,7 +465,7 @@ impl Perform for ListCommunities {
        .listing_type(&type_)
        .sort(&sort)
        .show_nsfw(show_nsfw)
-        .my_user_id(user_id)
+        .my_person_id(person_id)
        .page(page)
        .limit(limit)
        .list()
@ -485,7 +487,7 @@ impl Perform for FollowCommunity {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<CommunityResponse, LemmyError> {
    let data: &FollowCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let community_id = data.community_id;
    let community = blocking(context.pool(), move |conn| {
@ -494,13 +496,13 @@ impl Perform for FollowCommunity {
    .await??;
    let community_follower_form = CommunityFollowerForm {
      community_id: data.community_id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
      pending: false,
    };
    if community.local {
      if data.follow {
-        check_community_ban(user.id, community_id, context.pool()).await?;
+        check_community_ban(local_user_view.person.id, community_id, context.pool()).await?;
        let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
        if blocking(context.pool(), follow).await?.is_err() {
@ -516,9 +518,15 @@ impl Perform for FollowCommunity {
    } else if data.follow {
      // Dont actually add to the community followers here, because you need
      // to wait for the accept
-      user.send_follow(&community.actor_id(), context).await?;
+      local_user_view
        .person
        .send_follow(&community.actor_id(), context)
        .await?;
    } else {
-      user.send_unfollow(&community.actor_id(), context).await?;
+      local_user_view
        .person
        .send_unfollow(&community.actor_id(), context)
        .await?;
      let unfollow = move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
      if blocking(context.pool(), unfollow).await?.is_err() {
        return Err(ApiError::err("community_follower_already_exists").into());
@ -526,9 +534,9 @@ impl Perform for FollowCommunity {
    }
    let community_id = data.community_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let mut community_view = blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, Some(user_id))
+      CommunityView::read(conn, community_id, Some(person_id))
    })
    .await??;
@ -553,11 +561,11 @@ impl Perform for GetFollowedCommunities {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetFollowedCommunitiesResponse, LemmyError> {
    let data: &GetFollowedCommunities = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let communities = match blocking(context.pool(), move |conn| {
-      CommunityFollowerView::for_user(conn, user_id)
+      CommunityFollowerView::for_person(conn, person_id)
    })
    .await?
    {
@ -580,21 +588,21 @@ impl Perform for BanFromCommunity {
    websocket_id: Option<ConnectionId>,
  ) -> Result<BanFromCommunityResponse, LemmyError> {
    let data: &BanFromCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let community_id = data.community_id;
-    let banned_user_id = data.user_id;
+    let banned_person_id = data.person_id;
    // Verify that only mods or admins can ban
-    is_mod_or_admin(context.pool(), user.id, community_id).await?;
+    is_mod_or_admin(context.pool(), local_user_view.person.id, community_id).await?;
-    let community_user_ban_form = CommunityUserBanForm {
+    let community_user_ban_form = CommunityPersonBanForm {
      community_id: data.community_id,
-      user_id: data.user_id,
+      person_id: data.person_id,
    };
    if data.ban {
-      let ban = move |conn: &'_ _| CommunityUserBan::ban(conn, &community_user_ban_form);
+      let ban = move |conn: &'_ _| CommunityPersonBan::ban(conn, &community_user_ban_form);
      if blocking(context.pool(), ban).await?.is_err() {
        return Err(ApiError::err("community_user_already_banned").into());
      }
@ -602,7 +610,7 @@ impl Perform for BanFromCommunity {
      // Also unsubscribe them from the community, if they are subscribed
      let community_follower_form = CommunityFollowerForm {
        community_id: data.community_id,
-        user_id: banned_user_id,
+        person_id: banned_person_id,
        pending: false,
      };
      blocking(context.pool(), move |conn: &'_ _| {
@ -611,7 +619,7 @@ impl Perform for BanFromCommunity {
      .await?
      .ok();
    } else {
-      let unban = move |conn: &'_ _| CommunityUserBan::unban(conn, &community_user_ban_form);
+      let unban = move |conn: &'_ _| CommunityPersonBan::unban(conn, &community_user_ban_form);
      if blocking(context.pool(), unban).await?.is_err() {
        return Err(ApiError::err("community_user_already_banned").into());
      }
@ -621,7 +629,7 @@ impl Perform for BanFromCommunity {
    if data.remove_data {
      // Posts
      blocking(context.pool(), move |conn: &'_ _| {
-        Post::update_removed_for_creator(conn, banned_user_id, Some(community_id), true)
+        Post::update_removed_for_creator(conn, banned_person_id, Some(community_id), true)
      })
      .await??;
@ -629,7 +637,7 @@ impl Perform for BanFromCommunity {
      // TODO Diesel doesn't allow updates with joins, so this has to be a loop
      let comments = blocking(context.pool(), move |conn| {
        CommentQueryBuilder::create(conn)
-          .creator_id(banned_user_id)
+          .creator_id(banned_person_id)
          .community_id(community_id)
          .limit(std::i64::MAX)
          .list()
@ -653,8 +661,8 @@ impl Perform for BanFromCommunity {
    };
    let form = ModBanFromCommunityForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
-      other_user_id: data.user_id,
+      other_person_id: data.person_id,
      community_id: data.community_id,
      reason: data.reason.to_owned(),
      banned: Some(data.ban),
@ -665,14 +673,14 @@ impl Perform for BanFromCommunity {
    })
    .await??;
-    let user_id = data.user_id;
+    let person_id = data.person_id;
-    let user_view = blocking(context.pool(), move |conn| {
+    let person_view = blocking(context.pool(), move |conn| {
-      UserViewSafe::read(conn, user_id)
+      PersonViewSafe::read(conn, person_id)
    })
    .await??;
    let res = BanFromCommunityResponse {
-      user_view,
+      person_view,
      banned: data.ban,
    };
@ -697,17 +705,17 @@ impl Perform for AddModToCommunity {
    websocket_id: Option<ConnectionId>,
  ) -> Result<AddModToCommunityResponse, LemmyError> {
    let data: &AddModToCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let community_moderator_form = CommunityModeratorForm {
      community_id: data.community_id,
-      user_id: data.user_id,
+      person_id: data.person_id,
    };
    let community_id = data.community_id;
    // Verify that only mods or admins can add mod
-    is_mod_or_admin(context.pool(), user.id, community_id).await?;
+    is_mod_or_admin(context.pool(), local_user_view.person.id, community_id).await?;
    if data.added {
      let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
@ -723,8 +731,8 @@ impl Perform for AddModToCommunity {
    // Mod tables
    let form = ModAddCommunityForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
-      other_user_id: data.user_id,
+      other_person_id: data.person_id,
      community_id: data.community_id,
      removed: Some(!data.added),
    };
@ -762,7 +770,7 @@ impl Perform for TransferCommunity {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetCommunityResponse, LemmyError> {
    let data: &TransferCommunity = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let community_id = data.community_id;
    let read_community = blocking(context.pool(), move |conn| {
@ -775,25 +783,28 @@ impl Perform for TransferCommunity {
    })
    .await??;
-    let mut admins = blocking(context.pool(), move |conn| UserViewSafe::admins(conn)).await??;
+    let mut admins = blocking(context.pool(), move |conn| PersonViewSafe::admins(conn)).await??;
    // Making sure the creator, if an admin, is at the top
    let creator_index = admins
      .iter()
-      .position(|r| r.user.id == site_creator_id)
+      .position(|r| r.person.id == site_creator_id)
      .context(location_info!())?;
-    let creator_user = admins.remove(creator_index);
+    let creator_person = admins.remove(creator_index);
-    admins.insert(0, creator_user);
+    admins.insert(0, creator_person);
    // Make sure user is the creator, or an admin
-    if user.id != read_community.creator_id
+    if local_user_view.person.id != read_community.creator_id
-      && !admins.iter().map(|a| a.user.id).any(|x| x == user.id)
+      && !admins
        .iter()
        .map(|a| a.person.id)
        .any(|x| x == local_user_view.person.id)
    {
      return Err(ApiError::err("not_an_admin").into());
    }
    let community_id = data.community_id;
-    let new_creator = data.user_id;
+    let new_creator = data.person_id;
    let update = move |conn: &'_ _| Community::update_creator(conn, community_id, new_creator);
    if blocking(context.pool(), update).await?.is_err() {
      return Err(ApiError::err("couldnt_update_community").into());
@ -807,10 +818,10 @@ impl Perform for TransferCommunity {
    .await??;
    let creator_index = community_mods
      .iter()
-      .position(|r| r.moderator.id == data.user_id)
+      .position(|r| r.moderator.id == data.person_id)
      .context(location_info!())?;
-    let creator_user = community_mods.remove(creator_index);
+    let creator_person = community_mods.remove(creator_index);
-    community_mods.insert(0, creator_user);
+    community_mods.insert(0, creator_person);
    let community_id = data.community_id;
    blocking(context.pool(), move |conn| {
@ -822,7 +833,7 @@ impl Perform for TransferCommunity {
    for cmod in &community_mods {
      let community_moderator_form = CommunityModeratorForm {
        community_id: cmod.community.id,
-        user_id: cmod.moderator.id,
+        person_id: cmod.moderator.id,
      };
      let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
@ -833,8 +844,8 @@ impl Perform for TransferCommunity {
    // Mod tables
    let form = ModAddCommunityForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
-      other_user_id: data.user_id,
+      other_person_id: data.person_id,
      community_id: data.community_id,
      removed: Some(false),
    };
@ -844,9 +855,9 @@ impl Perform for TransferCommunity {
    .await??;
    let community_id = data.community_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_view = match blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, Some(user_id))
+      CommunityView::read(conn, community_id, Some(person_id))
    })
    .await?
    {
@ -879,7 +890,7 @@ fn send_community_websocket(
  websocket_id: Option<ConnectionId>,
  op: UserOperation,
 ) {
-  // Strip out the user id and subscribed when sending to others
+  // Strip out the person id and subscribed when sending to others
  let mut res_sent = res.clone();
  res_sent.community_view.subscribed = false;
--- a/crates/api/src/lib.rs
+++ b/crates/api/src/lib.rs
@ -3,28 +3,33 @@ use lemmy_api_structs::{
  blocking,
  comment::*,
  community::*,
  person::*,
  post::*,
  site::*,
  user::*,
  websocket::*,
 };
 use lemmy_db_queries::{
  source::{
    community::{CommunityModerator_, Community_},
    site::Site_,
    user::UserSafeSettings_,
  },
  Crud,
  DbPool,
 };
-use lemmy_db_schema::source::{
+use lemmy_db_schema::{
-  community::{Community, CommunityModerator},
+  source::{
-  post::Post,
+    community::{Community, CommunityModerator},
-  site::Site,
+    post::Post,
-  user::{UserSafeSettings, User_},
+    site::Site,
  },
  CommunityId,
  LocalUserId,
  PersonId,
  PostId,
 };
 use lemmy_db_views::local_user_view::{LocalUserSettingsView, LocalUserView};
 use lemmy_db_views_actor::{
-  community_user_ban_view::CommunityUserBanView,
+  community_person_ban_view::CommunityPersonBanView,
  community_view::CommunityView,
 };
 use lemmy_utils::{
@ -36,15 +41,15 @@ use lemmy_utils::{
 };
 use lemmy_websocket::{serialize_websocket_message, LemmyContext, UserOperation};
 use serde::Deserialize;
-use std::process::Command;
+use std::{env, process::Command};
 use url::Url;
 pub mod comment;
 pub mod community;
 pub mod local_user;
 pub mod post;
 pub mod routes;
 pub mod site;
 pub mod user;
 pub mod websocket;
 #[async_trait::async_trait(?Send)]
@ -60,11 +65,11 @@ pub trait Perform {
 pub(crate) async fn is_mod_or_admin(
  pool: &DbPool,
-  user_id: i32,
+  person_id: PersonId,
-  community_id: i32,
+  community_id: CommunityId,
 ) -> Result<(), LemmyError> {
  let is_mod_or_admin = blocking(pool, move |conn| {
-    CommunityView::is_mod_or_admin(conn, user_id, community_id)
+    CommunityView::is_mod_or_admin(conn, person_id, community_id)
  })
  .await?;
  if !is_mod_or_admin {
@ -72,78 +77,107 @@ pub(crate) async fn is_mod_or_admin(
  }
  Ok(())
 }
-pub async fn is_admin(pool: &DbPool, user_id: i32) -> Result<(), LemmyError> {
+
-  let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
+pub fn is_admin(local_user_view: &LocalUserView) -> Result<(), LemmyError> {
-  if !user.admin {
+  if !local_user_view.local_user.admin {
    return Err(ApiError::err("not_an_admin").into());
  }
  Ok(())
 }
-pub(crate) async fn get_post(post_id: i32, pool: &DbPool) -> Result<Post, LemmyError> {
+pub(crate) async fn get_post(post_id: PostId, pool: &DbPool) -> Result<Post, LemmyError> {
  match blocking(pool, move |conn| Post::read(conn, post_id)).await? {
    Ok(post) => Ok(post),
    Err(_e) => Err(ApiError::err("couldnt_find_post").into()),
  }
 }
-pub(crate) async fn get_user_from_jwt(jwt: &str, pool: &DbPool) -> Result<User_, LemmyError> {
+pub(crate) async fn get_local_user_view_from_jwt(
  jwt: &str,
  pool: &DbPool,
 ) -> Result<LocalUserView, LemmyError> {
  let claims = match Claims::decode(&jwt) {
    Ok(claims) => claims.claims,
    Err(_e) => return Err(ApiError::err("not_logged_in").into()),
  };
-  let user_id = claims.id;
+  let local_user_id = LocalUserId(claims.sub);
-  let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
+  let local_user_view =
    blocking(pool, move |conn| LocalUserView::read(conn, local_user_id)).await??;
  // Check for a site ban
-  if user.banned {
+  if local_user_view.person.banned {
    return Err(ApiError::err("site_ban").into());
  }
-  Ok(user)
+
  check_validator_time(&local_user_view.local_user.validator_time, &claims)?;
  Ok(local_user_view)
 }
-pub(crate) async fn get_user_from_jwt_opt(
+/// Checks if user's token was issued before user's password reset.
 pub(crate) fn check_validator_time(
  validator_time: &chrono::NaiveDateTime,
  claims: &Claims,
 ) -> Result<(), LemmyError> {
  let user_validation_time = validator_time.timestamp();
  if user_validation_time > claims.iat {
    Err(ApiError::err("not_logged_in").into())
  } else {
    Ok(())
  }
 }
 pub(crate) async fn get_local_user_view_from_jwt_opt(
  jwt: &Option<String>,
  pool: &DbPool,
-) -> Result<Option<User_>, LemmyError> {
+) -> Result<Option<LocalUserView>, LemmyError> {
  match jwt {
-    Some(jwt) => Ok(Some(get_user_from_jwt(jwt, pool).await?)),
+    Some(jwt) => Ok(Some(get_local_user_view_from_jwt(jwt, pool).await?)),
    None => Ok(None),
  }
 }
-pub(crate) async fn get_user_safe_settings_from_jwt(
+pub(crate) async fn get_local_user_settings_view_from_jwt(
  jwt: &str,
  pool: &DbPool,
-) -> Result<UserSafeSettings, LemmyError> {
+) -> Result<LocalUserSettingsView, LemmyError> {
  let claims = match Claims::decode(&jwt) {
    Ok(claims) => claims.claims,
    Err(_e) => return Err(ApiError::err("not_logged_in").into()),
  };
-  let user_id = claims.id;
+  let local_user_id = LocalUserId(claims.sub);
-  let user = blocking(pool, move |conn| UserSafeSettings::read(conn, user_id)).await??;
+  let local_user_view = blocking(pool, move |conn| {
    LocalUserSettingsView::read(conn, local_user_id)
  })
  .await??;
  // Check for a site ban
-  if user.banned {
+  if local_user_view.person.banned {
    return Err(ApiError::err("site_ban").into());
  }
-  Ok(user)
+
  check_validator_time(&local_user_view.local_user.validator_time, &claims)?;
  Ok(local_user_view)
 }
-pub(crate) async fn get_user_safe_settings_from_jwt_opt(
+pub(crate) async fn get_local_user_settings_view_from_jwt_opt(
  jwt: &Option<String>,
  pool: &DbPool,
-) -> Result<Option<UserSafeSettings>, LemmyError> {
+) -> Result<Option<LocalUserSettingsView>, LemmyError> {
  match jwt {
-    Some(jwt) => Ok(Some(get_user_safe_settings_from_jwt(jwt, pool).await?)),
+    Some(jwt) => Ok(Some(
      get_local_user_settings_view_from_jwt(jwt, pool).await?,
    )),
    None => Ok(None),
  }
 }
 pub(crate) async fn check_community_ban(
-  user_id: i32,
+  person_id: PersonId,
-  community_id: i32,
+  community_id: CommunityId,
  pool: &DbPool,
 ) -> Result<(), LemmyError> {
-  let is_banned = move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
+  let is_banned =
    move |conn: &'_ _| CommunityPersonBanView::get(conn, person_id, community_id).is_ok();
  if blocking(pool, is_banned).await? {
    Err(ApiError::err("community_ban").into())
  } else {
@ -165,21 +199,21 @@ pub(crate) async fn check_downvotes_enabled(score: i16, pool: &DbPool) -> Result
 /// or if a community_id is supplied validates the user is a moderator
 /// of that community and returns the community id in a vec
 ///
-/// * `user_id` - the user id of the moderator
+/// * `person_id` - the person id of the moderator
 /// * `community_id` - optional community id to check for moderator privileges
 /// * `pool` - the diesel db pool
 pub(crate) async fn collect_moderated_communities(
-  user_id: i32,
+  person_id: PersonId,
-  community_id: Option<i32>,
+  community_id: Option<CommunityId>,
  pool: &DbPool,
-) -> Result<Vec<i32>, LemmyError> {
+) -> Result<Vec<CommunityId>, LemmyError> {
  if let Some(community_id) = community_id {
    // if the user provides a community_id, just check for mod/admin privileges
-    is_mod_or_admin(pool, user_id, community_id).await?;
+    is_mod_or_admin(pool, person_id, community_id).await?;
    Ok(vec![community_id])
  } else {
    let ids = blocking(pool, move |conn: &'_ _| {
-      CommunityModerator::get_user_moderated_communities(conn, user_id)
+      CommunityModerator::get_person_moderated_communities(conn, person_id)
    })
    .await??;
    Ok(ids)
@ -236,17 +270,17 @@ pub async fn match_websocket_operation(
    UserOperation::Login => do_websocket_operation::<Login>(context, id, op, data).await,
    UserOperation::Register => do_websocket_operation::<Register>(context, id, op, data).await,
    UserOperation::GetCaptcha => do_websocket_operation::<GetCaptcha>(context, id, op, data).await,
-    UserOperation::GetUserDetails => {
+    UserOperation::GetPersonDetails => {
-      do_websocket_operation::<GetUserDetails>(context, id, op, data).await
+      do_websocket_operation::<GetPersonDetails>(context, id, op, data).await
    }
    UserOperation::GetReplies => do_websocket_operation::<GetReplies>(context, id, op, data).await,
    UserOperation::AddAdmin => do_websocket_operation::<AddAdmin>(context, id, op, data).await,
-    UserOperation::BanUser => do_websocket_operation::<BanUser>(context, id, op, data).await,
+    UserOperation::BanPerson => do_websocket_operation::<BanPerson>(context, id, op, data).await,
-    UserOperation::GetUserMentions => {
+    UserOperation::GetPersonMentions => {
-      do_websocket_operation::<GetUserMentions>(context, id, op, data).await
+      do_websocket_operation::<GetPersonMentions>(context, id, op, data).await
    }
-    UserOperation::MarkUserMentionAsRead => {
+    UserOperation::MarkPersonMentionAsRead => {
-      do_websocket_operation::<MarkUserMentionAsRead>(context, id, op, data).await
+      do_websocket_operation::<MarkPersonMentionAsRead>(context, id, op, data).await
    }
    UserOperation::MarkAllAsRead => {
      do_websocket_operation::<MarkAllAsRead>(context, id, op, data).await
@ -444,7 +478,11 @@ pub(crate) fn captcha_espeak_wav_base64(captcha: &str) -> Result<String, LemmyEr
 pub(crate) fn espeak_wav_base64(text: &str) -> Result<String, LemmyError> {
  // Make a temp file path
  let uuid = uuid::Uuid::new_v4().to_string();
-  let file_path = format!("/tmp/lemmy_espeak_{}.wav", &uuid);
+  let file_path = format!(
    "{}/lemmy_espeak_{}.wav",
    env::temp_dir().to_string_lossy(),
    &uuid
  );
  // Write the wav file
  Command::new("espeak")
@ -476,7 +514,70 @@ pub(crate) fn password_length_check(pass: &str) -> Result<(), LemmyError> {
 #[cfg(test)]
 mod tests {
-  use crate::captcha_espeak_wav_base64;
+  use crate::{captcha_espeak_wav_base64, check_validator_time};
  use lemmy_db_queries::{establish_unpooled_connection, source::local_user::LocalUser_, Crud};
  use lemmy_db_schema::source::{
    local_user::{LocalUser, LocalUserForm},
    person::{Person, PersonForm},
  };
  use lemmy_utils::claims::Claims;
  #[test]
  fn test_should_not_validate_user_token_after_password_change() {
    let conn = establish_unpooled_connection();
    let new_person = PersonForm {
      name: "Gerry9812".into(),
      preferred_username: None,
      avatar: None,
      banner: None,
      banned: None,
      deleted: None,
      published: None,
      updated: None,
      actor_id: None,
      bio: None,
      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
      inbox_url: None,
      shared_inbox_url: None,
    };
    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let local_user_form = LocalUserForm {
      person_id: inserted_person.id,
      email: None,
      matrix_user_id: None,
      password_encrypted: "123456".to_string(),
      admin: None,
      show_nsfw: None,
      theme: None,
      default_sort_type: None,
      default_listing_type: None,
      lang: None,
      show_avatars: None,
      send_notifications_to_email: None,
    };
    let inserted_local_user = LocalUser::create(&conn, &local_user_form).unwrap();
    let jwt = Claims::jwt(inserted_local_user.id.0).unwrap();
    let claims = Claims::decode(&jwt).unwrap().claims;
    let check = check_validator_time(&inserted_local_user.validator_time, &claims);
    assert!(check.is_ok());
    // The check should fail, since the validator time is now newer than the jwt issue time
    let updated_local_user =
      LocalUser::update_password(&conn, inserted_local_user.id, &"password111").unwrap();
    let check_after = check_validator_time(&updated_local_user.validator_time, &claims);
    assert!(check_after.is_err());
    let num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
    assert_eq!(1, num_deleted);
  }
  #[test]
  fn test_espeak() {
--- a/crates/api/src/local_user.rs
+++ b/crates/api/src/local_user.rs
--- a/crates/api/src/post.rs
+++ b/crates/api/src/post.rs
@ -2,8 +2,8 @@ use crate::{
  check_community_ban,
  check_downvotes_enabled,
  collect_moderated_communities,
-  get_user_from_jwt,
+  get_local_user_view_from_jwt,
-  get_user_from_jwt_opt,
+  get_local_user_view_from_jwt_opt,
  is_mod_or_admin,
  Perform,
 };
@ -60,7 +60,7 @@ impl Perform for CreatePost {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &CreatePost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    check_slurs(&data.name)?;
    check_slurs_opt(&data.body)?;
@ -69,7 +69,7 @@ impl Perform for CreatePost {
      return Err(ApiError::err("invalid_post_title").into());
    }
-    check_community_ban(user.id, data.community_id, context.pool()).await?;
+    check_community_ban(local_user_view.person.id, data.community_id, context.pool()).await?;
    // Fetch Iframely and pictrs cached image
    let data_url = data.url.as_ref();
@ -81,7 +81,7 @@ impl Perform for CreatePost {
      url: data_url.map(|u| u.to_owned().into()),
      body: data.body.to_owned(),
      community_id: data.community_id,
-      creator_id: user.id,
+      creator_id: local_user_view.person.id,
      removed: None,
      deleted: None,
      nsfw: data.nsfw,
@ -122,12 +122,14 @@ impl Perform for CreatePost {
      Err(_e) => return Err(ApiError::err("couldnt_create_post").into()),
    };
-    updated_post.send_create(&user, context).await?;
+    updated_post
      .send_create(&local_user_view.person, context)
      .await?;
    // They like their own post by default
    let like_form = PostLikeForm {
      post_id: inserted_post.id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
      score: 1,
    };
@ -136,12 +138,14 @@ impl Perform for CreatePost {
      return Err(ApiError::err("couldnt_like_post").into());
    }
-    updated_post.send_like(&user, context).await?;
+    updated_post
      .send_like(&local_user_view.person, context)
      .await?;
    // Refetch the view
    let inserted_post_id = inserted_post.id;
    let post_view = match blocking(context.pool(), move |conn| {
-      PostView::read(conn, inserted_post_id, Some(user.id))
+      PostView::read(conn, inserted_post_id, Some(local_user_view.person.id))
    })
    .await?
    {
@ -171,12 +175,12 @@ impl Perform for GetPost {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetPostResponse, LemmyError> {
    let data: &GetPost = &self;
-    let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
-    let user_id = user.map(|u| u.id);
+    let person_id = local_user_view.map(|u| u.person.id);
    let id = data.id;
    let post_view = match blocking(context.pool(), move |conn| {
-      PostView::read(conn, id, user_id)
+      PostView::read(conn, id, person_id)
    })
    .await?
    {
@ -187,7 +191,7 @@ impl Perform for GetPost {
    let id = data.id;
    let comments = blocking(context.pool(), move |conn| {
      CommentQueryBuilder::create(conn)
-        .my_user_id(user_id)
+        .my_person_id(person_id)
        .post_id(id)
        .limit(9999)
        .list()
@ -202,7 +206,7 @@ impl Perform for GetPost {
    // Necessary for the sidebar
    let community_view = match blocking(context.pool(), move |conn| {
-      CommunityView::read(conn, community_id, user_id)
+      CommunityView::read(conn, community_id, person_id)
    })
    .await?
    {
@ -237,15 +241,15 @@ impl Perform for GetPosts {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetPostsResponse, LemmyError> {
    let data: &GetPosts = &self;
-    let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
-    let user_id = match &user {
+    let person_id = match &local_user_view {
-      Some(user) => Some(user.id),
+      Some(uv) => Some(uv.person.id),
      None => None,
    };
-    let show_nsfw = match &user {
+    let show_nsfw = match &local_user_view {
-      Some(user) => user.show_nsfw,
+      Some(uv) => uv.local_user.show_nsfw,
      None => false,
    };
@ -263,7 +267,7 @@ impl Perform for GetPosts {
        .show_nsfw(show_nsfw)
        .community_id(community_id)
        .community_name(community_name)
-        .my_user_id(user_id)
+        .my_person_id(person_id)
        .page(page)
        .limit(limit)
        .list()
@ -288,7 +292,7 @@ impl Perform for CreatePostLike {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &CreatePostLike = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // Don't do a downvote if site has downvotes disabled
    check_downvotes_enabled(data.score, context.pool()).await?;
@ -297,18 +301,18 @@ impl Perform for CreatePostLike {
    let post_id = data.post_id;
    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
-    check_community_ban(user.id, post.community_id, context.pool()).await?;
+    check_community_ban(local_user_view.person.id, post.community_id, context.pool()).await?;
    let like_form = PostLikeForm {
      post_id: data.post_id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
      score: data.score,
    };
    // Remove any likes first
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    blocking(context.pool(), move |conn| {
-      PostLike::remove(conn, user_id, post_id)
+      PostLike::remove(conn, person_id, post_id)
    })
    .await??;
@ -322,18 +326,20 @@ impl Perform for CreatePostLike {
      }
      if like_form.score == 1 {
-        post.send_like(&user, context).await?;
+        post.send_like(&local_user_view.person, context).await?;
      } else if like_form.score == -1 {
-        post.send_dislike(&user, context).await?;
+        post.send_dislike(&local_user_view.person, context).await?;
      }
    } else {
-      post.send_undo_like(&user, context).await?;
+      post
        .send_undo_like(&local_user_view.person, context)
        .await?;
    }
    let post_id = data.post_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let post_view = match blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user_id))
+      PostView::read(conn, post_id, Some(person_id))
    })
    .await?
    {
@ -363,7 +369,7 @@ impl Perform for EditPost {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &EditPost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    check_slurs(&data.name)?;
    check_slurs_opt(&data.body)?;
@ -375,10 +381,15 @@ impl Perform for EditPost {
    let post_id = data.post_id;
    let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
-    check_community_ban(user.id, orig_post.community_id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_post.community_id,
      context.pool(),
    )
    .await?;
    // Verify that only the creator can edit
-    if !Post::is_post_creator(user.id, orig_post.creator_id) {
+    if !Post::is_post_creator(local_user_view.person.id, orig_post.creator_id) {
      return Err(ApiError::err("no_post_edit_allowed").into());
    }
@ -427,11 +438,13 @@ impl Perform for EditPost {
    };
    // Send apub update
-    updated_post.send_update(&user, context).await?;
+    updated_post
      .send_update(&local_user_view.person, context)
      .await?;
    let post_id = data.post_id;
    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user.id))
+      PostView::read(conn, post_id, Some(local_user_view.person.id))
    })
    .await??;
@ -457,15 +470,20 @@ impl Perform for DeletePost {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &DeletePost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let post_id = data.post_id;
    let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
-    check_community_ban(user.id, orig_post.community_id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_post.community_id,
      context.pool(),
    )
    .await?;
    // Verify that only the creator can delete
-    if !Post::is_post_creator(user.id, orig_post.creator_id) {
+    if !Post::is_post_creator(local_user_view.person.id, orig_post.creator_id) {
      return Err(ApiError::err("no_post_edit_allowed").into());
    }
@ -479,15 +497,19 @@ impl Perform for DeletePost {
    // apub updates
    if deleted {
-      updated_post.send_delete(&user, context).await?;
+      updated_post
        .send_delete(&local_user_view.person, context)
        .await?;
    } else {
-      updated_post.send_undo_delete(&user, context).await?;
+      updated_post
        .send_undo_delete(&local_user_view.person, context)
        .await?;
    }
    // Refetch the post
    let post_id = data.post_id;
    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user.id))
+      PostView::read(conn, post_id, Some(local_user_view.person.id))
    })
    .await??;
@ -513,15 +535,25 @@ impl Perform for RemovePost {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &RemovePost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let post_id = data.post_id;
    let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
-    check_community_ban(user.id, orig_post.community_id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_post.community_id,
      context.pool(),
    )
    .await?;
    // Verify that only the mods can remove
-    is_mod_or_admin(context.pool(), user.id, orig_post.community_id).await?;
+    is_mod_or_admin(
      context.pool(),
      local_user_view.person.id,
      orig_post.community_id,
    )
    .await?;
    // Update the post
    let post_id = data.post_id;
@ -533,7 +565,7 @@ impl Perform for RemovePost {
    // Mod tables
    let form = ModRemovePostForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
      post_id: data.post_id,
      removed: Some(removed),
      reason: data.reason.to_owned(),
@ -545,16 +577,20 @@ impl Perform for RemovePost {
    // apub updates
    if removed {
-      updated_post.send_remove(&user, context).await?;
+      updated_post
        .send_remove(&local_user_view.person, context)
        .await?;
    } else {
-      updated_post.send_undo_remove(&user, context).await?;
+      updated_post
        .send_undo_remove(&local_user_view.person, context)
        .await?;
    }
    // Refetch the post
    let post_id = data.post_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user_id))
+      PostView::read(conn, post_id, Some(person_id))
    })
    .await??;
@ -580,15 +616,25 @@ impl Perform for LockPost {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &LockPost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let post_id = data.post_id;
    let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
-    check_community_ban(user.id, orig_post.community_id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_post.community_id,
      context.pool(),
    )
    .await?;
    // Verify that only the mods can lock
-    is_mod_or_admin(context.pool(), user.id, orig_post.community_id).await?;
+    is_mod_or_admin(
      context.pool(),
      local_user_view.person.id,
      orig_post.community_id,
    )
    .await?;
    // Update the post
    let post_id = data.post_id;
@ -600,19 +646,21 @@ impl Perform for LockPost {
    // Mod tables
    let form = ModLockPostForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
      post_id: data.post_id,
      locked: Some(locked),
    };
    blocking(context.pool(), move |conn| ModLockPost::create(conn, &form)).await??;
    // apub updates
-    updated_post.send_update(&user, context).await?;
+    updated_post
      .send_update(&local_user_view.person, context)
      .await?;
    // Refetch the post
    let post_id = data.post_id;
    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user.id))
+      PostView::read(conn, post_id, Some(local_user_view.person.id))
    })
    .await??;
@ -638,15 +686,25 @@ impl Perform for StickyPost {
    websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &StickyPost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let post_id = data.post_id;
    let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
-    check_community_ban(user.id, orig_post.community_id, context.pool()).await?;
+    check_community_ban(
      local_user_view.person.id,
      orig_post.community_id,
      context.pool(),
    )
    .await?;
    // Verify that only the mods can sticky
-    is_mod_or_admin(context.pool(), user.id, orig_post.community_id).await?;
+    is_mod_or_admin(
      context.pool(),
      local_user_view.person.id,
      orig_post.community_id,
    )
    .await?;
    // Update the post
    let post_id = data.post_id;
@ -658,7 +716,7 @@ impl Perform for StickyPost {
    // Mod tables
    let form = ModStickyPostForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
      post_id: data.post_id,
      stickied: Some(stickied),
    };
@ -669,12 +727,14 @@ impl Perform for StickyPost {
    // Apub updates
    // TODO stickied should pry work like locked for ease of use
-    updated_post.send_update(&user, context).await?;
+    updated_post
      .send_update(&local_user_view.person, context)
      .await?;
    // Refetch the post
    let post_id = data.post_id;
    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user.id))
+      PostView::read(conn, post_id, Some(local_user_view.person.id))
    })
    .await??;
@ -700,11 +760,11 @@ impl Perform for SavePost {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<PostResponse, LemmyError> {
    let data: &SavePost = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let post_saved_form = PostSavedForm {
      post_id: data.post_id,
-      user_id: user.id,
+      person_id: local_user_view.person.id,
    };
    if data.save {
@ -720,9 +780,9 @@ impl Perform for SavePost {
    }
    let post_id = data.post_id;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(user_id))
+      PostView::read(conn, post_id, Some(person_id))
    })
    .await??;
@ -741,7 +801,7 @@ impl Perform for CreatePostReport {
    websocket_id: Option<ConnectionId>,
  ) -> Result<CreatePostReportResponse, LemmyError> {
    let data: &CreatePostReport = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // check size of report and check for whitespace
    let reason = data.reason.trim();
@ -752,17 +812,17 @@ impl Perform for CreatePostReport {
      return Err(ApiError::err("report_too_long").into());
    }
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let post_id = data.post_id;
    let post_view = blocking(context.pool(), move |conn| {
      PostView::read(&conn, post_id, None)
    })
    .await??;
-    check_community_ban(user_id, post_view.community.id, context.pool()).await?;
+    check_community_ban(person_id, post_view.community.id, context.pool()).await?;
    let report_form = PostReportForm {
-      creator_id: user_id,
+      creator_id: person_id,
      post_id,
      original_post_name: post_view.post.name,
      original_post_url: post_view.post.url,
@ -784,7 +844,7 @@ impl Perform for CreatePostReport {
    context.chat_server().do_send(SendUserRoomMessage {
      op: UserOperation::CreatePostReport,
      response: res.clone(),
-      recipient_id: user.id,
+      local_recipient_id: local_user_view.local_user.id,
      websocket_id,
    });
@ -810,7 +870,7 @@ impl Perform for ResolvePostReport {
    websocket_id: Option<ConnectionId>,
  ) -> Result<ResolvePostReportResponse, LemmyError> {
    let data: &ResolvePostReport = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    let report_id = data.report_id;
    let report = blocking(context.pool(), move |conn| {
@ -818,15 +878,15 @@ impl Perform for ResolvePostReport {
    })
    .await??;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
-    is_mod_or_admin(context.pool(), user_id, report.community.id).await?;
+    is_mod_or_admin(context.pool(), person_id, report.community.id).await?;
    let resolved = data.resolved;
    let resolve_fun = move |conn: &'_ _| {
      if resolved {
-        PostReport::resolve(conn, report_id, user_id)
+        PostReport::resolve(conn, report_id, person_id)
      } else {
-        PostReport::unresolve(conn, report_id, user_id)
+        PostReport::unresolve(conn, report_id, person_id)
      }
    };
@ -862,12 +922,12 @@ impl Perform for ListPostReports {
    websocket_id: Option<ConnectionId>,
  ) -> Result<ListPostReportsResponse, LemmyError> {
    let data: &ListPostReports = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
-    let user_id = user.id;
+    let person_id = local_user_view.person.id;
    let community_id = data.community;
    let community_ids =
-      collect_moderated_communities(user_id, community_id, context.pool()).await?;
+      collect_moderated_communities(person_id, community_id, context.pool()).await?;
    let page = data.page;
    let limit = data.limit;
@ -885,7 +945,7 @@ impl Perform for ListPostReports {
    context.chat_server().do_send(SendUserRoomMessage {
      op: UserOperation::ListPostReports,
      response: res.clone(),
-      recipient_id: user.id,
+      local_recipient_id: local_user_view.local_user.id,
      websocket_id,
    });
--- a/crates/api/src/routes.rs
+++ b/crates/api/src/routes.rs
@ -1,6 +1,6 @@
 use crate::Perform;
 use actix_web::{error::ErrorBadRequest, *};
-use lemmy_api_structs::{comment::*, community::*, post::*, site::*, user::*, websocket::*};
+use lemmy_api_structs::{comment::*, community::*, person::*, post::*, site::*, websocket::*};
 use lemmy_utils::rate_limit::RateLimit;
 use lemmy_websocket::{routes::chat_route, LemmyContext};
 use serde::Deserialize;
@ -137,11 +137,11 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
      .service(
        web::scope("/user")
          .wrap(rate_limit.message())
-          .route("", web::get().to(route_get::<GetUserDetails>))
+          .route("", web::get().to(route_get::<GetPersonDetails>))
-          .route("/mention", web::get().to(route_get::<GetUserMentions>))
+          .route("/mention", web::get().to(route_get::<GetPersonMentions>))
          .route(
            "/mention/mark_as_read",
-            web::post().to(route_post::<MarkUserMentionAsRead>),
+            web::post().to(route_post::<MarkPersonMentionAsRead>),
          )
          .route("/replies", web::get().to(route_get::<GetReplies>))
          .route(
@ -150,7 +150,7 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
          )
          .route("/join", web::post().to(route_post::<UserJoin>))
          // Admin action. I don't like that it's in /user
-          .route("/ban", web::post().to(route_post::<BanUser>))
+          .route("/ban", web::post().to(route_post::<BanPerson>))
          // Account actions. I don't like that they're in /user maybe /accounts
          .route("/login", web::post().to(route_post::<Login>))
          .route("/get_captcha", web::get().to(route_get::<GetCaptcha>))
--- a/crates/api/src/site.rs
+++ b/crates/api/src/site.rs
@ -1,15 +1,15 @@
 use crate::{
  build_federated_instances,
-  get_user_from_jwt,
+  get_local_user_settings_view_from_jwt,
-  get_user_from_jwt_opt,
+  get_local_user_settings_view_from_jwt_opt,
-  get_user_safe_settings_from_jwt,
+  get_local_user_view_from_jwt,
-  get_user_safe_settings_from_jwt_opt,
+  get_local_user_view_from_jwt_opt,
  is_admin,
  Perform,
 };
 use actix_web::web::Data;
 use anyhow::Context;
-use lemmy_api_structs::{blocking, site::*, user::Register};
+use lemmy_api_structs::{blocking, person::Register, site::*};
 use lemmy_apub::fetcher::search::search_by_apub_id;
 use lemmy_db_queries::{
  diesel_option_overwrite_to_url,
@ -32,7 +32,7 @@ use lemmy_db_views::{
 };
 use lemmy_db_views_actor::{
  community_view::CommunityQueryBuilder,
-  user_view::{UserQueryBuilder, UserViewSafe},
+  person_view::{PersonQueryBuilder, PersonViewSafe},
 };
 use lemmy_db_views_moderator::{
  mod_add_community_view::ModAddCommunityView,
@ -74,36 +74,36 @@ impl Perform for GetModlog {
    let data: &GetModlog = &self;
    let community_id = data.community_id;
-    let mod_user_id = data.mod_user_id;
+    let mod_person_id = data.mod_person_id;
    let page = data.page;
    let limit = data.limit;
    let removed_posts = blocking(context.pool(), move |conn| {
-      ModRemovePostView::list(conn, community_id, mod_user_id, page, limit)
+      ModRemovePostView::list(conn, community_id, mod_person_id, page, limit)
    })
    .await??;
    let locked_posts = blocking(context.pool(), move |conn| {
-      ModLockPostView::list(conn, community_id, mod_user_id, page, limit)
+      ModLockPostView::list(conn, community_id, mod_person_id, page, limit)
    })
    .await??;
    let stickied_posts = blocking(context.pool(), move |conn| {
-      ModStickyPostView::list(conn, community_id, mod_user_id, page, limit)
+      ModStickyPostView::list(conn, community_id, mod_person_id, page, limit)
    })
    .await??;
    let removed_comments = blocking(context.pool(), move |conn| {
-      ModRemoveCommentView::list(conn, community_id, mod_user_id, page, limit)
+      ModRemoveCommentView::list(conn, community_id, mod_person_id, page, limit)
    })
    .await??;
    let banned_from_community = blocking(context.pool(), move |conn| {
-      ModBanFromCommunityView::list(conn, community_id, mod_user_id, page, limit)
+      ModBanFromCommunityView::list(conn, community_id, mod_person_id, page, limit)
    })
    .await??;
    let added_to_community = blocking(context.pool(), move |conn| {
-      ModAddCommunityView::list(conn, community_id, mod_user_id, page, limit)
+      ModAddCommunityView::list(conn, community_id, mod_person_id, page, limit)
    })
    .await??;
@ -111,9 +111,9 @@ impl Perform for GetModlog {
    let (removed_communities, banned, added) = if data.community_id.is_none() {
      blocking(context.pool(), move |conn| {
        Ok((
-          ModRemoveCommunityView::list(conn, mod_user_id, page, limit)?,
+          ModRemoveCommunityView::list(conn, mod_person_id, page, limit)?,
-          ModBanView::list(conn, mod_user_id, page, limit)?,
+          ModBanView::list(conn, mod_person_id, page, limit)?,
-          ModAddView::list(conn, mod_user_id, page, limit)?,
+          ModAddView::list(conn, mod_person_id, page, limit)?,
        )) as Result<_, LemmyError>
      })
      .await??
@ -152,20 +152,20 @@ impl Perform for CreateSite {
      return Err(ApiError::err("site_already_exists").into());
    };
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    check_slurs(&data.name)?;
    check_slurs_opt(&data.description)?;
    // Make sure user is an admin
-    is_admin(context.pool(), user.id).await?;
+    is_admin(&local_user_view)?;
    let site_form = SiteForm {
      name: data.name.to_owned(),
      description: data.description.to_owned(),
      icon: Some(data.icon.to_owned().map(|url| url.into())),
      banner: Some(data.banner.to_owned().map(|url| url.into())),
-      creator_id: user.id,
+      creator_id: local_user_view.person.id,
      enable_downvotes: data.enable_downvotes,
      open_registration: data.open_registration,
      enable_nsfw: data.enable_nsfw,
@ -192,13 +192,13 @@ impl Perform for EditSite {
    websocket_id: Option<ConnectionId>,
  ) -> Result<SiteResponse, LemmyError> {
    let data: &EditSite = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    check_slurs(&data.name)?;
    check_slurs_opt(&data.description)?;
    // Make sure user is an admin
-    is_admin(context.pool(), user.id).await?;
+    is_admin(&local_user_view)?;
    let found_site = blocking(context.pool(), move |conn| Site::read_simple(conn)).await??;
@ -283,20 +283,20 @@ impl Perform for GetSite {
      }
    };
-    let mut admins = blocking(context.pool(), move |conn| UserViewSafe::admins(conn)).await??;
+    let mut admins = blocking(context.pool(), move |conn| PersonViewSafe::admins(conn)).await??;
    // Make sure the site creator is the top admin
    if let Some(site_view) = site_view.to_owned() {
      let site_creator_id = site_view.creator.id;
      // TODO investigate why this is sometimes coming back null
      // Maybe user_.admin isn't being set to true?
-      if let Some(creator_index) = admins.iter().position(|r| r.user.id == site_creator_id) {
+      if let Some(creator_index) = admins.iter().position(|r| r.person.id == site_creator_id) {
-        let creator_user = admins.remove(creator_index);
+        let creator_person = admins.remove(creator_index);
-        admins.insert(0, creator_user);
+        admins.insert(0, creator_person);
      }
    }
-    let banned = blocking(context.pool(), move |conn| UserViewSafe::banned(conn)).await??;
+    let banned = blocking(context.pool(), move |conn| PersonViewSafe::banned(conn)).await??;
    let online = context
      .chat_server()
@ -304,7 +304,7 @@ impl Perform for GetSite {
      .await
      .unwrap_or(1);
-    let my_user = get_user_safe_settings_from_jwt_opt(&data.auth, context.pool()).await?;
+    let my_user = get_local_user_settings_view_from_jwt_opt(&data.auth, context.pool()).await?;
    let federated_instances = build_federated_instances(context.pool()).await?;
    Ok(GetSiteResponse {
@ -335,8 +335,8 @@ impl Perform for Search {
      Err(e) => debug!("Failed to resolve search query as activitypub ID: {}", e),
    }
-    let user = get_user_from_jwt_opt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
-    let user_id = user.map(|u| u.id);
+    let person_id = local_user_view.map(|u| u.person.id);
    let type_ = SearchType::from_str(&data.type_)?;
@ -361,7 +361,7 @@ impl Perform for Search {
            .show_nsfw(true)
            .community_id(community_id)
            .community_name(community_name)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .search_term(q)
            .page(page)
            .limit(limit)
@ -374,7 +374,7 @@ impl Perform for Search {
          CommentQueryBuilder::create(&conn)
            .sort(&sort)
            .search_term(q)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .page(page)
            .limit(limit)
            .list()
@ -386,7 +386,7 @@ impl Perform for Search {
          CommunityQueryBuilder::create(conn)
            .sort(&sort)
            .search_term(q)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .page(page)
            .limit(limit)
            .list()
@ -395,7 +395,7 @@ impl Perform for Search {
      }
      SearchType::Users => {
        users = blocking(context.pool(), move |conn| {
-          UserQueryBuilder::create(conn)
+          PersonQueryBuilder::create(conn)
            .sort(&sort)
            .search_term(q)
            .page(page)
@ -411,7 +411,7 @@ impl Perform for Search {
            .show_nsfw(true)
            .community_id(community_id)
            .community_name(community_name)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .search_term(q)
            .page(page)
            .limit(limit)
@ -426,7 +426,7 @@ impl Perform for Search {
          CommentQueryBuilder::create(conn)
            .sort(&sort)
            .search_term(q)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .page(page)
            .limit(limit)
            .list()
@ -440,7 +440,7 @@ impl Perform for Search {
          CommunityQueryBuilder::create(conn)
            .sort(&sort)
            .search_term(q)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .page(page)
            .limit(limit)
            .list()
@ -451,7 +451,7 @@ impl Perform for Search {
        let sort = SortType::from_str(&data.sort)?;
        users = blocking(context.pool(), move |conn| {
-          UserQueryBuilder::create(conn)
+          PersonQueryBuilder::create(conn)
            .sort(&sort)
            .search_term(q)
            .page(page)
@ -465,7 +465,7 @@ impl Perform for Search {
          PostQueryBuilder::create(conn)
            .sort(&sort)
            .show_nsfw(true)
-            .my_user_id(user_id)
+            .my_person_id(person_id)
            .community_id(community_id)
            .community_name(community_name)
            .url_search(q)
@ -498,18 +498,18 @@ impl Perform for TransferSite {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetSiteResponse, LemmyError> {
    let data: &TransferSite = &self;
-    let user = get_user_safe_settings_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
-    is_admin(context.pool(), user.id).await?;
+    is_admin(&local_user_view)?;
    let read_site = blocking(context.pool(), move |conn| Site::read_simple(conn)).await??;
    // Make sure user is the creator
-    if read_site.creator_id != user.id {
+    if read_site.creator_id != local_user_view.person.id {
      return Err(ApiError::err("not_an_admin").into());
    }
-    let new_creator_id = data.user_id;
+    let new_creator_id = data.person_id;
    let transfer_site = move |conn: &'_ _| Site::transfer(conn, new_creator_id);
    if blocking(context.pool(), transfer_site).await?.is_err() {
      return Err(ApiError::err("couldnt_update_site").into());
@ -517,8 +517,8 @@ impl Perform for TransferSite {
    // Mod tables
    let form = ModAddForm {
-      mod_user_id: user.id,
+      mod_person_id: local_user_view.person.id,
-      other_user_id: data.user_id,
+      other_person_id: data.person_id,
      removed: Some(false),
    };
@ -526,24 +526,26 @@ impl Perform for TransferSite {
    let site_view = blocking(context.pool(), move |conn| SiteView::read(conn)).await??;
-    let mut admins = blocking(context.pool(), move |conn| UserViewSafe::admins(conn)).await??;
+    let mut admins = blocking(context.pool(), move |conn| PersonViewSafe::admins(conn)).await??;
    let creator_index = admins
      .iter()
-      .position(|r| r.user.id == site_view.creator.id)
+      .position(|r| r.person.id == site_view.creator.id)
      .context(location_info!())?;
-    let creator_user = admins.remove(creator_index);
+    let creator_person = admins.remove(creator_index);
-    admins.insert(0, creator_user);
+    admins.insert(0, creator_person);
-    let banned = blocking(context.pool(), move |conn| UserViewSafe::banned(conn)).await??;
+    let banned = blocking(context.pool(), move |conn| PersonViewSafe::banned(conn)).await??;
    let federated_instances = build_federated_instances(context.pool()).await?;
    let my_user = Some(get_local_user_settings_view_from_jwt(&data.auth, context.pool()).await?);
    Ok(GetSiteResponse {
      site_view: Some(site_view),
      admins,
      banned,
      online: 0,
      version: version::VERSION.to_string(),
-      my_user: Some(user),
+      my_user,
      federated_instances,
    })
  }
@ -559,10 +561,10 @@ impl Perform for GetSiteConfig {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetSiteConfigResponse, LemmyError> {
    let data: &GetSiteConfig = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // Only let admins read this
-    is_admin(context.pool(), user.id).await?;
+    is_admin(&local_user_view)?;
    let config_hjson = Settings::read_config_file()?;
@ -580,11 +582,10 @@ impl Perform for SaveSiteConfig {
    _websocket_id: Option<ConnectionId>,
  ) -> Result<GetSiteConfigResponse, LemmyError> {
    let data: &SaveSiteConfig = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    // Only let admins read this
-    let user_id = user.id;
+    is_admin(&local_user_view)?;
    is_admin(context.pool(), user_id).await?;
    // Make sure docker doesn't have :ro at the end of the volume, so its not a read-only filesystem
    let config_hjson = match Settings::save_config_file(&data.config_hjson) {
--- a/crates/api/src/websocket.rs
+++ b/crates/api/src/websocket.rs
@ -1,4 +1,4 @@
-use crate::{get_user_from_jwt, Perform};
+use crate::{get_local_user_view_from_jwt, Perform};
 use actix_web::web::Data;
 use lemmy_api_structs::websocket::*;
 use lemmy_utils::{ConnectionId, LemmyError};
@ -17,11 +17,11 @@ impl Perform for UserJoin {
    websocket_id: Option<ConnectionId>,
  ) -> Result<UserJoinResponse, LemmyError> {
    let data: &UserJoin = &self;
-    let user = get_user_from_jwt(&data.auth, context.pool()).await?;
+    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
    if let Some(ws_id) = websocket_id {
      context.chat_server().do_send(JoinUserRoom {
-        user_id: user.id,
+        local_user_id: local_user_view.local_user.id,
        id: ws_id,
      });
    }
--- a/crates/api_structs/src/comment.rs
+++ b/crates/api_structs/src/comment.rs
@ -1,11 +1,12 @@
 use lemmy_db_schema::{CommentId, CommunityId, LocalUserId, PostId};
 use lemmy_db_views::{comment_report_view::CommentReportView, comment_view::CommentView};
 use serde::{Deserialize, Serialize};
 #[derive(Deserialize)]
 pub struct CreateComment {
  pub content: String,
-  pub parent_id: Option<i32>,
+  pub parent_id: Option<CommentId>,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub form_id: Option<String>,
  pub auth: String,
 }
@ -13,21 +14,21 @@ pub struct CreateComment {
 #[derive(Deserialize)]
 pub struct EditComment {
  pub content: String,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub form_id: Option<String>,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct DeleteComment {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub deleted: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct RemoveComment {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub removed: bool,
  pub reason: Option<String>,
  pub auth: String,
@ -35,14 +36,14 @@ pub struct RemoveComment {
 #[derive(Deserialize)]
 pub struct MarkCommentAsRead {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub read: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct SaveComment {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub save: bool,
  pub auth: String,
 }
@ -50,13 +51,13 @@ pub struct SaveComment {
 #[derive(Serialize, Clone)]
 pub struct CommentResponse {
  pub comment_view: CommentView,
-  pub recipient_ids: Vec<i32>, // TODO another way to do this? Maybe a UserMention belongs to Comment
+  pub recipient_ids: Vec<LocalUserId>,
  pub form_id: Option<String>, // An optional front end ID, to tell which is coming back
 }
 #[derive(Deserialize)]
 pub struct CreateCommentLike {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub score: i16,
  pub auth: String,
 }
@ -67,7 +68,7 @@ pub struct GetComments {
  pub sort: String,
  pub page: Option<i64>,
  pub limit: Option<i64>,
-  pub community_id: Option<i32>,
+  pub community_id: Option<CommunityId>,
  pub community_name: Option<String>,
  pub auth: Option<String>,
 }
@ -79,7 +80,7 @@ pub struct GetCommentsResponse {
 #[derive(Serialize, Deserialize)]
 pub struct CreateCommentReport {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub reason: String,
  pub auth: String,
 }
@ -108,7 +109,7 @@ pub struct ListCommentReports {
  pub page: Option<i64>,
  pub limit: Option<i64>,
  /// if no community is given, it returns reports for all communities moderated by the auth user
-  pub community: Option<i32>,
+  pub community: Option<CommunityId>,
  pub auth: String,
 }
--- a/crates/api_structs/src/community.rs
+++ b/crates/api_structs/src/community.rs
@ -1,14 +1,15 @@
 use lemmy_db_schema::{CommunityId, PersonId};
 use lemmy_db_views_actor::{
  community_follower_view::CommunityFollowerView,
  community_moderator_view::CommunityModeratorView,
  community_view::CommunityView,
-  user_view::UserViewSafe,
+  person_view::PersonViewSafe,
 };
 use serde::{Deserialize, Serialize};
 #[derive(Deserialize)]
 pub struct GetCommunity {
-  pub id: Option<i32>,
+  pub id: Option<CommunityId>,
  pub name: Option<String>,
  pub auth: Option<String>,
 }
@ -52,8 +53,8 @@ pub struct ListCommunitiesResponse {
 #[derive(Deserialize, Clone)]
 pub struct BanFromCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub ban: bool,
  pub remove_data: bool,
  pub reason: Option<String>,
@ -63,14 +64,14 @@ pub struct BanFromCommunity {
 #[derive(Serialize, Clone)]
 pub struct BanFromCommunityResponse {
-  pub user_view: UserViewSafe,
+  pub person_view: PersonViewSafe,
  pub banned: bool,
 }
 #[derive(Deserialize)]
 pub struct AddModToCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub added: bool,
  pub auth: String,
 }
@ -82,7 +83,7 @@ pub struct AddModToCommunityResponse {
 #[derive(Deserialize)]
 pub struct EditCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub title: String,
  pub description: Option<String>,
  pub icon: Option<String>,
@ -93,14 +94,14 @@ pub struct EditCommunity {
 #[derive(Deserialize)]
 pub struct DeleteCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub deleted: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct RemoveCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub removed: bool,
  pub reason: Option<String>,
  pub expires: Option<i64>,
@ -109,7 +110,7 @@ pub struct RemoveCommunity {
 #[derive(Deserialize)]
 pub struct FollowCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub follow: bool,
  pub auth: String,
 }
@ -126,7 +127,7 @@ pub struct GetFollowedCommunitiesResponse {
 #[derive(Deserialize)]
 pub struct TransferCommunity {
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub auth: String,
 }
--- a/crates/api_structs/src/lib.rs
+++ b/crates/api_structs/src/lib.rs
@ -1,18 +1,22 @@
 pub mod comment;
 pub mod community;
 pub mod person;
 pub mod post;
 pub mod site;
 pub mod user;
 pub mod websocket;
 use diesel::PgConnection;
-use lemmy_db_queries::{source::user::User, Crud, DbPool};
+use lemmy_db_queries::{Crud, DbPool};
-use lemmy_db_schema::source::{
+use lemmy_db_schema::{
-  comment::Comment,
+  source::{
-  post::Post,
+    comment::Comment,
-  user::User_,
+    person::Person,
-  user_mention::{UserMention, UserMentionForm},
+    person_mention::{PersonMention, PersonMentionForm},
    post::Post,
  },
  LocalUserId,
 };
 use lemmy_db_views::local_user_view::LocalUserView;
 use lemmy_utils::{email::send_email, settings::structs::Settings, utils::MentionData, LemmyError};
 use log::error;
 use serde::{Deserialize, Serialize};
@ -54,14 +58,13 @@ where
 pub async fn send_local_notifs(
  mentions: Vec<MentionData>,
  comment: Comment,
-  user: &User_,
+  person: Person,
  post: Post,
  pool: &DbPool,
  do_send_email: bool,
-) -> Result<Vec<i32>, LemmyError> {
+) -> Result<Vec<LocalUserId>, LemmyError> {
  let user2 = user.clone();
  let ids = blocking(pool, move |conn| {
-    do_send_local_notifs(conn, &mentions, &comment, &user2, &post, do_send_email)
+    do_send_local_notifs(conn, &mentions, &comment, &person, &post, do_send_email)
  })
  .await?;
@ -72,40 +75,40 @@ fn do_send_local_notifs(
  conn: &PgConnection,
  mentions: &[MentionData],
  comment: &Comment,
-  user: &User_,
+  person: &Person,
  post: &Post,
  do_send_email: bool,
-) -> Vec<i32> {
+) -> Vec<LocalUserId> {
  let mut recipient_ids = Vec::new();
  // Send the local mentions
  for mention in mentions
    .iter()
-    .filter(|m| m.is_local() && m.name.ne(&user.name))
+    .filter(|m| m.is_local() && m.name.ne(&person.name))
    .collect::<Vec<&MentionData>>()
  {
-    if let Ok(mention_user) = User_::read_from_name(&conn, &mention.name) {
+    if let Ok(mention_user_view) = LocalUserView::read_from_name(&conn, &mention.name) {
      // TODO
      // 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
-      recipient_ids.push(mention_user.id);
+      recipient_ids.push(mention_user_view.local_user.id);
-      let user_mention_form = UserMentionForm {
+      let user_mention_form = PersonMentionForm {
-        recipient_id: mention_user.id,
+        recipient_id: mention_user_view.person.id,
        comment_id: comment.id,
        read: None,
      };
      // Allow this to fail softly, since comment edits might re-update or replace it
      // Let the uniqueness handle this fail
-      let _ = UserMention::create(&conn, &user_mention_form);
+      PersonMention::create(&conn, &user_mention_form).ok();
-      // Send an email to those users that have notifications on
+      // Send an email to those local users that have notifications on
-      if do_send_email && mention_user.send_notifications_to_email {
+      if do_send_email {
        send_email_to_user(
-          mention_user,
+          &mention_user_view,
          "Mentioned by",
-          "User Mention",
+          "Person Mention",
          &comment.content,
        )
      }
@ -116,12 +119,20 @@ fn do_send_local_notifs(
  match comment.parent_id {
    Some(parent_id) => {
      if let Ok(parent_comment) = Comment::read(&conn, parent_id) {
-        if parent_comment.creator_id != user.id {
+        // Don't send a notif to yourself
-          if let Ok(parent_user) = User_::read(&conn, parent_comment.creator_id) {
+        if parent_comment.creator_id != person.id {
-            recipient_ids.push(parent_user.id);
+          // Get the parent commenter local_user
          if let Ok(parent_user_view) = LocalUserView::read_person(&conn, parent_comment.creator_id)
          {
            recipient_ids.push(parent_user_view.local_user.id);
-            if do_send_email && parent_user.send_notifications_to_email {
+            if do_send_email {
-              send_email_to_user(parent_user, "Reply from", "Comment Reply", &comment.content)
+              send_email_to_user(
                &parent_user_view,
                "Reply from",
                "Comment Reply",
                &comment.content,
              )
            }
          }
        }
@ -129,12 +140,17 @@ fn do_send_local_notifs(
    }
    // Its a post
    None => {
-      if post.creator_id != user.id {
+      if post.creator_id != person.id {
-        if let Ok(parent_user) = User_::read(&conn, post.creator_id) {
+        if let Ok(parent_user_view) = LocalUserView::read_person(&conn, post.creator_id) {
-          recipient_ids.push(parent_user.id);
+          recipient_ids.push(parent_user_view.local_user.id);
-          if do_send_email && parent_user.send_notifications_to_email {
+          if do_send_email {
-            send_email_to_user(parent_user, "Reply from", "Post Reply", &comment.content)
+            send_email_to_user(
              &parent_user_view,
              "Reply from",
              "Post Reply",
              &comment.content,
            )
          }
        }
      }
@ -143,26 +159,31 @@ fn do_send_local_notifs(
  recipient_ids
 }
-pub fn send_email_to_user(user: User_, subject_text: &str, body_text: &str, comment_content: &str) {
+pub fn send_email_to_user(
-  if user.banned {
+  local_user_view: &LocalUserView,
  subject_text: &str,
  body_text: &str,
  comment_content: &str,
 ) {
  if local_user_view.person.banned || !local_user_view.local_user.send_notifications_to_email {
    return;
  }
-  if let Some(user_email) = user.email {
+  if let Some(user_email) = &local_user_view.local_user.email {
    let subject = &format!(
      "{} - {} {}",
      subject_text,
      Settings::get().hostname(),
-      user.name,
+      local_user_view.person.name,
    );
    let html = &format!(
      "<h1>{}</h1><br><div>{} - {}</div><br><a href={}/inbox>inbox</a>",
      body_text,
-      user.name,
+      local_user_view.person.name,
      comment_content,
      Settings::get().get_protocol_and_hostname()
    );
-    match send_email(subject, &user_email, &user.name, html) {
+    match send_email(subject, &user_email, &local_user_view.person.name, html) {
      Ok(_o) => _o,
      Err(e) => error!("{}", e),
    };
--- a/crates/api_structs/src/person.rs
+++ b/crates/api_structs/src/person.rs
@ -6,8 +6,8 @@ use lemmy_db_views::{
 use lemmy_db_views_actor::{
  community_follower_view::CommunityFollowerView,
  community_moderator_view::CommunityModeratorView,
-  user_mention_view::UserMentionView,
+  person_mention_view::PersonMentionView,
-  user_view::UserViewSafe,
+  person_view::PersonViewSafe,
 };
 use serde::{Deserialize, Serialize};
@ -16,6 +16,7 @@ pub struct Login {
  pub username_or_email: String,
  pub password: String,
 }
 use lemmy_db_schema::{CommunityId, PersonId, PersonMentionId, PrivateMessageId};
 #[derive(Deserialize)]
 pub struct Register {
@ -45,11 +46,11 @@ pub struct CaptchaResponse {
 #[derive(Deserialize)]
 pub struct SaveUserSettings {
-  pub show_nsfw: bool,
+  pub show_nsfw: Option<bool>,
-  pub theme: String,
+  pub theme: Option<String>,
-  pub default_sort_type: i16,
+  pub default_sort_type: Option<i16>,
-  pub default_listing_type: i16,
+  pub default_listing_type: Option<i16>,
-  pub lang: String,
+  pub lang: Option<String>,
  pub avatar: Option<String>,
  pub banner: Option<String>,
  pub preferred_username: Option<String>,
@ -59,8 +60,8 @@ pub struct SaveUserSettings {
  pub new_password: Option<String>,
  pub new_password_verify: Option<String>,
  pub old_password: Option<String>,
-  pub show_avatars: bool,
+  pub show_avatars: Option<bool>,
-  pub send_notifications_to_email: bool,
+  pub send_notifications_to_email: Option<bool>,
  pub auth: String,
 }
@ -70,20 +71,20 @@ pub struct LoginResponse {
 }
 #[derive(Deserialize)]
-pub struct GetUserDetails {
+pub struct GetPersonDetails {
-  pub user_id: Option<i32>,
+  pub person_id: Option<PersonId>,
  pub username: Option<String>,
  pub sort: String,
  pub page: Option<i64>,
  pub limit: Option<i64>,
-  pub community_id: Option<i32>,
+  pub community_id: Option<CommunityId>,
  pub saved_only: bool,
  pub auth: Option<String>,
 }
 #[derive(Serialize)]
-pub struct GetUserDetailsResponse {
+pub struct GetPersonDetailsResponse {
-  pub user_view: UserViewSafe,
+  pub person_view: PersonViewSafe,
  pub follows: Vec<CommunityFollowerView>,
  pub moderates: Vec<CommunityModeratorView>,
  pub comments: Vec<CommentView>,
@ -96,8 +97,8 @@ pub struct GetRepliesResponse {
 }
 #[derive(Serialize)]
-pub struct GetUserMentionsResponse {
+pub struct GetPersonMentionsResponse {
-  pub mentions: Vec<UserMentionView>,
+  pub mentions: Vec<PersonMentionView>,
 }
 #[derive(Deserialize)]
@ -107,19 +108,19 @@ pub struct MarkAllAsRead {
 #[derive(Deserialize)]
 pub struct AddAdmin {
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub added: bool,
  pub auth: String,
 }
 #[derive(Serialize, Clone)]
 pub struct AddAdminResponse {
-  pub admins: Vec<UserViewSafe>,
+  pub admins: Vec<PersonViewSafe>,
 }
 #[derive(Deserialize)]
-pub struct BanUser {
+pub struct BanPerson {
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub ban: bool,
  pub remove_data: bool,
  pub reason: Option<String>,
@ -128,8 +129,8 @@ pub struct BanUser {
 }
 #[derive(Serialize, Clone)]
-pub struct BanUserResponse {
+pub struct BanPersonResponse {
-  pub user_view: UserViewSafe,
+  pub person_view: PersonViewSafe,
  pub banned: bool,
 }
@ -143,7 +144,7 @@ pub struct GetReplies {
 }
 #[derive(Deserialize)]
-pub struct GetUserMentions {
+pub struct GetPersonMentions {
  pub sort: String,
  pub page: Option<i64>,
  pub limit: Option<i64>,
@ -152,15 +153,15 @@ pub struct GetUserMentions {
 }
 #[derive(Deserialize)]
-pub struct MarkUserMentionAsRead {
+pub struct MarkPersonMentionAsRead {
-  pub user_mention_id: i32,
+  pub person_mention_id: PersonMentionId,
  pub read: bool,
  pub auth: String,
 }
 #[derive(Serialize, Clone)]
-pub struct UserMentionResponse {
+pub struct PersonMentionResponse {
-  pub user_mention_view: UserMentionView,
+  pub person_mention_view: PersonMentionView,
 }
 #[derive(Deserialize)]
@ -187,27 +188,27 @@ pub struct PasswordChange {
 #[derive(Deserialize)]
 pub struct CreatePrivateMessage {
  pub content: String,
-  pub recipient_id: i32,
+  pub recipient_id: PersonId,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct EditPrivateMessage {
-  pub private_message_id: i32,
+  pub private_message_id: PrivateMessageId,
  pub content: String,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct DeletePrivateMessage {
-  pub private_message_id: i32,
+  pub private_message_id: PrivateMessageId,
  pub deleted: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct MarkPrivateMessageAsRead {
-  pub private_message_id: i32,
+  pub private_message_id: PrivateMessageId,
  pub read: bool,
  pub auth: String,
 }
@ -232,13 +233,13 @@ pub struct PrivateMessageResponse {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct GetReportCount {
-  pub community: Option<i32>,
+  pub community: Option<CommunityId>,
  pub auth: String,
 }
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct GetReportCountResponse {
-  pub community: Option<i32>,
+  pub community: Option<CommunityId>,
  pub comment_reports: i64,
  pub post_reports: i64,
 }
--- a/crates/api_structs/src/post.rs
+++ b/crates/api_structs/src/post.rs
@ -1,3 +1,4 @@
 use lemmy_db_schema::{CommunityId, PostId};
 use lemmy_db_views::{
  comment_view::CommentView,
  post_report_view::PostReportView,
@ -16,7 +17,7 @@ pub struct CreatePost {
  pub url: Option<Url>,
  pub body: Option<String>,
  pub nsfw: bool,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub auth: String,
 }
@ -27,7 +28,7 @@ pub struct PostResponse {
 #[derive(Deserialize)]
 pub struct GetPost {
-  pub id: i32,
+  pub id: PostId,
  pub auth: Option<String>,
 }
@ -46,7 +47,7 @@ pub struct GetPosts {
  pub sort: String,
  pub page: Option<i64>,
  pub limit: Option<i64>,
-  pub community_id: Option<i32>,
+  pub community_id: Option<CommunityId>,
  pub community_name: Option<String>,
  pub auth: Option<String>,
 }
@ -58,14 +59,14 @@ pub struct GetPostsResponse {
 #[derive(Deserialize)]
 pub struct CreatePostLike {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub score: i16,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct EditPost {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub name: String,
  pub url: Option<Url>,
  pub body: Option<String>,
@ -75,14 +76,14 @@ pub struct EditPost {
 #[derive(Deserialize)]
 pub struct DeletePost {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub deleted: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct RemovePost {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub removed: bool,
  pub reason: Option<String>,
  pub auth: String,
@ -90,28 +91,28 @@ pub struct RemovePost {
 #[derive(Deserialize)]
 pub struct LockPost {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub locked: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct StickyPost {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub stickied: bool,
  pub auth: String,
 }
 #[derive(Deserialize)]
 pub struct SavePost {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub save: bool,
  pub auth: String,
 }
 #[derive(Serialize, Deserialize)]
 pub struct CreatePostReport {
-  pub post_id: i32,
+  pub post_id: PostId,
  pub reason: String,
  pub auth: String,
 }
@ -138,7 +139,7 @@ pub struct ResolvePostReportResponse {
 pub struct ListPostReports {
  pub page: Option<i64>,
  pub limit: Option<i64>,
-  pub community: Option<i32>,
+  pub community: Option<CommunityId>,
  pub auth: String,
 }
--- a/crates/api_structs/src/site.rs
+++ b/crates/api_structs/src/site.rs
@ -1,6 +1,11 @@
-use lemmy_db_schema::source::user::UserSafeSettings;
+use lemmy_db_schema::{CommunityId, PersonId};
-use lemmy_db_views::{comment_view::CommentView, post_view::PostView, site_view::SiteView};
+use lemmy_db_views::{
-use lemmy_db_views_actor::{community_view::CommunityView, user_view::UserViewSafe};
+  comment_view::CommentView,
  local_user_view::LocalUserSettingsView,
  post_view::PostView,
  site_view::SiteView,
 };
 use lemmy_db_views_actor::{community_view::CommunityView, person_view::PersonViewSafe};
 use lemmy_db_views_moderator::{
  mod_add_community_view::ModAddCommunityView,
  mod_add_view::ModAddView,
@ -19,7 +24,7 @@ use url::Url;
 pub struct Search {
  pub q: String,
  pub type_: String,
-  pub community_id: Option<i32>,
+  pub community_id: Option<CommunityId>,
  pub community_name: Option<String>,
  pub sort: String,
  pub page: Option<i64>,
@ -33,13 +38,13 @@ pub struct SearchResponse {
  pub comments: Vec<CommentView>,
  pub posts: Vec<PostView>,
  pub communities: Vec<CommunityView>,
-  pub users: Vec<UserViewSafe>,
+  pub users: Vec<PersonViewSafe>,
 }
 #[derive(Deserialize)]
 pub struct GetModlog {
-  pub mod_user_id: Option<i32>,
+  pub mod_person_id: Option<PersonId>,
-  pub community_id: Option<i32>,
+  pub community_id: Option<CommunityId>,
  pub page: Option<i64>,
  pub limit: Option<i64>,
 }
@ -94,17 +99,17 @@ pub struct SiteResponse {
 #[derive(Serialize)]
 pub struct GetSiteResponse {
  pub site_view: Option<SiteView>, // Because the site might not be set up yet
-  pub admins: Vec<UserViewSafe>,
+  pub admins: Vec<PersonViewSafe>,
-  pub banned: Vec<UserViewSafe>,
+  pub banned: Vec<PersonViewSafe>,
  pub online: usize,
  pub version: String,
-  pub my_user: Option<UserSafeSettings>,
+  pub my_user: Option<LocalUserSettingsView>,
  pub federated_instances: Option<FederatedInstances>, // Federation may be disabled
 }
 #[derive(Deserialize)]
 pub struct TransferSite {
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub auth: String,
 }
--- a/crates/api_structs/src/websocket.rs
+++ b/crates/api_structs/src/websocket.rs
@ -1,3 +1,4 @@
 use lemmy_db_schema::{CommunityId, PostId};
 use serde::{Deserialize, Serialize};
 #[derive(Deserialize, Debug)]
@ -12,7 +13,7 @@ pub struct UserJoinResponse {
 #[derive(Deserialize, Debug)]
 pub struct CommunityJoin {
-  pub community_id: i32,
+  pub community_id: CommunityId,
 }
 #[derive(Serialize, Clone)]
@ -22,7 +23,7 @@ pub struct CommunityJoinResponse {
 #[derive(Deserialize, Debug)]
 pub struct ModJoin {
-  pub community_id: i32,
+  pub community_id: CommunityId,
 }
 #[derive(Serialize, Clone)]
@ -32,7 +33,7 @@ pub struct ModJoinResponse {
 #[derive(Deserialize, Debug)]
 pub struct PostJoin {
-  pub post_id: i32,
+  pub post_id: PostId,
 }
 #[derive(Serialize, Clone)]
--- a/crates/apub/src/activities/receive/comment.rs
+++ b/crates/apub/src/activities/receive/comment.rs
@ -1,4 +1,4 @@
-use crate::{activities::receive::get_actor_as_user, objects::FromApub, ActorType, NoteExt};
+use crate::{activities::receive::get_actor_as_person, objects::FromApub, ActorType, NoteExt};
 use activitystreams::{
  activity::{ActorAndObjectRefExt, Create, Dislike, Like, Remove, Update},
  base::ExtendsExt,
@ -19,11 +19,11 @@ pub(crate) async fn receive_create_comment(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&create, context, request_counter).await?;
+  let person = get_actor_as_person(&create, context, request_counter).await?;
  let note = NoteExt::from_any_base(create.object().to_owned().one().context(location_info!())?)?
    .context(location_info!())?;
-  let comment = Comment::from_apub(&note, context, user.actor_id(), request_counter).await?;
+  let comment = Comment::from_apub(&note, context, person.actor_id(), request_counter).await?;
  let post_id = comment.post_id;
  let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
@ -33,8 +33,15 @@ pub(crate) async fn receive_create_comment(
  // Its much easier to scrape them from the comment body, since the API has to do that
  // anyway.
  let mentions = scrape_text_for_mentions(&comment.content);
-  let recipient_ids =
+  let recipient_ids = send_local_notifs(
-    send_local_notifs(mentions, comment.clone(), &user, post, context.pool(), true).await?;
+    mentions,
    comment.clone(),
    person,
    post,
    context.pool(),
    true,
  )
  .await?;
  // Refetch the view
  let comment_view = blocking(context.pool(), move |conn| {
@ -64,9 +71,9 @@ pub(crate) async fn receive_update_comment(
 ) -> Result<(), LemmyError> {
  let note = NoteExt::from_any_base(update.object().to_owned().one().context(location_info!())?)?
    .context(location_info!())?;
-  let user = get_actor_as_user(&update, context, request_counter).await?;
+  let person = get_actor_as_person(&update, context, request_counter).await?;
-  let comment = Comment::from_apub(&note, context, user.actor_id(), request_counter).await?;
+  let comment = Comment::from_apub(&note, context, person.actor_id(), request_counter).await?;
  let comment_id = comment.id;
  let post_id = comment.post_id;
@ -74,7 +81,7 @@ pub(crate) async fn receive_update_comment(
  let mentions = scrape_text_for_mentions(&comment.content);
  let recipient_ids =
-    send_local_notifs(mentions, comment, &user, post, context.pool(), false).await?;
+    send_local_notifs(mentions, comment, person, post, context.pool(), false).await?;
  // Refetch the view
  let comment_view = blocking(context.pool(), move |conn| {
@ -103,18 +110,18 @@ pub(crate) async fn receive_like_comment(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&like, context, request_counter).await?;
+  let person = get_actor_as_person(&like, context, request_counter).await?;
  let comment_id = comment.id;
  let like_form = CommentLikeForm {
    comment_id,
    post_id: comment.post_id,
-    user_id: user.id,
+    person_id: person.id,
    score: 1,
  };
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    CommentLike::remove(conn, user_id, comment_id)?;
+    CommentLike::remove(conn, person_id, comment_id)?;
    CommentLike::like(conn, &like_form)
  })
  .await??;
@ -148,18 +155,18 @@ pub(crate) async fn receive_dislike_comment(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&dislike, context, request_counter).await?;
+  let person = get_actor_as_person(&dislike, context, request_counter).await?;
  let comment_id = comment.id;
  let like_form = CommentLikeForm {
    comment_id,
    post_id: comment.post_id,
-    user_id: user.id,
+    person_id: person.id,
    score: -1,
  };
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    CommentLike::remove(conn, user_id, comment_id)?;
+    CommentLike::remove(conn, person_id, comment_id)?;
    CommentLike::like(conn, &like_form)
  })
  .await??;
--- a/crates/apub/src/activities/receive/comment_undo.rs
+++ b/crates/apub/src/activities/receive/comment_undo.rs
@ -1,4 +1,4 @@
-use crate::activities::receive::get_actor_as_user;
+use crate::activities::receive::get_actor_as_person;
 use activitystreams::activity::{Dislike, Like};
 use lemmy_api_structs::{blocking, comment::CommentResponse};
 use lemmy_db_queries::{source::comment::Comment_, Likeable};
@ -13,12 +13,12 @@ pub(crate) async fn receive_undo_like_comment(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(like, context, request_counter).await?;
+  let person = get_actor_as_person(like, context, request_counter).await?;
  let comment_id = comment.id;
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    CommentLike::remove(conn, user_id, comment_id)
+    CommentLike::remove(conn, person_id, comment_id)
  })
  .await??;
@ -51,12 +51,12 @@ pub(crate) async fn receive_undo_dislike_comment(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(dislike, context, request_counter).await?;
+  let person = get_actor_as_person(dislike, context, request_counter).await?;
  let comment_id = comment.id;
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    CommentLike::remove(conn, user_id, comment_id)
+    CommentLike::remove(conn, person_id, comment_id)
  })
  .await??;
--- a/crates/apub/src/activities/receive/mod.rs
+++ b/crates/apub/src/activities/receive/mod.rs
@ -1,11 +1,11 @@
-use crate::fetcher::user::get_or_fetch_and_upsert_user;
+use crate::fetcher::person::get_or_fetch_and_upsert_person;
 use activitystreams::{
  activity::{ActorAndObjectRef, ActorAndObjectRefExt},
  base::{AsBase, BaseExt},
  error::DomainError,
 };
 use anyhow::{anyhow, Context};
-use lemmy_db_schema::source::user::User_;
+use lemmy_db_schema::source::person::Person;
 use lemmy_utils::{location_info, LemmyError};
 use lemmy_websocket::LemmyContext;
 use log::debug;
@ -28,18 +28,18 @@ where
  Err(anyhow!("Activity not supported").into())
 }
-/// Reads the actor field of an activity and returns the corresponding `User_`.
+/// Reads the actor field of an activity and returns the corresponding `Person`.
-pub(crate) async fn get_actor_as_user<T, A>(
+pub(crate) async fn get_actor_as_person<T, A>(
  activity: &T,
  context: &LemmyContext,
  request_counter: &mut i32,
-) -> Result<User_, LemmyError>
+) -> Result<Person, LemmyError>
 where
  T: AsBase<A> + ActorAndObjectRef,
 {
  let actor = activity.actor()?;
-  let user_uri = actor.as_single_xsd_any_uri().context(location_info!())?;
+  let person_uri = actor.as_single_xsd_any_uri().context(location_info!())?;
-  get_or_fetch_and_upsert_user(&user_uri, context, request_counter).await
+  get_or_fetch_and_upsert_person(&person_uri, context, request_counter).await
 }
 /// Ensure that the ID of an incoming activity comes from the same domain as the actor. Optionally
--- a/crates/apub/src/activities/receive/post.rs
+++ b/crates/apub/src/activities/receive/post.rs
@ -1,4 +1,4 @@
-use crate::{activities::receive::get_actor_as_user, objects::FromApub, ActorType, PageExt};
+use crate::{activities::receive::get_actor_as_person, objects::FromApub, ActorType, PageExt};
 use activitystreams::{
  activity::{Create, Dislike, Like, Remove, Update},
  prelude::*,
@ -16,11 +16,11 @@ pub(crate) async fn receive_create_post(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&create, context, request_counter).await?;
+  let person = get_actor_as_person(&create, context, request_counter).await?;
  let page = PageExt::from_any_base(create.object().to_owned().one().context(location_info!())?)?
    .context(location_info!())?;
-  let post = Post::from_apub(&page, context, user.actor_id(), request_counter).await?;
+  let post = Post::from_apub(&page, context, person.actor_id(), request_counter).await?;
  // Refetch the view
  let post_id = post.id;
@ -45,11 +45,11 @@ pub(crate) async fn receive_update_post(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&update, context, request_counter).await?;
+  let person = get_actor_as_person(&update, context, request_counter).await?;
  let page = PageExt::from_any_base(update.object().to_owned().one().context(location_info!())?)?
    .context(location_info!())?;
-  let post = Post::from_apub(&page, context, user.actor_id(), request_counter).await?;
+  let post = Post::from_apub(&page, context, person.actor_id(), request_counter).await?;
  let post_id = post.id;
  // Refetch the view
@ -75,17 +75,17 @@ pub(crate) async fn receive_like_post(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&like, context, request_counter).await?;
+  let person = get_actor_as_person(&like, context, request_counter).await?;
  let post_id = post.id;
  let like_form = PostLikeForm {
    post_id,
-    user_id: user.id,
+    person_id: person.id,
    score: 1,
  };
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    PostLike::remove(conn, user_id, post_id)?;
+    PostLike::remove(conn, person_id, post_id)?;
    PostLike::like(conn, &like_form)
  })
  .await??;
@ -113,17 +113,17 @@ pub(crate) async fn receive_dislike_post(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(&dislike, context, request_counter).await?;
+  let person = get_actor_as_person(&dislike, context, request_counter).await?;
  let post_id = post.id;
  let like_form = PostLikeForm {
    post_id,
-    user_id: user.id,
+    person_id: person.id,
    score: -1,
  };
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    PostLike::remove(conn, user_id, post_id)?;
+    PostLike::remove(conn, person_id, post_id)?;
    PostLike::like(conn, &like_form)
  })
  .await??;
--- a/crates/apub/src/activities/receive/post_undo.rs
+++ b/crates/apub/src/activities/receive/post_undo.rs
@ -1,4 +1,4 @@
-use crate::activities::receive::get_actor_as_user;
+use crate::activities::receive::get_actor_as_person;
 use activitystreams::activity::{Dislike, Like};
 use lemmy_api_structs::{blocking, post::PostResponse};
 use lemmy_db_queries::{source::post::Post_, Likeable};
@ -13,12 +13,12 @@ pub(crate) async fn receive_undo_like_post(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(like, context, request_counter).await?;
+  let person = get_actor_as_person(like, context, request_counter).await?;
  let post_id = post.id;
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    PostLike::remove(conn, user_id, post_id)
+    PostLike::remove(conn, person_id, post_id)
  })
  .await??;
@ -45,12 +45,12 @@ pub(crate) async fn receive_undo_dislike_post(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
-  let user = get_actor_as_user(dislike, context, request_counter).await?;
+  let person = get_actor_as_person(dislike, context, request_counter).await?;
  let post_id = post.id;
-  let user_id = user.id;
+  let person_id = person.id;
  blocking(context.pool(), move |conn| {
-    PostLike::remove(conn, user_id, post_id)
+    PostLike::remove(conn, person_id, post_id)
  })
  .await??;
--- a/crates/apub/src/activities/receive/private_message.rs
+++ b/crates/apub/src/activities/receive/private_message.rs
@ -1,7 +1,7 @@
 use crate::{
  activities::receive::verify_activity_domains_valid,
  check_is_apub_id_valid,
-  fetcher::user::get_or_fetch_and_upsert_user,
+  fetcher::person::get_or_fetch_and_upsert_person,
  inbox::get_activity_to_and_cc,
  objects::FromApub,
  NoteExt,
@ -13,10 +13,10 @@ use activitystreams::{
  public,
 };
 use anyhow::{anyhow, Context};
-use lemmy_api_structs::{blocking, user::PrivateMessageResponse};
+use lemmy_api_structs::{blocking, person::PrivateMessageResponse};
 use lemmy_db_queries::source::private_message::PrivateMessage_;
 use lemmy_db_schema::source::private_message::PrivateMessage;
-use lemmy_db_views::private_message_view::PrivateMessageView;
+use lemmy_db_views::{local_user_view::LocalUserView, private_message_view::PrivateMessageView};
 use lemmy_utils::{location_info, LemmyError};
 use lemmy_websocket::{messages::SendUserRoomMessage, LemmyContext, UserOperation};
 use url::Url;
@ -50,12 +50,19 @@ pub(crate) async fn receive_create_private_message(
    private_message_view: message,
  };
  // Send notifications to the local recipient, if one exists
  let recipient_id = res.private_message_view.recipient.id;
  let local_recipient_id = blocking(context.pool(), move |conn| {
    LocalUserView::read_person(conn, recipient_id)
  })
  .await??
  .local_user
  .id;
  context.chat_server().do_send(SendUserRoomMessage {
    op: UserOperation::CreatePrivateMessage,
    response: res,
-    recipient_id,
+    local_recipient_id,
    websocket_id: None,
  });
@ -91,11 +98,17 @@ pub(crate) async fn receive_update_private_message(
  };
  let recipient_id = res.private_message_view.recipient.id;
  let local_recipient_id = blocking(context.pool(), move |conn| {
    LocalUserView::read_person(conn, recipient_id)
  })
  .await??
  .local_user
  .id;
  context.chat_server().do_send(SendUserRoomMessage {
    op: UserOperation::EditPrivateMessage,
    response: res,
-    recipient_id,
+    local_recipient_id,
    websocket_id: None,
  });
@ -123,11 +136,19 @@ pub(crate) async fn receive_delete_private_message(
  let res = PrivateMessageResponse {
    private_message_view: message,
  };
  let recipient_id = res.private_message_view.recipient.id;
  let local_recipient_id = blocking(context.pool(), move |conn| {
    LocalUserView::read_person(conn, recipient_id)
  })
  .await??
  .local_user
  .id;
  context.chat_server().do_send(SendUserRoomMessage {
    op: UserOperation::EditPrivateMessage,
    response: res,
-    recipient_id,
+    local_recipient_id,
    websocket_id: None,
  });
@ -160,11 +181,19 @@ pub(crate) async fn receive_undo_delete_private_message(
  let res = PrivateMessageResponse {
    private_message_view: message,
  };
  let recipient_id = res.private_message_view.recipient.id;
  let local_recipient_id = blocking(context.pool(), move |conn| {
    LocalUserView::read_person(conn, recipient_id)
  })
  .await??
  .local_user
  .id;
  context.chat_server().do_send(SendUserRoomMessage {
    op: UserOperation::EditPrivateMessage,
    response: res,
-    recipient_id,
+    local_recipient_id,
    websocket_id: None,
  });
@ -181,19 +210,19 @@ where
 {
  let to_and_cc = get_activity_to_and_cc(activity);
  if to_and_cc.len() != 1 {
-    return Err(anyhow!("Private message can only be addressed to one user").into());
+    return Err(anyhow!("Private message can only be addressed to one person").into());
  }
  if to_and_cc.contains(&public()) {
    return Err(anyhow!("Private message cant be public").into());
  }
-  let user_id = activity
+  let person_id = activity
    .actor()?
    .to_owned()
    .single_xsd_any_uri()
    .context(location_info!())?;
-  check_is_apub_id_valid(&user_id)?;
+  check_is_apub_id_valid(&person_id)?;
-  // check that the sender is a user, not a community
+  // check that the sender is a person, not a community
-  get_or_fetch_and_upsert_user(&user_id, &context, request_counter).await?;
+  get_or_fetch_and_upsert_person(&person_id, &context, request_counter).await?;
  Ok(())
 }
--- a/crates/apub/src/activities/send/comment.rs
+++ b/crates/apub/src/activities/send/comment.rs
@ -2,7 +2,7 @@ use crate::{
  activities::send::generate_activity_id,
  activity_queue::{send_comment_mentions, send_to_community},
  extensions::context::lemmy_context,
-  fetcher::user::get_or_fetch_and_upsert_user,
+  fetcher::person::get_or_fetch_and_upsert_person,
  objects::ToApub,
  ActorType,
  ApubLikeableType,
@ -28,7 +28,7 @@ use anyhow::anyhow;
 use itertools::Itertools;
 use lemmy_api_structs::{blocking, WebFingerResponse};
 use lemmy_db_queries::{Crud, DbPool};
-use lemmy_db_schema::source::{comment::Comment, community::Community, post::Post, user::User_};
+use lemmy_db_schema::source::{comment::Comment, community::Community, person::Person, post::Post};
 use lemmy_utils::{
  request::{retry, RecvError},
  settings::structs::Settings,
@ -44,8 +44,8 @@ use url::Url;
 #[async_trait::async_trait(?Send)]
 impl ApubObjectType for Comment {
  /// Send out information about a newly created comment, to the followers of the community and
-  /// mentioned users.
+  /// mentioned persons.
-  async fn send_create(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_create(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let note = self.to_apub(context.pool()).await?;
    let post_id = self.post_id;
@ -77,8 +77,8 @@ impl ApubObjectType for Comment {
  }
  /// Send out information about an edited post, to the followers of the community and mentioned
-  /// users.
+  /// persons.
-  async fn send_update(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_update(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let note = self.to_apub(context.pool()).await?;
    let post_id = self.post_id;
@ -109,7 +109,7 @@ impl ApubObjectType for Comment {
    Ok(())
  }
-  async fn send_delete(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_delete(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let post_id = self.post_id;
    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
@ -135,7 +135,7 @@ impl ApubObjectType for Comment {
  async fn send_undo_delete(
    &self,
-    creator: &User_,
+    creator: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let post_id = self.post_id;
@ -173,7 +173,7 @@ impl ApubObjectType for Comment {
    Ok(())
  }
-  async fn send_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_remove(&self, mod_: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let post_id = self.post_id;
    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
@ -197,7 +197,11 @@ impl ApubObjectType for Comment {
    Ok(())
  }
-  async fn send_undo_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_undo_remove(
    &self,
    mod_: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let post_id = self.post_id;
    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
@ -236,7 +240,7 @@ impl ApubObjectType for Comment {
 #[async_trait::async_trait(?Send)]
 impl ApubLikeableType for Comment {
-  async fn send_like(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_like(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let post_id = self.post_id;
    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
@ -260,7 +264,7 @@ impl ApubLikeableType for Comment {
    Ok(())
  }
-  async fn send_dislike(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_dislike(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let post_id = self.post_id;
    let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
@ -286,7 +290,7 @@ impl ApubLikeableType for Comment {
  async fn send_undo_like(
    &self,
-    creator: &User_,
+    creator: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let post_id = self.post_id;
@ -342,7 +346,7 @@ impl MentionsAndAddresses {
 /// This takes a comment, and builds a list of to_addresses, inboxes,
 /// and mention tags, so they know where to be sent to.
-/// Addresses are the users / addresses that go in the cc field.
+/// Addresses are the persons / addresses that go in the cc field.
 async fn collect_non_local_mentions(
  comment: &Comment,
  community: &Community,
@ -356,7 +360,7 @@ async fn collect_non_local_mentions(
  // Add the mention tag
  let mut tags = Vec::new();
-  // Get the user IDs for any mentions
+  // Get the person IDs for any mentions
  let mentions = scrape_text_for_mentions(&comment.content)
    .into_iter()
    // Filter only the non-local ones
@ -369,8 +373,8 @@ async fn collect_non_local_mentions(
      debug!("mention actor_id: {}", actor_id);
      addressed_ccs.push(actor_id.to_owned().to_string().parse()?);
-      let mention_user = get_or_fetch_and_upsert_user(&actor_id, context, &mut 0).await?;
+      let mention_person = get_or_fetch_and_upsert_person(&actor_id, context, &mut 0).await?;
-      inboxes.push(mention_user.get_shared_inbox_or_inbox_url());
+      inboxes.push(mention_person.get_shared_inbox_or_inbox_url());
      let mut mention_tag = Mention::new();
      mention_tag.set_href(actor_id).set_name(mention.full_name());
@ -387,9 +391,12 @@ async fn collect_non_local_mentions(
  })
 }
-/// Returns the apub ID of the user this comment is responding to. Meaning, in case this is a
+/// Returns the apub ID of the person this comment is responding to. Meaning, in case this is a
 /// top-level comment, the creator of the post, otherwise the creator of the parent comment.
-async fn get_comment_parent_creator(pool: &DbPool, comment: &Comment) -> Result<User_, LemmyError> {
+async fn get_comment_parent_creator(
  pool: &DbPool,
  comment: &Comment,
 ) -> Result<Person, LemmyError> {
  let parent_creator_id = if let Some(parent_comment_id) = comment.parent_id {
    let parent_comment =
      blocking(pool, move |conn| Comment::read(conn, parent_comment_id)).await??;
@ -399,10 +406,10 @@ async fn get_comment_parent_creator(pool: &DbPool, comment: &Comment) -> Result<
    let parent_post = blocking(pool, move |conn| Post::read(conn, parent_post_id)).await??;
    parent_post.creator_id
  };
-  Ok(blocking(pool, move |conn| User_::read(conn, parent_creator_id)).await??)
+  Ok(blocking(pool, move |conn| Person::read(conn, parent_creator_id)).await??)
 }
-/// Turns a user id like `@name@example.com` into an apub ID, like `https://example.com/user/name`,
+/// Turns a person id like `@name@example.com` into an apub ID, like `https://example.com/user/name`,
 /// using webfinger.
 async fn fetch_webfinger_url(mention: &MentionData, client: &Client) -> Result<Url, LemmyError> {
  let fetch_url = format!(
--- a/crates/apub/src/activities/send/community.rs
+++ b/crates/apub/src/activities/send/community.rs
@ -3,7 +3,8 @@ use crate::{
  activity_queue::{send_activity_single_dest, send_to_community_followers},
  check_is_apub_id_valid,
  extensions::context::lemmy_context,
-  fetcher::user::get_or_fetch_and_upsert_user,
+  fetcher::person::get_or_fetch_and_upsert_person,
  insert_activity,
  ActorType,
 };
 use activitystreams::{
@ -27,7 +28,7 @@ use lemmy_api_structs::blocking;
 use lemmy_db_queries::DbPool;
 use lemmy_db_schema::source::community::Community;
 use lemmy_db_views_actor::community_follower_view::CommunityFollowerView;
-use lemmy_utils::{location_info, LemmyError};
+use lemmy_utils::{location_info, settings::structs::Settings, LemmyError};
 use lemmy_websocket::LemmyContext;
 use url::Url;
@ -70,7 +71,7 @@ impl ActorType for Community {
    unimplemented!()
  }
-  /// As a local community, accept the follow request from a remote user.
+  /// As a local community, accept the follow request from a remote person.
  async fn send_accept_follow(
    &self,
    follow: Follow,
@ -80,7 +81,7 @@ impl ActorType for Community {
      .actor()?
      .as_single_xsd_any_uri()
      .context(location_info!())?;
-    let user = get_or_fetch_and_upsert_user(actor_uri, context, &mut 0).await?;
+    let person = get_or_fetch_and_upsert_person(actor_uri, context, &mut 0).await?;
    let mut accept = Accept::new(
      self.actor_id.to_owned().into_inner(),
@ -89,9 +90,9 @@ impl ActorType for Community {
    accept
      .set_many_contexts(lemmy_context()?)
      .set_id(generate_activity_id(AcceptType::Accept)?)
-      .set_to(user.actor_id());
+      .set_to(person.actor_id());
-    send_activity_single_dest(accept, self, user.inbox_url.into(), context).await?;
+    send_activity_single_dest(accept, self, person.inbox_url.into(), context).await?;
    Ok(())
  }
@ -164,11 +165,20 @@ impl ActorType for Community {
  /// Wraps an activity sent to the community in an announce, and then sends the announce to all
  /// community followers.
  ///
  /// If we are announcing a local activity, it hasn't been stored in the database yet, and we need
  /// to do it here, so that it can be fetched by ID. Remote activities are inserted into DB in the
  /// inbox.
  async fn send_announce(
    &self,
    activity: AnyBase,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let inner_id = activity.id().context(location_info!())?;
    if inner_id.domain() == Some(&Settings::get().get_hostname_without_port()?) {
      insert_activity(inner_id, activity.clone(), true, false, context.pool()).await?;
    }
    let mut announce = Announce::new(self.actor_id.to_owned().into_inner(), activity);
    announce
      .set_many_contexts(lemmy_context()?)
--- a/crates/apub/src/activities/send/mod.rs
+++ b/crates/apub/src/activities/send/mod.rs
@ -4,9 +4,9 @@ use uuid::Uuid;
 pub(crate) mod comment;
 pub(crate) mod community;
 pub(crate) mod person;
 pub(crate) mod post;
 pub(crate) mod private_message;
 pub(crate) mod user;
 /// Generate a unique ID for an activity, in the format:
 /// `http(s)://example.com/receive/create/202daf0a-1489-45df-8d2e-c8a3173fed36`
--- a/crates/apub/src/activities/send/person.rs
+++ b/crates/apub/src/activities/send/person.rs
@ -17,14 +17,14 @@ use lemmy_api_structs::blocking;
 use lemmy_db_queries::{ApubObject, DbPool, Followable};
 use lemmy_db_schema::source::{
  community::{Community, CommunityFollower, CommunityFollowerForm},
-  user::User_,
+  person::Person,
 };
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 use url::Url;
 #[async_trait::async_trait(?Send)]
-impl ActorType for User_ {
+impl ActorType for Person {
  fn is_local(&self) -> bool {
    self.local
  }
@ -48,7 +48,7 @@ impl ActorType for User_ {
      .into()
  }
-  /// As a given local user, send out a follow request to a remote community.
+  /// As a given local person, send out a follow request to a remote community.
  async fn send_follow(
    &self,
    follow_actor_id: &Url,
@ -62,7 +62,7 @@ impl ActorType for User_ {
    let community_follower_form = CommunityFollowerForm {
      community_id: community.id,
-      user_id: self.id,
+      person_id: self.id,
      pending: true,
    };
    blocking(&context.pool(), move |conn| {
--- a/crates/apub/src/activities/send/post.rs
+++ b/crates/apub/src/activities/send/post.rs
@ -23,14 +23,14 @@ use activitystreams::{
 };
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::Crud;
-use lemmy_db_schema::source::{community::Community, post::Post, user::User_};
+use lemmy_db_schema::source::{community::Community, person::Person, post::Post};
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 #[async_trait::async_trait(?Send)]
 impl ApubObjectType for Post {
  /// Send out information about a newly created post, to the followers of the community.
-  async fn send_create(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_create(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let page = self.to_apub(context.pool()).await?;
    let community_id = self.community_id;
@ -54,7 +54,7 @@ impl ApubObjectType for Post {
  }
  /// Send out information about an edited post, to the followers of the community.
-  async fn send_update(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_update(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let page = self.to_apub(context.pool()).await?;
    let community_id = self.community_id;
@ -77,7 +77,7 @@ impl ApubObjectType for Post {
    Ok(())
  }
-  async fn send_delete(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_delete(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let community_id = self.community_id;
    let community = blocking(context.pool(), move |conn| {
      Community::read(conn, community_id)
@ -100,7 +100,7 @@ impl ApubObjectType for Post {
  async fn send_undo_delete(
    &self,
-    creator: &User_,
+    creator: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let community_id = self.community_id;
@ -134,7 +134,7 @@ impl ApubObjectType for Post {
    Ok(())
  }
-  async fn send_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_remove(&self, mod_: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let community_id = self.community_id;
    let community = blocking(context.pool(), move |conn| {
      Community::read(conn, community_id)
@ -155,7 +155,11 @@ impl ApubObjectType for Post {
    Ok(())
  }
-  async fn send_undo_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_undo_remove(
    &self,
    mod_: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let community_id = self.community_id;
    let community = blocking(context.pool(), move |conn| {
      Community::read(conn, community_id)
@ -190,7 +194,7 @@ impl ApubObjectType for Post {
 #[async_trait::async_trait(?Send)]
 impl ApubLikeableType for Post {
-  async fn send_like(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_like(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let community_id = self.community_id;
    let community = blocking(context.pool(), move |conn| {
      Community::read(conn, community_id)
@ -211,7 +215,7 @@ impl ApubLikeableType for Post {
    Ok(())
  }
-  async fn send_dislike(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_dislike(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let community_id = self.community_id;
    let community = blocking(context.pool(), move |conn| {
      Community::read(conn, community_id)
@ -234,7 +238,7 @@ impl ApubLikeableType for Post {
  async fn send_undo_like(
    &self,
-    creator: &User_,
+    creator: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let community_id = self.community_id;
--- a/crates/apub/src/activities/send/private_message.rs
+++ b/crates/apub/src/activities/send/private_message.rs
@ -18,18 +18,19 @@ use activitystreams::{
 };
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::Crud;
-use lemmy_db_schema::source::{private_message::PrivateMessage, user::User_};
+use lemmy_db_schema::source::{person::Person, private_message::PrivateMessage};
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 #[async_trait::async_trait(?Send)]
 impl ApubObjectType for PrivateMessage {
  /// Send out information about a newly created private message
-  async fn send_create(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_create(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let note = self.to_apub(context.pool()).await?;
    let recipient_id = self.recipient_id;
-    let recipient = blocking(context.pool(), move |conn| User_::read(conn, recipient_id)).await??;
+    let recipient =
      blocking(context.pool(), move |conn| Person::read(conn, recipient_id)).await??;
    let mut create = Create::new(
      creator.actor_id.to_owned().into_inner(),
@ -46,11 +47,12 @@ impl ApubObjectType for PrivateMessage {
  }
  /// Send out information about an edited private message, to the followers of the community.
-  async fn send_update(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_update(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let note = self.to_apub(context.pool()).await?;
    let recipient_id = self.recipient_id;
-    let recipient = blocking(context.pool(), move |conn| User_::read(conn, recipient_id)).await??;
+    let recipient =
      blocking(context.pool(), move |conn| Person::read(conn, recipient_id)).await??;
    let mut update = Update::new(
      creator.actor_id.to_owned().into_inner(),
@ -65,9 +67,10 @@ impl ApubObjectType for PrivateMessage {
    Ok(())
  }
-  async fn send_delete(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_delete(&self, creator: &Person, context: &LemmyContext) -> Result<(), LemmyError> {
    let recipient_id = self.recipient_id;
-    let recipient = blocking(context.pool(), move |conn| User_::read(conn, recipient_id)).await??;
+    let recipient =
      blocking(context.pool(), move |conn| Person::read(conn, recipient_id)).await??;
    let mut delete = Delete::new(
      creator.actor_id.to_owned().into_inner(),
@ -84,11 +87,12 @@ impl ApubObjectType for PrivateMessage {
  async fn send_undo_delete(
    &self,
-    creator: &User_,
+    creator: &Person,
    context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    let recipient_id = self.recipient_id;
-    let recipient = blocking(context.pool(), move |conn| User_::read(conn, recipient_id)).await??;
+    let recipient =
      blocking(context.pool(), move |conn| Person::read(conn, recipient_id)).await??;
    let mut delete = Delete::new(
      creator.actor_id.to_owned().into_inner(),
@ -113,13 +117,13 @@ impl ApubObjectType for PrivateMessage {
    Ok(())
  }
-  async fn send_remove(&self, _mod_: &User_, _context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn send_remove(&self, _mod_: &Person, _context: &LemmyContext) -> Result<(), LemmyError> {
    unimplemented!()
  }
  async fn send_undo_remove(
    &self,
-    _mod_: &User_,
+    _mod_: &Person,
    _context: &LemmyContext,
  ) -> Result<(), LemmyError> {
    unimplemented!()
--- a/crates/apub/src/activity_queue.rs
+++ b/crates/apub/src/activity_queue.rs
@ -21,7 +21,7 @@ use background_jobs::{
 };
 use itertools::Itertools;
 use lemmy_db_queries::DbPool;
-use lemmy_db_schema::source::{community::Community, user::User_};
+use lemmy_db_schema::source::{community::Community, person::Person};
 use lemmy_utils::{location_info, settings::structs::Settings, LemmyError};
 use lemmy_websocket::LemmyContext;
 use log::{debug, warn};
@ -112,7 +112,7 @@ where
  Ok(())
 }
-/// Sends an activity from a local user to a remote community.
+/// Sends an activity from a local person to a remote community.
 ///
 /// * `activity` the activity to send
 /// * `creator` the creator of the activity
@ -120,7 +120,7 @@ where
 ///
 pub(crate) async fn send_to_community<T, Kind>(
  activity: T,
-  creator: &User_,
+  creator: &Person,
  community: &Community,
  context: &LemmyContext,
 ) -> Result<(), LemmyError>
@ -157,13 +157,13 @@ where
  Ok(())
 }
-/// Sends notification to any users mentioned in a comment
+/// Sends notification to any persons mentioned in a comment
 ///
-/// * `creator` user who created the comment
+/// * `creator` person who created the comment
-/// * `mentions` list of inboxes of users which are mentioned in the comment
+/// * `mentions` list of inboxes of persons which are mentioned in the comment
 /// * `activity` either a `Create/Note` or `Update/Note`
 pub(crate) async fn send_comment_mentions<T, Kind>(
-  creator: &User_,
+  creator: &Person,
  mentions: Vec<Url>,
  activity: T,
  context: &LemmyContext,
--- a/crates/apub/src/extensions/signatures.rs
+++ b/crates/apub/src/extensions/signatures.rs
@ -95,7 +95,7 @@ pub(crate) fn verify_signature(
  }
 }
-/// Extension for actor public key, which is needed on user and community for HTTP signatures.
+/// Extension for actor public key, which is needed on person and community for HTTP signatures.
 ///
 /// Taken from: https://docs.rs/activitystreams/0.5.0-alpha.17/activitystreams/ext/index.html
 #[derive(Clone, Debug, Deserialize, Serialize)]
--- a/crates/apub/src/fetcher/community.rs
+++ b/crates/apub/src/fetcher/community.rs
@ -1,11 +1,11 @@
 use crate::{
  fetcher::{
    fetch::fetch_remote_object,
-    get_or_fetch_and_upsert_user,
+    get_or_fetch_and_upsert_person,
    is_deleted,
    should_refetch_actor,
  },
-  inbox::user_inbox::receive_announce,
+  inbox::person_inbox::receive_announce,
  objects::FromApub,
  GroupExt,
 };
@ -92,7 +92,7 @@ async fn fetch_remote_community(
  let mut creator_and_moderators = Vec::new();
  for uri in creator_and_moderator_uris {
-    let c_or_m = get_or_fetch_and_upsert_user(uri, context, recursion_counter).await?;
+    let c_or_m = get_or_fetch_and_upsert_person(uri, context, recursion_counter).await?;
    creator_and_moderators.push(c_or_m);
  }
@ -104,7 +104,7 @@ async fn fetch_remote_community(
      for mod_ in creator_and_moderators {
        let community_moderator_form = CommunityModeratorForm {
          community_id,
-          user_id: mod_.id,
+          person_id: mod_.id,
        };
        CommunityModerator::join(conn, &community_moderator_form)?;
--- a/crates/apub/src/fetcher/mod.rs
+++ b/crates/apub/src/fetcher/mod.rs
@ -1,14 +1,14 @@
 pub(crate) mod community;
 mod fetch;
 pub(crate) mod objects;
 pub(crate) mod person;
 pub mod search;
 pub(crate) mod user;
 use crate::{
  fetcher::{
    community::get_or_fetch_and_upsert_community,
    fetch::FetchError,
-    user::get_or_fetch_and_upsert_user,
+    person::get_or_fetch_and_upsert_person,
  },
  ActorType,
 };
@ -37,8 +37,8 @@ where
  false
 }
-/// Get a remote actor from its apub ID (either a user or a community). Thin wrapper around
+/// Get a remote actor from its apub ID (either a person or a community). Thin wrapper around
-/// `get_or_fetch_and_upsert_user()` and `get_or_fetch_and_upsert_community()`.
+/// `get_or_fetch_and_upsert_person()` and `get_or_fetch_and_upsert_community()`.
 ///
 /// If it exists locally and `!should_refetch_actor()`, it is returned directly from the database.
 /// Otherwise it is fetched from the remote instance, stored and returned.
@ -50,7 +50,7 @@ pub(crate) async fn get_or_fetch_and_upsert_actor(
  let community = get_or_fetch_and_upsert_community(apub_id, context, recursion_counter).await;
  let actor: Box<dyn ActorType> = match community {
    Ok(c) => Box::new(c),
-    Err(_) => Box::new(get_or_fetch_and_upsert_user(apub_id, context, recursion_counter).await?),
+    Err(_) => Box::new(get_or_fetch_and_upsert_person(apub_id, context, recursion_counter).await?),
  };
  Ok(actor)
 }
--- a/crates/apub/src/fetcher/person.rs
+++ b/crates/apub/src/fetcher/person.rs
@ -6,65 +6,67 @@ use crate::{
 use anyhow::anyhow;
 use diesel::result::Error::NotFound;
 use lemmy_api_structs::blocking;
-use lemmy_db_queries::{source::user::User, ApubObject};
+use lemmy_db_queries::{source::person::Person_, ApubObject};
-use lemmy_db_schema::source::user::User_;
+use lemmy_db_schema::source::person::Person;
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 use log::debug;
 use url::Url;
-/// Get a user from its apub ID.
+/// Get a person from its apub ID.
 ///
 /// If it exists locally and `!should_refetch_actor()`, it is returned directly from the database.
 /// Otherwise it is fetched from the remote instance, stored and returned.
-pub(crate) async fn get_or_fetch_and_upsert_user(
+pub(crate) async fn get_or_fetch_and_upsert_person(
  apub_id: &Url,
  context: &LemmyContext,
  recursion_counter: &mut i32,
-) -> Result<User_, LemmyError> {
+) -> Result<Person, LemmyError> {
  let apub_id_owned = apub_id.to_owned();
-  let user = blocking(context.pool(), move |conn| {
+  let person = blocking(context.pool(), move |conn| {
-    User_::read_from_apub_id(conn, &apub_id_owned.into())
+    Person::read_from_apub_id(conn, &apub_id_owned.into())
  })
  .await?;
-  match user {
+  match person {
    // If its older than a day, re-fetch it
    Ok(u) if !u.local && should_refetch_actor(u.last_refreshed_at) => {
-      debug!("Fetching and updating from remote user: {}", apub_id);
+      debug!("Fetching and updating from remote person: {}", apub_id);
      let person =
        fetch_remote_object::<PersonExt>(context.client(), apub_id, recursion_counter).await;
      if is_deleted(&person) {
-        // TODO: use User_::update_deleted() once implemented
+        // TODO: use Person::update_deleted() once implemented
        blocking(context.pool(), move |conn| {
-          User_::delete_account(conn, u.id)
+          Person::delete_account(conn, u.id)
        })
        .await??;
-        return Err(anyhow!("User was deleted by remote instance").into());
+        return Err(anyhow!("Person was deleted by remote instance").into());
      } else if person.is_err() {
        return Ok(u);
      }
-      let user = User_::from_apub(&person?, context, apub_id.to_owned(), recursion_counter).await?;
+      let person =
        Person::from_apub(&person?, context, apub_id.to_owned(), recursion_counter).await?;
-      let user_id = user.id;
+      let person_id = person.id;
      blocking(context.pool(), move |conn| {
-        User_::mark_as_updated(conn, user_id)
+        Person::mark_as_updated(conn, person_id)
      })
      .await??;
-      Ok(user)
+      Ok(person)
    }
    Ok(u) => Ok(u),
    Err(NotFound {}) => {
-      debug!("Fetching and creating remote user: {}", apub_id);
+      debug!("Fetching and creating remote person: {}", apub_id);
      let person =
        fetch_remote_object::<PersonExt>(context.client(), apub_id, recursion_counter).await?;
-      let user = User_::from_apub(&person, context, apub_id.to_owned(), recursion_counter).await?;
+      let person =
        Person::from_apub(&person, context, apub_id.to_owned(), recursion_counter).await?;
-      Ok(user)
+      Ok(person)
    }
    Err(e) => Err(e.into()),
  }
--- a/crates/apub/src/fetcher/search.rs
+++ b/crates/apub/src/fetcher/search.rs
@ -2,7 +2,7 @@ use crate::{
  fetcher::{
    fetch::fetch_remote_object,
    get_or_fetch_and_upsert_community,
-    get_or_fetch_and_upsert_user,
+    get_or_fetch_and_upsert_person,
    is_deleted,
  },
  find_object_by_id,
@ -20,21 +20,21 @@ use lemmy_db_queries::{
  source::{
    comment::Comment_,
    community::Community_,
    person::Person_,
    post::Post_,
    private_message::PrivateMessage_,
    user::User,
  },
  SearchType,
 };
 use lemmy_db_schema::source::{
  comment::Comment,
  community::Community,
  person::Person,
  post::Post,
  private_message::PrivateMessage,
  user::User_,
 };
 use lemmy_db_views::{comment_view::CommentView, post_view::PostView};
-use lemmy_db_views_actor::{community_view::CommunityView, user_view::UserViewSafe};
+use lemmy_db_views_actor::{community_view::CommunityView, person_view::PersonViewSafe};
 use lemmy_utils::{settings::structs::Settings, LemmyError};
 use lemmy_websocket::LemmyContext;
 use log::debug;
@ -66,7 +66,7 @@ pub async fn search_by_apub_id(
    debug!("Search for {}", query);
    let split = query.split('@').collect::<Vec<&str>>();
-    // User type will look like ['', username, instance]
+    // Person type will look like ['', username, instance]
    // Community will look like [!community, instance]
    let (name, instance) = if split.len() == 3 {
      (format!("/u/{}", split[1]), split[2])
@ -122,13 +122,13 @@ async fn build_response(
  match fetch_response {
    SearchAcceptedObjects::Person(p) => {
-      let user_uri = p.inner.id(domain)?.context("person has no id")?;
+      let person_uri = p.inner.id(domain)?.context("person has no id")?;
-      let user = get_or_fetch_and_upsert_user(&user_uri, context, recursion_counter).await?;
+      let person = get_or_fetch_and_upsert_person(&person_uri, context, recursion_counter).await?;
      response.users = vec![
        blocking(context.pool(), move |conn| {
-          UserViewSafe::read(conn, user.id)
+          PersonViewSafe::read(conn, person.id)
        })
        .await??,
      ];
@ -182,10 +182,10 @@ async fn delete_object_locally(query_url: &Url, context: &LemmyContext) -> Resul
      })
      .await??;
    }
-    Object::User(u) => {
+    Object::Person(u) => {
      // TODO: implement update_deleted() for user, move it to ApubObject trait
      blocking(context.pool(), move |conn| {
-        User_::delete_account(conn, u.id)
+        Person::delete_account(conn, u.id)
      })
      .await??;
    }
--- a/crates/apub/src/http/comment.rs
+++ b/crates/apub/src/http/comment.rs
@ -6,7 +6,7 @@ use actix_web::{body::Body, web, web::Path, HttpResponse};
 use diesel::result::Error::NotFound;
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::Crud;
-use lemmy_db_schema::source::comment::Comment;
+use lemmy_db_schema::{source::comment::Comment, CommentId};
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 use serde::Deserialize;
@ -21,7 +21,7 @@ pub async fn get_apub_comment(
  info: Path<CommentQuery>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse<Body>, LemmyError> {
-  let id = info.comment_id.parse::<i32>()?;
+  let id = CommentId(info.comment_id.parse::<i32>()?);
  let comment = blocking(context.pool(), move |conn| Comment::read(conn, id)).await??;
  if !comment.local {
    return Err(NotFound.into());
--- a/crates/apub/src/http/mod.rs
+++ b/crates/apub/src/http/mod.rs
@ -11,8 +11,8 @@ use url::Url;
 pub mod comment;
 pub mod community;
 pub mod person;
 pub mod post;
 pub mod user;
 /// Convert the data to json and turn it into an HTTP Response with the correct ActivityPub
 /// headers.
--- a/crates/apub/src/http/person.rs
+++ b/crates/apub/src/http/person.rs
@ -10,69 +10,69 @@ use activitystreams::{
 };
 use actix_web::{body::Body, web, HttpResponse};
 use lemmy_api_structs::blocking;
-use lemmy_db_queries::source::user::User;
+use lemmy_db_queries::source::person::Person_;
-use lemmy_db_schema::source::user::User_;
+use lemmy_db_schema::source::person::Person;
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 use serde::Deserialize;
 use url::Url;
 #[derive(Deserialize)]
-pub struct UserQuery {
+pub struct PersonQuery {
  user_name: String,
 }
-/// Return the ActivityPub json representation of a local user over HTTP.
+/// Return the ActivityPub json representation of a local person over HTTP.
-pub async fn get_apub_user_http(
+pub async fn get_apub_person_http(
-  info: web::Path<UserQuery>,
+  info: web::Path<PersonQuery>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse<Body>, LemmyError> {
  let user_name = info.into_inner().user_name;
-  // TODO: this needs to be able to read deleted users, so that it can send tombstones
+  // TODO: this needs to be able to read deleted persons, so that it can send tombstones
-  let user = blocking(context.pool(), move |conn| {
+  let person = blocking(context.pool(), move |conn| {
-    User_::find_by_email_or_username(conn, &user_name)
+    Person::find_by_name(conn, &user_name)
  })
  .await??;
-  if !user.deleted {
+  if !person.deleted {
-    let apub = user.to_apub(context.pool()).await?;
+    let apub = person.to_apub(context.pool()).await?;
    Ok(create_apub_response(&apub))
  } else {
-    Ok(create_apub_tombstone_response(&user.to_tombstone()?))
+    Ok(create_apub_tombstone_response(&person.to_tombstone()?))
  }
 }
-pub async fn get_apub_user_outbox(
+pub async fn get_apub_person_outbox(
-  info: web::Path<UserQuery>,
+  info: web::Path<PersonQuery>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse<Body>, LemmyError> {
-  let user = blocking(context.pool(), move |conn| {
+  let person = blocking(context.pool(), move |conn| {
-    User_::read_from_name(&conn, &info.user_name)
+    Person::find_by_name(&conn, &info.user_name)
  })
  .await??;
-  // TODO: populate the user outbox
+  // TODO: populate the person outbox
  let mut collection = OrderedCollection::new();
  collection
    .set_many_items(Vec::<Url>::new())
    .set_many_contexts(lemmy_context()?)
-    .set_id(user.get_outbox_url()?)
+    .set_id(person.get_outbox_url()?)
    .set_total_items(0_u64);
  Ok(create_apub_response(&collection))
 }
-pub async fn get_apub_user_inbox(
+pub async fn get_apub_person_inbox(
-  info: web::Path<UserQuery>,
+  info: web::Path<PersonQuery>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse<Body>, LemmyError> {
-  let user = blocking(context.pool(), move |conn| {
+  let person = blocking(context.pool(), move |conn| {
-    User_::read_from_name(&conn, &info.user_name)
+    Person::find_by_name(&conn, &info.user_name)
  })
  .await??;
  let mut collection = OrderedCollection::new();
  collection
-    .set_id(format!("{}/inbox", user.actor_id.into_inner()).parse()?)
+    .set_id(format!("{}/inbox", person.actor_id.into_inner()).parse()?)
    .set_many_contexts(lemmy_context()?);
  Ok(create_apub_response(&collection))
 }
--- a/crates/apub/src/http/post.rs
+++ b/crates/apub/src/http/post.rs
@ -6,7 +6,7 @@ use actix_web::{body::Body, web, HttpResponse};
 use diesel::result::Error::NotFound;
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::Crud;
-use lemmy_db_schema::source::post::Post;
+use lemmy_db_schema::{source::post::Post, PostId};
 use lemmy_utils::LemmyError;
 use lemmy_websocket::LemmyContext;
 use serde::Deserialize;
@ -21,7 +21,7 @@ pub async fn get_apub_post(
  info: web::Path<PostQuery>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse<Body>, LemmyError> {
-  let id = info.post_id.parse::<i32>()?;
+  let id = PostId(info.post_id.parse::<i32>()?);
  let post = blocking(context.pool(), move |conn| Post::read(conn, id)).await??;
  if !post.local {
    return Err(NotFound.into());
--- a/crates/apub/src/inbox/community_inbox.rs
+++ b/crates/apub/src/inbox/community_inbox.rs
@ -28,11 +28,14 @@ use actix_web::{web, HttpRequest, HttpResponse};
 use anyhow::{anyhow, Context};
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::{source::community::Community_, ApubObject, DbPool, Followable};
-use lemmy_db_schema::source::{
+use lemmy_db_schema::{
-  community::{Community, CommunityFollower, CommunityFollowerForm},
+  source::{
-  user::User_,
+    community::{Community, CommunityFollower, CommunityFollowerForm},
    person::Person,
  },
  CommunityId,
 };
-use lemmy_db_views_actor::community_user_ban_view::CommunityUserBanView;
+use lemmy_db_views_actor::community_person_ban_view::CommunityPersonBanView;
 use lemmy_utils::{location_info, LemmyError};
 use lemmy_websocket::LemmyContext;
 use log::info;
@ -44,8 +47,8 @@ use url::Url;
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
 #[serde(rename_all = "PascalCase")]
 pub enum CommunityValidTypes {
-  Follow,  // follow request from a user
+  Follow,  // follow request from a person
-  Undo,    // unfollow from a user
+  Undo,    // unfollow from a person
  Create,  // create post or comment
  Update,  // update post or comment
  Like,    // upvote post or comment
@ -113,21 +116,21 @@ pub(crate) async fn community_receive_message(
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<HttpResponse, LemmyError> {
-  // Only users can send activities to the community, so we can get the actor as user
+  // Only persons can send activities to the community, so we can get the actor as person
  // unconditionally.
  let actor_id = actor.actor_id();
-  let user = blocking(&context.pool(), move |conn| {
+  let person = blocking(&context.pool(), move |conn| {
-    User_::read_from_apub_id(&conn, &actor_id.into())
+    Person::read_from_apub_id(&conn, &actor_id.into())
  })
  .await??;
-  check_community_or_site_ban(&user, to_community.id, context.pool()).await?;
+  check_community_or_site_ban(&person, to_community.id, context.pool()).await?;
  let any_base = activity.clone().into_any_base()?;
  let actor_url = actor.actor_id();
  let activity_kind = activity.kind().context(location_info!())?;
  let do_announce = match activity_kind {
    CommunityValidTypes::Follow => {
-      handle_follow(any_base.clone(), user, &to_community, &context).await?;
+      handle_follow(any_base.clone(), person, &to_community, &context).await?;
      false
    }
    CommunityValidTypes::Undo => {
@ -162,7 +165,7 @@ pub(crate) async fn community_receive_message(
    }
    CommunityValidTypes::Remove => {
      // TODO: we dont support remote mods, so this is ignored for now
-      //receive_remove_for_community(context, any_base.clone(), &user_url).await?
+      //receive_remove_for_community(context, any_base.clone(), &person_url).await?
      false
    }
  };
@ -178,20 +181,20 @@ pub(crate) async fn community_receive_message(
  Ok(HttpResponse::Ok().finish())
 }
-/// Handle a follow request from a remote user, adding the user as follower and returning an
+/// Handle a follow request from a remote person, adding the person as follower and returning an
 /// Accept activity.
 async fn handle_follow(
  activity: AnyBase,
-  user: User_,
+  person: Person,
  community: &Community,
  context: &LemmyContext,
 ) -> Result<HttpResponse, LemmyError> {
  let follow = Follow::from_any_base(activity)?.context(location_info!())?;
-  verify_activity_domains_valid(&follow, &user.actor_id(), false)?;
+  verify_activity_domains_valid(&follow, &person.actor_id(), false)?;
  let community_follower_form = CommunityFollowerForm {
    community_id: community.id,
-    user_id: user.id,
+    person_id: person.id,
    pending: false,
  };
@ -226,27 +229,27 @@ async fn handle_undo(
  }
 }
-/// Handle `Undo/Follow` from a user, removing the user from followers list.
+/// Handle `Undo/Follow` from a person, removing the person from followers list.
 async fn handle_undo_follow(
  activity: AnyBase,
-  user_url: Url,
+  person_url: Url,
  community: &Community,
  context: &LemmyContext,
 ) -> Result<(), LemmyError> {
  let undo = Undo::from_any_base(activity)?.context(location_info!())?;
-  verify_activity_domains_valid(&undo, &user_url, true)?;
+  verify_activity_domains_valid(&undo, &person_url, true)?;
  let object = undo.object().to_owned().one().context(location_info!())?;
  let follow = Follow::from_any_base(object)?.context(location_info!())?;
-  verify_activity_domains_valid(&follow, &user_url, false)?;
+  verify_activity_domains_valid(&follow, &person_url, false)?;
-  let user = blocking(&context.pool(), move |conn| {
+  let person = blocking(&context.pool(), move |conn| {
-    User_::read_from_apub_id(&conn, &user_url.into())
+    Person::read_from_apub_id(&conn, &person_url.into())
  })
  .await??;
  let community_follower_form = CommunityFollowerForm {
    community_id: community.id,
-    user_id: user.id,
+    person_id: person.id,
    pending: false,
  };
@ -260,17 +263,18 @@ async fn handle_undo_follow(
 }
 pub(crate) async fn check_community_or_site_ban(
-  user: &User_,
+  person: &Person,
-  community_id: i32,
+  community_id: CommunityId,
  pool: &DbPool,
 ) -> Result<(), LemmyError> {
-  if user.banned {
+  if person.banned {
-    return Err(anyhow!("User is banned from site").into());
+    return Err(anyhow!("Person is banned from site").into());
  }
-  let user_id = user.id;
+  let person_id = person.id;
-  let is_banned = move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
+  let is_banned =
    move |conn: &'_ _| CommunityPersonBanView::get(conn, person_id, community_id).is_ok();
  if blocking(pool, is_banned).await? {
-    return Err(anyhow!("User is banned from community").into());
+    return Err(anyhow!("Person is banned from community").into());
  }
  Ok(())
--- a/crates/apub/src/inbox/mod.rs
+++ b/crates/apub/src/inbox/mod.rs
@ -18,7 +18,7 @@ use lemmy_db_queries::{
  ApubObject,
  DbPool,
 };
-use lemmy_db_schema::source::{activity::Activity, community::Community, user::User_};
+use lemmy_db_schema::source::{activity::Activity, community::Community, person::Person};
 use lemmy_utils::{location_info, settings::structs::Settings, LemmyError};
 use lemmy_websocket::LemmyContext;
 use serde::Serialize;
@ -26,9 +26,9 @@ use std::fmt::Debug;
 use url::Url;
 pub mod community_inbox;
 pub mod person_inbox;
 mod receive_for_community;
 pub mod shared_inbox;
 pub mod user_inbox;
 pub(crate) fn get_activity_id<T, Kind>(activity: &T, creator_uri: &Url) -> Result<Url, LemmyError>
 where
@ -119,17 +119,17 @@ where
 }
 /// Returns true if `to_and_cc` contains at least one local user.
-pub(crate) async fn is_addressed_to_local_user(
+pub(crate) async fn is_addressed_to_local_person(
  to_and_cc: &[Url],
  pool: &DbPool,
 ) -> Result<bool, LemmyError> {
  for url in to_and_cc {
    let url = url.to_owned();
-    let user = blocking(&pool, move |conn| {
+    let person = blocking(&pool, move |conn| {
-      User_::read_from_apub_id(&conn, &url.into())
+      Person::read_from_apub_id(&conn, &url.into())
    })
    .await?;
-    if let Ok(u) = user {
+    if let Ok(u) = person {
      if u.local {
        return Ok(true);
      }
--- a/crates/apub/src/inbox/person_inbox.rs
+++ b/crates/apub/src/inbox/person_inbox.rs
@ -25,7 +25,7 @@ use crate::{
    inbox_verify_http_signature,
    is_activity_already_known,
    is_addressed_to_community_followers,
-    is_addressed_to_local_user,
+    is_addressed_to_local_person,
    is_addressed_to_public,
    receive_for_community::{
      receive_create_for_community,
@ -49,11 +49,11 @@ use actix_web::{web, HttpRequest, HttpResponse};
 use anyhow::{anyhow, Context};
 use diesel::NotFound;
 use lemmy_api_structs::blocking;
-use lemmy_db_queries::{source::user::User, ApubObject, Followable};
+use lemmy_db_queries::{source::person::Person_, ApubObject, Followable};
 use lemmy_db_schema::source::{
  community::{Community, CommunityFollower},
  person::Person,
  private_message::PrivateMessage,
  user::User_,
 };
 use lemmy_utils::{location_info, LemmyError};
 use lemmy_websocket::LemmyContext;
@ -63,10 +63,10 @@ use std::fmt::Debug;
 use strum_macros::EnumString;
 use url::Url;
-/// Allowed activities for user inbox.
+/// Allowed activities for person inbox.
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
 #[serde(rename_all = "PascalCase")]
-pub enum UserValidTypes {
+pub enum PersonValidTypes {
  Accept,   // community accepted our follow request
  Create,   // create private message
  Update,   // edit private message
@ -76,12 +76,12 @@ pub enum UserValidTypes {
  Announce, // post, comment or vote in community
 }
-pub type UserAcceptedActivities = ActorAndObject<UserValidTypes>;
+pub type PersonAcceptedActivities = ActorAndObject<PersonValidTypes>;
-/// Handler for all incoming activities to user inboxes.
+/// Handler for all incoming activities to person inboxes.
-pub async fn user_inbox(
+pub async fn person_inbox(
  request: HttpRequest,
-  input: web::Json<UserAcceptedActivities>,
+  input: web::Json<PersonAcceptedActivities>,
  path: web::Path<String>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
@ -98,29 +98,29 @@ pub async fn user_inbox(
  // Check if the activity is actually meant for us
  let username = path.into_inner();
-  let user = blocking(&context.pool(), move |conn| {
+  let person = blocking(&context.pool(), move |conn| {
-    User_::read_from_name(&conn, &username)
+    Person::find_by_name(&conn, &username)
  })
  .await??;
  let to_and_cc = get_activity_to_and_cc(&activity);
  // TODO: we should also accept activities that are sent to community followers
-  if !to_and_cc.contains(&&user.actor_id()) {
+  if !to_and_cc.contains(&&person.actor_id()) {
-    return Err(anyhow!("Activity delivered to wrong user").into());
+    return Err(anyhow!("Activity delivered to wrong person").into());
  }
  assert_activity_not_local(&activity)?;
  insert_activity(&activity_id, activity.clone(), false, true, context.pool()).await?;
  debug!(
-    "User {} received activity {:?} from {}",
+    "Person {} received activity {:?} from {}",
-    user.name,
+    person.name,
    &activity.id_unchecked(),
    &actor.actor_id()
  );
-  user_receive_message(
+  person_receive_message(
    activity.clone(),
-    Some(user.clone()),
+    Some(person.clone()),
    actor.as_ref(),
    &context,
    request_counter,
@ -129,43 +129,43 @@ pub async fn user_inbox(
 }
 /// Receives Accept/Follow, Announce, private messages and community (undo) remove, (undo) delete
-pub(crate) async fn user_receive_message(
+pub(crate) async fn person_receive_message(
-  activity: UserAcceptedActivities,
+  activity: PersonAcceptedActivities,
-  to_user: Option<User_>,
+  to_person: Option<Person>,
  actor: &dyn ActorType,
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<HttpResponse, LemmyError> {
-  is_for_user_inbox(context, &activity).await?;
+  is_for_person_inbox(context, &activity).await?;
  let any_base = activity.clone().into_any_base()?;
  let kind = activity.kind().context(location_info!())?;
  let actor_url = actor.actor_id();
  match kind {
-    UserValidTypes::Accept => {
+    PersonValidTypes::Accept => {
      receive_accept(
        &context,
        any_base,
        actor,
-        to_user.expect("user provided"),
+        to_person.expect("person provided"),
        request_counter,
      )
      .await?;
    }
-    UserValidTypes::Announce => {
+    PersonValidTypes::Announce => {
      receive_announce(&context, any_base, actor, request_counter).await?
    }
-    UserValidTypes::Create => {
+    PersonValidTypes::Create => {
      receive_create(&context, any_base, actor_url, request_counter).await?
    }
-    UserValidTypes::Update => {
+    PersonValidTypes::Update => {
      receive_update(&context, any_base, actor_url, request_counter).await?
    }
-    UserValidTypes::Delete => {
+    PersonValidTypes::Delete => {
      receive_delete(context, any_base, &actor_url, request_counter).await?
    }
-    UserValidTypes::Undo => receive_undo(context, any_base, &actor_url, request_counter).await?,
+    PersonValidTypes::Undo => receive_undo(context, any_base, &actor_url, request_counter).await?,
-    UserValidTypes::Remove => receive_remove_community(&context, any_base, &actor_url).await?,
+    PersonValidTypes::Remove => receive_remove_community(&context, any_base, &actor_url).await?,
  };
  // TODO: would be logical to move websocket notification code here
@ -173,16 +173,16 @@ pub(crate) async fn user_receive_message(
  Ok(HttpResponse::Ok().finish())
 }
-/// Returns true if the activity is addressed directly to one or more local users, or if it is
+/// Returns true if the activity is addressed directly to one or more local persons, or if it is
-/// addressed to the followers collection of a remote community, and at least one local user follows
+/// addressed to the followers collection of a remote community, and at least one local person follows
 /// it.
-async fn is_for_user_inbox(
+async fn is_for_person_inbox(
  context: &LemmyContext,
-  activity: &UserAcceptedActivities,
+  activity: &PersonAcceptedActivities,
 ) -> Result<(), LemmyError> {
  let to_and_cc = get_activity_to_and_cc(activity);
-  // Check if it is addressed directly to any local user
+  // Check if it is addressed directly to any local person
-  if is_addressed_to_local_user(&to_and_cc, context.pool()).await? {
+  if is_addressed_to_local_person(&to_and_cc, context.pool()).await? {
    return Ok(());
  }
@ -205,7 +205,7 @@ async fn is_for_user_inbox(
    }
  }
-  Err(anyhow!("Not addressed for any local user").into())
+  Err(anyhow!("Not addressed for any local person").into())
 }
 /// Handle accepted follows.
@ -213,7 +213,7 @@ async fn receive_accept(
  context: &LemmyContext,
  activity: AnyBase,
  actor: &dyn ActorType,
-  user: User_,
+  person: Person,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError> {
  let accept = Accept::from_any_base(activity)?.context(location_info!())?;
@ -221,7 +221,7 @@ async fn receive_accept(
  let object = accept.object().to_owned().one().context(location_info!())?;
  let follow = Follow::from_any_base(object)?.context(location_info!())?;
-  verify_activity_domains_valid(&follow, &user.actor_id(), false)?;
+  verify_activity_domains_valid(&follow, &person.actor_id(), false)?;
  let community_uri = accept
    .actor()?
@ -233,10 +233,10 @@ async fn receive_accept(
    get_or_fetch_and_upsert_community(&community_uri, context, request_counter).await?;
  let community_id = community.id;
-  let user_id = user.id;
+  let person_id = person.id;
  // This will throw an error if no follow was requested
  blocking(&context.pool(), move |conn| {
-    CommunityFollower::follow_accepted(conn, community_id, user_id)
+    CommunityFollower::follow_accepted(conn, community_id, person_id)
  })
  .await??;
--- a/crates/apub/src/inbox/receive_for_community.rs
+++ b/crates/apub/src/inbox/receive_for_community.rs
@ -58,7 +58,7 @@ enum PageOrNote {
 }
 /// This file is for post/comment activities received by the community, and for post/comment
-///       activities announced by the community and received by the user.
+///       activities announced by the community and received by the person.
 /// A post or comment being created
 pub(in crate::inbox) async fn receive_create_for_community(
--- a/crates/apub/src/inbox/shared_inbox.rs
+++ b/crates/apub/src/inbox/shared_inbox.rs
@ -7,8 +7,8 @@ use crate::{
    inbox_verify_http_signature,
    is_activity_already_known,
    is_addressed_to_community_followers,
-    is_addressed_to_local_user,
+    is_addressed_to_local_person,
-    user_inbox::{user_receive_message, UserAcceptedActivities},
+    person_inbox::{person_receive_message, PersonAcceptedActivities},
  },
  insert_activity,
 };
@ -69,9 +69,9 @@ pub async fn shared_inbox(
  let mut res: Option<HttpResponse> = None;
  let to_and_cc = get_activity_to_and_cc(&activity);
  // Handle community first, so in case the sender is banned by the community, it will error out.
-  // If we handled the user receive first, the activity would be inserted to the database before the
+  // If we handled the person receive first, the activity would be inserted to the database before the
  // community could check for bans.
-  // Note that an activity can be addressed to a community and to a user (or multiple users) at the
+  // Note that an activity can be addressed to a community and to a person (or multiple persons) at the
  // same time. In this case we still only handle it once, to avoid duplicate websocket
  // notifications.
  let community = extract_local_community_from_destinations(&to_and_cc, context.pool()).await?;
@ -88,13 +88,13 @@ pub async fn shared_inbox(
      )
      .await?,
    );
-  } else if is_addressed_to_local_user(&to_and_cc, context.pool()).await? {
+  } else if is_addressed_to_local_person(&to_and_cc, context.pool()).await? {
-    let user_activity = UserAcceptedActivities::from_any_base(activity_any_base.clone())?
+    let person_activity = PersonAcceptedActivities::from_any_base(activity_any_base.clone())?
      .context(location_info!())?;
-    // `to_user` is only used for follow activities (which we dont receive here), so no need to pass
+    // `to_person` is only used for follow activities (which we dont receive here), so no need to pass
    // it in
-    user_receive_message(
+    person_receive_message(
-      user_activity,
+      person_activity,
      None,
      actor.as_ref(),
      &context,
@ -105,11 +105,11 @@ pub async fn shared_inbox(
    .await?
    .is_some()
  {
-    let user_activity = UserAcceptedActivities::from_any_base(activity_any_base.clone())?
+    let person_activity = PersonAcceptedActivities::from_any_base(activity_any_base.clone())?
      .context(location_info!())?;
    res = Some(
-      user_receive_message(
+      person_receive_message(
-        user_activity,
+        person_activity,
        None,
        actor.as_ref(),
        &context,
--- a/crates/apub/src/lib.rs
+++ b/crates/apub/src/lib.rs
@ -31,9 +31,9 @@ use lemmy_db_schema::{
    activity::Activity,
    comment::Comment,
    community::Community,
    person::Person as DbPerson,
    post::Post,
    private_message::PrivateMessage,
    user::User_,
  },
  DbUrl,
 };
@ -45,7 +45,7 @@ use url::{ParseError, Url};
 /// Activitystreams type for community
 type GroupExt = Ext2<ApActor<ApObject<Group>>, GroupExtension, PublicKeyExtension>;
-/// Activitystreams type for user
+/// Activitystreams type for person
 type PersonExt = Ext1<ApActor<ApObject<Person>>, PublicKeyExtension>;
 /// Activitystreams type for post
 type PageExt = Ext1<ApObject<Page>, PageExtension>;
@ -121,27 +121,41 @@ fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> {
 /// and actors in Lemmy.
 #[async_trait::async_trait(?Send)]
 pub trait ApubObjectType {
-  async fn send_create(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
+  async fn send_create(&self, creator: &DbPerson, context: &LemmyContext)
-  async fn send_update(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
+    -> Result<(), LemmyError>;
-  async fn send_delete(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
+  async fn send_update(&self, creator: &DbPerson, context: &LemmyContext)
    -> Result<(), LemmyError>;
  async fn send_delete(&self, creator: &DbPerson, context: &LemmyContext)
    -> Result<(), LemmyError>;
  async fn send_undo_delete(
    &self,
-    creator: &User_,
+    creator: &DbPerson,
    context: &LemmyContext,
  ) -> Result<(), LemmyError>;
  async fn send_remove(&self, mod_: &DbPerson, context: &LemmyContext) -> Result<(), LemmyError>;
  async fn send_undo_remove(
    &self,
    mod_: &DbPerson,
    context: &LemmyContext,
  ) -> Result<(), LemmyError>;
  async fn send_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
  async fn send_undo_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
 }
 #[async_trait::async_trait(?Send)]
 pub trait ApubLikeableType {
-  async fn send_like(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
+  async fn send_like(&self, creator: &DbPerson, context: &LemmyContext) -> Result<(), LemmyError>;
-  async fn send_dislike(&self, creator: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
+  async fn send_dislike(
-  async fn send_undo_like(&self, creator: &User_, context: &LemmyContext)
+    &self,
-    -> Result<(), LemmyError>;
+    creator: &DbPerson,
    context: &LemmyContext,
  ) -> Result<(), LemmyError>;
  async fn send_undo_like(
    &self,
    creator: &DbPerson,
    context: &LemmyContext,
  ) -> Result<(), LemmyError>;
 }
-/// Common methods provided by ActivityPub actors (community and user). Not all methods are
+/// Common methods provided by ActivityPub actors (community and person). Not all methods are
 /// implemented by all actors.
 #[async_trait::async_trait(?Send)]
 pub trait ActorType {
@ -209,7 +223,7 @@ pub trait ActorType {
 pub enum EndpointType {
  Community,
-  User,
+  Person,
  Post,
  Comment,
  PrivateMessage,
@ -222,7 +236,7 @@ pub fn generate_apub_endpoint(
 ) -> Result<DbUrl, ParseError> {
  let point = match endpoint_type {
    EndpointType::Community => "c",
-    EndpointType::User => "u",
+    EndpointType::Person => "u",
    EndpointType::Post => "post",
    EndpointType::Comment => "comment",
    EndpointType::PrivateMessage => "private_message",
@ -316,11 +330,11 @@ pub(crate) async fn find_post_or_comment_by_id(
 }
 pub(crate) enum Object {
-  Comment(Comment),
+  Comment(Box<Comment>),
-  Post(Post),
+  Post(Box<Post>),
-  Community(Community),
+  Community(Box<Community>),
-  User(User_),
+  Person(Box<DbPerson>),
-  PrivateMessage(PrivateMessage),
+  PrivateMessage(Box<PrivateMessage>),
 }
 pub(crate) async fn find_object_by_id(
@ -330,18 +344,18 @@ pub(crate) async fn find_object_by_id(
  let ap_id = apub_id.clone();
  if let Ok(pc) = find_post_or_comment_by_id(context, ap_id.to_owned()).await {
    return Ok(match pc {
-      PostOrComment::Post(p) => Object::Post(*p),
+      PostOrComment::Post(p) => Object::Post(Box::new(*p)),
-      PostOrComment::Comment(c) => Object::Comment(*c),
+      PostOrComment::Comment(c) => Object::Comment(Box::new(*c)),
    });
  }
  let ap_id = apub_id.clone();
-  let user = blocking(context.pool(), move |conn| {
+  let person = blocking(context.pool(), move |conn| {
-    User_::read_from_apub_id(conn, &ap_id.into())
+    DbPerson::read_from_apub_id(conn, &ap_id.into())
  })
  .await?;
-  if let Ok(u) = user {
+  if let Ok(u) = person {
-    return Ok(Object::User(u));
+    return Ok(Object::Person(Box::new(u)));
  }
  let ap_id = apub_id.clone();
@ -350,7 +364,7 @@ pub(crate) async fn find_object_by_id(
  })
  .await?;
  if let Ok(c) = community {
-    return Ok(Object::Community(c));
+    return Ok(Object::Community(Box::new(c)));
  }
  let private_message = blocking(context.pool(), move |conn| {
@ -358,7 +372,7 @@ pub(crate) async fn find_object_by_id(
  })
  .await?;
  if let Ok(pm) = private_message {
-    return Ok(Object::PrivateMessage(pm));
+    return Ok(Object::PrivateMessage(Box::new(pm)));
  }
  Err(NotFound.into())
--- a/crates/apub/src/objects/comment.rs
+++ b/crates/apub/src/objects/comment.rs
@ -6,7 +6,7 @@ use crate::{
    check_object_for_community_or_site_ban,
    create_tombstone,
    get_object_from_apub,
-    get_or_fetch_and_upsert_user,
+    get_or_fetch_and_upsert_person,
    get_source_markdown_value,
    set_content_and_source,
    FromApub,
@ -23,10 +23,13 @@ use activitystreams::{
 use anyhow::{anyhow, Context};
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::{Crud, DbPool};
-use lemmy_db_schema::source::{
+use lemmy_db_schema::{
-  comment::{Comment, CommentForm},
+  source::{
-  post::Post,
+    comment::{Comment, CommentForm},
-  user::User_,
+    person::Person,
    post::Post,
  },
  CommentId,
 };
 use lemmy_utils::{
  location_info,
@ -44,7 +47,7 @@ impl ToApub for Comment {
    let mut comment = ApObject::new(Note::new());
    let creator_id = self.creator_id;
-    let creator = blocking(pool, move |conn| User_::read(conn, creator_id)).await??;
+    let creator = blocking(pool, move |conn| Person::read(conn, creator_id)).await??;
    let post_id = self.post_id;
    let post = blocking(pool, move |conn| Post::read(conn, post_id)).await??;
@ -135,7 +138,8 @@ impl FromApubToForm<NoteExt> for CommentForm {
      .as_single_xsd_any_uri()
      .context(location_info!())?;
-    let creator = get_or_fetch_and_upsert_user(creator_actor_id, context, request_counter).await?;
+    let creator =
      get_or_fetch_and_upsert_person(creator_actor_id, context, request_counter).await?;
    let mut in_reply_tos = note
      .in_reply_to()
@ -152,7 +156,7 @@ impl FromApubToForm<NoteExt> for CommentForm {
    // The 2nd item, if it exists, is the parent comment apub_id
    // For deeply nested comments, FromApub automatically gets called recursively
-    let parent_id: Option<i32> = match in_reply_tos.next() {
+    let parent_id: Option<CommentId> = match in_reply_tos.next() {
      Some(parent_comment_uri) => {
        let parent_comment_ap_id = &parent_comment_uri?;
        let parent_comment =
--- a/crates/apub/src/objects/community.rs
+++ b/crates/apub/src/objects/community.rs
@ -1,6 +1,6 @@
 use crate::{
  extensions::{context::lemmy_context, group_extensions::GroupExtension},
-  fetcher::user::get_or_fetch_and_upsert_user,
+  fetcher::person::get_or_fetch_and_upsert_person,
  objects::{
    check_object_domain,
    create_tombstone,
@ -143,7 +143,7 @@ impl FromApubToForm<GroupExt> for CommunityForm {
      .as_xsd_any_uri()
      .context(location_info!())?;
-    let creator = get_or_fetch_and_upsert_user(creator_uri, context, request_counter).await?;
+    let creator = get_or_fetch_and_upsert_person(creator_uri, context, request_counter).await?;
    let name = group
      .inner
      .preferred_username()
--- a/crates/apub/src/objects/mod.rs
+++ b/crates/apub/src/objects/mod.rs
@ -1,6 +1,6 @@
 use crate::{
  check_is_apub_id_valid,
-  fetcher::{community::get_or_fetch_and_upsert_community, user::get_or_fetch_and_upsert_user},
+  fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
  inbox::community_inbox::check_community_or_site_ban,
 };
 use activitystreams::{
@ -14,7 +14,7 @@ use chrono::NaiveDateTime;
 use diesel::result::Error::NotFound;
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::{ApubObject, Crud, DbPool};
-use lemmy_db_schema::{source::community::Community, DbUrl};
+use lemmy_db_schema::{source::community::Community, CommunityId, DbUrl};
 use lemmy_utils::{
  location_info,
  settings::structs::Settings,
@ -26,9 +26,9 @@ use url::Url;
 pub(crate) mod comment;
 pub(crate) mod community;
 pub(crate) mod person;
 pub(crate) mod post;
 pub(crate) mod private_message;
 pub(crate) mod user;
 /// Trait for converting an object or actor into the respective ActivityPub type.
 #[async_trait::async_trait(?Send)]
@ -172,7 +172,7 @@ pub(in crate::objects) fn check_is_markdown(mime: Option<&Mime>) -> Result<(), L
 /// Converts an ActivityPub object (eg `Note`) to a database object (eg `Comment`). If an object
 /// with the same ActivityPub ID already exists in the database, it is returned directly. Otherwise
 /// the apub object is parsed, inserted and returned.
-pub(in crate::objects) async fn get_object_from_apub<From, Kind, To, ToForm>(
+pub(in crate::objects) async fn get_object_from_apub<From, Kind, To, ToForm, IdType>(
  from: &From,
  context: &LemmyContext,
  expected_domain: Url,
@ -180,7 +180,7 @@ pub(in crate::objects) async fn get_object_from_apub<From, Kind, To, ToForm>(
 ) -> Result<To, LemmyError>
 where
  From: BaseExt<Kind>,
-  To: ApubObject<ToForm> + Crud<ToForm> + Send + 'static,
+  To: ApubObject<ToForm> + Crud<ToForm, IdType> + Send + 'static,
  ToForm: FromApubToForm<From> + Send + 'static,
 {
  let object_id = from.id_unchecked().context(location_info!())?.to_owned();
@ -205,20 +205,20 @@ where
 pub(in crate::objects) async fn check_object_for_community_or_site_ban<T, Kind>(
  object: &T,
-  community_id: i32,
+  community_id: CommunityId,
  context: &LemmyContext,
  request_counter: &mut i32,
 ) -> Result<(), LemmyError>
 where
  T: ObjectExt<Kind>,
 {
-  let user_id = object
+  let person_id = object
    .attributed_to()
    .context(location_info!())?
    .as_single_xsd_any_uri()
    .context(location_info!())?;
-  let user = get_or_fetch_and_upsert_user(user_id, context, request_counter).await?;
+  let person = get_or_fetch_and_upsert_person(person_id, context, request_counter).await?;
-  check_community_or_site_ban(&user, community_id, context.pool()).await
+  check_community_or_site_ban(&person, community_id, context.pool()).await
 }
 pub(in crate::objects) async fn get_to_community<T, Kind>(
--- a/crates/apub/src/objects/person.rs
+++ b/crates/apub/src/objects/person.rs
@ -22,7 +22,7 @@ use lemmy_api_structs::blocking;
 use lemmy_db_queries::{ApubObject, DbPool};
 use lemmy_db_schema::{
  naive_now,
-  source::user::{UserForm, User_},
+  source::person::{Person as DbPerson, PersonForm},
 };
 use lemmy_utils::{
  location_info,
@ -34,7 +34,7 @@ use lemmy_websocket::LemmyContext;
 use url::Url;
 #[async_trait::async_trait(?Send)]
-impl ToApub for User_ {
+impl ToApub for DbPerson {
  type ApubType = PersonExt;
  async fn to_apub(&self, _pool: &DbPool) -> Result<PersonExt, LemmyError> {
@ -85,7 +85,7 @@ impl ToApub for User_ {
 }
 #[async_trait::async_trait(?Send)]
-impl FromApub for User_ {
+impl FromApub for DbPerson {
  type ApubType = PersonExt;
  async fn from_apub(
@ -93,26 +93,29 @@ impl FromApub for User_ {
    context: &LemmyContext,
    expected_domain: Url,
    request_counter: &mut i32,
-  ) -> Result<User_, LemmyError> {
+  ) -> Result<DbPerson, LemmyError> {
-    let user_id = person.id_unchecked().context(location_info!())?.to_owned();
+    let person_id = person.id_unchecked().context(location_info!())?.to_owned();
-    let domain = user_id.domain().context(location_info!())?;
+    let domain = person_id.domain().context(location_info!())?;
    if domain == Settings::get().hostname() {
-      let user = blocking(context.pool(), move |conn| {
+      let person = blocking(context.pool(), move |conn| {
-        User_::read_from_apub_id(conn, &user_id.into())
+        DbPerson::read_from_apub_id(conn, &person_id.into())
      })
      .await??;
-      Ok(user)
+      Ok(person)
    } else {
-      let user_form =
+      let person_form =
-        UserForm::from_apub(person, context, expected_domain, request_counter).await?;
+        PersonForm::from_apub(person, context, expected_domain, request_counter).await?;
-      let user = blocking(context.pool(), move |conn| User_::upsert(conn, &user_form)).await??;
+      let person = blocking(context.pool(), move |conn| {
-      Ok(user)
+        DbPerson::upsert(conn, &person_form)
      })
      .await??;
      Ok(person)
    }
  }
 }
 #[async_trait::async_trait(?Send)]
-impl FromApubToForm<PersonExt> for UserForm {
+impl FromApubToForm<PersonExt> for PersonForm {
  async fn from_apub(
    person: &PersonExt,
    _context: &LemmyContext,
@ -167,30 +170,20 @@ impl FromApubToForm<PersonExt> for UserForm {
    check_slurs_opt(&preferred_username)?;
    check_slurs_opt(&bio)?;
-    Ok(UserForm {
+    Ok(PersonForm {
      name,
      preferred_username: Some(preferred_username),
      password_encrypted: "".to_string(),
      admin: false,
      banned: None,
-      email: None,
+      deleted: None,
      avatar: avatar.map(|o| o.map(|i| i.into())),
      banner: banner.map(|o| o.map(|i| i.into())),
      published: person.inner.published().map(|u| u.to_owned().naive_local()),
      updated: person.updated().map(|u| u.to_owned().naive_local()),
      show_nsfw: false,
      theme: "".to_string(),
      default_sort_type: 0,
      default_listing_type: 0,
      lang: "".to_string(),
      show_avatars: false,
      send_notifications_to_email: false,
      matrix_user_id: None,
      actor_id: Some(check_object_domain(person, expected_domain)?),
      bio: Some(bio),
-      local: false,
+      local: Some(false),
      private_key: None,
-      public_key: Some(person.ext_one.public_key.to_owned().public_key_pem),
+      public_key: Some(Some(person.ext_one.public_key.to_owned().public_key_pem)),
      last_refreshed_at: Some(naive_now()),
      inbox_url: Some(person.inner.inbox()?.to_owned().into()),
      shared_inbox_url: Some(shared_inbox),
--- a/crates/apub/src/objects/post.rs
+++ b/crates/apub/src/objects/post.rs
@ -1,6 +1,6 @@
 use crate::{
  extensions::{context::lemmy_context, page_extension::PageExtension},
-  fetcher::user::get_or_fetch_and_upsert_user,
+  fetcher::person::get_or_fetch_and_upsert_person,
  objects::{
    check_object_domain,
    check_object_for_community_or_site_ban,
@ -28,8 +28,8 @@ use lemmy_db_schema::{
  self,
  source::{
    community::Community,
    person::Person,
    post::{Post, PostForm},
    user::User_,
  },
 };
 use lemmy_utils::{
@ -50,7 +50,7 @@ impl ToApub for Post {
    let mut page = ApObject::new(Page::new());
    let creator_id = self.creator_id;
-    let creator = blocking(pool, move |conn| User_::read(conn, creator_id)).await??;
+    let creator = blocking(pool, move |conn| Person::read(conn, creator_id)).await??;
    let community_id = self.community_id;
    let community = blocking(pool, move |conn| Community::read(conn, community_id)).await??;
@ -142,7 +142,8 @@ impl FromApubToForm<PageExt> for PostForm {
      .as_single_xsd_any_uri()
      .context(location_info!())?;
-    let creator = get_or_fetch_and_upsert_user(creator_actor_id, context, request_counter).await?;
+    let creator =
      get_or_fetch_and_upsert_person(creator_actor_id, context, request_counter).await?;
    let community = get_to_community(page, context, request_counter).await?;
--- a/crates/apub/src/objects/private_message.rs
+++ b/crates/apub/src/objects/private_message.rs
@ -1,7 +1,7 @@
 use crate::{
  check_is_apub_id_valid,
  extensions::context::lemmy_context,
-  fetcher::user::get_or_fetch_and_upsert_user,
+  fetcher::person::get_or_fetch_and_upsert_person,
  objects::{
    check_object_domain,
    create_tombstone,
@ -22,8 +22,8 @@ use anyhow::Context;
 use lemmy_api_structs::blocking;
 use lemmy_db_queries::{Crud, DbPool};
 use lemmy_db_schema::source::{
  person::Person,
  private_message::{PrivateMessage, PrivateMessageForm},
  user::User_,
 };
 use lemmy_utils::{location_info, utils::convert_datetime, LemmyError};
 use lemmy_websocket::LemmyContext;
@ -37,10 +37,10 @@ impl ToApub for PrivateMessage {
    let mut private_message = ApObject::new(Note::new());
    let creator_id = self.creator_id;
-    let creator = blocking(pool, move |conn| User_::read(conn, creator_id)).await??;
+    let creator = blocking(pool, move |conn| Person::read(conn, creator_id)).await??;
    let recipient_id = self.recipient_id;
-    let recipient = blocking(pool, move |conn| User_::read(conn, recipient_id)).await??;
+    let recipient = blocking(pool, move |conn| Person::read(conn, recipient_id)).await??;
    private_message
      .set_many_contexts(lemmy_context()?)
@ -97,7 +97,8 @@ impl FromApubToForm<NoteExt> for PrivateMessageForm {
      .single_xsd_any_uri()
      .context(location_info!())?;
-    let creator = get_or_fetch_and_upsert_user(&creator_actor_id, context, request_counter).await?;
+    let creator =
      get_or_fetch_and_upsert_person(&creator_actor_id, context, request_counter).await?;
    let recipient_actor_id = note
      .to()
      .context(location_info!())?
@ -105,7 +106,7 @@ impl FromApubToForm<NoteExt> for PrivateMessageForm {
      .single_xsd_any_uri()
      .context(location_info!())?;
    let recipient =
-      get_or_fetch_and_upsert_user(&recipient_actor_id, context, request_counter).await?;
+      get_or_fetch_and_upsert_person(&recipient_actor_id, context, request_counter).await?;
    let ap_id = note.id_unchecked().context(location_info!())?.to_string();
    check_is_apub_id_valid(&Url::parse(&ap_id)?)?;
--- a/crates/apub/src/routes.rs
+++ b/crates/apub/src/routes.rs
@ -8,10 +8,14 @@ use crate::{
      get_apub_community_outbox,
    },
    get_activity,
    person::{get_apub_person_http, get_apub_person_inbox, get_apub_person_outbox},
    post::get_apub_post,
    user::{get_apub_user_http, get_apub_user_inbox, get_apub_user_outbox},
  },
-  inbox::{community_inbox::community_inbox, shared_inbox::shared_inbox, user_inbox::user_inbox},
+  inbox::{
    community_inbox::community_inbox,
    person_inbox::person_inbox,
    shared_inbox::shared_inbox,
  },
  APUB_JSON_CONTENT_TYPE,
 };
 use actix_web::*;
@ -53,9 +57,12 @@ pub fn config(cfg: &mut web::ServiceConfig) {
            "/c/{community_name}/inbox",
            web::get().to(get_apub_community_inbox),
          )
-          .route("/u/{user_name}", web::get().to(get_apub_user_http))
+          .route("/u/{user_name}", web::get().to(get_apub_person_http))
-          .route("/u/{user_name}/outbox", web::get().to(get_apub_user_outbox))
+          .route(
-          .route("/u/{user_name}/inbox", web::get().to(get_apub_user_inbox))
+            "/u/{user_name}/outbox",
            web::get().to(get_apub_person_outbox),
          )
          .route("/u/{user_name}/inbox", web::get().to(get_apub_person_inbox))
          .route("/post/{post_id}", web::get().to(get_apub_post))
          .route("/comment/{comment_id}", web::get().to(get_apub_comment))
          .route("/activities/{type_}/{id}", web::get().to(get_activity)),
@ -66,7 +73,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
          .wrap(digest_verifier)
          .guard(header_guard_content_type)
          .route("/c/{community_name}/inbox", web::post().to(community_inbox))
-          .route("/u/{user_name}/inbox", web::post().to(user_inbox))
+          .route("/u/{user_name}/inbox", web::post().to(person_inbox))
          .route("/inbox", web::post().to(shared_inbox)),
      );
  }
--- a/crates/db_queries/src/aggregates/comment_aggregates.rs
+++ b/crates/db_queries/src/aggregates/comment_aggregates.rs
@ -1,12 +1,12 @@
 use diesel::{result::Error, *};
-use lemmy_db_schema::schema::comment_aggregates;
+use lemmy_db_schema::{schema::comment_aggregates, CommentId};
 use serde::Serialize;
 #[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Clone)]
 #[table_name = "comment_aggregates"]
 pub struct CommentAggregates {
  pub id: i32,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub score: i64,
  pub upvotes: i64,
  pub downvotes: i64,
@ -14,7 +14,7 @@ pub struct CommentAggregates {
 }
 impl CommentAggregates {
-  pub fn read(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
+  pub fn read(conn: &PgConnection, comment_id: CommentId) -> Result<Self, Error> {
    comment_aggregates::table
      .filter(comment_aggregates::comment_id.eq(comment_id))
      .first::<Self>(conn)
@ -28,14 +28,12 @@ mod tests {
    establish_unpooled_connection,
    Crud,
    Likeable,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{
    comment::{Comment, CommentForm, CommentLike, CommentLikeForm},
    community::{Community, CommunityForm},
    person::{Person, PersonForm},
    post::{Post, PostForm},
    user::{UserForm, User_},
  };
  use serial_test::serial;
@ -44,28 +42,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "thommy_comment_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -73,30 +61,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
-    let another_user = UserForm {
+    let another_person = PersonForm {
      name: "jerry_comment_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -104,11 +82,11 @@ mod tests {
      shared_inbox_url: None,
    };
-    let another_inserted_user = User_::create(&conn, &another_user).unwrap();
+    let another_inserted_person = Person::create(&conn, &another_person).unwrap();
    let new_community = CommunityForm {
      name: "TIL_comment_agg".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -134,7 +112,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -155,7 +133,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -171,7 +149,7 @@ mod tests {
    let child_comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -188,7 +166,7 @@ mod tests {
    let comment_like = CommentLikeForm {
      comment_id: inserted_comment.id,
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      score: 1,
    };
@ -200,11 +178,11 @@ mod tests {
    assert_eq!(1, comment_aggs_before_delete.upvotes);
    assert_eq!(0, comment_aggs_before_delete.downvotes);
-    // Add a post dislike from the other user
+    // Add a post dislike from the other person
    let comment_dislike = CommentLikeForm {
      comment_id: inserted_comment.id,
      post_id: inserted_post.id,
-      user_id: another_inserted_user.id,
+      person_id: another_inserted_person.id,
      score: -1,
    };
@ -217,7 +195,7 @@ mod tests {
    assert_eq!(1, comment_aggs_after_dislike.downvotes);
    // Remove the first comment like
-    CommentLike::remove(&conn, inserted_user.id, inserted_comment.id).unwrap();
+    CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap();
    let after_like_remove = CommentAggregates::read(&conn, inserted_comment.id).unwrap();
    assert_eq!(-1, after_like_remove.score);
    assert_eq!(0, after_like_remove.upvotes);
@ -231,8 +209,8 @@ mod tests {
    assert!(after_delete.is_err());
    // This should delete all the associated rows, and fire triggers
-    User_::delete(&conn, another_inserted_user.id).unwrap();
+    Person::delete(&conn, another_inserted_person.id).unwrap();
-    let user_num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
+    let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
-    assert_eq!(1, user_num_deleted);
+    assert_eq!(1, person_num_deleted);
  }
 }
--- a/crates/db_queries/src/aggregates/community_aggregates.rs
+++ b/crates/db_queries/src/aggregates/community_aggregates.rs
@ -1,12 +1,12 @@
 use diesel::{result::Error, *};
-use lemmy_db_schema::schema::community_aggregates;
+use lemmy_db_schema::{schema::community_aggregates, CommunityId};
 use serde::Serialize;
 #[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Clone)]
 #[table_name = "community_aggregates"]
 pub struct CommunityAggregates {
  pub id: i32,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub subscribers: i64,
  pub posts: i64,
  pub comments: i64,
@ -18,7 +18,7 @@ pub struct CommunityAggregates {
 }
 impl CommunityAggregates {
-  pub fn read(conn: &PgConnection, community_id: i32) -> Result<Self, Error> {
+  pub fn read(conn: &PgConnection, community_id: CommunityId) -> Result<Self, Error> {
    community_aggregates::table
      .filter(community_aggregates::community_id.eq(community_id))
      .first::<Self>(conn)
@ -32,14 +32,12 @@ mod tests {
    establish_unpooled_connection,
    Crud,
    Followable,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{
    comment::{Comment, CommentForm},
    community::{Community, CommunityFollower, CommunityFollowerForm, CommunityForm},
    person::{Person, PersonForm},
    post::{Post, PostForm},
    user::{UserForm, User_},
  };
  use serial_test::serial;
@ -48,28 +46,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "thommy_community_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -77,30 +65,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
-    let another_user = UserForm {
+    let another_person = PersonForm {
      name: "jerry_community_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -108,11 +86,11 @@ mod tests {
      shared_inbox_url: None,
    };
-    let another_inserted_user = User_::create(&conn, &another_user).unwrap();
+    let another_inserted_person = Person::create(&conn, &another_person).unwrap();
    let new_community = CommunityForm {
      name: "TIL_community_agg".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -136,7 +114,7 @@ mod tests {
    let another_community = CommunityForm {
      name: "TIL_community_agg_2".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -158,25 +136,25 @@ mod tests {
    let another_inserted_community = Community::create(&conn, &another_community).unwrap();
-    let first_user_follow = CommunityFollowerForm {
+    let first_person_follow = CommunityFollowerForm {
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      pending: false,
    };
-    CommunityFollower::follow(&conn, &first_user_follow).unwrap();
+    CommunityFollower::follow(&conn, &first_person_follow).unwrap();
-    let second_user_follow = CommunityFollowerForm {
+    let second_person_follow = CommunityFollowerForm {
      community_id: inserted_community.id,
-      user_id: another_inserted_user.id,
+      person_id: another_inserted_person.id,
      pending: false,
    };
-    CommunityFollower::follow(&conn, &second_user_follow).unwrap();
+    CommunityFollower::follow(&conn, &second_person_follow).unwrap();
    let another_community_follow = CommunityFollowerForm {
      community_id: another_inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      pending: false,
    };
@ -186,7 +164,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -207,7 +185,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -223,7 +201,7 @@ mod tests {
    let child_comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -252,12 +230,12 @@ mod tests {
    assert_eq!(0, another_community_aggs.comments);
    // Unfollow test
-    CommunityFollower::unfollow(&conn, &second_user_follow).unwrap();
+    CommunityFollower::unfollow(&conn, &second_person_follow).unwrap();
    let after_unfollow = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
    assert_eq!(1, after_unfollow.subscribers);
    // Follow again just for the later tests
-    CommunityFollower::follow(&conn, &second_user_follow).unwrap();
+    CommunityFollower::follow(&conn, &second_person_follow).unwrap();
    let after_follow_again = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
    assert_eq!(2, after_follow_again.subscribers);
@ -267,14 +245,14 @@ mod tests {
    assert_eq!(0, after_parent_post_delete.comments);
    assert_eq!(0, after_parent_post_delete.posts);
-    // Remove the 2nd user
+    // Remove the 2nd person
-    User_::delete(&conn, another_inserted_user.id).unwrap();
+    Person::delete(&conn, another_inserted_person.id).unwrap();
-    let after_user_delete = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
+    let after_person_delete = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
-    assert_eq!(1, after_user_delete.subscribers);
+    assert_eq!(1, after_person_delete.subscribers);
    // This should delete all the associated rows, and fire triggers
-    let user_num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
+    let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
-    assert_eq!(1, user_num_deleted);
+    assert_eq!(1, person_num_deleted);
    // Should be none found, since the creator was deleted
    let after_delete = CommunityAggregates::read(&conn, inserted_community.id);
--- a/crates/db_queries/src/aggregates/mod.rs
+++ b/crates/db_queries/src/aggregates/mod.rs
@ -1,5 +1,5 @@
 pub mod comment_aggregates;
 pub mod community_aggregates;
 pub mod person_aggregates;
 pub mod post_aggregates;
 pub mod site_aggregates;
 pub mod user_aggregates;
--- a/crates/db_queries/src/aggregates/person_aggregates.rs
+++ b/crates/db_queries/src/aggregates/person_aggregates.rs
@ -1,22 +1,22 @@
 use diesel::{result::Error, *};
-use lemmy_db_schema::schema::user_aggregates;
+use lemmy_db_schema::{schema::person_aggregates, PersonId};
 use serde::Serialize;
 #[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Clone)]
-#[table_name = "user_aggregates"]
+#[table_name = "person_aggregates"]
-pub struct UserAggregates {
+pub struct PersonAggregates {
  pub id: i32,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub post_count: i64,
  pub post_score: i64,
  pub comment_count: i64,
  pub comment_score: i64,
 }
-impl UserAggregates {
+impl PersonAggregates {
-  pub fn read(conn: &PgConnection, user_id: i32) -> Result<Self, Error> {
+  pub fn read(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
-    user_aggregates::table
+    person_aggregates::table
-      .filter(user_aggregates::user_id.eq(user_id))
+      .filter(person_aggregates::person_id.eq(person_id))
      .first::<Self>(conn)
  }
 }
@ -24,18 +24,16 @@ impl UserAggregates {
 #[cfg(test)]
 mod tests {
  use crate::{
-    aggregates::user_aggregates::UserAggregates,
+    aggregates::person_aggregates::PersonAggregates,
    establish_unpooled_connection,
    Crud,
    Likeable,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{
    comment::{Comment, CommentForm, CommentLike, CommentLikeForm},
    community::{Community, CommunityForm},
    person::{Person, PersonForm},
    post::{Post, PostForm, PostLike, PostLikeForm},
    user::{UserForm, User_},
  };
  use serial_test::serial;
@ -44,28 +42,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "thommy_user_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -73,30 +61,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
-    let another_user = UserForm {
+    let another_person = PersonForm {
      name: "jerry_user_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -104,11 +82,11 @@ mod tests {
      shared_inbox_url: None,
    };
-    let another_inserted_user = User_::create(&conn, &another_user).unwrap();
+    let another_inserted_person = Person::create(&conn, &another_person).unwrap();
    let new_community = CommunityForm {
      name: "TIL_site_agg".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -134,7 +112,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -155,7 +133,7 @@ mod tests {
    let post_like = PostLikeForm {
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      score: 1,
    };
@ -163,7 +141,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -179,7 +157,7 @@ mod tests {
    let mut comment_like = CommentLikeForm {
      comment_id: inserted_comment.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      post_id: inserted_post.id,
      score: 1,
    };
@ -188,7 +166,7 @@ mod tests {
    let mut child_comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -204,28 +182,29 @@ mod tests {
    let child_comment_like = CommentLikeForm {
      comment_id: inserted_child_comment.id,
-      user_id: another_inserted_user.id,
+      person_id: another_inserted_person.id,
      post_id: inserted_post.id,
      score: 1,
    };
    let _inserted_child_comment_like = CommentLike::like(&conn, &child_comment_like).unwrap();
-    let user_aggregates_before_delete = UserAggregates::read(&conn, inserted_user.id).unwrap();
+    let person_aggregates_before_delete =
      PersonAggregates::read(&conn, inserted_person.id).unwrap();
-    assert_eq!(1, user_aggregates_before_delete.post_count);
+    assert_eq!(1, person_aggregates_before_delete.post_count);
-    assert_eq!(1, user_aggregates_before_delete.post_score);
+    assert_eq!(1, person_aggregates_before_delete.post_score);
-    assert_eq!(2, user_aggregates_before_delete.comment_count);
+    assert_eq!(2, person_aggregates_before_delete.comment_count);
-    assert_eq!(2, user_aggregates_before_delete.comment_score);
+    assert_eq!(2, person_aggregates_before_delete.comment_score);
    // Remove a post like
-    PostLike::remove(&conn, inserted_user.id, inserted_post.id).unwrap();
+    PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
-    let after_post_like_remove = UserAggregates::read(&conn, inserted_user.id).unwrap();
+    let after_post_like_remove = PersonAggregates::read(&conn, inserted_person.id).unwrap();
    assert_eq!(0, after_post_like_remove.post_score);
    // Remove a parent comment (the scores should also be removed)
    Comment::delete(&conn, inserted_comment.id).unwrap();
-    let after_parent_comment_delete = UserAggregates::read(&conn, inserted_user.id).unwrap();
+    let after_parent_comment_delete = PersonAggregates::read(&conn, inserted_person.id).unwrap();
    assert_eq!(0, after_parent_comment_delete.comment_count);
    assert_eq!(0, after_parent_comment_delete.comment_score);
@ -235,24 +214,24 @@ mod tests {
    Comment::create(&conn, &child_comment_form).unwrap();
    comment_like.comment_id = new_parent_comment.id;
    CommentLike::like(&conn, &comment_like).unwrap();
-    let after_comment_add = UserAggregates::read(&conn, inserted_user.id).unwrap();
+    let after_comment_add = PersonAggregates::read(&conn, inserted_person.id).unwrap();
    assert_eq!(2, after_comment_add.comment_count);
    assert_eq!(1, after_comment_add.comment_score);
    Post::delete(&conn, inserted_post.id).unwrap();
-    let after_post_delete = UserAggregates::read(&conn, inserted_user.id).unwrap();
+    let after_post_delete = PersonAggregates::read(&conn, inserted_person.id).unwrap();
    assert_eq!(0, after_post_delete.comment_score);
    assert_eq!(0, after_post_delete.comment_count);
    assert_eq!(0, after_post_delete.post_score);
    assert_eq!(0, after_post_delete.post_count);
    // This should delete all the associated rows, and fire triggers
-    let user_num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
+    let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
-    assert_eq!(1, user_num_deleted);
+    assert_eq!(1, person_num_deleted);
-    User_::delete(&conn, another_inserted_user.id).unwrap();
+    Person::delete(&conn, another_inserted_person.id).unwrap();
    // Should be none found
-    let after_delete = UserAggregates::read(&conn, inserted_user.id);
+    let after_delete = PersonAggregates::read(&conn, inserted_person.id);
    assert!(after_delete.is_err());
  }
 }
--- a/crates/db_queries/src/aggregates/post_aggregates.rs
+++ b/crates/db_queries/src/aggregates/post_aggregates.rs
@ -1,12 +1,12 @@
 use diesel::{result::Error, *};
-use lemmy_db_schema::schema::post_aggregates;
+use lemmy_db_schema::{schema::post_aggregates, PostId};
 use serde::Serialize;
 #[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Clone)]
 #[table_name = "post_aggregates"]
 pub struct PostAggregates {
  pub id: i32,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub comments: i64,
  pub score: i64,
  pub upvotes: i64,
@ -18,7 +18,7 @@ pub struct PostAggregates {
 }
 impl PostAggregates {
-  pub fn read(conn: &PgConnection, post_id: i32) -> Result<Self, Error> {
+  pub fn read(conn: &PgConnection, post_id: PostId) -> Result<Self, Error> {
    post_aggregates::table
      .filter(post_aggregates::post_id.eq(post_id))
      .first::<Self>(conn)
@ -32,14 +32,12 @@ mod tests {
    establish_unpooled_connection,
    Crud,
    Likeable,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{
    comment::{Comment, CommentForm},
    community::{Community, CommunityForm},
    person::{Person, PersonForm},
    post::{Post, PostForm, PostLike, PostLikeForm},
    user::{UserForm, User_},
  };
  use serial_test::serial;
@ -48,28 +46,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "thommy_community_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -77,30 +65,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
-    let another_user = UserForm {
+    let another_person = PersonForm {
      name: "jerry_community_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -108,11 +86,11 @@ mod tests {
      shared_inbox_url: None,
    };
-    let another_inserted_user = User_::create(&conn, &another_user).unwrap();
+    let another_inserted_person = Person::create(&conn, &another_person).unwrap();
    let new_community = CommunityForm {
      name: "TIL_community_agg".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -138,7 +116,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -159,7 +137,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -175,7 +153,7 @@ mod tests {
    let child_comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -191,7 +169,7 @@ mod tests {
    let post_like = PostLikeForm {
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      score: 1,
    };
@ -204,10 +182,10 @@ mod tests {
    assert_eq!(1, post_aggs_before_delete.upvotes);
    assert_eq!(0, post_aggs_before_delete.downvotes);
-    // Add a post dislike from the other user
+    // Add a post dislike from the other person
    let post_dislike = PostLikeForm {
      post_id: inserted_post.id,
-      user_id: another_inserted_user.id,
+      person_id: another_inserted_person.id,
      score: -1,
    };
@ -229,7 +207,7 @@ mod tests {
    assert_eq!(1, after_comment_delete.downvotes);
    // Remove the first post like
-    PostLike::remove(&conn, inserted_user.id, inserted_post.id).unwrap();
+    PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
    let after_like_remove = PostAggregates::read(&conn, inserted_post.id).unwrap();
    assert_eq!(0, after_like_remove.comments);
    assert_eq!(-1, after_like_remove.score);
@ -237,9 +215,9 @@ mod tests {
    assert_eq!(1, after_like_remove.downvotes);
    // This should delete all the associated rows, and fire triggers
-    User_::delete(&conn, another_inserted_user.id).unwrap();
+    Person::delete(&conn, another_inserted_person.id).unwrap();
-    let user_num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
+    let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
-    assert_eq!(1, user_num_deleted);
+    assert_eq!(1, person_num_deleted);
    // Should be none found, since the creator was deleted
    let after_delete = PostAggregates::read(&conn, inserted_post.id);
--- a/crates/db_queries/src/aggregates/site_aggregates.rs
+++ b/crates/db_queries/src/aggregates/site_aggregates.rs
@ -25,19 +25,13 @@ impl SiteAggregates {
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::{aggregates::site_aggregates::SiteAggregates, establish_unpooled_connection, Crud};
    aggregates::site_aggregates::SiteAggregates,
    establish_unpooled_connection,
    Crud,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{
    comment::{Comment, CommentForm},
    community::{Community, CommunityForm},
    person::{Person, PersonForm},
    post::{Post, PostForm},
    site::{Site, SiteForm},
    user::{UserForm, User_},
  };
  use serial_test::serial;
@ -46,28 +40,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "thommy_site_agg".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -75,14 +59,14 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let site_form = SiteForm {
      name: "test_site".into(),
      description: None,
      icon: None,
      banner: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      enable_downvotes: true,
      open_registration: true,
      enable_nsfw: true,
@ -93,7 +77,7 @@ mod tests {
    let new_community = CommunityForm {
      name: "TIL_site_agg".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -119,7 +103,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -142,7 +126,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -159,7 +143,7 @@ mod tests {
    let child_comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -187,8 +171,8 @@ mod tests {
    assert_eq!(0, site_aggregates_after_post_delete.comments);
    // This shouuld delete all the associated rows, and fire triggers
-    let user_num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
+    let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
-    assert_eq!(1, user_num_deleted);
+    assert_eq!(1, person_num_deleted);
    let after_delete = SiteAggregates::read(&conn);
    assert!(after_delete.is_err());
--- a/crates/db_queries/src/lib.rs
+++ b/crates/db_queries/src/lib.rs
@ -13,7 +13,7 @@ extern crate diesel_migrations;
 extern crate serial_test;
 use diesel::{result::Error, *};
-use lemmy_db_schema::DbUrl;
+use lemmy_db_schema::{CommunityId, DbUrl, PersonId};
 use lemmy_utils::ApiError;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@ -25,17 +25,17 @@ pub mod source;
 pub type DbPool = diesel::r2d2::Pool<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
-pub trait Crud<T> {
+pub trait Crud<Form, IdType> {
-  fn create(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn create(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn read(conn: &PgConnection, id: i32) -> Result<Self, Error>
+  fn read(conn: &PgConnection, id: IdType) -> Result<Self, Error>
  where
    Self: Sized;
-  fn update(conn: &PgConnection, id: i32, form: &T) -> Result<Self, Error>
+  fn update(conn: &PgConnection, id: IdType, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn delete(_conn: &PgConnection, _id: i32) -> Result<usize, Error>
+  fn delete(_conn: &PgConnection, _id: IdType) -> Result<usize, Error>
  where
    Self: Sized,
  {
@ -43,81 +43,85 @@ pub trait Crud<T> {
  }
 }
-pub trait Followable<T> {
+pub trait Followable<Form> {
-  fn follow(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn follow(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn follow_accepted(conn: &PgConnection, community_id: i32, user_id: i32) -> Result<Self, Error>
+  fn follow_accepted(
    conn: &PgConnection,
    community_id: CommunityId,
    person_id: PersonId,
  ) -> Result<Self, Error>
  where
    Self: Sized;
-  fn unfollow(conn: &PgConnection, form: &T) -> Result<usize, Error>
+  fn unfollow(conn: &PgConnection, form: &Form) -> Result<usize, Error>
  where
    Self: Sized;
-  fn has_local_followers(conn: &PgConnection, community_id: i32) -> Result<bool, Error>;
+  fn has_local_followers(conn: &PgConnection, community_id: CommunityId) -> Result<bool, Error>;
 }
-pub trait Joinable<T> {
+pub trait Joinable<Form> {
-  fn join(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn join(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn leave(conn: &PgConnection, form: &T) -> Result<usize, Error>
+  fn leave(conn: &PgConnection, form: &Form) -> Result<usize, Error>
  where
    Self: Sized;
 }
-pub trait Likeable<T> {
+pub trait Likeable<Form, IdType> {
-  fn like(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn like(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn remove(conn: &PgConnection, user_id: i32, item_id: i32) -> Result<usize, Error>
+  fn remove(conn: &PgConnection, person_id: PersonId, item_id: IdType) -> Result<usize, Error>
  where
    Self: Sized;
 }
-pub trait Bannable<T> {
+pub trait Bannable<Form> {
-  fn ban(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn ban(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn unban(conn: &PgConnection, form: &T) -> Result<usize, Error>
+  fn unban(conn: &PgConnection, form: &Form) -> Result<usize, Error>
  where
    Self: Sized;
 }
-pub trait Saveable<T> {
+pub trait Saveable<Form> {
-  fn save(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn save(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn unsave(conn: &PgConnection, form: &T) -> Result<usize, Error>
+  fn unsave(conn: &PgConnection, form: &Form) -> Result<usize, Error>
  where
    Self: Sized;
 }
-pub trait Readable<T> {
+pub trait Readable<Form> {
-  fn mark_as_read(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn mark_as_read(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn mark_as_unread(conn: &PgConnection, form: &T) -> Result<usize, Error>
+  fn mark_as_unread(conn: &PgConnection, form: &Form) -> Result<usize, Error>
  where
    Self: Sized;
 }
-pub trait Reportable<T> {
+pub trait Reportable<Form> {
-  fn report(conn: &PgConnection, form: &T) -> Result<Self, Error>
+  fn report(conn: &PgConnection, form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
-  fn resolve(conn: &PgConnection, report_id: i32, resolver_id: i32) -> Result<usize, Error>
+  fn resolve(conn: &PgConnection, report_id: i32, resolver_id: PersonId) -> Result<usize, Error>
  where
    Self: Sized;
-  fn unresolve(conn: &PgConnection, report_id: i32, resolver_id: i32) -> Result<usize, Error>
+  fn unresolve(conn: &PgConnection, report_id: i32, resolver_id: PersonId) -> Result<usize, Error>
  where
    Self: Sized;
 }
-pub trait ApubObject<T> {
+pub trait ApubObject<Form> {
  fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Self, Error>
  where
    Self: Sized;
-  fn upsert(conn: &PgConnection, user_form: &T) -> Result<Self, Error>
+  fn upsert(conn: &PgConnection, user_form: &Form) -> Result<Self, Error>
  where
    Self: Sized;
 }
--- a/crates/db_queries/src/source/activity.rs
+++ b/crates/db_queries/src/source/activity.rs
@ -9,7 +9,7 @@ use std::{
  io::{Error as IoError, ErrorKind},
 };
-impl Crud<ActivityForm> for Activity {
+impl Crud<ActivityForm, i32> for Activity {
  fn read(conn: &PgConnection, activity_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::activity::dsl::*;
    activity.find(activity_id).first::<Self>(conn)
@ -122,16 +122,10 @@ impl Activity_ for Activity {
 #[cfg(test)]
 mod tests {
  use super::*;
-  use crate::{
+  use crate::{establish_unpooled_connection, source::activity::Activity_};
    establish_unpooled_connection,
    source::activity::Activity_,
    Crud,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{
    activity::{Activity, ActivityForm},
-    user::{UserForm, User_},
+    person::{Person, PersonForm},
  };
  use serde_json::Value;
  use serial_test::serial;
@ -142,28 +136,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let creator_form = UserForm {
+    let creator_form = PersonForm {
      name: "activity_creator_pm".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -171,7 +155,7 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_creator = User_::create(&conn, &creator_form).unwrap();
+    let inserted_creator = Person::create(&conn, &creator_form).unwrap();
    let ap_id: DbUrl = Url::parse(
      "https://enterprise.lemmy.ml/activities/delete/f1b5d57c-80f8-4e03-a615-688d552e946c",
@ -214,7 +198,7 @@ mod tests {
    let read_activity = Activity::read(&conn, inserted_activity.id).unwrap();
    let read_activity_by_apub_id = Activity::read_from_apub_id(&conn, &ap_id).unwrap();
-    User_::delete(&conn, inserted_creator.id).unwrap();
+    Person::delete(&conn, inserted_creator.id).unwrap();
    Activity::delete(&conn, inserted_activity.id).unwrap();
    assert_eq!(expected_activity, read_activity);
--- a/crates/db_queries/src/source/comment.rs
+++ b/crates/db_queries/src/source/comment.rs
@ -10,40 +10,54 @@ use lemmy_db_schema::{
    CommentSaved,
    CommentSavedForm,
  },
  CommentId,
  DbUrl,
  PersonId,
 };
 pub trait Comment_ {
-  fn update_ap_id(conn: &PgConnection, comment_id: i32, apub_id: DbUrl) -> Result<Comment, Error>;
+  fn update_ap_id(
    conn: &PgConnection,
    comment_id: CommentId,
    apub_id: DbUrl,
  ) -> Result<Comment, Error>;
  fn permadelete_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
  ) -> Result<Vec<Comment>, Error>;
  fn update_deleted(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    new_deleted: bool,
  ) -> Result<Comment, Error>;
  fn update_removed(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    new_removed: bool,
  ) -> Result<Comment, Error>;
  fn update_removed_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
    new_removed: bool,
  ) -> Result<Vec<Comment>, Error>;
-  fn update_read(conn: &PgConnection, comment_id: i32, new_read: bool) -> Result<Comment, Error>;
+  fn update_read(
    conn: &PgConnection,
    comment_id: CommentId,
    new_read: bool,
  ) -> Result<Comment, Error>;
  fn update_content(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    new_content: &str,
  ) -> Result<Comment, Error>;
 }
 impl Comment_ for Comment {
-  fn update_ap_id(conn: &PgConnection, comment_id: i32, apub_id: DbUrl) -> Result<Self, Error> {
+  fn update_ap_id(
    conn: &PgConnection,
    comment_id: CommentId,
    apub_id: DbUrl,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
    diesel::update(comment.find(comment_id))
@ -51,7 +65,10 @@ impl Comment_ for Comment {
      .get_result::<Self>(conn)
  }
-  fn permadelete_for_creator(conn: &PgConnection, for_creator_id: i32) -> Result<Vec<Self>, Error> {
+  fn permadelete_for_creator(
    conn: &PgConnection,
    for_creator_id: PersonId,
  ) -> Result<Vec<Self>, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
    diesel::update(comment.filter(creator_id.eq(for_creator_id)))
      .set((
@ -64,7 +81,7 @@ impl Comment_ for Comment {
  fn update_deleted(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    new_deleted: bool,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
@ -75,7 +92,7 @@ impl Comment_ for Comment {
  fn update_removed(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    new_removed: bool,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
@ -86,7 +103,7 @@ impl Comment_ for Comment {
  fn update_removed_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
    new_removed: bool,
  ) -> Result<Vec<Self>, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
@ -95,7 +112,11 @@ impl Comment_ for Comment {
      .get_results::<Self>(conn)
  }
-  fn update_read(conn: &PgConnection, comment_id: i32, new_read: bool) -> Result<Self, Error> {
+  fn update_read(
    conn: &PgConnection,
    comment_id: CommentId,
    new_read: bool,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
    diesel::update(comment.find(comment_id))
      .set(read.eq(new_read))
@ -104,7 +125,7 @@ impl Comment_ for Comment {
  fn update_content(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    new_content: &str,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
@ -114,13 +135,13 @@ impl Comment_ for Comment {
  }
 }
-impl Crud<CommentForm> for Comment {
+impl Crud<CommentForm, CommentId> for Comment {
-  fn read(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
+  fn read(conn: &PgConnection, comment_id: CommentId) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
    comment.find(comment_id).first::<Self>(conn)
  }
-  fn delete(conn: &PgConnection, comment_id: i32) -> Result<usize, Error> {
+  fn delete(conn: &PgConnection, comment_id: CommentId) -> Result<usize, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
    diesel::delete(comment.find(comment_id)).execute(conn)
  }
@ -134,7 +155,7 @@ impl Crud<CommentForm> for Comment {
  fn update(
    conn: &PgConnection,
-    comment_id: i32,
+    comment_id: CommentId,
    comment_form: &CommentForm,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment::dsl::*;
@ -161,22 +182,26 @@ impl ApubObject<CommentForm> for Comment {
  }
 }
-impl Likeable<CommentLikeForm> for CommentLike {
+impl Likeable<CommentLikeForm, CommentId> for CommentLike {
  fn like(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result<Self, Error> {
    use lemmy_db_schema::schema::comment_like::dsl::*;
    insert_into(comment_like)
      .values(comment_like_form)
-      .on_conflict((comment_id, user_id))
+      .on_conflict((comment_id, person_id))
      .do_update()
      .set(comment_like_form)
      .get_result::<Self>(conn)
  }
-  fn remove(conn: &PgConnection, user_id: i32, comment_id: i32) -> Result<usize, Error> {
+  fn remove(
    conn: &PgConnection,
    person_id: PersonId,
    comment_id: CommentId,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::comment_like::dsl;
    diesel::delete(
      dsl::comment_like
        .filter(dsl::comment_id.eq(comment_id))
-        .filter(dsl::user_id.eq(user_id)),
+        .filter(dsl::person_id.eq(person_id)),
    )
    .execute(conn)
  }
@ -187,7 +212,7 @@ impl Saveable<CommentSavedForm> for CommentSaved {
    use lemmy_db_schema::schema::comment_saved::dsl::*;
    insert_into(comment_saved)
      .values(comment_saved_form)
-      .on_conflict((comment_id, user_id))
+      .on_conflict((comment_id, person_id))
      .do_update()
      .set(comment_saved_form)
      .get_result::<Self>(conn)
@ -197,7 +222,7 @@ impl Saveable<CommentSavedForm> for CommentSaved {
    diesel::delete(
      comment_saved
        .filter(comment_id.eq(comment_saved_form.comment_id))
-        .filter(user_id.eq(comment_saved_form.user_id)),
+        .filter(person_id.eq(comment_saved_form.person_id)),
    )
    .execute(conn)
  }
@ -205,12 +230,12 @@ impl Saveable<CommentSavedForm> for CommentSaved {
 #[cfg(test)]
 mod tests {
-  use crate::{establish_unpooled_connection, Crud, Likeable, ListingType, Saveable, SortType};
+  use crate::{establish_unpooled_connection, Crud, Likeable, Saveable};
  use lemmy_db_schema::source::{
    comment::*,
    community::{Community, CommunityForm},
    person::{Person, PersonForm},
    post::*,
    user::{UserForm, User_},
  };
  use serial_test::serial;
@ -219,28 +244,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "terry".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -248,13 +263,13 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let new_community = CommunityForm {
      name: "test community".to_string(),
      title: "nada".to_owned(),
      description: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      removed: None,
      deleted: None,
      updated: None,
@ -276,7 +291,7 @@ mod tests {
    let new_post = PostForm {
      name: "A test post".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      url: None,
      body: None,
      community_id: inserted_community.id,
@ -299,7 +314,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -316,7 +331,7 @@ mod tests {
    let expected_comment = Comment {
      id: inserted_comment.id,
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: false,
      deleted: false,
@ -330,7 +345,7 @@ mod tests {
    let child_comment_form = CommentForm {
      content: "A child comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      parent_id: Some(inserted_comment.id),
      removed: None,
@ -348,7 +363,7 @@ mod tests {
    let comment_like_form = CommentLikeForm {
      comment_id: inserted_comment.id,
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      score: 1,
    };
@ -358,7 +373,7 @@ mod tests {
      id: inserted_comment_like.id,
      comment_id: inserted_comment.id,
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      published: inserted_comment_like.published,
      score: 1,
    };
@ -366,7 +381,7 @@ mod tests {
    // Comment Saved
    let comment_saved_form = CommentSavedForm {
      comment_id: inserted_comment.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
    };
    let inserted_comment_saved = CommentSaved::save(&conn, &comment_saved_form).unwrap();
@ -374,19 +389,19 @@ mod tests {
    let expected_comment_saved = CommentSaved {
      id: inserted_comment_saved.id,
      comment_id: inserted_comment.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      published: inserted_comment_saved.published,
    };
    let read_comment = Comment::read(&conn, inserted_comment.id).unwrap();
    let updated_comment = Comment::update(&conn, inserted_comment.id, &comment_form).unwrap();
-    let like_removed = CommentLike::remove(&conn, inserted_user.id, inserted_comment.id).unwrap();
+    let like_removed = CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap();
    let saved_removed = CommentSaved::unsave(&conn, &comment_saved_form).unwrap();
    let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap();
    Comment::delete(&conn, inserted_child_comment.id).unwrap();
    Post::delete(&conn, inserted_post.id).unwrap();
    Community::delete(&conn, inserted_community.id).unwrap();
-    User_::delete(&conn, inserted_user.id).unwrap();
+    Person::delete(&conn, inserted_person.id).unwrap();
    assert_eq!(expected_comment, read_comment);
    assert_eq!(expected_comment, inserted_comment);
--- a/crates/db_queries/src/source/comment_report.rs
+++ b/crates/db_queries/src/source/comment_report.rs
@ -3,6 +3,7 @@ use diesel::{dsl::*, result::Error, *};
 use lemmy_db_schema::{
  naive_now,
  source::comment_report::{CommentReport, CommentReportForm},
  PersonId,
 };
 impl Reportable<CommentReportForm> for CommentReport {
@ -22,7 +23,11 @@ impl Reportable<CommentReportForm> for CommentReport {
  /// * `conn` - the postgres connection
  /// * `report_id` - the id of the report to resolve
  /// * `by_resolver_id` - the id of the user resolving the report
-  fn resolve(conn: &PgConnection, report_id: i32, by_resolver_id: i32) -> Result<usize, Error> {
+  fn resolve(
    conn: &PgConnection,
    report_id: i32,
    by_resolver_id: PersonId,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::comment_report::dsl::*;
    update(comment_report.find(report_id))
      .set((
@ -38,7 +43,11 @@ impl Reportable<CommentReportForm> for CommentReport {
  /// * `conn` - the postgres connection
  /// * `report_id` - the id of the report to unresolve
  /// * `by_resolver_id` - the id of the user unresolving the report
-  fn unresolve(conn: &PgConnection, report_id: i32, by_resolver_id: i32) -> Result<usize, Error> {
+  fn unresolve(
    conn: &PgConnection,
    report_id: i32,
    by_resolver_id: PersonId,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::comment_report::dsl::*;
    update(comment_report.find(report_id))
      .set((
--- a/crates/db_queries/src/source/community.rs
+++ b/crates/db_queries/src/source/community.rs
@ -9,10 +9,12 @@ use lemmy_db_schema::{
    CommunityForm,
    CommunityModerator,
    CommunityModeratorForm,
-    CommunityUserBan,
+    CommunityPersonBan,
-    CommunityUserBanForm,
+    CommunityPersonBanForm,
  },
  CommunityId,
  DbUrl,
  PersonId,
 };
 mod safe_type {
@ -59,13 +61,13 @@ mod safe_type {
  }
 }
-impl Crud<CommunityForm> for Community {
+impl Crud<CommunityForm, CommunityId> for Community {
-  fn read(conn: &PgConnection, community_id: i32) -> Result<Self, Error> {
+  fn read(conn: &PgConnection, community_id: CommunityId) -> Result<Self, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
    community.find(community_id).first::<Self>(conn)
  }
-  fn delete(conn: &PgConnection, community_id: i32) -> Result<usize, Error> {
+  fn delete(conn: &PgConnection, community_id: CommunityId) -> Result<usize, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
    diesel::delete(community.find(community_id)).execute(conn)
  }
@ -79,7 +81,7 @@ impl Crud<CommunityForm> for Community {
  fn update(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
    new_community: &CommunityForm,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
@ -112,23 +114,23 @@ pub trait Community_ {
  fn read_from_name(conn: &PgConnection, community_name: &str) -> Result<Community, Error>;
  fn update_deleted(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
    new_deleted: bool,
  ) -> Result<Community, Error>;
  fn update_removed(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
    new_removed: bool,
  ) -> Result<Community, Error>;
  fn update_removed_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
    new_removed: bool,
  ) -> Result<Vec<Community>, Error>;
  fn update_creator(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
-    new_creator_id: i32,
+    new_creator_id: PersonId,
  ) -> Result<Community, Error>;
  fn distinct_federated_communities(conn: &PgConnection) -> Result<Vec<String>, Error>;
  fn read_from_followers_url(
@ -148,7 +150,7 @@ impl Community_ for Community {
  fn update_deleted(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
    new_deleted: bool,
  ) -> Result<Community, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
@ -159,7 +161,7 @@ impl Community_ for Community {
  fn update_removed(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
    new_removed: bool,
  ) -> Result<Community, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
@ -170,7 +172,7 @@ impl Community_ for Community {
  fn update_removed_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
    new_removed: bool,
  ) -> Result<Vec<Community>, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
@ -181,8 +183,8 @@ impl Community_ for Community {
  fn update_creator(
    conn: &PgConnection,
-    community_id: i32,
+    community_id: CommunityId,
-    new_creator_id: i32,
+    new_creator_id: PersonId,
  ) -> Result<Community, Error> {
    use lemmy_db_schema::schema::community::dsl::*;
    diesel::update(community.find(community_id))
@ -209,74 +211,80 @@ impl Community_ for Community {
 impl Joinable<CommunityModeratorForm> for CommunityModerator {
  fn join(
    conn: &PgConnection,
-    community_user_form: &CommunityModeratorForm,
+    community_moderator_form: &CommunityModeratorForm,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::community_moderator::dsl::*;
    insert_into(community_moderator)
-      .values(community_user_form)
+      .values(community_moderator_form)
      .get_result::<Self>(conn)
  }
  fn leave(
    conn: &PgConnection,
-    community_user_form: &CommunityModeratorForm,
+    community_moderator_form: &CommunityModeratorForm,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::community_moderator::dsl::*;
    diesel::delete(
      community_moderator
-        .filter(community_id.eq(community_user_form.community_id))
+        .filter(community_id.eq(community_moderator_form.community_id))
-        .filter(user_id.eq(community_user_form.user_id)),
+        .filter(person_id.eq(community_moderator_form.person_id)),
    )
    .execute(conn)
  }
 }
 pub trait CommunityModerator_ {
-  fn delete_for_community(conn: &PgConnection, for_community_id: i32) -> Result<usize, Error>;
+  fn delete_for_community(
  fn get_user_moderated_communities(
    conn: &PgConnection,
-    for_user_id: i32,
+    for_community_id: CommunityId,
-  ) -> Result<Vec<i32>, Error>;
+  ) -> Result<usize, Error>;
  fn get_person_moderated_communities(
    conn: &PgConnection,
    for_person_id: PersonId,
  ) -> Result<Vec<CommunityId>, Error>;
 }
 impl CommunityModerator_ for CommunityModerator {
-  fn delete_for_community(conn: &PgConnection, for_community_id: i32) -> Result<usize, Error> {
+  fn delete_for_community(
    conn: &PgConnection,
    for_community_id: CommunityId,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::community_moderator::dsl::*;
    diesel::delete(community_moderator.filter(community_id.eq(for_community_id))).execute(conn)
  }
-  fn get_user_moderated_communities(
+  fn get_person_moderated_communities(
    conn: &PgConnection,
-    for_user_id: i32,
+    for_person_id: PersonId,
-  ) -> Result<Vec<i32>, Error> {
+  ) -> Result<Vec<CommunityId>, Error> {
    use lemmy_db_schema::schema::community_moderator::dsl::*;
    community_moderator
-      .filter(user_id.eq(for_user_id))
+      .filter(person_id.eq(for_person_id))
      .select(community_id)
-      .load::<i32>(conn)
+      .load::<CommunityId>(conn)
  }
 }
-impl Bannable<CommunityUserBanForm> for CommunityUserBan {
+impl Bannable<CommunityPersonBanForm> for CommunityPersonBan {
  fn ban(
    conn: &PgConnection,
-    community_user_ban_form: &CommunityUserBanForm,
+    community_person_ban_form: &CommunityPersonBanForm,
  ) -> Result<Self, Error> {
-    use lemmy_db_schema::schema::community_user_ban::dsl::*;
+    use lemmy_db_schema::schema::community_person_ban::dsl::*;
-    insert_into(community_user_ban)
+    insert_into(community_person_ban)
-      .values(community_user_ban_form)
+      .values(community_person_ban_form)
      .get_result::<Self>(conn)
  }
  fn unban(
    conn: &PgConnection,
-    community_user_ban_form: &CommunityUserBanForm,
+    community_person_ban_form: &CommunityPersonBanForm,
  ) -> Result<usize, Error> {
-    use lemmy_db_schema::schema::community_user_ban::dsl::*;
+    use lemmy_db_schema::schema::community_person_ban::dsl::*;
    diesel::delete(
-      community_user_ban
+      community_person_ban
-        .filter(community_id.eq(community_user_ban_form.community_id))
+        .filter(community_id.eq(community_person_ban_form.community_id))
-        .filter(user_id.eq(community_user_ban_form.user_id)),
+        .filter(person_id.eq(community_person_ban_form.person_id)),
    )
    .execute(conn)
  }
@ -290,12 +298,16 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
    use lemmy_db_schema::schema::community_follower::dsl::*;
    insert_into(community_follower)
      .values(community_follower_form)
-      .on_conflict((community_id, user_id))
+      .on_conflict((community_id, person_id))
      .do_update()
      .set(community_follower_form)
      .get_result::<Self>(conn)
  }
-  fn follow_accepted(conn: &PgConnection, community_id_: i32, user_id_: i32) -> Result<Self, Error>
+  fn follow_accepted(
    conn: &PgConnection,
    community_id_: CommunityId,
    person_id_: PersonId,
  ) -> Result<Self, Error>
  where
    Self: Sized,
  {
@ -303,7 +315,7 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
    diesel::update(
      community_follower
        .filter(community_id.eq(community_id_))
-        .filter(user_id.eq(user_id_)),
+        .filter(person_id.eq(person_id_)),
    )
    .set(pending.eq(true))
    .get_result::<Self>(conn)
@ -316,13 +328,13 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
    diesel::delete(
      community_follower
        .filter(community_id.eq(&community_follower_form.community_id))
-        .filter(user_id.eq(&community_follower_form.user_id)),
+        .filter(person_id.eq(&community_follower_form.person_id)),
    )
    .execute(conn)
  }
  // TODO: this function name only makes sense if you call it with a remote community. for a local
  //       community, it will also return true if only remote followers exist
-  fn has_local_followers(conn: &PgConnection, community_id_: i32) -> Result<bool, Error> {
+  fn has_local_followers(conn: &PgConnection, community_id_: CommunityId) -> Result<bool, Error> {
    use lemmy_db_schema::schema::community_follower::dsl::*;
    diesel::select(exists(
      community_follower.filter(community_id.eq(community_id_)),
@ -333,16 +345,8 @@ impl Followable<CommunityFollowerForm> for CommunityFollower {
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::{establish_unpooled_connection, Bannable, Crud, Followable, Joinable};
-    establish_unpooled_connection,
+  use lemmy_db_schema::source::{community::*, person::*};
    Bannable,
    Crud,
    Followable,
    Joinable,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{community::*, user::*};
  use serial_test::serial;
  #[test]
@ -350,28 +354,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "bobbee".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -379,11 +373,11 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let new_community = CommunityForm {
      name: "TIL".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      title: "nada".to_owned(),
      description: None,
      nsfw: false,
@ -407,7 +401,7 @@ mod tests {
    let expected_community = Community {
      id: inserted_community.id,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      name: "TIL".into(),
      title: "nada".to_owned(),
      description: None,
@ -430,7 +424,7 @@ mod tests {
    let community_follower_form = CommunityFollowerForm {
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      pending: false,
    };
@ -440,55 +434,56 @@ mod tests {
    let expected_community_follower = CommunityFollower {
      id: inserted_community_follower.id,
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      pending: Some(false),
      published: inserted_community_follower.published,
    };
-    let community_user_form = CommunityModeratorForm {
+    let community_moderator_form = CommunityModeratorForm {
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
    };
-    let inserted_community_user = CommunityModerator::join(&conn, &community_user_form).unwrap();
+    let inserted_community_moderator =
      CommunityModerator::join(&conn, &community_moderator_form).unwrap();
-    let expected_community_user = CommunityModerator {
+    let expected_community_moderator = CommunityModerator {
-      id: inserted_community_user.id,
+      id: inserted_community_moderator.id,
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
-      published: inserted_community_user.published,
+      published: inserted_community_moderator.published,
    };
-    let community_user_ban_form = CommunityUserBanForm {
+    let community_person_ban_form = CommunityPersonBanForm {
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
    };
-    let inserted_community_user_ban =
+    let inserted_community_person_ban =
-      CommunityUserBan::ban(&conn, &community_user_ban_form).unwrap();
+      CommunityPersonBan::ban(&conn, &community_person_ban_form).unwrap();
-    let expected_community_user_ban = CommunityUserBan {
+    let expected_community_person_ban = CommunityPersonBan {
-      id: inserted_community_user_ban.id,
+      id: inserted_community_person_ban.id,
      community_id: inserted_community.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
-      published: inserted_community_user_ban.published,
+      published: inserted_community_person_ban.published,
    };
    let read_community = Community::read(&conn, inserted_community.id).unwrap();
    let updated_community =
      Community::update(&conn, inserted_community.id, &new_community).unwrap();
    let ignored_community = CommunityFollower::unfollow(&conn, &community_follower_form).unwrap();
-    let left_community = CommunityModerator::leave(&conn, &community_user_form).unwrap();
+    let left_community = CommunityModerator::leave(&conn, &community_moderator_form).unwrap();
-    let unban = CommunityUserBan::unban(&conn, &community_user_ban_form).unwrap();
+    let unban = CommunityPersonBan::unban(&conn, &community_person_ban_form).unwrap();
    let num_deleted = Community::delete(&conn, inserted_community.id).unwrap();
-    User_::delete(&conn, inserted_user.id).unwrap();
+    Person::delete(&conn, inserted_person.id).unwrap();
    assert_eq!(expected_community, read_community);
    assert_eq!(expected_community, inserted_community);
    assert_eq!(expected_community, updated_community);
    assert_eq!(expected_community_follower, inserted_community_follower);
-    assert_eq!(expected_community_user, inserted_community_user);
+    assert_eq!(expected_community_moderator, inserted_community_moderator);
-    assert_eq!(expected_community_user_ban, inserted_community_user_ban);
+    assert_eq!(expected_community_person_ban, inserted_community_person_ban);
    assert_eq!(1, ignored_community);
    assert_eq!(1, left_community);
    assert_eq!(1, unban);
--- a/crates/db_queries/src/source/local_user.rs
+++ b/crates/db_queries/src/source/local_user.rs
@ -0,0 +1,119 @@
 use crate::Crud;
 use bcrypt::{hash, DEFAULT_COST};
 use diesel::{dsl::*, result::Error, *};
 use lemmy_db_schema::{
  naive_now,
  schema::local_user::dsl::*,
  source::local_user::{LocalUser, LocalUserForm},
  LocalUserId,
  PersonId,
 };
 mod safe_settings_type {
  use crate::ToSafeSettings;
  use lemmy_db_schema::{schema::local_user::columns::*, source::local_user::LocalUser};
  type Columns = (
    id,
    person_id,
    email,
    admin,
    show_nsfw,
    theme,
    default_sort_type,
    default_listing_type,
    lang,
    show_avatars,
    send_notifications_to_email,
    matrix_user_id,
    validator_time,
  );
  impl ToSafeSettings for LocalUser {
    type SafeSettingsColumns = Columns;
    /// Includes everything but the hashed password
    fn safe_settings_columns_tuple() -> Self::SafeSettingsColumns {
      (
        id,
        person_id,
        email,
        admin,
        show_nsfw,
        theme,
        default_sort_type,
        default_listing_type,
        lang,
        show_avatars,
        send_notifications_to_email,
        matrix_user_id,
        validator_time,
      )
    }
  }
 }
 pub trait LocalUser_ {
  fn register(conn: &PgConnection, form: &LocalUserForm) -> Result<LocalUser, Error>;
  fn update_password(
    conn: &PgConnection,
    local_user_id: LocalUserId,
    new_password: &str,
  ) -> Result<LocalUser, Error>;
  fn add_admin(conn: &PgConnection, person_id: PersonId, added: bool) -> Result<LocalUser, Error>;
 }
 impl LocalUser_ for LocalUser {
  fn register(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
    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;
    Self::create(&conn, &edited_user)
  }
  fn update_password(
    conn: &PgConnection,
    local_user_id: LocalUserId,
    new_password: &str,
  ) -> Result<Self, Error> {
    let password_hash = hash(new_password, DEFAULT_COST).expect("Couldn't hash password");
    diesel::update(local_user.find(local_user_id))
      .set((
        password_encrypted.eq(password_hash),
        validator_time.eq(naive_now()),
      ))
      .get_result::<Self>(conn)
  }
  fn add_admin(conn: &PgConnection, for_person_id: PersonId, added: bool) -> Result<Self, Error> {
    diesel::update(local_user.filter(person_id.eq(for_person_id)))
      .set(admin.eq(added))
      .get_result::<Self>(conn)
  }
 }
 impl Crud<LocalUserForm, LocalUserId> for LocalUser {
  fn read(conn: &PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
    local_user.find(local_user_id).first::<Self>(conn)
  }
  fn delete(conn: &PgConnection, local_user_id: LocalUserId) -> Result<usize, Error> {
    diesel::delete(local_user.find(local_user_id)).execute(conn)
  }
  fn create(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
    insert_into(local_user)
      .values(form)
      .get_result::<Self>(conn)
  }
  fn update(
    conn: &PgConnection,
    local_user_id: LocalUserId,
    form: &LocalUserForm,
  ) -> Result<Self, Error> {
    diesel::update(local_user.find(local_user_id))
      .set(form)
      .get_result::<Self>(conn)
  }
 }
--- a/crates/db_queries/src/source/mod.rs
+++ b/crates/db_queries/src/source/mod.rs
@ -2,11 +2,12 @@ pub mod activity;
 pub mod comment;
 pub mod comment_report;
 pub mod community;
 pub mod local_user;
 pub mod moderator;
 pub mod password_reset_request;
 pub mod person;
 pub mod person_mention;
 pub mod post;
 pub mod post_report;
 pub mod private_message;
 pub mod site;
 pub mod user;
 pub mod user_mention;
--- a/crates/db_queries/src/source/moderator.rs
+++ b/crates/db_queries/src/source/moderator.rs
@ -2,7 +2,7 @@ use crate::Crud;
 use diesel::{dsl::*, result::Error, *};
 use lemmy_db_schema::source::moderator::*;
-impl Crud<ModRemovePostForm> for ModRemovePost {
+impl Crud<ModRemovePostForm, i32> for ModRemovePost {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_remove_post::dsl::*;
    mod_remove_post.find(from_id).first::<Self>(conn)
@ -23,7 +23,7 @@ impl Crud<ModRemovePostForm> for ModRemovePost {
  }
 }
-impl Crud<ModLockPostForm> for ModLockPost {
+impl Crud<ModLockPostForm, i32> for ModLockPost {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_lock_post::dsl::*;
    mod_lock_post.find(from_id).first::<Self>(conn)
@ -44,7 +44,7 @@ impl Crud<ModLockPostForm> for ModLockPost {
  }
 }
-impl Crud<ModStickyPostForm> for ModStickyPost {
+impl Crud<ModStickyPostForm, i32> for ModStickyPost {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_sticky_post::dsl::*;
    mod_sticky_post.find(from_id).first::<Self>(conn)
@ -65,7 +65,7 @@ impl Crud<ModStickyPostForm> for ModStickyPost {
  }
 }
-impl Crud<ModRemoveCommentForm> for ModRemoveComment {
+impl Crud<ModRemoveCommentForm, i32> for ModRemoveComment {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_remove_comment::dsl::*;
    mod_remove_comment.find(from_id).first::<Self>(conn)
@ -86,7 +86,7 @@ impl Crud<ModRemoveCommentForm> for ModRemoveComment {
  }
 }
-impl Crud<ModRemoveCommunityForm> for ModRemoveCommunity {
+impl Crud<ModRemoveCommunityForm, i32> for ModRemoveCommunity {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_remove_community::dsl::*;
    mod_remove_community.find(from_id).first::<Self>(conn)
@ -111,7 +111,7 @@ impl Crud<ModRemoveCommunityForm> for ModRemoveCommunity {
  }
 }
-impl Crud<ModBanFromCommunityForm> for ModBanFromCommunity {
+impl Crud<ModBanFromCommunityForm, i32> for ModBanFromCommunity {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_ban_from_community::dsl::*;
    mod_ban_from_community.find(from_id).first::<Self>(conn)
@ -136,7 +136,7 @@ impl Crud<ModBanFromCommunityForm> for ModBanFromCommunity {
  }
 }
-impl Crud<ModBanForm> for ModBan {
+impl Crud<ModBanForm, i32> for ModBan {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_ban::dsl::*;
    mod_ban.find(from_id).first::<Self>(conn)
@ -155,7 +155,7 @@ impl Crud<ModBanForm> for ModBan {
  }
 }
-impl Crud<ModAddCommunityForm> for ModAddCommunity {
+impl Crud<ModAddCommunityForm, i32> for ModAddCommunity {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_add_community::dsl::*;
    mod_add_community.find(from_id).first::<Self>(conn)
@ -176,7 +176,7 @@ impl Crud<ModAddCommunityForm> for ModAddCommunity {
  }
 }
-impl Crud<ModAddForm> for ModAdd {
+impl Crud<ModAddForm, i32> for ModAdd {
  fn read(conn: &PgConnection, from_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::mod_add::dsl::*;
    mod_add.find(from_id).first::<Self>(conn)
@ -197,8 +197,8 @@ impl Crud<ModAddForm> for ModAdd {
 #[cfg(test)]
 mod tests {
-  use crate::{establish_unpooled_connection, Crud, ListingType, SortType};
+  use crate::{establish_unpooled_connection, Crud};
-  use lemmy_db_schema::source::{comment::*, community::*, moderator::*, post::*, user::*};
+  use lemmy_db_schema::source::{comment::*, community::*, moderator::*, person::*, post::*};
  use serial_test::serial;
  // use Crud;
@ -207,28 +207,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_mod = UserForm {
+    let new_mod = PersonForm {
      name: "the mod".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -236,30 +226,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_mod = User_::create(&conn, &new_mod).unwrap();
+    let inserted_mod = Person::create(&conn, &new_mod).unwrap();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "jim2".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -267,13 +247,13 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let new_community = CommunityForm {
      name: "mod_community".to_string(),
      title: "nada".to_owned(),
      description: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      removed: None,
      deleted: None,
      updated: None,
@ -297,7 +277,7 @@ mod tests {
      name: "A test post thweep".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -318,7 +298,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -336,7 +316,7 @@ mod tests {
    // remove post
    let mod_remove_post_form = ModRemovePostForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      post_id: inserted_post.id,
      reason: None,
      removed: None,
@ -346,7 +326,7 @@ mod tests {
    let expected_mod_remove_post = ModRemovePost {
      id: inserted_mod_remove_post.id,
      post_id: inserted_post.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      reason: None,
      removed: Some(true),
      when_: inserted_mod_remove_post.when_,
@ -355,7 +335,7 @@ mod tests {
    // lock post
    let mod_lock_post_form = ModLockPostForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      post_id: inserted_post.id,
      locked: None,
    };
@ -364,7 +344,7 @@ mod tests {
    let expected_mod_lock_post = ModLockPost {
      id: inserted_mod_lock_post.id,
      post_id: inserted_post.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      locked: Some(true),
      when_: inserted_mod_lock_post.when_,
    };
@ -372,7 +352,7 @@ mod tests {
    // sticky post
    let mod_sticky_post_form = ModStickyPostForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      post_id: inserted_post.id,
      stickied: None,
    };
@ -381,7 +361,7 @@ mod tests {
    let expected_mod_sticky_post = ModStickyPost {
      id: inserted_mod_sticky_post.id,
      post_id: inserted_post.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      stickied: Some(true),
      when_: inserted_mod_sticky_post.when_,
    };
@ -389,7 +369,7 @@ mod tests {
    // comment
    let mod_remove_comment_form = ModRemoveCommentForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      comment_id: inserted_comment.id,
      reason: None,
      removed: None,
@ -401,7 +381,7 @@ mod tests {
    let expected_mod_remove_comment = ModRemoveComment {
      id: inserted_mod_remove_comment.id,
      comment_id: inserted_comment.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      reason: None,
      removed: Some(true),
      when_: inserted_mod_remove_comment.when_,
@ -410,7 +390,7 @@ mod tests {
    // community
    let mod_remove_community_form = ModRemoveCommunityForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      community_id: inserted_community.id,
      reason: None,
      removed: None,
@ -423,7 +403,7 @@ mod tests {
    let expected_mod_remove_community = ModRemoveCommunity {
      id: inserted_mod_remove_community.id,
      community_id: inserted_community.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
      reason: None,
      removed: Some(true),
      expires: None,
@ -433,8 +413,8 @@ mod tests {
    // ban from community
    let mod_ban_from_community_form = ModBanFromCommunityForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      community_id: inserted_community.id,
      reason: None,
      banned: None,
@ -447,8 +427,8 @@ mod tests {
    let expected_mod_ban_from_community = ModBanFromCommunity {
      id: inserted_mod_ban_from_community.id,
      community_id: inserted_community.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      reason: None,
      banned: Some(true),
      expires: None,
@ -458,8 +438,8 @@ mod tests {
    // ban
    let mod_ban_form = ModBanForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      reason: None,
      banned: None,
      expires: None,
@ -468,8 +448,8 @@ mod tests {
    let read_mod_ban = ModBan::read(&conn, inserted_mod_ban.id).unwrap();
    let expected_mod_ban = ModBan {
      id: inserted_mod_ban.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      reason: None,
      banned: Some(true),
      expires: None,
@ -479,8 +459,8 @@ mod tests {
    // mod add community
    let mod_add_community_form = ModAddCommunityForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
    };
@ -491,8 +471,8 @@ mod tests {
    let expected_mod_add_community = ModAddCommunity {
      id: inserted_mod_add_community.id,
      community_id: inserted_community.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      removed: Some(false),
      when_: inserted_mod_add_community.when_,
    };
@ -500,16 +480,16 @@ mod tests {
    // mod add
    let mod_add_form = ModAddForm {
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      removed: None,
    };
    let inserted_mod_add = ModAdd::create(&conn, &mod_add_form).unwrap();
    let read_mod_add = ModAdd::read(&conn, inserted_mod_add.id).unwrap();
    let expected_mod_add = ModAdd {
      id: inserted_mod_add.id,
-      mod_user_id: inserted_mod.id,
+      mod_person_id: inserted_mod.id,
-      other_user_id: inserted_user.id,
+      other_person_id: inserted_person.id,
      removed: Some(false),
      when_: inserted_mod_add.when_,
    };
@ -517,8 +497,8 @@ mod tests {
    Comment::delete(&conn, inserted_comment.id).unwrap();
    Post::delete(&conn, inserted_post.id).unwrap();
    Community::delete(&conn, inserted_community.id).unwrap();
-    User_::delete(&conn, inserted_user.id).unwrap();
+    Person::delete(&conn, inserted_person.id).unwrap();
-    User_::delete(&conn, inserted_mod.id).unwrap();
+    Person::delete(&conn, inserted_mod.id).unwrap();
    assert_eq!(expected_mod_remove_post, read_mod_remove_post);
    assert_eq!(expected_mod_lock_post, read_mod_lock_post);
--- a/crates/db_queries/src/source/password_reset_request.rs
+++ b/crates/db_queries/src/source/password_reset_request.rs
@ -1,9 +1,13 @@
 use crate::Crud;
 use diesel::{dsl::*, result::Error, PgConnection, *};
-use lemmy_db_schema::{schema::password_reset_request::dsl::*, source::password_reset_request::*};
+use lemmy_db_schema::{
  schema::password_reset_request::dsl::*,
  source::password_reset_request::*,
  LocalUserId,
 };
 use sha2::{Digest, Sha256};
-impl Crud<PasswordResetRequestForm> for PasswordResetRequest {
+impl Crud<PasswordResetRequestForm, i32> for PasswordResetRequest {
  fn read(conn: &PgConnection, password_reset_request_id: i32) -> Result<Self, Error> {
    password_reset_request
      .find(password_reset_request_id)
@ -28,7 +32,7 @@ impl Crud<PasswordResetRequestForm> for PasswordResetRequest {
 pub trait PasswordResetRequest_ {
  fn create_token(
    conn: &PgConnection,
-    from_user_id: i32,
+    from_local_user_id: LocalUserId,
    token: &str,
  ) -> Result<PasswordResetRequest, Error>;
  fn read_from_token(conn: &PgConnection, token: &str) -> Result<PasswordResetRequest, Error>;
@ -37,7 +41,7 @@ pub trait PasswordResetRequest_ {
 impl PasswordResetRequest_ for PasswordResetRequest {
  fn create_token(
    conn: &PgConnection,
-    from_user_id: i32,
+    from_local_user_id: LocalUserId,
    token: &str,
  ) -> Result<PasswordResetRequest, Error> {
    let mut hasher = Sha256::new();
@ -45,7 +49,7 @@ impl PasswordResetRequest_ for PasswordResetRequest {
    let token_hash: String = bytes_to_hex(hasher.finalize().to_vec());
    let form = PasswordResetRequestForm {
-      user_id: from_user_id,
+      local_user_id: from_local_user_id,
      token_encrypted: token_hash,
    };
@ -76,10 +80,12 @@ mod tests {
    establish_unpooled_connection,
    source::password_reset_request::PasswordResetRequest_,
    Crud,
    ListingType,
    SortType,
  };
-  use lemmy_db_schema::source::{password_reset_request::PasswordResetRequest, user::*};
+  use lemmy_db_schema::source::{
    local_user::{LocalUser, LocalUserForm},
    password_reset_request::PasswordResetRequest,
    person::*,
  };
  use serial_test::serial;
  #[test]
@ -87,28 +93,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "thommy prw".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -116,23 +112,40 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let new_local_user = LocalUserForm {
      person_id: inserted_person.id,
      password_encrypted: "pass".to_string(),
      email: None,
      matrix_user_id: None,
      admin: None,
      show_nsfw: None,
      theme: None,
      default_sort_type: None,
      default_listing_type: None,
      lang: None,
      show_avatars: None,
      send_notifications_to_email: None,
    };
    let inserted_local_user = LocalUser::create(&conn, &new_local_user).unwrap();
    let token = "nope";
    let token_encrypted_ = "ca3704aa0b06f5954c79ee837faa152d84d6b2d42838f0637a15eda8337dbdce";
    let inserted_password_reset_request =
-      PasswordResetRequest::create_token(&conn, inserted_user.id, token).unwrap();
+      PasswordResetRequest::create_token(&conn, inserted_local_user.id, token).unwrap();
    let expected_password_reset_request = PasswordResetRequest {
      id: inserted_password_reset_request.id,
-      user_id: inserted_user.id,
+      local_user_id: inserted_local_user.id,
      token_encrypted: token_encrypted_.to_string(),
      published: inserted_password_reset_request.published,
    };
    let read_password_reset_request = PasswordResetRequest::read_from_token(&conn, token).unwrap();
-    let num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
+    let num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
    assert_eq!(expected_password_reset_request, read_password_reset_request);
    assert_eq!(
--- a/crates/db_queries/src/source/person.rs
+++ b/crates/db_queries/src/source/person.rs
@ -0,0 +1,290 @@
 use crate::{ApubObject, Crud};
 use diesel::{dsl::*, result::Error, *};
 use lemmy_db_schema::{
  naive_now,
  schema::person::dsl::*,
  source::person::{Person, PersonForm},
  DbUrl,
  PersonId,
 };
 mod safe_type {
  use crate::ToSafe;
  use lemmy_db_schema::{schema::person::columns::*, source::person::Person};
  type Columns = (
    id,
    name,
    preferred_username,
    avatar,
    banned,
    published,
    updated,
    actor_id,
    bio,
    local,
    banner,
    deleted,
    inbox_url,
    shared_inbox_url,
  );
  impl ToSafe for Person {
    type SafeColumns = Columns;
    fn safe_columns_tuple() -> Self::SafeColumns {
      (
        id,
        name,
        preferred_username,
        avatar,
        banned,
        published,
        updated,
        actor_id,
        bio,
        local,
        banner,
        deleted,
        inbox_url,
        shared_inbox_url,
      )
    }
  }
 }
 mod safe_type_alias_1 {
  use crate::ToSafe;
  use lemmy_db_schema::{schema::person_alias_1::columns::*, source::person::PersonAlias1};
  type Columns = (
    id,
    name,
    preferred_username,
    avatar,
    banned,
    published,
    updated,
    actor_id,
    bio,
    local,
    banner,
    deleted,
    inbox_url,
    shared_inbox_url,
  );
  impl ToSafe for PersonAlias1 {
    type SafeColumns = Columns;
    fn safe_columns_tuple() -> Self::SafeColumns {
      (
        id,
        name,
        preferred_username,
        avatar,
        banned,
        published,
        updated,
        actor_id,
        bio,
        local,
        banner,
        deleted,
        inbox_url,
        shared_inbox_url,
      )
    }
  }
 }
 mod safe_type_alias_2 {
  use crate::ToSafe;
  use lemmy_db_schema::{schema::person_alias_2::columns::*, source::person::PersonAlias2};
  type Columns = (
    id,
    name,
    preferred_username,
    avatar,
    banned,
    published,
    updated,
    actor_id,
    bio,
    local,
    banner,
    deleted,
    inbox_url,
    shared_inbox_url,
  );
  impl ToSafe for PersonAlias2 {
    type SafeColumns = Columns;
    fn safe_columns_tuple() -> Self::SafeColumns {
      (
        id,
        name,
        preferred_username,
        avatar,
        banned,
        published,
        updated,
        actor_id,
        bio,
        local,
        banner,
        deleted,
        inbox_url,
        shared_inbox_url,
      )
    }
  }
 }
 impl Crud<PersonForm, PersonId> for Person {
  fn read(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
    person
      .filter(deleted.eq(false))
      .find(person_id)
      .first::<Self>(conn)
  }
  fn delete(conn: &PgConnection, person_id: PersonId) -> Result<usize, Error> {
    diesel::delete(person.find(person_id)).execute(conn)
  }
  fn create(conn: &PgConnection, form: &PersonForm) -> Result<Self, Error> {
    insert_into(person).values(form).get_result::<Self>(conn)
  }
  fn update(conn: &PgConnection, person_id: PersonId, form: &PersonForm) -> Result<Self, Error> {
    diesel::update(person.find(person_id))
      .set(form)
      .get_result::<Self>(conn)
  }
 }
 impl ApubObject<PersonForm> for Person {
  fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Self, Error> {
    use lemmy_db_schema::schema::person::dsl::*;
    person
      .filter(deleted.eq(false))
      .filter(actor_id.eq(object_id))
      .first::<Self>(conn)
  }
  fn upsert(conn: &PgConnection, person_form: &PersonForm) -> Result<Person, Error> {
    insert_into(person)
      .values(person_form)
      .on_conflict(actor_id)
      .do_update()
      .set(person_form)
      .get_result::<Self>(conn)
  }
 }
 pub trait Person_ {
  fn ban_person(conn: &PgConnection, person_id: PersonId, ban: bool) -> Result<Person, Error>;
  fn find_by_name(conn: &PgConnection, name: &str) -> Result<Person, Error>;
  fn mark_as_updated(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error>;
  fn delete_account(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error>;
 }
 impl Person_ for Person {
  fn ban_person(conn: &PgConnection, person_id: PersonId, ban: bool) -> Result<Self, Error> {
    diesel::update(person.find(person_id))
      .set(banned.eq(ban))
      .get_result::<Self>(conn)
  }
  fn find_by_name(conn: &PgConnection, from_name: &str) -> Result<Person, Error> {
    person
      .filter(deleted.eq(false))
      .filter(local.eq(true))
      .filter(name.ilike(from_name))
      .first::<Person>(conn)
  }
  fn mark_as_updated(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error> {
    diesel::update(person.find(person_id))
      .set((last_refreshed_at.eq(naive_now()),))
      .get_result::<Self>(conn)
  }
  fn delete_account(conn: &PgConnection, person_id: PersonId) -> Result<Person, Error> {
    use lemmy_db_schema::schema::local_user;
    // Set the local user info to none
    diesel::update(local_user::table.filter(local_user::person_id.eq(person_id)))
      .set((
        local_user::email.eq::<Option<String>>(None),
        local_user::matrix_user_id.eq::<Option<String>>(None),
      ))
      .execute(conn)?;
    diesel::update(person.find(person_id))
      .set((
        preferred_username.eq::<Option<String>>(None),
        bio.eq::<Option<String>>(None),
        deleted.eq(true),
        updated.eq(naive_now()),
      ))
      .get_result::<Self>(conn)
  }
 }
 #[cfg(test)]
 mod tests {
  use crate::{establish_unpooled_connection, source::person::*};
  #[test]
  fn test_crud() {
    let conn = establish_unpooled_connection();
    let new_person = PersonForm {
      name: "holly".into(),
      preferred_username: None,
      avatar: None,
      banner: None,
      banned: None,
      deleted: None,
      published: None,
      updated: None,
      actor_id: None,
      bio: None,
      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
      inbox_url: None,
      shared_inbox_url: None,
    };
    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let expected_person = Person {
      id: inserted_person.id,
      name: "holly".into(),
      preferred_username: None,
      avatar: None,
      banner: None,
      banned: false,
      deleted: false,
      published: inserted_person.published,
      updated: None,
      actor_id: inserted_person.actor_id.to_owned(),
      bio: None,
      local: true,
      private_key: None,
      public_key: None,
      last_refreshed_at: inserted_person.published,
      inbox_url: inserted_person.inbox_url.to_owned(),
      shared_inbox_url: None,
    };
    let read_person = Person::read(&conn, inserted_person.id).unwrap();
    let updated_person = Person::update(&conn, inserted_person.id, &new_person).unwrap();
    let num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
    assert_eq!(expected_person, read_person);
    assert_eq!(expected_person, inserted_person);
    assert_eq!(expected_person, updated_person);
    assert_eq!(1, num_deleted);
  }
 }
--- a/crates/db_queries/src/source/person_mention.rs
+++ b/crates/db_queries/src/source/person_mention.rs
@ -1,68 +1,68 @@
 use crate::Crud;
 use diesel::{dsl::*, result::Error, *};
-use lemmy_db_schema::source::user_mention::*;
+use lemmy_db_schema::{source::person_mention::*, PersonId, PersonMentionId};
-impl Crud<UserMentionForm> for UserMention {
+impl Crud<PersonMentionForm, PersonMentionId> for PersonMention {
-  fn read(conn: &PgConnection, user_mention_id: i32) -> Result<Self, Error> {
+  fn read(conn: &PgConnection, person_mention_id: PersonMentionId) -> Result<Self, Error> {
-    use lemmy_db_schema::schema::user_mention::dsl::*;
+    use lemmy_db_schema::schema::person_mention::dsl::*;
-    user_mention.find(user_mention_id).first::<Self>(conn)
+    person_mention.find(person_mention_id).first::<Self>(conn)
  }
-  fn create(conn: &PgConnection, user_mention_form: &UserMentionForm) -> Result<Self, Error> {
+  fn create(conn: &PgConnection, person_mention_form: &PersonMentionForm) -> Result<Self, Error> {
-    use lemmy_db_schema::schema::user_mention::dsl::*;
+    use lemmy_db_schema::schema::person_mention::dsl::*;
    // since the return here isnt utilized, we dont need to do an update
    // but get_result doesnt return the existing row here
-    insert_into(user_mention)
+    insert_into(person_mention)
-      .values(user_mention_form)
+      .values(person_mention_form)
      .on_conflict((recipient_id, comment_id))
      .do_update()
-      .set(user_mention_form)
+      .set(person_mention_form)
      .get_result::<Self>(conn)
  }
  fn update(
    conn: &PgConnection,
-    user_mention_id: i32,
+    person_mention_id: PersonMentionId,
-    user_mention_form: &UserMentionForm,
+    person_mention_form: &PersonMentionForm,
  ) -> Result<Self, Error> {
-    use lemmy_db_schema::schema::user_mention::dsl::*;
+    use lemmy_db_schema::schema::person_mention::dsl::*;
-    diesel::update(user_mention.find(user_mention_id))
+    diesel::update(person_mention.find(person_mention_id))
-      .set(user_mention_form)
+      .set(person_mention_form)
      .get_result::<Self>(conn)
  }
 }
-pub trait UserMention_ {
+pub trait PersonMention_ {
  fn update_read(
    conn: &PgConnection,
-    user_mention_id: i32,
+    person_mention_id: PersonMentionId,
    new_read: bool,
-  ) -> Result<UserMention, Error>;
+  ) -> Result<PersonMention, Error>;
  fn mark_all_as_read(
    conn: &PgConnection,
-    for_recipient_id: i32,
+    for_recipient_id: PersonId,
-  ) -> Result<Vec<UserMention>, Error>;
+  ) -> Result<Vec<PersonMention>, Error>;
 }
-impl UserMention_ for UserMention {
+impl PersonMention_ for PersonMention {
  fn update_read(
    conn: &PgConnection,
-    user_mention_id: i32,
+    person_mention_id: PersonMentionId,
    new_read: bool,
-  ) -> Result<UserMention, Error> {
+  ) -> Result<PersonMention, Error> {
-    use lemmy_db_schema::schema::user_mention::dsl::*;
+    use lemmy_db_schema::schema::person_mention::dsl::*;
-    diesel::update(user_mention.find(user_mention_id))
+    diesel::update(person_mention.find(person_mention_id))
      .set(read.eq(new_read))
      .get_result::<Self>(conn)
  }
  fn mark_all_as_read(
    conn: &PgConnection,
-    for_recipient_id: i32,
+    for_recipient_id: PersonId,
-  ) -> Result<Vec<UserMention>, Error> {
+  ) -> Result<Vec<PersonMention>, Error> {
-    use lemmy_db_schema::schema::user_mention::dsl::*;
+    use lemmy_db_schema::schema::person_mention::dsl::*;
    diesel::update(
-      user_mention
+      person_mention
        .filter(recipient_id.eq(for_recipient_id))
        .filter(read.eq(false)),
    )
@ -73,13 +73,13 @@ impl UserMention_ for UserMention {
 #[cfg(test)]
 mod tests {
-  use crate::{establish_unpooled_connection, Crud, ListingType, SortType};
+  use crate::{establish_unpooled_connection, Crud};
  use lemmy_db_schema::source::{
    comment::*,
    community::{Community, CommunityForm},
    person::*,
    person_mention::*,
    post::*,
    user::*,
    user_mention::*,
  };
  use serial_test::serial;
@ -88,28 +88,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "terrylake".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -117,30 +107,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
-    let recipient_form = UserForm {
+    let recipient_form = PersonForm {
      name: "terrylakes recipient".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -148,13 +128,13 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_recipient = User_::create(&conn, &recipient_form).unwrap();
+    let inserted_recipient = Person::create(&conn, &recipient_form).unwrap();
    let new_community = CommunityForm {
      name: "test community lake".to_string(),
      title: "nada".to_owned(),
      description: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      removed: None,
      deleted: None,
      updated: None,
@ -176,7 +156,7 @@ mod tests {
    let new_post = PostForm {
      name: "A test post".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      url: None,
      body: None,
      community_id: inserted_community.id,
@ -199,7 +179,7 @@ mod tests {
    let comment_form = CommentForm {
      content: "A test comment".into(),
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      post_id: inserted_post.id,
      removed: None,
      deleted: None,
@ -213,15 +193,15 @@ mod tests {
    let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
-    let user_mention_form = UserMentionForm {
+    let person_mention_form = PersonMentionForm {
      recipient_id: inserted_recipient.id,
      comment_id: inserted_comment.id,
      read: None,
    };
-    let inserted_mention = UserMention::create(&conn, &user_mention_form).unwrap();
+    let inserted_mention = PersonMention::create(&conn, &person_mention_form).unwrap();
-    let expected_mention = UserMention {
+    let expected_mention = PersonMention {
      id: inserted_mention.id,
      recipient_id: inserted_mention.recipient_id,
      comment_id: inserted_mention.comment_id,
@ -229,14 +209,14 @@ mod tests {
      published: inserted_mention.published,
    };
-    let read_mention = UserMention::read(&conn, inserted_mention.id).unwrap();
+    let read_mention = PersonMention::read(&conn, inserted_mention.id).unwrap();
    let updated_mention =
-      UserMention::update(&conn, inserted_mention.id, &user_mention_form).unwrap();
+      PersonMention::update(&conn, inserted_mention.id, &person_mention_form).unwrap();
    Comment::delete(&conn, inserted_comment.id).unwrap();
    Post::delete(&conn, inserted_post.id).unwrap();
    Community::delete(&conn, inserted_community.id).unwrap();
-    User_::delete(&conn, inserted_user.id).unwrap();
+    Person::delete(&conn, inserted_person.id).unwrap();
-    User_::delete(&conn, inserted_recipient.id).unwrap();
+    Person::delete(&conn, inserted_recipient.id).unwrap();
    assert_eq!(expected_mention, read_mention);
    assert_eq!(expected_mention, inserted_mention);
--- a/crates/db_queries/src/source/post.rs
+++ b/crates/db_queries/src/source/post.rs
@ -12,16 +12,19 @@ use lemmy_db_schema::{
    PostSaved,
    PostSavedForm,
  },
  CommunityId,
  DbUrl,
  PersonId,
  PostId,
 };
-impl Crud<PostForm> for Post {
+impl Crud<PostForm, PostId> for Post {
-  fn read(conn: &PgConnection, post_id: i32) -> Result<Self, Error> {
+  fn read(conn: &PgConnection, post_id: PostId) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    post.find(post_id).first::<Self>(conn)
  }
-  fn delete(conn: &PgConnection, post_id: i32) -> Result<usize, Error> {
+  fn delete(conn: &PgConnection, post_id: PostId) -> Result<usize, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::delete(post.find(post_id)).execute(conn)
  }
@ -31,7 +34,7 @@ impl Crud<PostForm> for Post {
    insert_into(post).values(new_post).get_result::<Self>(conn)
  }
-  fn update(conn: &PgConnection, post_id: i32, new_post: &PostForm) -> Result<Self, Error> {
+  fn update(conn: &PgConnection, post_id: PostId, new_post: &PostForm) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::update(post.find(post_id))
      .set(new_post)
@ -41,24 +44,39 @@ impl Crud<PostForm> for Post {
 pub trait Post_ {
  //fn read(conn: &PgConnection, post_id: i32) -> Result<Post, Error>;
-  fn list_for_community(conn: &PgConnection, the_community_id: i32) -> Result<Vec<Post>, Error>;
+  fn list_for_community(
-  fn update_ap_id(conn: &PgConnection, post_id: i32, apub_id: DbUrl) -> Result<Post, Error>;
+    conn: &PgConnection,
-  fn permadelete_for_creator(conn: &PgConnection, for_creator_id: i32) -> Result<Vec<Post>, Error>;
+    the_community_id: CommunityId,
-  fn update_deleted(conn: &PgConnection, post_id: i32, new_deleted: bool) -> Result<Post, Error>;
+  ) -> Result<Vec<Post>, Error>;
-  fn update_removed(conn: &PgConnection, post_id: i32, new_removed: bool) -> Result<Post, Error>;
+  fn update_ap_id(conn: &PgConnection, post_id: PostId, apub_id: DbUrl) -> Result<Post, Error>;
  fn permadelete_for_creator(
    conn: &PgConnection,
    for_creator_id: PersonId,
  ) -> Result<Vec<Post>, Error>;
  fn update_deleted(conn: &PgConnection, post_id: PostId, new_deleted: bool)
    -> Result<Post, Error>;
  fn update_removed(conn: &PgConnection, post_id: PostId, new_removed: bool)
    -> Result<Post, Error>;
  fn update_removed_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
-    for_community_id: Option<i32>,
+    for_community_id: Option<CommunityId>,
    new_removed: bool,
  ) -> Result<Vec<Post>, Error>;
-  fn update_locked(conn: &PgConnection, post_id: i32, new_locked: bool) -> Result<Post, Error>;
+  fn update_locked(conn: &PgConnection, post_id: PostId, new_locked: bool) -> Result<Post, Error>;
-  fn update_stickied(conn: &PgConnection, post_id: i32, new_stickied: bool) -> Result<Post, Error>;
+  fn update_stickied(
-  fn is_post_creator(user_id: i32, post_creator_id: i32) -> bool;
+    conn: &PgConnection,
    post_id: PostId,
    new_stickied: bool,
  ) -> Result<Post, Error>;
  fn is_post_creator(person_id: PersonId, post_creator_id: PersonId) -> bool;
 }
 impl Post_ for Post {
-  fn list_for_community(conn: &PgConnection, the_community_id: i32) -> Result<Vec<Self>, Error> {
+  fn list_for_community(
    conn: &PgConnection,
    the_community_id: CommunityId,
  ) -> Result<Vec<Self>, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    post
      .filter(community_id.eq(the_community_id))
@ -68,7 +86,7 @@ impl Post_ for Post {
      .load::<Self>(conn)
  }
-  fn update_ap_id(conn: &PgConnection, post_id: i32, apub_id: DbUrl) -> Result<Self, Error> {
+  fn update_ap_id(conn: &PgConnection, post_id: PostId, apub_id: DbUrl) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::update(post.find(post_id))
@ -76,7 +94,10 @@ impl Post_ for Post {
      .get_result::<Self>(conn)
  }
-  fn permadelete_for_creator(conn: &PgConnection, for_creator_id: i32) -> Result<Vec<Self>, Error> {
+  fn permadelete_for_creator(
    conn: &PgConnection,
    for_creator_id: PersonId,
  ) -> Result<Vec<Self>, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    let perma_deleted = "*Permananently Deleted*";
@ -93,14 +114,22 @@ impl Post_ for Post {
      .get_results::<Self>(conn)
  }
-  fn update_deleted(conn: &PgConnection, post_id: i32, new_deleted: bool) -> Result<Self, Error> {
+  fn update_deleted(
    conn: &PgConnection,
    post_id: PostId,
    new_deleted: bool,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::update(post.find(post_id))
      .set((deleted.eq(new_deleted), updated.eq(naive_now())))
      .get_result::<Self>(conn)
  }
-  fn update_removed(conn: &PgConnection, post_id: i32, new_removed: bool) -> Result<Self, Error> {
+  fn update_removed(
    conn: &PgConnection,
    post_id: PostId,
    new_removed: bool,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::update(post.find(post_id))
      .set((removed.eq(new_removed), updated.eq(naive_now())))
@ -109,8 +138,8 @@ impl Post_ for Post {
  fn update_removed_for_creator(
    conn: &PgConnection,
-    for_creator_id: i32,
+    for_creator_id: PersonId,
-    for_community_id: Option<i32>,
+    for_community_id: Option<CommunityId>,
    new_removed: bool,
  ) -> Result<Vec<Self>, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
@ -127,22 +156,26 @@ impl Post_ for Post {
      .get_results::<Self>(conn)
  }
-  fn update_locked(conn: &PgConnection, post_id: i32, new_locked: bool) -> Result<Self, Error> {
+  fn update_locked(conn: &PgConnection, post_id: PostId, new_locked: bool) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::update(post.find(post_id))
      .set(locked.eq(new_locked))
      .get_result::<Self>(conn)
  }
-  fn update_stickied(conn: &PgConnection, post_id: i32, new_stickied: bool) -> Result<Self, Error> {
+  fn update_stickied(
    conn: &PgConnection,
    post_id: PostId,
    new_stickied: bool,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post::dsl::*;
    diesel::update(post.find(post_id))
      .set(stickied.eq(new_stickied))
      .get_result::<Self>(conn)
  }
-  fn is_post_creator(user_id: i32, post_creator_id: i32) -> bool {
+  fn is_post_creator(person_id: PersonId, post_creator_id: PersonId) -> bool {
-    user_id == post_creator_id
+    person_id == post_creator_id
  }
 }
@ -163,22 +196,22 @@ impl ApubObject<PostForm> for Post {
  }
 }
-impl Likeable<PostLikeForm> for PostLike {
+impl Likeable<PostLikeForm, PostId> for PostLike {
  fn like(conn: &PgConnection, post_like_form: &PostLikeForm) -> Result<Self, Error> {
    use lemmy_db_schema::schema::post_like::dsl::*;
    insert_into(post_like)
      .values(post_like_form)
-      .on_conflict((post_id, user_id))
+      .on_conflict((post_id, person_id))
      .do_update()
      .set(post_like_form)
      .get_result::<Self>(conn)
  }
-  fn remove(conn: &PgConnection, user_id: i32, post_id: i32) -> Result<usize, Error> {
+  fn remove(conn: &PgConnection, person_id: PersonId, post_id: PostId) -> Result<usize, Error> {
    use lemmy_db_schema::schema::post_like::dsl;
    diesel::delete(
      dsl::post_like
        .filter(dsl::post_id.eq(post_id))
-        .filter(dsl::user_id.eq(user_id)),
+        .filter(dsl::person_id.eq(person_id)),
    )
    .execute(conn)
  }
@ -189,7 +222,7 @@ impl Saveable<PostSavedForm> for PostSaved {
    use lemmy_db_schema::schema::post_saved::dsl::*;
    insert_into(post_saved)
      .values(post_saved_form)
-      .on_conflict((post_id, user_id))
+      .on_conflict((post_id, person_id))
      .do_update()
      .set(post_saved_form)
      .get_result::<Self>(conn)
@ -199,7 +232,7 @@ impl Saveable<PostSavedForm> for PostSaved {
    diesel::delete(
      post_saved
        .filter(post_id.eq(post_saved_form.post_id))
-        .filter(user_id.eq(post_saved_form.user_id)),
+        .filter(person_id.eq(post_saved_form.person_id)),
    )
    .execute(conn)
  }
@ -218,7 +251,7 @@ impl Readable<PostReadForm> for PostRead {
    diesel::delete(
      post_read
        .filter(post_id.eq(post_read_form.post_id))
-        .filter(user_id.eq(post_read_form.user_id)),
+        .filter(person_id.eq(post_read_form.person_id)),
    )
    .execute(conn)
  }
@ -226,10 +259,10 @@ impl Readable<PostReadForm> for PostRead {
 #[cfg(test)]
 mod tests {
-  use crate::{establish_unpooled_connection, source::post::*, ListingType, SortType};
+  use crate::{establish_unpooled_connection, source::post::*};
  use lemmy_db_schema::source::{
    community::{Community, CommunityForm},
-    user::*,
+    person::*,
  };
  use serial_test::serial;
@ -238,28 +271,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let new_user = UserForm {
+    let new_person = PersonForm {
      name: "jim".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -267,13 +290,13 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_user = User_::create(&conn, &new_user).unwrap();
+    let inserted_person = Person::create(&conn, &new_person).unwrap();
    let new_community = CommunityForm {
      name: "test community_3".to_string(),
      title: "nada".to_owned(),
      description: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      removed: None,
      deleted: None,
      updated: None,
@ -297,7 +320,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      removed: None,
      deleted: None,
@ -321,7 +344,7 @@ mod tests {
      name: "A test post".into(),
      url: None,
      body: None,
-      creator_id: inserted_user.id,
+      creator_id: inserted_person.id,
      community_id: inserted_community.id,
      published: inserted_post.published,
      removed: false,
@ -341,7 +364,7 @@ mod tests {
    // Post Like
    let post_like_form = PostLikeForm {
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      score: 1,
    };
@ -350,7 +373,7 @@ mod tests {
    let expected_post_like = PostLike {
      id: inserted_post_like.id,
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      published: inserted_post_like.published,
      score: 1,
    };
@ -358,7 +381,7 @@ mod tests {
    // Post Save
    let post_saved_form = PostSavedForm {
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
    };
    let inserted_post_saved = PostSaved::save(&conn, &post_saved_form).unwrap();
@ -366,14 +389,14 @@ mod tests {
    let expected_post_saved = PostSaved {
      id: inserted_post_saved.id,
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      published: inserted_post_saved.published,
    };
    // Post Read
    let post_read_form = PostReadForm {
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
    };
    let inserted_post_read = PostRead::mark_as_read(&conn, &post_read_form).unwrap();
@ -381,18 +404,18 @@ mod tests {
    let expected_post_read = PostRead {
      id: inserted_post_read.id,
      post_id: inserted_post.id,
-      user_id: inserted_user.id,
+      person_id: inserted_person.id,
      published: inserted_post_read.published,
    };
    let read_post = Post::read(&conn, inserted_post.id).unwrap();
    let updated_post = Post::update(&conn, inserted_post.id, &new_post).unwrap();
-    let like_removed = PostLike::remove(&conn, inserted_user.id, inserted_post.id).unwrap();
+    let like_removed = PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
    let saved_removed = PostSaved::unsave(&conn, &post_saved_form).unwrap();
    let read_removed = PostRead::mark_as_unread(&conn, &post_read_form).unwrap();
    let num_deleted = Post::delete(&conn, inserted_post.id).unwrap();
    Community::delete(&conn, inserted_community.id).unwrap();
-    User_::delete(&conn, inserted_user.id).unwrap();
+    Person::delete(&conn, inserted_person.id).unwrap();
    assert_eq!(expected_post, read_post);
    assert_eq!(expected_post, inserted_post);
--- a/crates/db_queries/src/source/post_report.rs
+++ b/crates/db_queries/src/source/post_report.rs
@ -1,6 +1,6 @@
 use crate::Reportable;
 use diesel::{dsl::*, result::Error, *};
-use lemmy_db_schema::{naive_now, source::post_report::*};
+use lemmy_db_schema::{naive_now, source::post_report::*, PersonId};
 impl Reportable<PostReportForm> for PostReport {
  /// creates a post report and returns it
@ -19,7 +19,11 @@ impl Reportable<PostReportForm> for PostReport {
  /// * `conn` - the postgres connection
  /// * `report_id` - the id of the report to resolve
  /// * `by_resolver_id` - the id of the user resolving the report
-  fn resolve(conn: &PgConnection, report_id: i32, by_resolver_id: i32) -> Result<usize, Error> {
+  fn resolve(
    conn: &PgConnection,
    report_id: i32,
    by_resolver_id: PersonId,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::post_report::dsl::*;
    update(post_report.find(report_id))
      .set((
@ -35,7 +39,11 @@ impl Reportable<PostReportForm> for PostReport {
  /// * `conn` - the postgres connection
  /// * `report_id` - the id of the report to unresolve
  /// * `by_resolver_id` - the id of the user unresolving the report
-  fn unresolve(conn: &PgConnection, report_id: i32, by_resolver_id: i32) -> Result<usize, Error> {
+  fn unresolve(
    conn: &PgConnection,
    report_id: i32,
    by_resolver_id: PersonId,
  ) -> Result<usize, Error> {
    use lemmy_db_schema::schema::post_report::dsl::*;
    update(post_report.find(report_id))
      .set((
--- a/crates/db_queries/src/source/private_message.rs
+++ b/crates/db_queries/src/source/private_message.rs
@ -1,9 +1,9 @@
 use crate::{ApubObject, Crud};
 use diesel::{dsl::*, result::Error, *};
-use lemmy_db_schema::{naive_now, source::private_message::*, DbUrl};
+use lemmy_db_schema::{naive_now, source::private_message::*, DbUrl, PersonId, PrivateMessageId};
-impl Crud<PrivateMessageForm> for PrivateMessage {
+impl Crud<PrivateMessageForm, PrivateMessageId> for PrivateMessage {
-  fn read(conn: &PgConnection, private_message_id: i32) -> Result<Self, Error> {
+  fn read(conn: &PgConnection, private_message_id: PrivateMessageId) -> Result<Self, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
    private_message.find(private_message_id).first::<Self>(conn)
  }
@ -17,7 +17,7 @@ impl Crud<PrivateMessageForm> for PrivateMessage {
  fn update(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    private_message_form: &PrivateMessageForm,
  ) -> Result<Self, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
@ -52,34 +52,34 @@ impl ApubObject<PrivateMessageForm> for PrivateMessage {
 pub trait PrivateMessage_ {
  fn update_ap_id(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    apub_id: DbUrl,
  ) -> Result<PrivateMessage, Error>;
  fn update_content(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    new_content: &str,
  ) -> Result<PrivateMessage, Error>;
  fn update_deleted(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    new_deleted: bool,
  ) -> Result<PrivateMessage, Error>;
  fn update_read(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    new_read: bool,
  ) -> Result<PrivateMessage, Error>;
  fn mark_all_as_read(
    conn: &PgConnection,
-    for_recipient_id: i32,
+    for_recipient_id: PersonId,
  ) -> Result<Vec<PrivateMessage>, Error>;
 }
 impl PrivateMessage_ for PrivateMessage {
  fn update_ap_id(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    apub_id: DbUrl,
  ) -> Result<PrivateMessage, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
@ -91,7 +91,7 @@ impl PrivateMessage_ for PrivateMessage {
  fn update_content(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    new_content: &str,
  ) -> Result<PrivateMessage, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
@ -102,7 +102,7 @@ impl PrivateMessage_ for PrivateMessage {
  fn update_deleted(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    new_deleted: bool,
  ) -> Result<PrivateMessage, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
@ -113,7 +113,7 @@ impl PrivateMessage_ for PrivateMessage {
  fn update_read(
    conn: &PgConnection,
-    private_message_id: i32,
+    private_message_id: PrivateMessageId,
    new_read: bool,
  ) -> Result<PrivateMessage, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
@ -124,7 +124,7 @@ impl PrivateMessage_ for PrivateMessage {
  fn mark_all_as_read(
    conn: &PgConnection,
-    for_recipient_id: i32,
+    for_recipient_id: PersonId,
  ) -> Result<Vec<PrivateMessage>, Error> {
    use lemmy_db_schema::schema::private_message::dsl::*;
    diesel::update(
@ -139,14 +139,8 @@ impl PrivateMessage_ for PrivateMessage {
 #[cfg(test)]
 mod tests {
-  use crate::{
+  use crate::{establish_unpooled_connection, source::private_message::PrivateMessage_, Crud};
-    establish_unpooled_connection,
+  use lemmy_db_schema::source::{person::*, private_message::*};
    source::private_message::PrivateMessage_,
    Crud,
    ListingType,
    SortType,
  };
  use lemmy_db_schema::source::{private_message::*, user::*};
  use serial_test::serial;
  #[test]
@ -154,28 +148,18 @@ mod tests {
  fn test_crud() {
    let conn = establish_unpooled_connection();
-    let creator_form = UserForm {
+    let creator_form = PersonForm {
      name: "creator_pm".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -183,30 +167,20 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_creator = User_::create(&conn, &creator_form).unwrap();
+    let inserted_creator = Person::create(&conn, &creator_form).unwrap();
-    let recipient_form = UserForm {
+    let recipient_form = PersonForm {
      name: "recipient_pm".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
-      admin: false,
+      banned: None,
-      banned: Some(false),
+      deleted: None,
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
-      local: true,
+      local: None,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
@ -214,7 +188,7 @@ mod tests {
      shared_inbox_url: None,
    };
-    let inserted_recipient = User_::create(&conn, &recipient_form).unwrap();
+    let inserted_recipient = Person::create(&conn, &recipient_form).unwrap();
    let private_message_form = PrivateMessageForm {
      content: "A test private message".into(),
@ -250,8 +224,8 @@ mod tests {
      PrivateMessage::update_deleted(&conn, inserted_private_message.id, true).unwrap();
    let marked_read_private_message =
      PrivateMessage::update_read(&conn, inserted_private_message.id, true).unwrap();
-    User_::delete(&conn, inserted_creator.id).unwrap();
+    Person::delete(&conn, inserted_creator.id).unwrap();
-    User_::delete(&conn, inserted_recipient.id).unwrap();
+    Person::delete(&conn, inserted_recipient.id).unwrap();
    assert_eq!(expected_private_message, read_private_message);
    assert_eq!(expected_private_message, updated_private_message);
--- a/crates/db_queries/src/source/site.rs
+++ b/crates/db_queries/src/source/site.rs
@ -1,8 +1,8 @@
 use crate::Crud;
 use diesel::{dsl::*, result::Error, *};
-use lemmy_db_schema::{naive_now, source::site::*};
+use lemmy_db_schema::{naive_now, source::site::*, PersonId};
-impl Crud<SiteForm> for Site {
+impl Crud<SiteForm, i32> for Site {
  fn read(conn: &PgConnection, _site_id: i32) -> Result<Self, Error> {
    use lemmy_db_schema::schema::site::dsl::*;
    site.first::<Self>(conn)
@ -26,12 +26,12 @@ impl Crud<SiteForm> for Site {
 }
 pub trait Site_ {
-  fn transfer(conn: &PgConnection, new_creator_id: i32) -> Result<Site, Error>;
+  fn transfer(conn: &PgConnection, new_creator_id: PersonId) -> Result<Site, Error>;
  fn read_simple(conn: &PgConnection) -> Result<Site, Error>;
 }
 impl Site_ for Site {
-  fn transfer(conn: &PgConnection, new_creator_id: i32) -> Result<Site, Error> {
+  fn transfer(conn: &PgConnection, new_creator_id: PersonId) -> Result<Site, Error> {
    use lemmy_db_schema::schema::site::dsl::*;
    diesel::update(site.find(1))
      .set((creator_id.eq(new_creator_id), updated.eq(naive_now())))
--- a/crates/db_queries/src/source/user.rs
+++ b/crates/db_queries/src/source/user.rs
@ -1,460 +0,0 @@
 use crate::{is_email_regex, ApubObject, Crud, ToSafeSettings};
 use bcrypt::{hash, DEFAULT_COST};
 use diesel::{dsl::*, result::Error, *};
 use lemmy_db_schema::{
  naive_now,
  schema::user_::dsl::*,
  source::user::{UserForm, UserSafeSettings, User_},
  DbUrl,
 };
 use lemmy_utils::settings::structs::Settings;
 mod safe_type {
  use crate::ToSafe;
  use lemmy_db_schema::{schema::user_::columns::*, source::user::User_};
  type Columns = (
    id,
    name,
    preferred_username,
    avatar,
    admin,
    banned,
    published,
    updated,
    matrix_user_id,
    actor_id,
    bio,
    local,
    banner,
    deleted,
    inbox_url,
    shared_inbox_url,
  );
  impl ToSafe for User_ {
    type SafeColumns = Columns;
    fn safe_columns_tuple() -> Self::SafeColumns {
      (
        id,
        name,
        preferred_username,
        avatar,
        admin,
        banned,
        published,
        updated,
        matrix_user_id,
        actor_id,
        bio,
        local,
        banner,
        deleted,
        inbox_url,
        shared_inbox_url,
      )
    }
  }
 }
 mod safe_type_alias_1 {
  use crate::ToSafe;
  use lemmy_db_schema::{schema::user_alias_1::columns::*, source::user::UserAlias1};
  type Columns = (
    id,
    name,
    preferred_username,
    avatar,
    admin,
    banned,
    published,
    updated,
    matrix_user_id,
    actor_id,
    bio,
    local,
    banner,
    deleted,
  );
  impl ToSafe for UserAlias1 {
    type SafeColumns = Columns;
    fn safe_columns_tuple() -> Self::SafeColumns {
      (
        id,
        name,
        preferred_username,
        avatar,
        admin,
        banned,
        published,
        updated,
        matrix_user_id,
        actor_id,
        bio,
        local,
        banner,
        deleted,
      )
    }
  }
 }
 mod safe_type_alias_2 {
  use crate::ToSafe;
  use lemmy_db_schema::{schema::user_alias_2::columns::*, source::user::UserAlias2};
  type Columns = (
    id,
    name,
    preferred_username,
    avatar,
    admin,
    banned,
    published,
    updated,
    matrix_user_id,
    actor_id,
    bio,
    local,
    banner,
    deleted,
  );
  impl ToSafe for UserAlias2 {
    type SafeColumns = Columns;
    fn safe_columns_tuple() -> Self::SafeColumns {
      (
        id,
        name,
        preferred_username,
        avatar,
        admin,
        banned,
        published,
        updated,
        matrix_user_id,
        actor_id,
        bio,
        local,
        banner,
        deleted,
      )
    }
  }
 }
 mod safe_settings_type {
  use crate::ToSafeSettings;
  use lemmy_db_schema::{schema::user_::columns::*, source::user::User_};
  type Columns = (
    id,
    name,
    preferred_username,
    email,
    avatar,
    admin,
    banned,
    published,
    updated,
    show_nsfw,
    theme,
    default_sort_type,
    default_listing_type,
    lang,
    show_avatars,
    send_notifications_to_email,
    matrix_user_id,
    actor_id,
    bio,
    local,
    last_refreshed_at,
    banner,
    deleted,
  );
  impl ToSafeSettings for User_ {
    type SafeSettingsColumns = Columns;
    fn safe_settings_columns_tuple() -> Self::SafeSettingsColumns {
      (
        id,
        name,
        preferred_username,
        email,
        avatar,
        admin,
        banned,
        published,
        updated,
        show_nsfw,
        theme,
        default_sort_type,
        default_listing_type,
        lang,
        show_avatars,
        send_notifications_to_email,
        matrix_user_id,
        actor_id,
        bio,
        local,
        last_refreshed_at,
        banner,
        deleted,
      )
    }
  }
 }
 pub trait UserSafeSettings_ {
  fn read(conn: &PgConnection, user_id: i32) -> Result<UserSafeSettings, Error>;
 }
 impl UserSafeSettings_ for UserSafeSettings {
  fn read(conn: &PgConnection, user_id: i32) -> Result<Self, Error> {
    user_
      .select(User_::safe_settings_columns_tuple())
      .filter(deleted.eq(false))
      .find(user_id)
      .first::<Self>(conn)
  }
 }
 impl Crud<UserForm> for User_ {
  fn read(conn: &PgConnection, user_id: i32) -> Result<Self, Error> {
    user_
      .filter(deleted.eq(false))
      .find(user_id)
      .first::<Self>(conn)
  }
  fn delete(conn: &PgConnection, user_id: i32) -> Result<usize, Error> {
    diesel::delete(user_.find(user_id)).execute(conn)
  }
  fn create(conn: &PgConnection, form: &UserForm) -> Result<Self, Error> {
    insert_into(user_).values(form).get_result::<Self>(conn)
  }
  fn update(conn: &PgConnection, user_id: i32, form: &UserForm) -> Result<Self, Error> {
    diesel::update(user_.find(user_id))
      .set(form)
      .get_result::<Self>(conn)
  }
 }
 impl ApubObject<UserForm> for User_ {
  fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Self, Error> {
    use lemmy_db_schema::schema::user_::dsl::*;
    user_
      .filter(deleted.eq(false))
      .filter(actor_id.eq(object_id))
      .first::<Self>(conn)
  }
  fn upsert(conn: &PgConnection, user_form: &UserForm) -> Result<User_, Error> {
    insert_into(user_)
      .values(user_form)
      .on_conflict(actor_id)
      .do_update()
      .set(user_form)
      .get_result::<Self>(conn)
  }
 }
 pub trait User {
  fn register(conn: &PgConnection, form: &UserForm) -> Result<User_, Error>;
  fn update_password(conn: &PgConnection, user_id: i32, new_password: &str)
    -> Result<User_, Error>;
  fn read_from_name(conn: &PgConnection, from_user_name: &str) -> Result<User_, Error>;
  fn add_admin(conn: &PgConnection, user_id: i32, added: bool) -> Result<User_, Error>;
  fn ban_user(conn: &PgConnection, user_id: i32, ban: bool) -> Result<User_, Error>;
  fn find_by_email_or_username(
    conn: &PgConnection,
    username_or_email: &str,
  ) -> Result<User_, Error>;
  fn find_by_username(conn: &PgConnection, username: &str) -> Result<User_, Error>;
  fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<User_, Error>;
  fn get_profile_url(&self, hostname: &str) -> String;
  fn mark_as_updated(conn: &PgConnection, user_id: i32) -> Result<User_, Error>;
  fn delete_account(conn: &PgConnection, user_id: i32) -> Result<User_, Error>;
 }
 impl User for User_ {
  fn register(conn: &PgConnection, form: &UserForm) -> Result<Self, Error> {
    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;
    Self::create(&conn, &edited_user)
  }
  // TODO do more individual updates like these
  fn update_password(conn: &PgConnection, user_id: i32, new_password: &str) -> Result<Self, Error> {
    let password_hash = hash(new_password, DEFAULT_COST).expect("Couldn't hash password");
    diesel::update(user_.find(user_id))
      .set((
        password_encrypted.eq(password_hash),
        updated.eq(naive_now()),
      ))
      .get_result::<Self>(conn)
  }
  fn read_from_name(conn: &PgConnection, from_user_name: &str) -> Result<Self, Error> {
    user_
      .filter(local.eq(true))
      .filter(deleted.eq(false))
      .filter(name.eq(from_user_name))
      .first::<Self>(conn)
  }
  fn add_admin(conn: &PgConnection, user_id: i32, added: bool) -> Result<Self, Error> {
    diesel::update(user_.find(user_id))
      .set(admin.eq(added))
      .get_result::<Self>(conn)
  }
  fn ban_user(conn: &PgConnection, user_id: i32, ban: bool) -> Result<Self, Error> {
    diesel::update(user_.find(user_id))
      .set(banned.eq(ban))
      .get_result::<Self>(conn)
  }
  fn find_by_email_or_username(
    conn: &PgConnection,
    username_or_email: &str,
  ) -> Result<Self, Error> {
    if is_email_regex(username_or_email) {
      Self::find_by_email(conn, username_or_email)
    } else {
      Self::find_by_username(conn, username_or_email)
    }
  }
  fn find_by_username(conn: &PgConnection, username: &str) -> Result<User_, Error> {
    user_
      .filter(deleted.eq(false))
      .filter(local.eq(true))
      .filter(name.ilike(username))
      .first::<User_>(conn)
  }
  fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<User_, Error> {
    user_
      .filter(deleted.eq(false))
      .filter(local.eq(true))
      .filter(email.eq(from_email))
      .first::<User_>(conn)
  }
  fn get_profile_url(&self, hostname: &str) -> String {
    format!(
      "{}://{}/u/{}",
      Settings::get().get_protocol_string(),
      hostname,
      self.name
    )
  }
  fn mark_as_updated(conn: &PgConnection, user_id: i32) -> Result<User_, Error> {
    diesel::update(user_.find(user_id))
      .set((last_refreshed_at.eq(naive_now()),))
      .get_result::<Self>(conn)
  }
  fn delete_account(conn: &PgConnection, user_id: i32) -> Result<User_, Error> {
    diesel::update(user_.find(user_id))
      .set((
        preferred_username.eq::<Option<String>>(None),
        email.eq::<Option<String>>(None),
        matrix_user_id.eq::<Option<String>>(None),
        bio.eq::<Option<String>>(None),
        deleted.eq(true),
        updated.eq(naive_now()),
      ))
      .get_result::<Self>(conn)
  }
 }
 #[cfg(test)]
 mod tests {
  use crate::{establish_unpooled_connection, source::user::*, ListingType, SortType};
  use serial_test::serial;
  #[test]
  #[serial]
  fn test_crud() {
    let conn = establish_unpooled_connection();
    let new_user = UserForm {
      name: "thommy".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
      admin: false,
      banned: Some(false),
      published: None,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: None,
      bio: None,
      local: true,
      private_key: None,
      public_key: None,
      last_refreshed_at: None,
      inbox_url: None,
      shared_inbox_url: None,
    };
    let inserted_user = User_::create(&conn, &new_user).unwrap();
    let expected_user = User_ {
      id: inserted_user.id,
      name: "thommy".into(),
      preferred_username: None,
      password_encrypted: "nope".into(),
      email: None,
      matrix_user_id: None,
      avatar: None,
      banner: None,
      admin: false,
      banned: false,
      published: inserted_user.published,
      updated: None,
      show_nsfw: false,
      theme: "browser".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,
      actor_id: inserted_user.actor_id.to_owned(),
      bio: None,
      local: true,
      private_key: None,
      public_key: None,
      last_refreshed_at: inserted_user.published,
      deleted: false,
      inbox_url: inserted_user.inbox_url.to_owned(),
      shared_inbox_url: None,
    };
    let read_user = User_::read(&conn, inserted_user.id).unwrap();
    let updated_user = User_::update(&conn, inserted_user.id, &new_user).unwrap();
    let num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
    assert_eq!(expected_user, read_user);
    assert_eq!(expected_user, inserted_user);
    assert_eq!(expected_user, updated_user);
    assert_eq!(1, num_deleted);
  }
 }
--- a/crates/db_schema/Cargo.toml
+++ b/crates/db_schema/Cargo.toml
@ -13,3 +13,4 @@ serde = { version = "1.0.123", features = ["derive"] }
 serde_json = { version = "1.0.61", features = ["preserve_order"] }
 log = "0.4.14"
 url = { version = "2.2.1", features = ["serde"] }
 diesel-derive-newtype = "0.1"
--- a/crates/db_schema/src/lib.rs
+++ b/crates/db_schema/src/lib.rs
@ -1,6 +1,9 @@
 #[macro_use]
 extern crate diesel;
 #[macro_use]
 extern crate diesel_derive_newtype;
 use chrono::NaiveDateTime;
 use diesel::{
  backend::Backend,
@ -10,6 +13,7 @@ use diesel::{
 };
 use serde::{Deserialize, Serialize};
 use std::{
  fmt,
  fmt::{Display, Formatter},
  io::Write,
 };
@ -18,6 +22,45 @@ use url::Url;
 pub mod schema;
 pub mod source;
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct PostId(pub i32);
 impl fmt::Display for PostId {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
    write!(f, "{}", self.0)
  }
 }
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct PersonId(pub i32);
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct CommentId(pub i32);
 impl fmt::Display for CommentId {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
    write!(f, "{}", self.0)
  }
 }
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct CommunityId(pub i32);
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct LocalUserId(pub i32);
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct PrivateMessageId(i32);
 impl fmt::Display for PrivateMessageId {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
    write!(f, "{}", self.0)
  }
 }
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, DieselNewType)]
 pub struct PersonMentionId(i32);
 #[repr(transparent)]
 #[derive(Clone, PartialEq, Serialize, Deserialize, Debug, AsExpression, FromSqlRow)]
 #[sql_type = "Text"]
--- a/crates/db_schema/src/schema.rs
+++ b/crates/db_schema/src/schema.rs
@ -41,7 +41,7 @@ table! {
 table! {
    comment_like (id) {
        id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        comment_id -> Int4,
        post_id -> Int4,
        score -> Int2,
@ -67,7 +67,7 @@ table! {
    comment_saved (id) {
        id -> Int4,
        comment_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        published -> Timestamp,
    }
 }
@ -89,11 +89,11 @@ table! {
        private_key -> Nullable<Text>,
        public_key -> Nullable<Text>,
        last_refreshed_at -> Timestamp,
-        icon -> Nullable<Text>,
+        icon -> Nullable<Varchar>,
-        banner -> Nullable<Text>,
+        banner -> Nullable<Varchar>,
-        followers_url -> Text,
+        followers_url -> Varchar,
-        inbox_url -> Text,
+        inbox_url -> Varchar,
-        shared_inbox_url -> Nullable<Text>,
+        shared_inbox_url -> Nullable<Varchar>,
    }
 }
@ -116,7 +116,7 @@ table! {
    community_follower (id) {
        id -> Int4,
        community_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        published -> Timestamp,
        pending -> Nullable<Bool>,
    }
@ -126,25 +126,44 @@ table! {
    community_moderator (id) {
        id -> Int4,
        community_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        published -> Timestamp,
    }
 }
 table! {
-    community_user_ban (id) {
+    community_person_ban (id) {
        id -> Int4,
        community_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        published -> Timestamp,
    }
 }
 table! {
    local_user (id) {
        id -> Int4,
        person_id -> Int4,
        password_encrypted -> Text,
        email -> Nullable<Text>,
        admin -> Bool,
        show_nsfw -> Bool,
        theme -> Varchar,
        default_sort_type -> Int2,
        default_listing_type -> Int2,
        lang -> Varchar,
        show_avatars -> Bool,
        send_notifications_to_email -> Bool,
        matrix_user_id -> Nullable<Text>,
        validator_time -> Timestamp,
    }
 }
 table! {
    mod_add (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
-        other_user_id -> Int4,
+        other_person_id -> Int4,
        removed -> Nullable<Bool>,
        when_ -> Timestamp,
    }
@ -153,8 +172,8 @@ table! {
 table! {
    mod_add_community (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
-        other_user_id -> Int4,
+        other_person_id -> Int4,
        community_id -> Int4,
        removed -> Nullable<Bool>,
        when_ -> Timestamp,
@ -164,8 +183,8 @@ table! {
 table! {
    mod_ban (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
-        other_user_id -> Int4,
+        other_person_id -> Int4,
        reason -> Nullable<Text>,
        banned -> Nullable<Bool>,
        expires -> Nullable<Timestamp>,
@ -176,8 +195,8 @@ table! {
 table! {
    mod_ban_from_community (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
-        other_user_id -> Int4,
+        other_person_id -> Int4,
        community_id -> Int4,
        reason -> Nullable<Text>,
        banned -> Nullable<Bool>,
@ -189,7 +208,7 @@ table! {
 table! {
    mod_lock_post (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
        post_id -> Int4,
        locked -> Nullable<Bool>,
        when_ -> Timestamp,
@ -199,7 +218,7 @@ table! {
 table! {
    mod_remove_comment (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
        comment_id -> Int4,
        reason -> Nullable<Text>,
        removed -> Nullable<Bool>,
@ -210,7 +229,7 @@ table! {
 table! {
    mod_remove_community (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
        community_id -> Int4,
        reason -> Nullable<Text>,
        removed -> Nullable<Bool>,
@ -222,7 +241,7 @@ table! {
 table! {
    mod_remove_post (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
        post_id -> Int4,
        reason -> Nullable<Text>,
        removed -> Nullable<Bool>,
@ -233,7 +252,7 @@ table! {
 table! {
    mod_sticky_post (id) {
        id -> Int4,
-        mod_user_id -> Int4,
+        mod_person_id -> Int4,
        post_id -> Int4,
        stickied -> Nullable<Bool>,
        when_ -> Timestamp,
@ -243,9 +262,60 @@ table! {
 table! {
    password_reset_request (id) {
        id -> Int4,
        user_id -> Int4,
        token_encrypted -> Text,
        published -> Timestamp,
        local_user_id -> Int4,
    }
 }
 table! {
    person (id) {
        id -> Int4,
        name -> Varchar,
        preferred_username -> Nullable<Varchar>,
        avatar -> Nullable<Varchar>,
        banned -> Bool,
        published -> Timestamp,
        updated -> Nullable<Timestamp>,
        actor_id -> Varchar,
        bio -> Nullable<Text>,
        local -> Bool,
        private_key -> Nullable<Text>,
        public_key -> Nullable<Text>,
        last_refreshed_at -> Timestamp,
        banner -> Nullable<Varchar>,
        deleted -> Bool,
        inbox_url -> Varchar,
        shared_inbox_url -> Nullable<Varchar>,
    }
 }
 table! {
    person_aggregates (id) {
        id -> Int4,
        person_id -> Int4,
        post_count -> Int8,
        post_score -> Int8,
        comment_count -> Int8,
        comment_score -> Int8,
    }
 }
 table! {
    person_ban (id) {
        id -> Int4,
        person_id -> Int4,
        published -> Timestamp,
    }
 }
 table! {
    person_mention (id) {
        id -> Int4,
        recipient_id -> Int4,
        comment_id -> Int4,
        read -> Bool,
        published -> Timestamp,
    }
 }
@ -253,7 +323,7 @@ table! {
    post (id) {
        id -> Int4,
        name -> Varchar,
-        url -> Nullable<Text>,
+        url -> Nullable<Varchar>,
        body -> Nullable<Text>,
        creator_id -> Int4,
        community_id -> Int4,
@ -292,7 +362,7 @@ table! {
    post_like (id) {
        id -> Int4,
        post_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        score -> Int2,
        published -> Timestamp,
    }
@ -302,7 +372,7 @@ table! {
    post_read (id) {
        id -> Int4,
        post_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        published -> Timestamp,
    }
 }
@ -327,7 +397,7 @@ table! {
    post_saved (id) {
        id -> Int4,
        post_id -> Int4,
-        user_id -> Int4,
+        person_id -> Int4,
        published -> Timestamp,
    }
 }
@ -358,8 +428,8 @@ table! {
        enable_downvotes -> Bool,
        open_registration -> Bool,
        enable_nsfw -> Bool,
-        icon -> Nullable<Text>,
+        icon -> Nullable<Varchar>,
-        banner -> Nullable<Text>,
+        banner -> Nullable<Varchar>,
    }
 }
@ -378,68 +448,6 @@ table! {
    }
 }
 table! {
    user_ (id) {
        id -> Int4,
        name -> Varchar,
        preferred_username -> Nullable<Varchar>,
        password_encrypted -> Text,
        email -> Nullable<Text>,
        avatar -> Nullable<Text>,
        admin -> Bool,
        banned -> Bool,
        published -> Timestamp,
        updated -> Nullable<Timestamp>,
        show_nsfw -> Bool,
        theme -> Varchar,
        default_sort_type -> Int2,
        default_listing_type -> Int2,
        lang -> Varchar,
        show_avatars -> Bool,
        send_notifications_to_email -> Bool,
        matrix_user_id -> Nullable<Text>,
        actor_id -> Varchar,
        bio -> Nullable<Text>,
        local -> Bool,
        private_key -> Nullable<Text>,
        public_key -> Nullable<Text>,
        last_refreshed_at -> Timestamp,
        banner -> Nullable<Text>,
        deleted -> Bool,
        inbox_url -> Text,
        shared_inbox_url -> Nullable<Text>,
    }
 }
 table! {
    user_aggregates (id) {
        id -> Int4,
        user_id -> Int4,
        post_count -> Int8,
        post_score -> Int8,
        comment_count -> Int8,
        comment_score -> Int8,
    }
 }
 table! {
    user_ban (id) {
        id -> Int4,
        user_id -> Int4,
        published -> Timestamp,
    }
 }
 table! {
    user_mention (id) {
        id -> Int4,
        recipient_id -> Int4,
        comment_id -> Int4,
        read -> Bool,
        published -> Timestamp,
    }
 }
 // These are necessary since diesel doesn't have self joins / aliases
 table! {
    comment_alias_1 (id) {
@ -459,122 +467,105 @@ table! {
 }
 table! {
-    user_alias_1 (id) {
+    person_alias_1 (id) {
        id -> Int4,
        name -> Varchar,
        preferred_username -> Nullable<Varchar>,
-        password_encrypted -> Text,
+        avatar -> Nullable<Varchar>,
        email -> Nullable<Text>,
        avatar -> Nullable<Text>,
        admin -> Bool,
        banned -> Bool,
        published -> Timestamp,
        updated -> Nullable<Timestamp>,
        show_nsfw -> Bool,
        theme -> Varchar,
        default_sort_type -> Int2,
        default_listing_type -> Int2,
        lang -> Varchar,
        show_avatars -> Bool,
        send_notifications_to_email -> Bool,
        matrix_user_id -> Nullable<Text>,
        actor_id -> Varchar,
        bio -> Nullable<Text>,
        local -> Bool,
        private_key -> Nullable<Text>,
        public_key -> Nullable<Text>,
        last_refreshed_at -> Timestamp,
-        banner -> Nullable<Text>,
+        banner -> Nullable<Varchar>,
        deleted -> Bool,
        inbox_url -> Varchar,
        shared_inbox_url -> Nullable<Varchar>,
    }
 }
 table! {
-    user_alias_2 (id) {
+    person_alias_2 (id) {
        id -> Int4,
        name -> Varchar,
        preferred_username -> Nullable<Varchar>,
-        password_encrypted -> Text,
+        avatar -> Nullable<Varchar>,
        email -> Nullable<Text>,
        avatar -> Nullable<Text>,
        admin -> Bool,
        banned -> Bool,
        published -> Timestamp,
        updated -> Nullable<Timestamp>,
        show_nsfw -> Bool,
        theme -> Varchar,
        default_sort_type -> Int2,
        default_listing_type -> Int2,
        lang -> Varchar,
        show_avatars -> Bool,
        send_notifications_to_email -> Bool,
        matrix_user_id -> Nullable<Text>,
        actor_id -> Varchar,
        bio -> Nullable<Text>,
        local -> Bool,
        private_key -> Nullable<Text>,
        public_key -> Nullable<Text>,
        last_refreshed_at -> Timestamp,
-        banner -> Nullable<Text>,
+        banner -> Nullable<Varchar>,
        deleted -> Bool,
        inbox_url -> Varchar,
        shared_inbox_url -> Nullable<Varchar>,
    }
 }
-joinable!(comment_alias_1 -> user_alias_1 (creator_id));
+joinable!(comment_alias_1 -> person_alias_1 (creator_id));
 joinable!(comment -> comment_alias_1 (parent_id));
-joinable!(user_mention -> user_alias_1 (recipient_id));
+joinable!(person_mention -> person_alias_1 (recipient_id));
-joinable!(post -> user_alias_1 (creator_id));
+joinable!(post -> person_alias_1 (creator_id));
-joinable!(comment -> user_alias_1 (creator_id));
+joinable!(comment -> person_alias_1 (creator_id));
-joinable!(post_report -> user_alias_2 (resolver_id));
+joinable!(post_report -> person_alias_2 (resolver_id));
-joinable!(comment_report -> user_alias_2 (resolver_id));
+joinable!(comment_report -> person_alias_2 (resolver_id));
 joinable!(comment -> person (creator_id));
 joinable!(comment -> post (post_id));
 joinable!(comment -> user_ (creator_id));
 joinable!(comment_aggregates -> comment (comment_id));
 joinable!(comment_like -> comment (comment_id));
 joinable!(comment_like -> person (person_id));
 joinable!(comment_like -> post (post_id));
 joinable!(comment_like -> user_ (user_id));
 joinable!(comment_report -> comment (comment_id));
 joinable!(comment_saved -> comment (comment_id));
-joinable!(comment_saved -> user_ (user_id));
+joinable!(comment_saved -> person (person_id));
-joinable!(community -> user_ (creator_id));
+joinable!(community -> person (creator_id));
 joinable!(community_aggregates -> community (community_id));
 joinable!(community_follower -> community (community_id));
-joinable!(community_follower -> user_ (user_id));
+joinable!(community_follower -> person (person_id));
 joinable!(community_moderator -> community (community_id));
-joinable!(community_moderator -> user_ (user_id));
+joinable!(community_moderator -> person (person_id));
-joinable!(community_user_ban -> community (community_id));
+joinable!(community_person_ban -> community (community_id));
-joinable!(community_user_ban -> user_ (user_id));
+joinable!(community_person_ban -> person (person_id));
 joinable!(local_user -> person (person_id));
 joinable!(mod_add_community -> community (community_id));
 joinable!(mod_ban_from_community -> community (community_id));
 joinable!(mod_lock_post -> person (mod_person_id));
 joinable!(mod_lock_post -> post (post_id));
 joinable!(mod_lock_post -> user_ (mod_user_id));
 joinable!(mod_remove_comment -> comment (comment_id));
-joinable!(mod_remove_comment -> user_ (mod_user_id));
+joinable!(mod_remove_comment -> person (mod_person_id));
 joinable!(mod_remove_community -> community (community_id));
-joinable!(mod_remove_community -> user_ (mod_user_id));
+joinable!(mod_remove_community -> person (mod_person_id));
 joinable!(mod_remove_post -> person (mod_person_id));
 joinable!(mod_remove_post -> post (post_id));
-joinable!(mod_remove_post -> user_ (mod_user_id));
+joinable!(mod_sticky_post -> person (mod_person_id));
 joinable!(mod_sticky_post -> post (post_id));
-joinable!(mod_sticky_post -> user_ (mod_user_id));
+joinable!(password_reset_request -> local_user (local_user_id));
-joinable!(password_reset_request -> user_ (user_id));
+joinable!(person_aggregates -> person (person_id));
 joinable!(person_ban -> person (person_id));
 joinable!(person_mention -> comment (comment_id));
 joinable!(person_mention -> person (recipient_id));
 joinable!(post -> community (community_id));
-joinable!(post -> user_ (creator_id));
+joinable!(post -> person (creator_id));
 joinable!(post_aggregates -> post (post_id));
 joinable!(post_like -> person (person_id));
 joinable!(post_like -> post (post_id));
-joinable!(post_like -> user_ (user_id));
+joinable!(post_read -> person (person_id));
 joinable!(post_read -> post (post_id));
 joinable!(post_read -> user_ (user_id));
 joinable!(post_report -> post (post_id));
 joinable!(post_saved -> person (person_id));
 joinable!(post_saved -> post (post_id));
-joinable!(post_saved -> user_ (user_id));
+joinable!(site -> person (creator_id));
 joinable!(site -> user_ (creator_id));
 joinable!(site_aggregates -> site (site_id));
 joinable!(user_aggregates -> user_ (user_id));
 joinable!(user_ban -> user_ (user_id));
 joinable!(user_mention -> comment (comment_id));
 joinable!(user_mention -> user_ (recipient_id));
 allow_tables_to_appear_in_same_query!(
  activity,
@ -587,7 +578,8 @@ allow_tables_to_appear_in_same_query!(
  community_aggregates,
  community_follower,
  community_moderator,
-  community_user_ban,
+  community_person_ban,
  local_user,
  mod_add,
  mod_add_community,
  mod_ban,
@ -598,6 +590,10 @@ allow_tables_to_appear_in_same_query!(
  mod_remove_post,
  mod_sticky_post,
  password_reset_request,
  person,
  person_aggregates,
  person_ban,
  person_mention,
  post,
  post_aggregates,
  post_like,
@ -607,11 +603,7 @@ allow_tables_to_appear_in_same_query!(
  private_message,
  site,
  site_aggregates,
  user_,
  user_aggregates,
  user_ban,
  user_mention,
  comment_alias_1,
-  user_alias_1,
+  person_alias_1,
-  user_alias_2,
+  person_alias_2,
 );
--- a/crates/db_schema/src/source/comment.rs
+++ b/crates/db_schema/src/source/comment.rs
@ -1,7 +1,10 @@
 use crate::{
  schema::{comment, comment_alias_1, comment_like, comment_saved},
  source::post::Post,
  CommentId,
  DbUrl,
  PersonId,
  PostId,
 };
 use serde::Serialize;
@ -16,10 +19,10 @@ use serde::Serialize;
 #[belongs_to(Post)]
 #[table_name = "comment"]
 pub struct Comment {
-  pub id: i32,
+  pub id: CommentId,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub parent_id: Option<i32>,
+  pub parent_id: Option<CommentId>,
  pub content: String,
  pub removed: bool,
  pub read: bool, // Whether the recipient has read the comment or not
@ -34,10 +37,10 @@ pub struct Comment {
 #[belongs_to(Post)]
 #[table_name = "comment_alias_1"]
 pub struct CommentAlias1 {
-  pub id: i32,
+  pub id: CommentId,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub parent_id: Option<i32>,
+  pub parent_id: Option<CommentId>,
  pub content: String,
  pub removed: bool,
  pub read: bool, // Whether the recipient has read the comment or not
@ -51,9 +54,9 @@ pub struct CommentAlias1 {
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "comment"]
 pub struct CommentForm {
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub parent_id: Option<i32>,
+  pub parent_id: Option<CommentId>,
  pub content: String,
  pub removed: Option<bool>,
  pub read: Option<bool>,
@ -69,9 +72,9 @@ pub struct CommentForm {
 #[table_name = "comment_like"]
 pub struct CommentLike {
  pub id: i32,
-  pub user_id: i32,
+  pub person_id: PersonId,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
-  pub post_id: i32, // TODO this is redundant
+  pub post_id: PostId, // TODO this is redundant
  pub score: i16,
  pub published: chrono::NaiveDateTime,
 }
@ -79,9 +82,9 @@ pub struct CommentLike {
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "comment_like"]
 pub struct CommentLikeForm {
-  pub user_id: i32,
+  pub person_id: PersonId,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
-  pub post_id: i32, // TODO this is redundant
+  pub post_id: PostId, // TODO this is redundant
  pub score: i16,
 }
@ -90,14 +93,14 @@ pub struct CommentLikeForm {
 #[table_name = "comment_saved"]
 pub struct CommentSaved {
  pub id: i32,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset)]
 #[table_name = "comment_saved"]
 pub struct CommentSavedForm {
-  pub comment_id: i32,
+  pub comment_id: CommentId,
-  pub user_id: i32,
+  pub person_id: PersonId,
 }
--- a/crates/db_schema/src/source/comment_report.rs
+++ b/crates/db_schema/src/source/comment_report.rs
@ -1,4 +1,4 @@
-use crate::{schema::comment_report, source::comment::Comment};
+use crate::{schema::comment_report, source::comment::Comment, CommentId, PersonId};
 use serde::{Deserialize, Serialize};
 #[derive(
@ -8,12 +8,12 @@ use serde::{Deserialize, Serialize};
 #[table_name = "comment_report"]
 pub struct CommentReport {
  pub id: i32,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub original_comment_text: String,
  pub reason: String,
  pub resolved: bool,
-  pub resolver_id: Option<i32>,
+  pub resolver_id: Option<PersonId>,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
 }
@ -21,8 +21,8 @@ pub struct CommentReport {
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "comment_report"]
 pub struct CommentReportForm {
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub original_comment_text: String,
  pub reason: String,
 }
--- a/crates/db_schema/src/source/community.rs
+++ b/crates/db_schema/src/source/community.rs
@ -1,17 +1,19 @@
 use crate::{
-  schema::{community, community_follower, community_moderator, community_user_ban},
+  schema::{community, community_follower, community_moderator, community_person_ban},
  CommunityId,
  DbUrl,
  PersonId,
 };
 use serde::Serialize;
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "community"]
 pub struct Community {
-  pub id: i32,
+  pub id: CommunityId,
  pub name: String,
  pub title: String,
  pub description: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
  pub removed: bool,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
@ -33,11 +35,11 @@ pub struct Community {
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "community"]
 pub struct CommunitySafe {
-  pub id: i32,
+  pub id: CommunityId,
  pub name: String,
  pub title: String,
  pub description: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
  pub removed: bool,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
@ -55,7 +57,7 @@ pub struct CommunityForm {
  pub name: String,
  pub title: String,
  pub description: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
  pub removed: Option<bool>,
  pub published: Option<chrono::NaiveDateTime>,
  pub updated: Option<chrono::NaiveDateTime>,
@ -78,33 +80,33 @@ pub struct CommunityForm {
 #[table_name = "community_moderator"]
 pub struct CommunityModerator {
  pub id: i32,
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "community_moderator"]
 pub struct CommunityModeratorForm {
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
 }
 #[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
 #[belongs_to(Community)]
-#[table_name = "community_user_ban"]
+#[table_name = "community_person_ban"]
-pub struct CommunityUserBan {
+pub struct CommunityPersonBan {
  pub id: i32,
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset, Clone)]
-#[table_name = "community_user_ban"]
+#[table_name = "community_person_ban"]
-pub struct CommunityUserBanForm {
+pub struct CommunityPersonBanForm {
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
 }
 #[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
@ -112,8 +114,8 @@ pub struct CommunityUserBanForm {
 #[table_name = "community_follower"]
 pub struct CommunityFollower {
  pub id: i32,
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub published: chrono::NaiveDateTime,
  pub pending: Option<bool>,
 }
@ -121,7 +123,7 @@ pub struct CommunityFollower {
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "community_follower"]
 pub struct CommunityFollowerForm {
-  pub community_id: i32,
+  pub community_id: CommunityId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub pending: bool,
 }
--- a/crates/db_schema/src/source/local_user.rs
+++ b/crates/db_schema/src/source/local_user.rs
@ -0,0 +1,58 @@
 use crate::{schema::local_user, LocalUserId, PersonId};
 use serde::Serialize;
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "local_user"]
 pub struct LocalUser {
  pub id: LocalUserId,
  pub person_id: PersonId,
  pub password_encrypted: String,
  pub email: Option<String>,
  pub admin: bool,
  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>,
  pub validator_time: chrono::NaiveDateTime,
 }
 // TODO redo these, check table defaults
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "local_user"]
 pub struct LocalUserForm {
  pub person_id: PersonId,
  pub password_encrypted: String,
  pub email: Option<Option<String>>,
  pub admin: Option<bool>,
  pub show_nsfw: Option<bool>,
  pub theme: Option<String>,
  pub default_sort_type: Option<i16>,
  pub default_listing_type: Option<i16>,
  pub lang: Option<String>,
  pub show_avatars: Option<bool>,
  pub send_notifications_to_email: Option<bool>,
  pub matrix_user_id: Option<Option<String>>,
 }
 /// A local user view that removes password encrypted
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "local_user"]
 pub struct LocalUserSettings {
  pub id: LocalUserId,
  pub person_id: PersonId,
  pub email: Option<String>,
  pub admin: bool,
  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>,
  pub validator_time: chrono::NaiveDateTime,
 }
--- a/crates/db_schema/src/source/mod.rs
+++ b/crates/db_schema/src/source/mod.rs
@ -2,11 +2,12 @@ pub mod activity;
 pub mod comment;
 pub mod comment_report;
 pub mod community;
 pub mod local_user;
 pub mod moderator;
 pub mod password_reset_request;
 pub mod person;
 pub mod person_mention;
 pub mod post;
 pub mod post_report;
 pub mod private_message;
 pub mod site;
 pub mod user;
 pub mod user_mention;
--- a/crates/db_schema/src/source/moderator.rs
+++ b/crates/db_schema/src/source/moderator.rs
@ -1,13 +1,19 @@
-use crate::schema::{
+use crate::{
-  mod_add,
+  schema::{
-  mod_add_community,
+    mod_add,
-  mod_ban,
+    mod_add_community,
-  mod_ban_from_community,
+    mod_ban,
-  mod_lock_post,
+    mod_ban_from_community,
-  mod_remove_comment,
+    mod_lock_post,
-  mod_remove_community,
+    mod_remove_comment,
-  mod_remove_post,
+    mod_remove_community,
-  mod_sticky_post,
+    mod_remove_post,
    mod_sticky_post,
  },
  CommentId,
  CommunityId,
  PersonId,
  PostId,
 };
 use serde::Serialize;
@ -15,8 +21,8 @@ use serde::Serialize;
 #[table_name = "mod_remove_post"]
 pub struct ModRemovePost {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub reason: Option<String>,
  pub removed: Option<bool>,
  pub when_: chrono::NaiveDateTime,
@ -25,8 +31,8 @@ pub struct ModRemovePost {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_remove_post"]
 pub struct ModRemovePostForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub reason: Option<String>,
  pub removed: Option<bool>,
 }
@ -35,8 +41,8 @@ pub struct ModRemovePostForm {
 #[table_name = "mod_lock_post"]
 pub struct ModLockPost {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub locked: Option<bool>,
  pub when_: chrono::NaiveDateTime,
 }
@ -44,8 +50,8 @@ pub struct ModLockPost {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_lock_post"]
 pub struct ModLockPostForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub locked: Option<bool>,
 }
@ -53,8 +59,8 @@ pub struct ModLockPostForm {
 #[table_name = "mod_sticky_post"]
 pub struct ModStickyPost {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub stickied: Option<bool>,
  pub when_: chrono::NaiveDateTime,
 }
@ -62,8 +68,8 @@ pub struct ModStickyPost {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_sticky_post"]
 pub struct ModStickyPostForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub stickied: Option<bool>,
 }
@ -71,8 +77,8 @@ pub struct ModStickyPostForm {
 #[table_name = "mod_remove_comment"]
 pub struct ModRemoveComment {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub reason: Option<String>,
  pub removed: Option<bool>,
  pub when_: chrono::NaiveDateTime,
@ -81,8 +87,8 @@ pub struct ModRemoveComment {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_remove_comment"]
 pub struct ModRemoveCommentForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub comment_id: i32,
+  pub comment_id: CommentId,
  pub reason: Option<String>,
  pub removed: Option<bool>,
 }
@ -91,8 +97,8 @@ pub struct ModRemoveCommentForm {
 #[table_name = "mod_remove_community"]
 pub struct ModRemoveCommunity {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub reason: Option<String>,
  pub removed: Option<bool>,
  pub expires: Option<chrono::NaiveDateTime>,
@ -102,8 +108,8 @@ pub struct ModRemoveCommunity {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_remove_community"]
 pub struct ModRemoveCommunityForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub reason: Option<String>,
  pub removed: Option<bool>,
  pub expires: Option<chrono::NaiveDateTime>,
@ -113,9 +119,9 @@ pub struct ModRemoveCommunityForm {
 #[table_name = "mod_ban_from_community"]
 pub struct ModBanFromCommunity {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub reason: Option<String>,
  pub banned: Option<bool>,
  pub expires: Option<chrono::NaiveDateTime>,
@ -125,9 +131,9 @@ pub struct ModBanFromCommunity {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_ban_from_community"]
 pub struct ModBanFromCommunityForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub reason: Option<String>,
  pub banned: Option<bool>,
  pub expires: Option<chrono::NaiveDateTime>,
@ -137,8 +143,8 @@ pub struct ModBanFromCommunityForm {
 #[table_name = "mod_ban"]
 pub struct ModBan {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
  pub reason: Option<String>,
  pub banned: Option<bool>,
  pub expires: Option<chrono::NaiveDateTime>,
@ -148,8 +154,8 @@ pub struct ModBan {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_ban"]
 pub struct ModBanForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
  pub reason: Option<String>,
  pub banned: Option<bool>,
  pub expires: Option<chrono::NaiveDateTime>,
@ -159,9 +165,9 @@ pub struct ModBanForm {
 #[table_name = "mod_add_community"]
 pub struct ModAddCommunity {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub removed: Option<bool>,
  pub when_: chrono::NaiveDateTime,
 }
@ -169,9 +175,9 @@ pub struct ModAddCommunity {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_add_community"]
 pub struct ModAddCommunityForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub removed: Option<bool>,
 }
@ -179,8 +185,8 @@ pub struct ModAddCommunityForm {
 #[table_name = "mod_add"]
 pub struct ModAdd {
  pub id: i32,
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
  pub removed: Option<bool>,
  pub when_: chrono::NaiveDateTime,
 }
@ -188,7 +194,7 @@ pub struct ModAdd {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "mod_add"]
 pub struct ModAddForm {
-  pub mod_user_id: i32,
+  pub mod_person_id: PersonId,
-  pub other_user_id: i32,
+  pub other_person_id: PersonId,
  pub removed: Option<bool>,
 }
--- a/crates/db_schema/src/source/password_reset_request.rs
+++ b/crates/db_schema/src/source/password_reset_request.rs
@ -1,17 +1,17 @@
-use crate::schema::password_reset_request;
+use crate::{schema::password_reset_request, LocalUserId};
 #[derive(Queryable, Identifiable, PartialEq, Debug)]
 #[table_name = "password_reset_request"]
 pub struct PasswordResetRequest {
  pub id: i32,
  pub user_id: i32,
  pub token_encrypted: String,
  pub published: chrono::NaiveDateTime,
  pub local_user_id: LocalUserId,
 }
 #[derive(Insertable, AsChangeset)]
 #[table_name = "password_reset_request"]
 pub struct PasswordResetRequestForm {
-  pub user_id: i32,
+  pub local_user_id: LocalUserId,
  pub token_encrypted: String,
 }
--- a/crates/db_schema/src/source/person.rs
+++ b/crates/db_schema/src/source/person.rs
@ -1,30 +1,20 @@
 use crate::{
-  schema::{user_, user_alias_1, user_alias_2},
+  schema::{person, person_alias_1, person_alias_2},
  DbUrl,
  PersonId,
 };
 use serde::Serialize;
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "user_"]
+#[table_name = "person"]
-pub struct User_ {
+pub struct Person {
-  pub id: i32,
+  pub id: PersonId,
  pub name: String,
  pub preferred_username: Option<String>,
  pub password_encrypted: String,
  pub email: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  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>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
@ -37,19 +27,17 @@ pub struct User_ {
  pub shared_inbox_url: Option<DbUrl>,
 }
-/// A safe representation of user, without the sensitive info
+/// A safe representation of person, without the sensitive info
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "user_"]
+#[table_name = "person"]
-pub struct UserSafe {
+pub struct PersonSafe {
-  pub id: i32,
+  pub id: PersonId,
  pub name: String,
  pub preferred_username: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
  pub matrix_user_id: Option<String>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
@ -59,56 +47,16 @@ pub struct UserSafe {
  pub shared_inbox_url: Option<DbUrl>,
 }
 /// A safe user view with only settings
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "user_"]
+#[table_name = "person_alias_1"]
-pub struct UserSafeSettings {
+pub struct PersonAlias1 {
-  pub id: i32,
+  pub id: PersonId,
  pub name: String,
  pub preferred_username: Option<String>,
  pub email: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  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>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
  pub last_refreshed_at: chrono::NaiveDateTime,
  pub banner: Option<DbUrl>,
  pub deleted: bool,
 }
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "user_alias_1"]
 pub struct UserAlias1 {
  pub id: i32,
  pub name: String,
  pub preferred_username: Option<String>,
  pub password_encrypted: String,
  pub email: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  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>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
@ -117,48 +65,39 @@ pub struct UserAlias1 {
  pub last_refreshed_at: chrono::NaiveDateTime,
  pub banner: Option<DbUrl>,
  pub deleted: bool,
  pub inbox_url: DbUrl,
  pub shared_inbox_url: Option<DbUrl>,
 }
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "user_alias_1"]
+#[table_name = "person_alias_1"]
-pub struct UserSafeAlias1 {
+pub struct PersonSafeAlias1 {
-  pub id: i32,
+  pub id: PersonId,
  pub name: String,
  pub preferred_username: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
  pub matrix_user_id: Option<String>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
  pub banner: Option<DbUrl>,
  pub deleted: bool,
  pub inbox_url: DbUrl,
  pub shared_inbox_url: Option<DbUrl>,
 }
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "user_alias_2"]
+#[table_name = "person_alias_2"]
-pub struct UserAlias2 {
+pub struct PersonAlias2 {
-  pub id: i32,
+  pub id: PersonId,
  pub name: String,
  pub preferred_username: Option<String>,
  pub password_encrypted: String,
  pub email: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  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>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
@ -167,54 +106,46 @@ pub struct UserAlias2 {
  pub last_refreshed_at: chrono::NaiveDateTime,
  pub banner: Option<DbUrl>,
  pub deleted: bool,
  pub inbox_url: DbUrl,
  pub shared_inbox_url: Option<DbUrl>,
 }
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
-#[table_name = "user_alias_2"]
+#[table_name = "person_alias_1"]
-pub struct UserSafeAlias2 {
+pub struct PersonSafeAlias2 {
-  pub id: i32,
+  pub id: PersonId,
  pub name: String,
  pub preferred_username: Option<String>,
  pub avatar: Option<DbUrl>,
  pub admin: bool,
  pub banned: bool,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
  pub matrix_user_id: Option<String>,
  pub actor_id: DbUrl,
  pub bio: Option<String>,
  pub local: bool,
  pub banner: Option<DbUrl>,
  pub deleted: bool,
  pub inbox_url: DbUrl,
  pub shared_inbox_url: Option<DbUrl>,
 }
 #[derive(Insertable, AsChangeset, Clone)]
-#[table_name = "user_"]
+#[table_name = "person"]
-pub struct UserForm {
+pub struct PersonForm {
  pub name: String,
  pub preferred_username: Option<Option<String>>,
  pub password_encrypted: String,
  pub admin: bool,
  pub banned: Option<bool>,
  pub email: Option<Option<String>>,
  pub avatar: Option<Option<DbUrl>>,
  pub banned: Option<bool>,
  pub published: Option<chrono::NaiveDateTime>,
  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<Option<String>>,
  pub actor_id: Option<DbUrl>,
  pub bio: Option<Option<String>>,
-  pub local: bool,
+  pub local: Option<bool>,
-  pub private_key: Option<String>,
+  pub private_key: Option<Option<String>>,
-  pub public_key: Option<String>,
+  pub public_key: Option<Option<String>>,
  pub last_refreshed_at: Option<chrono::NaiveDateTime>,
  pub banner: Option<Option<DbUrl>>,
  pub deleted: Option<bool>,
  pub inbox_url: Option<DbUrl>,
  pub shared_inbox_url: Option<Option<DbUrl>>,
 }
--- a/crates/db_schema/src/source/person_mention.rs
+++ b/crates/db_schema/src/source/person_mention.rs
@ -0,0 +1,27 @@
 use crate::{
  schema::person_mention,
  source::comment::Comment,
  CommentId,
  PersonId,
  PersonMentionId,
 };
 use serde::Serialize;
 #[derive(Clone, Queryable, Associations, Identifiable, PartialEq, Debug, Serialize)]
 #[belongs_to(Comment)]
 #[table_name = "person_mention"]
 pub struct PersonMention {
  pub id: PersonMentionId,
  pub recipient_id: PersonId,
  pub comment_id: CommentId,
  pub read: bool,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset)]
 #[table_name = "person_mention"]
 pub struct PersonMentionForm {
  pub recipient_id: PersonId,
  pub comment_id: CommentId,
  pub read: Option<bool>,
 }
--- a/crates/db_schema/src/source/post.rs
+++ b/crates/db_schema/src/source/post.rs
@ -1,18 +1,21 @@
 use crate::{
  schema::{post, post_like, post_read, post_saved},
  CommunityId,
  DbUrl,
  PersonId,
  PostId,
 };
 use serde::Serialize;
 #[derive(Clone, Queryable, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "post"]
 pub struct Post {
-  pub id: i32,
+  pub id: PostId,
  pub name: String,
  pub url: Option<DbUrl>,
  pub body: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub removed: bool,
  pub locked: bool,
  pub published: chrono::NaiveDateTime,
@ -34,8 +37,8 @@ pub struct PostForm {
  pub name: String,
  pub url: Option<DbUrl>,
  pub body: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub community_id: i32,
+  pub community_id: CommunityId,
  pub removed: Option<bool>,
  pub locked: Option<bool>,
  pub published: Option<chrono::NaiveDateTime>,
@ -56,8 +59,8 @@ pub struct PostForm {
 #[table_name = "post_like"]
 pub struct PostLike {
  pub id: i32,
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub score: i16,
  pub published: chrono::NaiveDateTime,
 }
@ -65,8 +68,8 @@ pub struct PostLike {
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "post_like"]
 pub struct PostLikeForm {
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub score: i16,
 }
@ -75,16 +78,16 @@ pub struct PostLikeForm {
 #[table_name = "post_saved"]
 pub struct PostSaved {
  pub id: i32,
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub user_id: i32,
+  pub person_id: PersonId,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset)]
 #[table_name = "post_saved"]
 pub struct PostSavedForm {
-  pub post_id: i32,
+  pub post_id: PostId,
-  pub user_id: i32,
+  pub person_id: PersonId,
 }
 #[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
@ -92,18 +95,14 @@ pub struct PostSavedForm {
 #[table_name = "post_read"]
 pub struct PostRead {
  pub id: i32,
-
+  pub post_id: PostId,
-  pub post_id: i32,
+  pub person_id: PersonId,
  pub user_id: i32,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset)]
 #[table_name = "post_read"]
 pub struct PostReadForm {
-  pub post_id: i32,
+  pub post_id: PostId,
-
+  pub person_id: PersonId,
  pub user_id: i32,
 }
--- a/crates/db_schema/src/source/post_report.rs
+++ b/crates/db_schema/src/source/post_report.rs
@ -1,4 +1,4 @@
-use crate::{schema::post_report, source::post::Post, DbUrl};
+use crate::{schema::post_report, source::post::Post, DbUrl, PersonId, PostId};
 use serde::{Deserialize, Serialize};
 #[derive(
@ -8,14 +8,14 @@ use serde::{Deserialize, Serialize};
 #[table_name = "post_report"]
 pub struct PostReport {
  pub id: i32,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub original_post_name: String,
  pub original_post_url: Option<DbUrl>,
  pub original_post_body: Option<String>,
  pub reason: String,
  pub resolved: bool,
-  pub resolver_id: Option<i32>,
+  pub resolver_id: Option<PersonId>,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
 }
@ -23,8 +23,8 @@ pub struct PostReport {
 #[derive(Insertable, AsChangeset, Clone)]
 #[table_name = "post_report"]
 pub struct PostReportForm {
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub post_id: i32,
+  pub post_id: PostId,
  pub original_post_name: String,
  pub original_post_url: Option<DbUrl>,
  pub original_post_body: Option<String>,
--- a/crates/db_schema/src/source/private_message.rs
+++ b/crates/db_schema/src/source/private_message.rs
@ -1,12 +1,12 @@
-use crate::{schema::private_message, DbUrl};
+use crate::{schema::private_message, DbUrl, PersonId, PrivateMessageId};
 use serde::Serialize;
 #[derive(Clone, Queryable, Associations, Identifiable, PartialEq, Debug, Serialize)]
 #[table_name = "private_message"]
 pub struct PrivateMessage {
-  pub id: i32,
+  pub id: PrivateMessageId,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub recipient_id: i32,
+  pub recipient_id: PersonId,
  pub content: String,
  pub deleted: bool,
  pub read: bool,
@ -19,8 +19,8 @@ pub struct PrivateMessage {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "private_message"]
 pub struct PrivateMessageForm {
-  pub creator_id: i32,
+  pub creator_id: PersonId,
-  pub recipient_id: i32,
+  pub recipient_id: PersonId,
  pub content: String,
  pub deleted: Option<bool>,
  pub read: Option<bool>,
--- a/crates/db_schema/src/source/site.rs
+++ b/crates/db_schema/src/source/site.rs
@ -1,4 +1,4 @@
-use crate::{schema::site, DbUrl};
+use crate::{schema::site, DbUrl, PersonId};
 use serde::Serialize;
 #[derive(Queryable, Identifiable, PartialEq, Debug, Clone, Serialize)]
@ -7,7 +7,7 @@ pub struct Site {
  pub id: i32,
  pub name: String,
  pub description: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
  pub published: chrono::NaiveDateTime,
  pub updated: Option<chrono::NaiveDateTime>,
  pub enable_downvotes: bool,
@ -22,7 +22,7 @@ pub struct Site {
 pub struct SiteForm {
  pub name: String,
  pub description: Option<String>,
-  pub creator_id: i32,
+  pub creator_id: PersonId,
  pub updated: Option<chrono::NaiveDateTime>,
  pub enable_downvotes: bool,
  pub open_registration: bool,
--- a/crates/db_schema/src/source/user_mention.rs
+++ b/crates/db_schema/src/source/user_mention.rs
@ -1,21 +0,0 @@
 use crate::{schema::user_mention, source::comment::Comment};
 use serde::Serialize;
 #[derive(Clone, Queryable, Associations, Identifiable, PartialEq, Debug, Serialize)]
 #[belongs_to(Comment)]
 #[table_name = "user_mention"]
 pub struct UserMention {
  pub id: i32,
  pub recipient_id: i32,
  pub comment_id: i32,
  pub read: bool,
  pub published: chrono::NaiveDateTime,
 }
 #[derive(Insertable, AsChangeset)]
 #[table_name = "user_mention"]
 pub struct UserMentionForm {
  pub recipient_id: i32,
  pub comment_id: i32,
  pub read: Option<bool>,
 }
--- a/crates/db_views/src/comment_report_view.rs
+++ b/crates/db_views/src/comment_report_view.rs
@ -1,14 +1,15 @@
 use diesel::{result::Error, *};
 use lemmy_db_queries::{limit_and_offset, MaybeOptional, ToSafe, ViewToVec};
 use lemmy_db_schema::{
-  schema::{comment, comment_report, community, post, user_, user_alias_1, user_alias_2},
+  schema::{comment, comment_report, community, person, person_alias_1, person_alias_2, post},
  source::{
    comment::Comment,
    comment_report::CommentReport,
    community::{Community, CommunitySafe},
    person::{Person, PersonAlias1, PersonAlias2, PersonSafe, PersonSafeAlias1, PersonSafeAlias2},
    post::Post,
    user::{UserAlias1, UserAlias2, UserSafe, UserSafeAlias1, UserSafeAlias2, User_},
  },
  CommunityId,
 };
 use serde::Serialize;
@ -18,9 +19,9 @@ pub struct CommentReportView {
  pub comment: Comment,
  pub post: Post,
  pub community: CommunitySafe,
-  pub creator: UserSafe,
+  pub creator: PersonSafe,
-  pub comment_creator: UserSafeAlias1,
+  pub comment_creator: PersonSafeAlias1,
-  pub resolver: Option<UserSafeAlias2>,
+  pub resolver: Option<PersonSafeAlias2>,
 }
 type CommentReportViewTuple = (
@ -28,9 +29,9 @@ type CommentReportViewTuple = (
  Comment,
  Post,
  CommunitySafe,
-  UserSafe,
+  PersonSafe,
-  UserSafeAlias1,
+  PersonSafeAlias1,
-  Option<UserSafeAlias2>,
+  Option<PersonSafeAlias2>,
 );
 impl CommentReportView {
@ -44,19 +45,19 @@ impl CommentReportView {
        .inner_join(comment::table)
        .inner_join(post::table.on(comment::post_id.eq(post::id)))
        .inner_join(community::table.on(post::community_id.eq(community::id)))
-        .inner_join(user_::table.on(comment_report::creator_id.eq(user_::id)))
+        .inner_join(person::table.on(comment_report::creator_id.eq(person::id)))
-        .inner_join(user_alias_1::table.on(post::creator_id.eq(user_alias_1::id)))
+        .inner_join(person_alias_1::table.on(post::creator_id.eq(person_alias_1::id)))
        .left_join(
-          user_alias_2::table.on(comment_report::resolver_id.eq(user_alias_2::id.nullable())),
+          person_alias_2::table.on(comment_report::resolver_id.eq(person_alias_2::id.nullable())),
        )
        .select((
          comment_report::all_columns,
          comment::all_columns,
          post::all_columns,
          Community::safe_columns_tuple(),
-          User_::safe_columns_tuple(),
+          Person::safe_columns_tuple(),
-          UserAlias1::safe_columns_tuple(),
+          PersonAlias1::safe_columns_tuple(),
-          UserAlias2::safe_columns_tuple().nullable(),
+          PersonAlias2::safe_columns_tuple().nullable(),
        ))
        .first::<CommentReportViewTuple>(conn)?;
@ -75,8 +76,11 @@ impl CommentReportView {
  ///
  /// * `community_ids` - a Vec<i32> of community_ids to get a count for
  /// TODO this eq_any is a bad way to do this, would be better to join to communitymoderator
-  /// for a user id
+  /// for a person id
-  pub fn get_report_count(conn: &PgConnection, community_ids: &[i32]) -> Result<i64, Error> {
+  pub fn get_report_count(
    conn: &PgConnection,
    community_ids: &[CommunityId],
  ) -> Result<i64, Error> {
    use diesel::dsl::*;
    comment_report::table
      .inner_join(comment::table)
@ -93,7 +97,7 @@ impl CommentReportView {
 pub struct CommentReportQueryBuilder<'a> {
  conn: &'a PgConnection,
-  community_ids: Option<Vec<i32>>, // TODO bad way to do this
+  community_ids: Option<Vec<CommunityId>>, // TODO bad way to do this
  page: Option<i64>,
  limit: Option<i64>,
  resolved: Option<bool>,
@ -110,7 +114,7 @@ impl<'a> CommentReportQueryBuilder<'a> {
    }
  }
-  pub fn community_ids<T: MaybeOptional<Vec<i32>>>(mut self, community_ids: T) -> Self {
+  pub fn community_ids<T: MaybeOptional<Vec<CommunityId>>>(mut self, community_ids: T) -> Self {
    self.community_ids = community_ids.get_optional();
    self
  }
@ -135,19 +139,19 @@ impl<'a> CommentReportQueryBuilder<'a> {
      .inner_join(comment::table)
      .inner_join(post::table.on(comment::post_id.eq(post::id)))
      .inner_join(community::table.on(post::community_id.eq(community::id)))
-      .inner_join(user_::table.on(comment_report::creator_id.eq(user_::id)))
+      .inner_join(person::table.on(comment_report::creator_id.eq(person::id)))
-      .inner_join(user_alias_1::table.on(post::creator_id.eq(user_alias_1::id)))
+      .inner_join(person_alias_1::table.on(post::creator_id.eq(person_alias_1::id)))
      .left_join(
-        user_alias_2::table.on(comment_report::resolver_id.eq(user_alias_2::id.nullable())),
+        person_alias_2::table.on(comment_report::resolver_id.eq(person_alias_2::id.nullable())),
      )
      .select((
        comment_report::all_columns,
        comment::all_columns,
        post::all_columns,
        Community::safe_columns_tuple(),
-        User_::safe_columns_tuple(),
+        Person::safe_columns_tuple(),
-        UserAlias1::safe_columns_tuple(),
+        PersonAlias1::safe_columns_tuple(),
-        UserAlias2::safe_columns_tuple().nullable(),
+        PersonAlias2::safe_columns_tuple().nullable(),
      ))
      .into_boxed();
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Dessalines	f55ef1d7ef	Version 0.10.0-rc.7	2021-03-19 11:46:46 -04:00
Nutomic	14bc9f0946	Merge pull request #1500 from LemmyNet/jwt_revocation_dess Jwt revocation dess	2021-03-19 15:43:47 +00:00
Dessalines	493598c1ba	A few suggestion fixes.	2021-03-19 10:02:58 -04:00
Nutomic	96efe302ce	Merge pull request #1499 from LemmyNet/strictly_type_db_ids Strictly type db ids	2021-03-19 13:41:22 +00:00
Nutomic	e25bcb35d7	Merge pull request #1428 from LemmyNet/split_user_table Split user table	2021-03-19 13:20:23 +00:00
Dessalines	05b485b678	Merge branch 'Mart-Bogdan-1462-jwt-revocation-on-pwd-change' into jwt_revocation_dess	2021-03-19 00:31:49 -04:00
Dessalines	360d4ea8d1	Merge branch '1462-jwt-revocation-on-pwd-change' of https://github.com/Mart-Bogdan/lemmy into Mart-Bogdan-1462-jwt-revocation-on-pwd-change	2021-03-18 21:41:00 -04:00
Dessalines	c06d612432	Merge branch 'split_user_table' into strictly_type_db_ids	2021-03-18 19:37:54 -04:00
Dessalines	c88722983e	Merge branch 'main' into split_user_table	2021-03-18 19:36:48 -04:00
Nutomic	33a326854a	Set CARGO_HOME for CI so deps arent redownloaded (#1497 ) * Set CARGO_HOME for CI so deps arent redownloaded * run find on x86 * fix path * cleanup * try again * use mv	2021-03-18 16:35:04 -04:00
Dessalines	9930c7288a	Merge branch 'split_user_table' into strictly_type_db_ids	2021-03-18 16:30:42 -04:00
Dessalines	8d9fab0389	Merge branch 'main' into split_user_table	2021-03-18 16:30:29 -04:00
Dessalines	c3efb9f7cf	Strictly typing DB id fields. Fixes #1498	2021-03-18 16:25:21 -04:00
Dessalines	5899b89ef2	Adding some comments to notifs.	2021-03-18 10:59:17 -04:00
Dessalines	99e5a4d1c3	Moving send email check inside function.	2021-03-18 10:52:25 -04:00
dessalines	db4fe8031c	Merge pull request 'Insert announced activities into DB for fetching (fixes #1494 )' (#187 ) from insert-local-announce into main Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/187	2021-03-16 13:47:32 +00:00
Dessalines	270ce539bf	Removing some TODOS.	2021-03-15 18:18:50 -04:00
Dessalines	b9f483bc27	Version 0.10.0-rc.5	2021-03-15 14:50:50 -04:00
Dessalines	8ee624a542	Some changes - Changing claim name to local_user_id to facilitate logout. - Changing AddAdmin back to using person_id	2021-03-15 14:02:27 -04:00
Felix Ableitner	621355b6ef	Insert announced activities into DB for fetching (fixes #1494 )	2021-03-15 13:58:54 +01:00
Nutomic	72b5e0cab5	Merge pull request #1491 from LemmyNet/upgrade_pictrs_3 Upgrading pictrs.	2021-03-15 12:14:31 +00:00
Bogdan Mart	74272ed754	more correct tests	2021-03-13 22:36:40 +02:00
Bogdan Mart	4426c3176d	fix timestamp condition #1462	2021-03-13 22:18:26 +02:00
Bogdan Mart	7b0a09e84e	Merge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change * origin/main: revert Compose file version from 3.3 to 2.2 Adding more mem limits bump memory limit of iframely Remove extra category_id s . Fixes #1429 Fixing wrong user_ and community icon and banner urls. Remove category from activitypub context Adding a password length check to other API actions. (#1474) Update test script Use URL type in most outstanding struct fields (#1468) Forbid usage of unwrap Upgrade Rust version Rewrite settings implementation. Fixes #1270 (#1433) Rename `lemmy_structs` to `lemmy_api_structs` # Conflicts: # crates/db_schema/src/source/user.rs	2021-03-13 20:19:55 +02:00
Bogdan Mart	ab947f1f08	User token revocation upon password change Added DB column validator_time and chedking that is is less then token's "Issuead at time" Wip on #1462	2021-03-13 20:16:35 +02:00
Dessalines	5998c83b2a	Only sending private message if its a local user.	2021-03-12 15:18:03 -05:00
Dessalines	434fb53dd1	Trying to fix API tests.	2021-03-12 14:09:03 -05:00
Dessalines	75a95acf04	Change joinuser, sendusermessage to use local_user_id	2021-03-12 10:54:47 -05:00
dessalines	931a132161	Merge pull request 'Add memory limit for pictrs' (#186 ) from nutomic-patch-1 into main Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/186	2021-03-12 15:16:49 +00:00
Dessalines	0a7271a185	Upgrading pictrs.	2021-03-12 10:13:20 -05:00
Dessalines	7c039340ed	2nd pass. JWT now uses local_user_id	2021-03-11 17:47:44 -05:00
Dessalines	7d04f371a5	fixing tests 3	2021-03-11 12:08:30 -05:00
Dessalines	5d8ccbafe4	Fixing some tests 2	2021-03-11 11:54:03 -05:00
Dessalines	1a4c8c08ee	Fixing some tests	2021-03-11 11:41:04 -05:00
Dessalines	9cb4dad4b4	A first pass.	2021-03-10 23:43:11 -05:00
Dessalines	ddf4a667b1	~80% done	2021-03-10 17:33:55 -05:00
Nutomic	8f6b8895f4	Merge pull request #1485 from PatMulligan/fix-docker-compose-yaml revert Compose file version from 3.3 to 2.2	2021-03-08 15:41:17 +00:00
Patrick Mulligan	a650312858	revert Compose file version from 3.3 to 2.2	2021-03-08 09:23:50 -06:00
Dessalines	a869a2823b	Still continuing on....	2021-02-26 08:49:58 -05:00
Dessalines	efc9047f87	Done with user->person migrations, now to code.	2021-02-25 14:04:12 -05:00
Dessalines	aba32917bd	Merge branch 'main' into split_user_table	2021-02-25 12:34:00 -05:00
Dessalines	a183815870	Adding a few more tables.	2021-02-15 14:34:10 -05:00
Dessalines	d0bd02eea0	Starting on user_ to person migration.	2021-02-14 13:46:16 -05:00
Dessalines	5a33fce8bd	Listing columns.	2021-02-10 11:05:12 -05:00