Merge branch 'main' into language-checks

2024-11-25 10:51:03 +00:00 · 2024-11-12 11:02:59 +01:00 · 2024-11-12 11:02:59 +01:00 · dc6ee00d86
commit dc6ee00d86
parent 163bc3ffc4 2e8687e203
252 changed files with 5856 additions and 2948 deletions
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -73,12 +73,12 @@ steps:
    when:
      - event: pull_request

-  cargo_machete:
+  cargo_shear:
    image: *rust_nightly_image
    commands:
      - *install_binstall
-      - cargo binstall -y cargo-machete
-      - cargo machete
+      - cargo binstall -y cargo-shear
+      - cargo shear
    when:
      - event: pull_request

@ -122,7 +122,6 @@ steps:
    environment:
      CARGO_HOME: .cargo_home
    commands:
-      - export LEMMY_CONFIG_LOCATION=./config/config.hjson
      - ./scripts/update_config_defaults.sh config/defaults_current.hjson
      - diff config/defaults.hjson config/defaults_current.hjson
    when: *slow_check_paths
@ -134,8 +133,8 @@ steps:
      DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
    commands:
      - <<: *install_diesel_cli
+      - cp crates/db_schema/src/schema.rs tmp.schema
      - diesel migration run
-      - diesel print-schema --config-file=diesel.toml > tmp.schema
      - diff tmp.schema crates/db_schema/src/schema.rs
    when: *slow_check_paths

@ -147,7 +146,6 @@ steps:
      CARGO_HOME: .cargo_home
    commands:
      # same as scripts/db_perf.sh but without creating a new database server
-      - export LEMMY_CONFIG_LOCATION=config/config.hjson
      - cargo run --package lemmy_db_perf -- --posts 10 --read-post-pages 1
    when: *slow_check_paths

@ -176,11 +174,20 @@ steps:
      RUST_BACKTRACE: "1"
      CARGO_HOME: .cargo_home
      LEMMY_TEST_FAST_FEDERATION: "1"
+      LEMMY_CONFIG_LOCATION: ../../config/config.hjson
    commands:
-      - export LEMMY_CONFIG_LOCATION=../../config/config.hjson
      - cargo test --workspace --no-fail-fast
    when: *slow_check_paths

+  check_ts_bindings:
+    image: *rust_image
+    environment:
+      CARGO_HOME: .cargo_home
+    commands:
+      - ./scripts/ts_bindings_check.sh
+    when:
+      - event: pull_request
+
  check_diesel_migration:
    # TODO: use willsquire/diesel-cli image when shared libraries become optional in lemmy_server
    image: *rust_image
@ -215,7 +222,7 @@ steps:
    when: *slow_check_paths

  run_federation_tests:
-    image: node:20-bookworm-slim
+    image: node:22-bookworm-slim
    environment:
      LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
      DO_WRITE_HOSTS_FILE: "1"
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "accept-language"
 version = "3.1.0"
@ -1287,6 +1281,15 @@ dependencies = [
 "tokio-postgres",
 ]

+[[package]]
+name = "diesel-bind-if-some"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ed8ce9db476124d2eaf4c9db45dc6581b8e8c4c4d47d5e0f39de1fb55dfb2a7"
+dependencies = [
+ "diesel",
+]
+
 [[package]]
 name = "diesel-derive-enum"
 version = "2.1.0"
@ -2570,7 +2573,6 @@ dependencies = [
 "futures",
 "html2md",
 "html2text",
- "http 1.1.0",
 "itertools 0.13.0",
 "lemmy_api_common",
 "lemmy_db_schema",
@ -2620,6 +2622,7 @@ dependencies = [
 "derive-new",
 "diesel",
 "diesel-async",
+ "diesel-bind-if-some",
 "diesel-derive-enum",
 "diesel-derive-newtype",
 "diesel_ltree",
@ -2641,6 +2644,7 @@ dependencies = [
 "tokio-postgres-rustls",
 "tracing",
 "ts-rs",
+ "tuplex",
 "url",
 "uuid",
 ]
@ -2809,9 +2813,12 @@ dependencies = [
 "itertools 0.13.0",
 "lettre",
 "markdown-it",
+ "markdown-it-block-spoiler",
+ "markdown-it-ruby",
+ "markdown-it-sub",
+ "markdown-it-sup",
 "pretty_assertions",
 "regex",
- "reqwest 0.12.8",
 "reqwest-middleware",
 "rosetta-build",
 "rosetta-i18n",
@ -2980,6 +2987,44 @@ dependencies = [
 "unicode-general-category",
 ]

+[[package]]
+name = "markdown-it-block-spoiler"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "008a8e4184fd08b5dca0f2b5b2ef8f126c1e83ca797c44ee41f8d7765951360c"
+dependencies = [
+ "itertools 0.13.0",
+ "markdown-it",
+]
+
+[[package]]
+name = "markdown-it-ruby"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3505f4ada7c372e7f5eb4b07850bf5921193bc0bd43cb18991233999c9134d4"
+dependencies = [
+ "itertools 0.13.0",
+ "markdown-it",
+]
+
+[[package]]
+name = "markdown-it-sub"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8abe3aa8927af2314644b3aae37393241a229e869ff9c95ac640749e08357d2a"
+dependencies = [
+ "markdown-it",
+]
+
+[[package]]
+name = "markdown-it-sup"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ae949e78c7a615f88a47019d51b65962bfc5c4cbc65fa81eae8b9b2506d1cb1"
+dependencies = [
+ "markdown-it",
+]
+
 [[package]]
 name = "markup5ever"
 version = "0.11.0"
@ -5215,28 +5260,35 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

 [[package]]
 name = "ts-rs"
-version = "7.1.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2cae1fc5d05d47aa24b64f9a4f7cba24cdc9187a2084dd97ac57bef5eccae6"
+checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9"
 dependencies = [
 "chrono",
+ "lazy_static",
 "thiserror",
 "ts-rs-macros",
+ "url",
 ]

 [[package]]
 name = "ts-rs-macros"
-version = "7.1.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f7f9b821696963053a89a7bd8b292dc34420aea8294d7b225274d488f3ec92"
+checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
 dependencies = [
- "Inflector",
 "proc-macro2",
 "quote",
 "syn 2.0.77",
 "termcolor",
 ]

+[[package]]
+name = "tuplex"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "676ac81d5454c4dcf37955d34fa8626ede3490f744b86ca14a7b90168d2a08aa"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@ -5579,7 +5631,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -24,11 +24,12 @@ doctest = false
 [lints]
 workspace = true

+# See https://github.com/johnthagen/min-sized-rust for additional optimizations
 [profile.release]
 debug = 0
-lto = "thin"
-strip = true    # Automatically strip symbols from the binary.
-opt-level = "z" # Optimize for size.
+lto = "fat"
+opt-level = 3     # Optimize for speed, not size.
+codegen-units = 1 # Reduce parallel code generation.

 # This profile significantly speeds up build time. If debug info is needed you can comment the line
 # out temporarily, but make sure to leave this in the main branch.
@ -77,6 +78,7 @@ uninlined_format_args = "allow"
 unused_self = "deny"
 unwrap_used = "deny"
 unimplemented = "deny"
+unused_async = "deny"

 [workspace.dependencies]
 lemmy_api = { version = "=0.19.6-beta.7", path = "./crates/api" }
@ -141,10 +143,11 @@ itertools = "0.13.0"
 futures = "0.3.30"
 http = "1.1"
 rosetta-i18n = "0.1.3"
-ts-rs = { version = "7.1.1", features = [
+ts-rs = { version = "10.0.0", features = [
  "serde-compat",
  "chrono-impl",
  "no-serde-warnings",
+  "url-impl",
 ] }
 rustls = { version = "0.23.12", features = ["ring"] }
 futures-util = "0.3.30"
@ -157,6 +160,8 @@ i-love-jesus = { version = "0.1.0" }
 clap = { version = "4.5.13", features = ["derive", "env"] }
 pretty_assertions = "1.4.0"
 derive-new = "0.7.0"
+diesel-bind-if-some = "0.1.0"
+tuplex = "0.1.2"

 [dependencies]
 lemmy_api = { workspace = true }
--- a/api_tests/package.json
+++ b/api_tests/package.json
@ -6,16 +6,17 @@
  "repository": "https://github.com/LemmyNet/lemmy",
  "author": "Dessalines",
  "license": "AGPL-3.0",
-  "packageManager": "pnpm@9.12.0",
+  "packageManager": "pnpm@9.12.3",
  "scripts": {
    "lint": "tsc --noEmit && eslint --report-unused-disable-directives && prettier --check 'src/**/*.ts'",
    "fix": "prettier --write src && eslint --fix src",
-    "api-test": "jest -i follow.spec.ts && jest -i image.spec.ts && jest -i user.spec.ts && jest -i private_message.spec.ts && jest -i community.spec.ts &&  jest -i post.spec.ts && jest -i comment.spec.ts ",
+    "api-test": "jest -i follow.spec.ts && jest -i image.spec.ts && jest -i user.spec.ts && jest -i private_message.spec.ts && jest -i community.spec.ts && jest -i private_community.spec.ts && jest -i post.spec.ts && jest -i comment.spec.ts ",
    "api-test-follow": "jest -i follow.spec.ts",
    "api-test-comment": "jest -i comment.spec.ts",
    "api-test-post": "jest -i post.spec.ts",
    "api-test-user": "jest -i user.spec.ts",
    "api-test-community": "jest -i community.spec.ts",
+    "api-test-private-community": "jest -i private_community.spec.ts",
    "api-test-private-message": "jest -i private_message.spec.ts",
    "api-test-image": "jest -i image.spec.ts"
  },
@ -27,7 +28,7 @@
    "eslint": "^9.9.0",
    "eslint-plugin-prettier": "^5.1.3",
    "jest": "^29.5.0",
-    "lemmy-js-client": "0.20.0-alpha.11",
+    "lemmy-js-client": "0.20.0-private-community.9",
    "prettier": "^3.2.5",
    "ts-jest": "^29.1.0",
    "typescript": "^5.5.4",
--- a/api_tests/pnpm-lock.yaml
+++ b/api_tests/pnpm-lock.yaml
--- a/api_tests/src/comment.spec.ts
+++ b/api_tests/src/comment.spec.ts
@ -158,16 +158,16 @@ test("Delete a comment", async () => {
  expect(deleteCommentRes.comment_view.comment.deleted).toBe(true);
  expect(deleteCommentRes.comment_view.comment.content).toBe("");

-  // Make sure that comment is undefined on beta
+  // Make sure that comment is deleted on beta
  await waitUntil(
-    () => resolveComment(beta, commentRes.comment_view.comment).catch(e => e),
-    e => e.message == "not_found",
+    () => resolveComment(beta, commentRes.comment_view.comment),
+    c => c.comment?.comment.deleted === true,
  );

-  // Make sure that comment is undefined on gamma after delete
+  // Make sure that comment is deleted on gamma after delete
  await waitUntil(
-    () => resolveComment(gamma, commentRes.comment_view.comment).catch(e => e),
-    e => e.message === "not_found",
+    () => resolveComment(gamma, commentRes.comment_view.comment),
+    c => c.comment?.comment.deleted === true,
  );

  // Test undeleting the comment
@ -181,11 +181,10 @@ test("Delete a comment", async () => {
  // Make sure that comment is undeleted on beta
  let betaComment2 = (
    await waitUntil(
-      () => resolveComment(beta, commentRes.comment_view.comment).catch(e => e),
-      e => e.message !== "not_found",
+      () => resolveComment(beta, commentRes.comment_view.comment),
+      c => c.comment?.comment.deleted === false,
    )
  ).comment;
-  expect(betaComment2?.comment.deleted).toBe(false);
  assertCommentFederation(betaComment2, undeleteCommentRes.comment_view);
 });

@ -861,7 +860,7 @@ test("Dont send a comment reply to a blocked community", async () => {

 /// Fetching a deeply nested comment can lead to stack overflow as all parent comments are also
 /// fetched recursively. Ensure that it works properly.
-test("Fetch a deeply nested comment", async () => {
+test.skip("Fetch a deeply nested comment", async () => {
  let lastComment;
  for (let i = 0; i < 50; i++) {
    let commentRes = await createComment(
--- a/api_tests/src/private_community.spec.ts
+++ b/api_tests/src/private_community.spec.ts
@ -0,0 +1,214 @@
+jest.setTimeout(120000);
+
+import { FollowCommunity } from "lemmy-js-client";
+import {
+  alpha,
+  setupLogins,
+  createCommunity,
+  unfollows,
+  registerUser,
+  listCommunityPendingFollows,
+  getCommunity,
+  getCommunityPendingFollowsCount,
+  approveCommunityPendingFollow,
+  randomString,
+  createPost,
+  createComment,
+  beta,
+  resolveCommunity,
+  betaUrl,
+  resolvePost,
+  resolveComment,
+  likeComment,
+  waitUntil,
+} from "./shared";
+
+beforeAll(setupLogins);
+afterAll(unfollows);
+
+test("Follow a private community", async () => {
+  // create private community
+  const community = await createCommunity(alpha, randomString(10), "Private");
+  expect(community.community_view.community.visibility).toBe("Private");
+  const alphaCommunityId = community.community_view.community.id;
+
+  // No pending follows yet
+  const pendingFollows0 = await listCommunityPendingFollows(alpha);
+  expect(pendingFollows0.items.length).toBe(0);
+  const pendingFollowsCount0 = await getCommunityPendingFollowsCount(
+    alpha,
+    alphaCommunityId,
+  );
+  expect(pendingFollowsCount0.count).toBe(0);
+
+  // follow as new user
+  const user = await registerUser(beta, betaUrl);
+  const betaCommunity = (
+    await resolveCommunity(user, community.community_view.community.actor_id)
+  ).community;
+  expect(betaCommunity).toBeDefined();
+  const betaCommunityId = betaCommunity!.community.id;
+  const follow_form: FollowCommunity = {
+    community_id: betaCommunityId,
+    follow: true,
+  };
+  await user.followCommunity(follow_form);
+
+  // Follow listed as pending
+  const follow1 = await getCommunity(user, betaCommunityId);
+  expect(follow1.community_view.subscribed).toBe("ApprovalRequired");
+
+  // Wait for follow to federate, shown as pending
+  let pendingFollows1 = await waitUntil(
+    () => listCommunityPendingFollows(alpha),
+    f => f.items.length == 1,
+  );
+  expect(pendingFollows1.items[0].is_new_instance).toBe(true);
+  const pendingFollowsCount1 = await getCommunityPendingFollowsCount(
+    alpha,
+    alphaCommunityId,
+  );
+  expect(pendingFollowsCount1.count).toBe(1);
+
+  // user still sees approval required at this point
+  const betaCommunity2 = await getCommunity(user, betaCommunityId);
+  expect(betaCommunity2.community_view.subscribed).toBe("ApprovalRequired");
+
+  // Approve the follow
+  const approve = await approveCommunityPendingFollow(
+    alpha,
+    alphaCommunityId,
+    pendingFollows1.items[0].person.id,
+  );
+  expect(approve.success).toBe(true);
+
+  // Follow is confirmed
+  await waitUntil(
+    () => getCommunity(user, betaCommunityId),
+    c => c.community_view.subscribed == "Subscribed",
+  );
+  const pendingFollows2 = await listCommunityPendingFollows(alpha);
+  expect(pendingFollows2.items.length).toBe(0);
+  const pendingFollowsCount2 = await getCommunityPendingFollowsCount(
+    alpha,
+    alphaCommunityId,
+  );
+  expect(pendingFollowsCount2.count).toBe(0);
+
+  // follow with another user from that instance, is_new_instance should be false now
+  const user2 = await registerUser(beta, betaUrl);
+  await user2.followCommunity(follow_form);
+  let pendingFollows3 = await waitUntil(
+    () => listCommunityPendingFollows(alpha),
+    f => f.items.length == 1,
+  );
+  expect(pendingFollows3.items[0].is_new_instance).toBe(false);
+
+  // cleanup pending follow
+  const approve2 = await approveCommunityPendingFollow(
+    alpha,
+    alphaCommunityId,
+    pendingFollows3.items[0].person.id,
+  );
+  expect(approve2.success).toBe(true);
+});
+
+test("Only followers can view and interact with private community content", async () => {
+  // create private community
+  const community = await createCommunity(alpha, randomString(10), "Private");
+  expect(community.community_view.community.visibility).toBe("Private");
+  const alphaCommunityId = community.community_view.community.id;
+
+  // create post and comment
+  const post0 = await createPost(alpha, alphaCommunityId);
+  const post_id = post0.post_view.post.id;
+  expect(post_id).toBeDefined();
+  const comment = await createComment(alpha, post_id);
+  const comment_id = comment.comment_view.comment.id;
+  expect(comment_id).toBeDefined();
+
+  // user is not following the community and cannot view nor create posts
+  const user = await registerUser(beta, betaUrl);
+  const betaCommunity = (
+    await resolveCommunity(user, community.community_view.community.actor_id)
+  ).community!.community;
+  await expect(resolvePost(user, post0.post_view.post)).rejects.toStrictEqual(
+    Error("not_found"),
+  );
+  await expect(
+    resolveComment(user, comment.comment_view.comment),
+  ).rejects.toStrictEqual(Error("not_found"));
+  await expect(createPost(user, betaCommunity.id)).rejects.toStrictEqual(
+    Error("not_found"),
+  );
+
+  // follow the community and approve
+  const follow_form: FollowCommunity = {
+    community_id: betaCommunity.id,
+    follow: true,
+  };
+  await user.followCommunity(follow_form);
+  const pendingFollows1 = await waitUntil(
+    () => listCommunityPendingFollows(alpha),
+    f => f.items.length == 1,
+  );
+  const approve = await approveCommunityPendingFollow(
+    alpha,
+    alphaCommunityId,
+    pendingFollows1.items[0].person.id,
+  );
+  expect(approve.success).toBe(true);
+
+  // now user can fetch posts and comments in community (using signed fetch), and create posts
+  await waitUntil(
+    () => resolvePost(user, post0.post_view.post),
+    p => p?.post?.post.id != undefined,
+  );
+  const resolvedComment = (
+    await resolveComment(user, comment.comment_view.comment)
+  ).comment;
+  expect(resolvedComment?.comment.id).toBeDefined();
+
+  const post1 = await createPost(user, betaCommunity.id);
+  expect(post1.post_view).toBeDefined();
+  const like = await likeComment(user, 1, resolvedComment!.comment);
+  expect(like.comment_view.my_vote).toBe(1);
+});
+
+test("Reject follower", async () => {
+  // create private community
+  const community = await createCommunity(alpha, randomString(10), "Private");
+  expect(community.community_view.community.visibility).toBe("Private");
+  const alphaCommunityId = community.community_view.community.id;
+
+  // user is not following the community and cannot view nor create posts
+  const user = await registerUser(beta, betaUrl);
+  const betaCommunity1 = (
+    await resolveCommunity(user, community.community_view.community.actor_id)
+  ).community!.community;
+
+  // follow the community and reject
+  const follow_form: FollowCommunity = {
+    community_id: betaCommunity1.id,
+    follow: true,
+  };
+  const follow = await user.followCommunity(follow_form);
+  expect(follow.community_view.subscribed).toBe("ApprovalRequired");
+
+  const pendingFollows1 = await waitUntil(
+    () => listCommunityPendingFollows(alpha),
+    f => f.items.length == 1,
+  );
+  const approve = await approveCommunityPendingFollow(
+    alpha,
+    alphaCommunityId,
+    pendingFollows1.items[0].person.id,
+    false,
+  );
+  expect(approve.success).toBe(true);
+
+  await waitUntil(
+    () => getCommunity(user, betaCommunity1.id),
+    c => c.community_view.subscribed == "NotSubscribed",
+  );
+});
--- a/api_tests/src/shared.ts
+++ b/api_tests/src/shared.ts
@ -1,17 +1,24 @@
 import {
+  ApproveCommunityPendingFollower,
  BlockCommunity,
  BlockCommunityResponse,
  BlockInstance,
  BlockInstanceResponse,
  CommunityId,
+  CommunityVisibility,
  CreatePrivateMessageReport,
  DeleteImage,
  EditCommunity,
+  GetCommunityPendingFollowsCount,
+  GetCommunityPendingFollowsCountResponse,
  GetReplies,
  GetRepliesResponse,
  GetUnreadCountResponse,
  InstanceId,
  LemmyHttp,
+  ListCommunityPendingFollows,
+  ListCommunityPendingFollowsResponse,
+  PersonId,
  PostView,
  PrivateMessageReportResponse,
  SuccessResponse,
@ -83,7 +90,7 @@ export const fetchFunction = fetch;
 export const imageFetchLimit = 50;
 export const sampleImage =
  "https://i.pinimg.com/originals/df/5f/5b/df5f5b1b174a2b4b6026cc6c8f9395c1.jpg";
-export const sampleSite = "https://yahoo.com";
+export const sampleSite = "https://w3.org";

 export const alphaUrl = "http://127.0.0.1:8541";
 export const betaUrl = "http://127.0.0.1:8551";
@ -198,7 +205,7 @@ export async function setupLogins() {
    // only needed the first time so do in this try
    await delay(10_000);
  } catch {
-    console.log("Communities already exist");
+    //console.log("Communities already exist");
  }
 }

@ -554,12 +561,14 @@ export async function likeComment(
 export async function createCommunity(
  api: LemmyHttp,
  name_: string = randomString(10),
+  visibility: CommunityVisibility = "Public",
 ): Promise<CommunityResponse> {
  let description = "a sample description";
  let form: CreateCommunity = {
    name: name_,
    title: name_,
    description,
+    visibility,
  };
  return api.createCommunity(form);
 }
@ -688,7 +697,6 @@ export async function saveUserSettingsBio(
  let form: SaveUserSettings = {
    show_nsfw: true,
    blur_nsfw: false,
-    auto_expand: true,
    theme: "darkly",
    default_post_sort_type: "Active",
    default_listing_type: "All",
@ -709,7 +717,6 @@ export async function saveUserSettingsFederated(
  let form: SaveUserSettings = {
    show_nsfw: false,
    blur_nsfw: true,
-    auto_expand: false,
    default_post_sort_type: "Hot",
    default_listing_type: "All",
    interface_language: "",
@ -872,6 +879,39 @@ export function blockCommunity(
  return api.blockCommunity(form);
 }

+export function listCommunityPendingFollows(
+  api: LemmyHttp,
+): Promise<ListCommunityPendingFollowsResponse> {
+  let form: ListCommunityPendingFollows = {
+    pending_only: true,
+    all_communities: false,
+    page: 1,
+    limit: 50,
+  };
+  return api.listCommunityPendingFollows(form);
+}
+
+export function getCommunityPendingFollowsCount(
+  api: LemmyHttp,
+  community_id: CommunityId,
+): Promise<GetCommunityPendingFollowsCountResponse> {
+  return api.getCommunityPendingFollowsCount(community_id);
+}
+
+export function approveCommunityPendingFollow(
+  api: LemmyHttp,
+  community_id: CommunityId,
+  follower_id: PersonId,
+  approve: boolean = true,
+): Promise<SuccessResponse> {
+  let form: ApproveCommunityPendingFollower = {
+    community_id,
+    follower_id,
+    approve,
+  };
+  return api.approveCommunityPendingFollow(form);
+}
+
 export function delay(millis = 500) {
  return new Promise(resolve => setTimeout(resolve, millis));
 }
@ -962,8 +1002,12 @@ export async function waitUntil<T>(
  let retry = 0;
  let result;
  while (retry++ < retries) {
+    try {
      result = await fetcher();
      if (checker(result)) return result;
+    } catch (error) {
+      //console.error(error);
+    }
    await delay(
      delaySeconds[Math.min(retry - 1, delaySeconds.length - 1)] * 1000,
    );
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@ -76,7 +76,7 @@
    # Timeout for uploading images to pictrs (in seconds)
    upload_timeout: 30
    # Resize post thumbnails to this maximum width/height.
-    max_thumbnail_size: 256
+    max_thumbnail_size: 512
  }
  # Email sending configuration. All options except login/password are mandatory
  email: {
--- a/crates/api/src/comment/distinguish.rs
+++ b/crates/api/src/comment/distinguish.rs
@ -26,7 +26,7 @@ pub async fn distinguish_comment(

  check_community_user_action(
    &local_user_view.person,
-    orig_comment.community.id,
+    &orig_comment.community,
    &mut context.pool(),
  )
  .await?;
@ -39,7 +39,7 @@ pub async fn distinguish_comment(
  // Verify that only a mod or admin can distinguish a comment
  check_community_mod_action(
    &local_user_view.person,
-    orig_comment.community.id,
+    &orig_comment.community,
    false,
    &mut context.pool(),
  )
--- a/crates/api/src/comment/like.rs
+++ b/crates/api/src/comment/like.rs
@ -50,7 +50,7 @@ pub async fn like_comment(

  check_community_user_action(
    &local_user_view.person,
-    orig_comment.community.id,
+    &orig_comment.community,
    &mut context.pool(),
  )
  .await?;
@ -67,7 +67,6 @@ pub async fn like_comment(

  let like_form = CommentLikeForm {
    comment_id: data.comment_id,
-    post_id: orig_comment.post.id,
    person_id: local_user_view.person.id,
    score: data.score,
  };
@ -93,8 +92,7 @@ pub async fn like_comment(
      score: data.score,
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(
    build_comment_response(
--- a/crates/api/src/comment_report/create.rs
+++ b/crates/api/src/comment_report/create.rs
@ -44,7 +44,7 @@ pub async fn create_comment_report(

  check_community_user_action(
    &local_user_view.person,
-    comment_view.community.id,
+    &comment_view.community,
    &mut context.pool(),
  )
  .await?;
@ -85,8 +85,7 @@ pub async fn create_comment_report(
      reason: data.reason.clone(),
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(CommentReportResponse {
    comment_report_view,
--- a/crates/api/src/comment_report/resolve.rs
+++ b/crates/api/src/comment_report/resolve.rs
@ -22,7 +22,7 @@ pub async fn resolve_comment_report(
  let person_id = local_user_view.person.id;
  check_community_mod_action(
    &local_user_view.person,
-    report.community.id,
+    &report.community,
    true,
    &mut context.pool(),
  )
--- a/crates/api/src/community/add_mod.rs
+++ b/crates/api/src/community/add_mod.rs
@ -24,12 +24,11 @@ pub async fn add_mod_to_community(
  context: Data<LemmyContext>,
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<AddModToCommunityResponse>> {
-  let community_id = data.community_id;
-
+  let community = Community::read(&mut context.pool(), data.community_id).await?;
  // Verify that only mods or admins can add mod
  check_community_mod_action(
    &local_user_view.person,
-    community_id,
+    &community,
    false,
    &mut context.pool(),
  )
@ -39,15 +38,13 @@ pub async fn add_mod_to_community(
  if !data.added {
    LocalUser::is_higher_mod_or_admin_check(
      &mut context.pool(),
-      community_id,
+      community.id,
      local_user_view.person.id,
      vec![data.person_id],
    )
    .await?;
  }

-  let community = Community::read(&mut context.pool(), community_id).await?;
-
  // If user is admin and community is remote, explicitly check that he is a
  // moderator. This is necessary because otherwise the action would be rejected
  // by the community's home instance.
@ -98,8 +95,7 @@ pub async fn add_mod_to_community(
      added: data.added,
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(AddModToCommunityResponse { moderators }))
 }
--- a/crates/api/src/community/ban.rs
+++ b/crates/api/src/community/ban.rs
@ -13,6 +13,7 @@ use lemmy_api_common::{
 use lemmy_db_schema::{
  source::{
    community::{
+      Community,
      CommunityFollower,
      CommunityFollowerForm,
      CommunityPersonBan,
@ -38,11 +39,12 @@ pub async fn ban_from_community(
 ) -> LemmyResult<Json<BanFromCommunityResponse>> {
  let banned_person_id = data.person_id;
  let expires = check_expire_time(data.expires)?;
+  let community = Community::read(&mut context.pool(), data.community_id).await?;

  // Verify that only mods or admins can ban
  check_community_mod_action(
    &local_user_view.person,
-    data.community_id,
+    &community,
    false,
    &mut context.pool(),
  )
@ -72,12 +74,7 @@ pub async fn ban_from_community(
      .with_lemmy_type(LemmyErrorType::CommunityUserAlreadyBanned)?;

    // Also unsubscribe them from the community, if they are subscribed
-    let community_follower_form = CommunityFollowerForm {
-      community_id: data.community_id,
-      person_id: banned_person_id,
-      pending: false,
-    };
-
+    let community_follower_form = CommunityFollowerForm::new(data.community_id, banned_person_id);
    CommunityFollower::unfollow(&mut context.pool(), &community_follower_form)
      .await
      .ok();
@ -123,8 +120,7 @@ pub async fn ban_from_community(
      data: data.0.clone(),
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(BanFromCommunityResponse {
    person_view,
--- a/crates/api/src/community/block.rs
+++ b/crates/api/src/community/block.rs
@ -35,12 +35,7 @@ pub async fn block_community(
      .with_lemmy_type(LemmyErrorType::CommunityBlockAlreadyExists)?;

    // Also, unfollow the community, and send a federated unfollow
-    let community_follower_form = CommunityFollowerForm {
-      community_id: data.community_id,
-      person_id,
-      pending: false,
-    };
-
+    let community_follower_form = CommunityFollowerForm::new(data.community_id, person_id);
    CommunityFollower::unfollow(&mut context.pool(), &community_follower_form)
      .await
      .ok();
@ -65,8 +60,7 @@ pub async fn block_community(
      false,
    ),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(BlockCommunityResponse {
    blocked: data.block,
--- a/crates/api/src/community/follow.rs
+++ b/crates/api/src/community/follow.rs
@ -4,17 +4,18 @@ use lemmy_api_common::{
  community::{CommunityResponse, FollowCommunity},
  context::LemmyContext,
  send_activity::{ActivityChannel, SendActivityData},
-  utils::check_community_user_action,
+  utils::{check_community_deleted_removed, check_user_valid},
 };
 use lemmy_db_schema::{
  source::{
    actor_language::CommunityLanguage,
-    community::{Community, CommunityFollower, CommunityFollowerForm},
+    community::{Community, CommunityFollower, CommunityFollowerForm, CommunityFollowerState},
  },
  traits::{Crud, Followable},
+  CommunityVisibility,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_db_views_actor::structs::CommunityView;
+use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};

 #[tracing::instrument(skip(context))]
@ -23,40 +24,52 @@ pub async fn follow_community(
  context: Data<LemmyContext>,
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
+  check_user_valid(&local_user_view.person)?;
  let community = Community::read(&mut context.pool(), data.community_id).await?;
-  let mut community_follower_form = CommunityFollowerForm {
-    community_id: community.id,
-    person_id: local_user_view.person.id,
-    pending: false,
-  };
+  let form = CommunityFollowerForm::new(community.id, local_user_view.person.id);

  if data.follow {
+    // Only run these checks for local community, in case of remote community the local
+    // state may be outdated. Can't use check_community_user_action() here as it only allows
+    // actions from existing followers for private community (so following would be impossible).
    if community.local {
-      check_community_user_action(&local_user_view.person, community.id, &mut context.pool())
+      check_community_deleted_removed(&community)?;
+      CommunityPersonBanView::check(&mut context.pool(), local_user_view.person.id, community.id)
        .await?;
-
-      CommunityFollower::follow(&mut context.pool(), &community_follower_form)
-        .await
-        .with_lemmy_type(LemmyErrorType::CommunityFollowerAlreadyExists)?;
-    } else {
-      // Mark as pending, the actual federation activity is sent via `SendActivity` handler
-      community_follower_form.pending = true;
-      CommunityFollower::follow(&mut context.pool(), &community_follower_form)
-        .await
-        .with_lemmy_type(LemmyErrorType::CommunityFollowerAlreadyExists)?;
    }
+
+    let state = if community.local {
+      // Local follow is accepted immediately
+      Some(CommunityFollowerState::Accepted)
+    } else if community.visibility == CommunityVisibility::Private {
+      // Private communities require manual approval
+      Some(CommunityFollowerState::ApprovalRequired)
    } else {
-    CommunityFollower::unfollow(&mut context.pool(), &community_follower_form)
+      // remote follow needs to be federated first
+      Some(CommunityFollowerState::Pending)
+    };
+
+    let form = CommunityFollowerForm {
+      state,
+      ..CommunityFollowerForm::new(community.id, local_user_view.person.id)
+    };
+
+    // Write to db
+    CommunityFollower::follow(&mut context.pool(), &form)
+      .await
+      .with_lemmy_type(LemmyErrorType::CommunityFollowerAlreadyExists)?;
+  } else {
+    CommunityFollower::unfollow(&mut context.pool(), &form)
      .await
      .with_lemmy_type(LemmyErrorType::CommunityFollowerAlreadyExists)?;
  }

+  // Send the federated follow
  if !community.local {
    ActivityChannel::submit_activity(
      SendActivityData::FollowCommunity(community, local_user_view.person.clone(), data.follow),
      &context,
-    )
-    .await?;
+    )?;
  }

  let community_id = data.community_id;
--- a/crates/api/src/community/hide.rs
+++ b/crates/api/src/community/hide.rs
@ -48,8 +48,7 @@ pub async fn hide_community(
  ActivityChannel::submit_activity(
    SendActivityData::UpdateCommunity(local_user_view.person.clone(), community),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(SuccessResponse::default()))
 }
--- a/crates/api/src/community/mod.rs
+++ b/crates/api/src/community/mod.rs
@ -3,5 +3,6 @@ pub mod ban;
 pub mod block;
 pub mod follow;
 pub mod hide;
+pub mod pending_follows;
 pub mod random;
 pub mod transfer;
--- a/crates/api/src/community/pending_follows/approve.rs
+++ b/crates/api/src/community/pending_follows/approve.rs
@ -0,0 +1,46 @@
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
+use lemmy_api_common::{
+  community::ApproveCommunityPendingFollower,
+  context::LemmyContext,
+  send_activity::{ActivityChannel, SendActivityData},
+  utils::is_mod_or_admin,
+  SuccessResponse,
+};
+use lemmy_db_schema::{
+  source::community::{CommunityFollower, CommunityFollowerForm},
+  traits::Followable,
+};
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_utils::error::LemmyResult;
+
+pub async fn post_pending_follows_approve(
+  data: Json<ApproveCommunityPendingFollower>,
+  context: Data<LemmyContext>,
+  local_user_view: LocalUserView,
+) -> LemmyResult<Json<SuccessResponse>> {
+  is_mod_or_admin(
+    &mut context.pool(),
+    &local_user_view.person,
+    data.community_id,
+  )
+  .await?;
+
+  let activity_data = if data.approve {
+    CommunityFollower::approve(
+      &mut context.pool(),
+      data.community_id,
+      data.follower_id,
+      local_user_view.person.id,
+    )
+    .await?;
+    SendActivityData::AcceptFollower(data.community_id, data.follower_id)
+  } else {
+    let form = CommunityFollowerForm::new(data.community_id, data.follower_id);
+    CommunityFollower::unfollow(&mut context.pool(), &form).await?;
+    SendActivityData::RejectFollower(data.community_id, data.follower_id)
+  };
+  ActivityChannel::submit_activity(activity_data, &context)?;
+
+  Ok(Json(SuccessResponse::default()))
+}
--- a/crates/api/src/community/pending_follows/count.rs
+++ b/crates/api/src/community/pending_follows/count.rs
@ -0,0 +1,25 @@
+use actix_web::web::{Data, Json, Query};
+use lemmy_api_common::{
+  community::{GetCommunityPendingFollowsCount, GetCommunityPendingFollowsCountResponse},
+  context::LemmyContext,
+  utils::is_mod_or_admin,
+};
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views_actor::structs::CommunityFollowerView;
+use lemmy_utils::error::LemmyResult;
+
+pub async fn get_pending_follows_count(
+  data: Query<GetCommunityPendingFollowsCount>,
+  context: Data<LemmyContext>,
+  local_user_view: LocalUserView,
+) -> LemmyResult<Json<GetCommunityPendingFollowsCountResponse>> {
+  is_mod_or_admin(
+    &mut context.pool(),
+    &local_user_view.person,
+    data.community_id,
+  )
+  .await?;
+  let count =
+    CommunityFollowerView::count_approval_required(&mut context.pool(), data.community_id).await?;
+  Ok(Json(GetCommunityPendingFollowsCountResponse { count }))
+}
--- a/crates/api/src/community/pending_follows/list.rs
+++ b/crates/api/src/community/pending_follows/list.rs
@ -0,0 +1,29 @@
+use actix_web::web::{Data, Json, Query};
+use lemmy_api_common::{
+  community::{ListCommunityPendingFollows, ListCommunityPendingFollowsResponse},
+  context::LemmyContext,
+  utils::check_community_mod_of_any_or_admin_action,
+};
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views_actor::structs::CommunityFollowerView;
+use lemmy_utils::error::LemmyResult;
+
+pub async fn get_pending_follows_list(
+  data: Query<ListCommunityPendingFollows>,
+  context: Data<LemmyContext>,
+  local_user_view: LocalUserView,
+) -> LemmyResult<Json<ListCommunityPendingFollowsResponse>> {
+  check_community_mod_of_any_or_admin_action(&local_user_view, &mut context.pool()).await?;
+  let all_communities =
+    data.all_communities.unwrap_or_default() && local_user_view.local_user.admin;
+  let items = CommunityFollowerView::list_approval_required(
+    &mut context.pool(),
+    local_user_view.person.id,
+    all_communities,
+    data.pending_only.unwrap_or_default(),
+    data.page,
+    data.limit,
+  )
+  .await?;
+  Ok(Json(ListCommunityPendingFollowsResponse { items }))
+}
--- a/crates/api/src/community/pending_follows/mod.rs
+++ b/crates/api/src/community/pending_follows/mod.rs
@ -0,0 +1,3 @@
+pub mod approve;
+pub mod count;
+pub mod list;
--- a/crates/api/src/community/transfer.rs
+++ b/crates/api/src/community/transfer.rs
@ -7,7 +7,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{
  source::{
-    community::{CommunityModerator, CommunityModeratorForm},
+    community::{Community, CommunityModerator, CommunityModeratorForm},
    moderator::{ModTransferCommunity, ModTransferCommunityForm},
  },
  traits::{Crud, Joinable},
@ -27,11 +27,11 @@ pub async fn transfer_community(
  context: Data<LemmyContext>,
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<GetCommunityResponse>> {
-  let community_id = data.community_id;
+  let community = Community::read(&mut context.pool(), data.community_id).await?;
  let mut community_mods =
-    CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
+    CommunityModeratorView::for_community(&mut context.pool(), community.id).await?;

-  check_community_user_action(&local_user_view.person, community_id, &mut context.pool()).await?;
+  check_community_user_action(&local_user_view.person, &community, &mut context.pool()).await?;

  // Make sure transferrer is either the top community mod, or an admin
  if !(is_top_mod(&local_user_view, &community_mods).is_ok() || is_admin(&local_user_view).is_ok())
--- a/crates/api/src/lib.rs
+++ b/crates/api/src/lib.rs
@ -197,11 +197,7 @@ pub(crate) async fn ban_nonlocal_user_from_local_communities(
          .ok();

        // Also unsubscribe them from the community, if they are subscribed
-        let community_follower_form = CommunityFollowerForm {
-          community_id,
-          person_id: target.id,
-          pending: false,
-        };
+        let community_follower_form = CommunityFollowerForm::new(community_id, target.id);

        CommunityFollower::unfollow(&mut context.pool(), &community_follower_form)
          .await
@ -242,8 +238,7 @@ pub(crate) async fn ban_nonlocal_user_from_local_communities(
          data: ban_from_community,
        },
        context,
-      )
-      .await?;
+      )?;
    }
  }

--- a/crates/api/src/local_user/ban_person.rs
+++ b/crates/api/src/local_user/ban_person.rs
@ -111,8 +111,7 @@ pub async fn ban_from_site(
      expires: data.expires,
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(BanPersonResponse {
    person_view,
--- a/crates/api/src/local_user/save_settings.rs
+++ b/crates/api/src/local_user/save_settings.rs
@ -141,6 +141,7 @@ pub async fn save_user_settings(
    post_listing_mode: data.post_listing_mode,
    enable_keyboard_navigation: data.enable_keyboard_navigation,
    enable_animated_images: data.enable_animated_images,
+    enable_private_messages: data.enable_private_messages,
    collapse_bot_comments: data.collapse_bot_comments,
    ..Default::default()
  };
--- a/crates/api/src/post/feature.rs
+++ b/crates/api/src/post/feature.rs
@ -9,6 +9,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{
  source::{
+    community::Community,
    moderator::{ModFeaturePost, ModFeaturePostForm},
    post::{Post, PostUpdateForm},
  },
@ -27,9 +28,10 @@ pub async fn feature_post(
  let post_id = data.post_id;
  let orig_post = Post::read(&mut context.pool(), post_id).await?;

+  let community = Community::read(&mut context.pool(), orig_post.community_id).await?;
  check_community_mod_action(
    &local_user_view.person,
-    orig_post.community_id,
+    &community,
    false,
    &mut context.pool(),
  )
@ -67,8 +69,7 @@ pub async fn feature_post(
  ActivityChannel::submit_activity(
    SendActivityData::FeaturePost(post, local_user_view.person.clone(), data.featured),
    &context,
-  )
-  .await?;
+  )?;

  build_post_response(&context, orig_post.community_id, local_user_view, post_id).await
 }
--- a/crates/api/src/post/get_link_metadata.rs
+++ b/crates/api/src/post/get_link_metadata.rs
@ -5,10 +5,7 @@ use lemmy_api_common::{
  request::fetch_link_metadata,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{
-  error::{LemmyErrorExt, LemmyResult},
-  LemmyErrorType,
-};
+use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 use url::Url;

 #[tracing::instrument(skip(context))]
--- a/crates/api/src/post/like.rs
+++ b/crates/api/src/post/like.rs
@ -15,13 +15,12 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{
  source::{
-    community::Community,
    local_site::LocalSite,
-    post::{Post, PostLike, PostLikeForm},
+    post::{PostLike, PostLikeForm},
  },
-  traits::{Crud, Likeable},
+  traits::Likeable,
 };
-use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
 use std::ops::Deref;

@ -45,11 +44,11 @@ pub async fn like_post(
  check_bot_account(&local_user_view.person)?;

  // Check for a community ban
-  let post = Post::read(&mut context.pool(), post_id).await?;
+  let post = PostView::read(&mut context.pool(), post_id, None, false).await?;

  check_community_user_action(
    &local_user_view.person,
-    post.community_id,
+    &post.community,
    &mut context.pool(),
  )
  .await?;
@ -75,18 +74,15 @@ pub async fn like_post(

  mark_post_as_read(person_id, post_id, &mut context.pool()).await?;

-  let community = Community::read(&mut context.pool(), post.community_id).await?;
-
  ActivityChannel::submit_activity(
    SendActivityData::LikePostOrComment {
-      object_id: post.ap_id,
+      object_id: post.post.ap_id,
      actor: local_user_view.person.clone(),
-      community,
+      community: post.community.clone(),
      score: data.score,
    },
    &context,
-  )
-  .await?;
+  )?;

-  build_post_response(context.deref(), post.community_id, local_user_view, post_id).await
+  build_post_response(context.deref(), post.community.id, local_user_view, post_id).await
 }
--- a/crates/api/src/post/lock.rs
+++ b/crates/api/src/post/lock.rs
@ -14,7 +14,7 @@ use lemmy_db_schema::{
  },
  traits::Crud,
 };
-use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::error::LemmyResult;

 #[tracing::instrument(skip(context))]
@ -24,11 +24,11 @@ pub async fn lock_post(
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
  let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = PostView::read(&mut context.pool(), post_id, None, false).await?;

  check_community_mod_action(
    &local_user_view.person,
-    orig_post.community_id,
+    &orig_post.community,
    false,
    &mut context.pool(),
  )
@ -58,8 +58,7 @@ pub async fn lock_post(
  ActivityChannel::submit_activity(
    SendActivityData::LockPost(post, local_user_view.person.clone(), data.locked),
    &context,
-  )
-  .await?;
+  )?;

-  build_post_response(&context, orig_post.community_id, local_user_view, post_id).await
+  build_post_response(&context, orig_post.community.id, local_user_view, post_id).await
 }
--- a/crates/api/src/post_report/create.rs
+++ b/crates/api/src/post_report/create.rs
@ -39,7 +39,7 @@ pub async fn create_post_report(

  check_community_user_action(
    &local_user_view.person,
-    post_view.community.id,
+    &post_view.community,
    &mut context.pool(),
  )
  .await?;
@ -80,8 +80,7 @@ pub async fn create_post_report(
      reason: data.reason.clone(),
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(PostReportResponse { post_report_view }))
 }
--- a/crates/api/src/post_report/resolve.rs
+++ b/crates/api/src/post_report/resolve.rs
@ -22,7 +22,7 @@ pub async fn resolve_post_report(
  let person_id = local_user_view.person.id;
  check_community_mod_action(
    &local_user_view.person,
-    report.community.id,
+    &report.community,
    true,
    &mut context.pool(),
  )
--- a/crates/api/src/site/purge/comment.rs
+++ b/crates/api/src/site/purge/comment.rs
@ -67,8 +67,7 @@ pub async fn purge_comment(
      reason: data.reason.clone(),
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(SuccessResponse::default()))
 }
--- a/crates/api/src/site/purge/community.rs
+++ b/crates/api/src/site/purge/community.rs
@ -75,8 +75,7 @@ pub async fn purge_community(
      removed: true,
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(SuccessResponse::default()))
 }
--- a/crates/api/src/site/purge/person.rs
+++ b/crates/api/src/site/purge/person.rs
@ -80,8 +80,7 @@ pub async fn purge_person(
      expires: None,
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(SuccessResponse::default()))
 }
--- a/crates/api/src/site/purge/post.rs
+++ b/crates/api/src/site/purge/post.rs
@ -66,8 +66,7 @@ pub async fn purge_post(
      removed: true,
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(SuccessResponse::default()))
 }
--- a/crates/api/src/site/registration_applications/tests.rs
+++ b/crates/api/src/site/registration_applications/tests.rs
@ -31,7 +31,10 @@ use lemmy_db_schema::{
  RegistrationMode,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType, CACHE_DURATION_API};
+use lemmy_utils::{
+  error::{LemmyErrorType, LemmyResult},
+  CACHE_DURATION_API,
+};
 use serial_test::serial;

 async fn create_test_site(context: &Data<LemmyContext>) -> LemmyResult<(Instance, LocalUserView)> {
--- a/crates/api/src/sitemap.rs
+++ b/crates/api/src/sitemap.rs
@ -9,14 +9,12 @@ use lemmy_utils::error::LemmyResult;
 use sitemap_rs::{url::Url, url_set::UrlSet};
 use tracing::info;

-async fn generate_urlset(
-  posts: Vec<(DbUrl, chrono::DateTime<chrono::Utc>)>,
-) -> LemmyResult<UrlSet> {
+fn generate_urlset(posts: Vec<(DbUrl, chrono::DateTime<chrono::Utc>)>) -> LemmyResult<UrlSet> {
  let urls = posts
    .into_iter()
-    .map_while(|post| {
-      Url::builder(post.0.to_string())
-        .last_modified(post.1.into())
+    .map_while(|(url, date_time)| {
+      Url::builder(url.to_string())
+        .last_modified(date_time.into())
        .build()
        .ok()
    })
@ -31,7 +29,7 @@ pub async fn get_sitemap(context: Data<LemmyContext>) -> LemmyResult<HttpRespons
  info!("Loaded latest {} posts", posts.len());

  let mut buf = Vec::<u8>::new();
-  generate_urlset(posts).await?.write(&mut buf)?;
+  generate_urlset(posts)?.write(&mut buf)?;

  Ok(
    HttpResponse::Ok()
@ -74,7 +72,7 @@ pub(crate) mod tests {
    ];

    let mut buf = Vec::<u8>::new();
-    generate_urlset(posts).await?.write(&mut buf)?;
+    generate_urlset(posts)?.write(&mut buf)?;
    let root = Element::from_reader(buf.as_slice())?;

    assert_eq!(root.tag().name(), "urlset");
--- a/crates/api_common/Cargo.toml
+++ b/crates/api_common/Cargo.toml
@ -72,7 +72,7 @@ jsonwebtoken = { version = "9.3.0", optional = true }
 # necessary for wasmt compilation
 getrandom = { version = "0.2.15", features = ["js"] }

-[package.metadata.cargo-machete]
+[package.metadata.cargo-shear]
 ignored = ["getrandom"]

 [dev-dependencies]
--- a/crates/api_common/src/claims.rs
+++ b/crates/api_common/src/claims.rs
@ -92,7 +92,7 @@ mod tests {
  #[tokio::test]
  #[serial]
  async fn test_should_not_validate_user_token_after_password_change() -> LemmyResult<()> {
-    let pool_ = build_db_pool_for_tests().await;
+    let pool_ = build_db_pool_for_tests();
    let pool = &mut (&pool_).into();
    let secret = Secret::init(pool).await?;
    let context = LemmyContext::create(
--- a/crates/api_common/src/comment.rs
+++ b/crates/api_common/src/comment.rs
@ -17,7 +17,9 @@ use ts_rs::TS;
 pub struct CreateComment {
  pub content: String,
  pub post_id: PostId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub parent_id: Option<CommentId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub language_id: Option<LanguageId>,
 }

@ -37,7 +39,9 @@ pub struct GetComment {
 /// Edit a comment.
 pub struct EditComment {
  pub comment_id: CommentId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub content: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub language_id: Option<LanguageId>,
 }

@ -69,6 +73,7 @@ pub struct DeleteComment {
 pub struct RemoveComment {
  pub comment_id: CommentId,
  pub removed: bool,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -107,17 +112,29 @@ pub struct CreateCommentLike {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get a list of comments.
 pub struct GetComments {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub type_: Option<ListingType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<CommentSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub max_depth: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_name: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_id: Option<PostId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub parent_id: Option<CommentId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub saved_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub liked_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub disliked_only: Option<bool>,
 }

@ -161,12 +178,17 @@ pub struct ResolveCommentReport {
 #[cfg_attr(feature = "full", ts(export))]
 /// List comment reports.
 pub struct ListCommentReports {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_id: Option<CommentId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
  /// Only shows the unresolved reports
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unresolved_only: Option<bool>,
  /// if no community is given, it returns reports for all communities moderated by the auth user
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
 }

@ -185,7 +207,9 @@ pub struct ListCommentReportsResponse {
 /// List comment likes. Admins-only.
 pub struct ListCommentLikes {
  pub comment_id: CommentId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
 }

--- a/crates/api_common/src/community.rs
+++ b/crates/api_common/src/community.rs
@ -8,6 +8,7 @@ use lemmy_db_views_actor::structs::{
  CommunityModeratorView,
  CommunitySortType,
  CommunityView,
+  PendingFollow,
  PersonView,
 };
 use serde::{Deserialize, Serialize};
@ -19,10 +20,13 @@ use ts_rs::TS;
 #[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "full", derive(TS))]
 #[cfg_attr(feature = "full", ts(export))]
+// TODO make this into a tagged enum
 /// Get a community. Must provide either an id, or a name.
 pub struct GetCommunity {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub id: Option<CommunityId>,
  /// Example: star_trek , or star_trek@xyz.tld
+  #[cfg_attr(feature = "full", ts(optional))]
  pub name: Option<String>,
 }

@ -33,6 +37,7 @@ pub struct GetCommunity {
 /// The community response.
 pub struct GetCommunityResponse {
  pub community_view: CommunityView,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub site: Option<Site>,
  pub moderators: Vec<CommunityModeratorView>,
  pub discussion_languages: Vec<LanguageId>,
@ -48,17 +53,27 @@ pub struct CreateCommunity {
  pub name: String,
  /// A longer title.
  pub title: String,
-  /// A longer sidebar, or description of your community, in markdown.
+  /// A sidebar for the community in markdown.
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub sidebar: Option<String>,
+  /// A shorter, one line description of your community.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub description: Option<String>,
  /// An icon URL.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub icon: Option<String>,
  /// A banner URL.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub banner: Option<String>,
  /// Whether its an NSFW community.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub nsfw: Option<bool>,
  /// Whether to restrict posting only to moderators.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub posting_restricted_to_mods: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub discussion_languages: Option<Vec<LanguageId>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub visibility: Option<CommunityVisibility>,
 }

@ -77,10 +92,15 @@ pub struct CommunityResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Fetches a list of communities.
 pub struct ListCommunities {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub type_: Option<ListingType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<CommunitySortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_nsfw: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
 }

@ -103,11 +123,14 @@ pub struct BanFromCommunity {
  pub ban: bool,
  /// Optionally remove or restore all their data. Useful for new troll accounts.
  /// If ban is true, then this means remove. If ban is false, it means restore.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub remove_or_restore_data: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
  /// A time that the ban will expire, in unix epoch seconds.
  ///
  /// An i64 unix timestamp is used for a simpler API client implementation.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub expires: Option<i64>,
 }

@ -146,18 +169,29 @@ pub struct AddModToCommunityResponse {
 pub struct EditCommunity {
  pub community_id: CommunityId,
  /// A longer title.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub title: Option<String>,
-  /// A longer sidebar, or description of your community, in markdown.
+  /// A sidebar for the community in markdown.
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub sidebar: Option<String>,
+  /// A shorter, one line description of your community.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub description: Option<String>,
  /// An icon URL.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub icon: Option<String>,
  /// A banner URL.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub banner: Option<String>,
  /// Whether its an NSFW community.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub nsfw: Option<bool>,
  /// Whether to restrict posting only to moderators.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub posting_restricted_to_mods: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub discussion_languages: Option<Vec<LanguageId>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub visibility: Option<CommunityVisibility>,
 }

@ -169,6 +203,7 @@ pub struct EditCommunity {
 pub struct HideCommunity {
  pub community_id: CommunityId,
  pub hidden: bool,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -190,6 +225,7 @@ pub struct DeleteCommunity {
 pub struct RemoveCommunity {
  pub community_id: CommunityId,
  pub removed: bool,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -236,5 +272,53 @@ pub struct TransferCommunity {
 #[cfg_attr(feature = "full", ts(export))]
 /// Fetches a random community
 pub struct GetRandomCommunity {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub type_: Option<ListingType>,
 }
+
+#[skip_serializing_none]
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+pub struct ListCommunityPendingFollows {
+  /// Only shows the unapproved applications
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub pending_only: Option<bool>,
+  // Only for admins, show pending follows for communities which you dont moderate
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub all_communities: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub limit: Option<i64>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+pub struct GetCommunityPendingFollowsCount {
+  pub community_id: CommunityId,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+pub struct GetCommunityPendingFollowsCountResponse {
+  pub count: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+pub struct ListCommunityPendingFollowsResponse {
+  pub items: Vec<PendingFollow>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[cfg_attr(feature = "full", derive(TS))]
+#[cfg_attr(feature = "full", ts(export))]
+pub struct ApproveCommunityPendingFollower {
+  pub community_id: CommunityId,
+  pub follower_id: PersonId,
+  pub approve: bool,
+}
--- a/crates/api_common/src/context.rs
+++ b/crates/api_common/src/context.rs
@ -57,7 +57,7 @@ impl LemmyContext {
  /// Do not use this in production code.
  pub async fn init_test_federation_config() -> FederationConfig<LemmyContext> {
    // call this to run migrations
-    let pool = build_db_pool_for_tests().await;
+    let pool = build_db_pool_for_tests();

    let client = client_builder(&SETTINGS).build().expect("build client");

--- a/crates/api_common/src/custom_emoji.rs
+++ b/crates/api_common/src/custom_emoji.rs
@ -62,8 +62,12 @@ pub struct ListCustomEmojisResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Fetches a list of custom emojis.
 pub struct ListCustomEmojis {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub category: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub ignore_page_limits: Option<bool>,
 }
--- a/crates/api_common/src/lib.rs
+++ b/crates/api_common/src/lib.rs
@ -26,7 +26,7 @@ pub extern crate lemmy_db_views_actor;
 pub extern crate lemmy_db_views_moderator;
 pub extern crate lemmy_utils;

-pub use lemmy_utils::LemmyErrorType;
+pub use lemmy_utils::error::LemmyErrorType;
 use serde::{Deserialize, Serialize};
 use std::{cmp::min, time::Duration};

--- a/crates/api_common/src/oauth_provider.rs
+++ b/crates/api_common/src/oauth_provider.rs
@ -20,8 +20,11 @@ pub struct CreateOAuthProvider {
  pub client_id: String,
  pub client_secret: String,
  pub scopes: String,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub auto_verify_email: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub account_linking_enabled: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub enabled: Option<bool>,
 }

@ -32,15 +35,25 @@ pub struct CreateOAuthProvider {
 /// Edit an external auth method.
 pub struct EditOAuthProvider {
  pub id: OAuthProviderId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub display_name: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub authorization_endpoint: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub token_endpoint: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub userinfo_endpoint: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub id_claim: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub client_secret: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub scopes: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub auto_verify_email: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub account_linking_enabled: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub enabled: Option<bool>,
 }

@ -59,13 +72,14 @@ pub struct DeleteOAuthProvider {
 /// Logging in with an OAuth 2.0 authorization
 pub struct AuthenticateWithOauth {
  pub code: String,
-  #[cfg_attr(feature = "full", ts(type = "string"))]
  pub oauth_provider_id: OAuthProviderId,
-  #[cfg_attr(feature = "full", ts(type = "string"))]
  pub redirect_uri: Url,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_nsfw: Option<bool>,
  /// Username is mandatory at registration time
+  #[cfg_attr(feature = "full", ts(optional))]
  pub username: Option<String>,
  /// An answer is mandatory if require application is enabled on the server
+  #[cfg_attr(feature = "full", ts(optional))]
  pub answer: Option<String>,
 }
--- a/crates/api_common/src/person.rs
+++ b/crates/api_common/src/person.rs
@ -28,6 +28,7 @@ pub struct Login {
  pub username_or_email: SensitiveString,
  pub password: SensitiveString,
  /// May be required, if totp is enabled for their account.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub totp_2fa_token: Option<String>,
 }

@ -40,16 +41,22 @@ pub struct Register {
  pub username: String,
  pub password: SensitiveString,
  pub password_verify: SensitiveString,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_nsfw: Option<bool>,
  /// email is mandatory if email verification is enabled on the server
+  #[cfg_attr(feature = "full", ts(optional))]
  pub email: Option<SensitiveString>,
  /// The UUID of the captcha item.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub captcha_uuid: Option<String>,
  /// Your captcha answer.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub captcha_answer: Option<String>,
  /// A form field to trick signup bots. Should be None.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub honeypot: Option<String>,
  /// An answer is mandatory if require application is enabled on the server
+  #[cfg_attr(feature = "full", ts(optional))]
  pub answer: Option<String>,
 }

@ -60,6 +67,7 @@ pub struct Register {
 /// A wrapper for the captcha response.
 pub struct GetCaptchaResponse {
  /// Will be None if captchas are disabled.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub ok: Option<CaptchaResponse>,
 }

@ -83,60 +91,92 @@ pub struct CaptchaResponse {
 /// Saves settings for your user.
 pub struct SaveUserSettings {
  /// Show nsfw posts.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_nsfw: Option<bool>,
  /// Blur nsfw posts.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub blur_nsfw: Option<bool>,
  /// Your user's theme.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub theme: Option<String>,
  /// The default post listing type, usually "local"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_listing_type: Option<ListingType>,
  /// A post-view mode that changes how multiple post listings look.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_listing_mode: Option<PostListingMode>,
  /// The default post sort, usually "active"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_sort_type: Option<PostSortType>,
  /// The default comment sort, usually "hot"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_comment_sort_type: Option<CommentSortType>,
  /// The language of the lemmy interface
+  #[cfg_attr(feature = "full", ts(optional))]
  pub interface_language: Option<String>,
  /// A URL for your avatar.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub avatar: Option<String>,
  /// A URL for your banner.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub banner: Option<String>,
  /// Your display name, which can contain strange characters, and does not need to be unique.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub display_name: Option<String>,
  /// Your email.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub email: Option<SensitiveString>,
  /// Your bio / info, in markdown.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub bio: Option<String>,
  /// Your matrix user id. Ex: @my_user:matrix.org
+  #[cfg_attr(feature = "full", ts(optional))]
  pub matrix_user_id: Option<String>,
  /// Whether to show or hide avatars.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_avatars: Option<bool>,
  /// Sends notifications to your email.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub send_notifications_to_email: Option<bool>,
  /// Whether this account is a bot account. Users can hide these accounts easily if they wish.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub bot_account: Option<bool>,
  /// Whether to show bot accounts.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_bot_accounts: Option<bool>,
  /// Whether to show read posts.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_read_posts: Option<bool>,
  /// A list of languages you are able to see discussion in.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub discussion_languages: Option<Vec<LanguageId>>,
  /// Open links in a new tab
+  #[cfg_attr(feature = "full", ts(optional))]
  pub open_links_in_new_tab: Option<bool>,
  /// Enable infinite scroll
+  #[cfg_attr(feature = "full", ts(optional))]
  pub infinite_scroll_enabled: Option<bool>,
  /// Whether to allow keyboard navigation (for browsing and interacting with posts and comments).
+  #[cfg_attr(feature = "full", ts(optional))]
  pub enable_keyboard_navigation: Option<bool>,
  /// Whether user avatars or inline images in the UI that are gifs should be allowed to play or
  /// should be paused
+  #[cfg_attr(feature = "full", ts(optional))]
  pub enable_animated_images: Option<bool>,
+  /// Whether a user can send / receive private messages
+  #[cfg_attr(feature = "full", ts(optional))]
+  pub enable_private_messages: Option<bool>,
  /// Whether to auto-collapse bot comments.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub collapse_bot_comments: Option<bool>,
  /// Some vote display mode settings
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_scores: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_upvotes: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_downvotes: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_upvote_percentage: Option<bool>,
 }

@ -158,6 +198,7 @@ pub struct ChangePassword {
 pub struct LoginResponse {
  /// This is None in response to `Register` if email verification is enabled, or the server
  /// requires registration applications.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub jwt: Option<SensitiveString>,
  /// If registration applications are required, this will return true for a signup response.
  pub registration_created: bool,
@ -173,13 +214,20 @@ pub struct LoginResponse {
 ///
 /// Either person_id, or username are required.
 pub struct GetPersonDetails {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub person_id: Option<PersonId>,
  /// Example: dessalines , or dessalines@xyz.tld
+  #[cfg_attr(feature = "full", ts(optional))]
  pub username: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<PostSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub saved_only: Option<bool>,
 }

@ -190,6 +238,7 @@ pub struct GetPersonDetails {
 /// A person's details response.
 pub struct GetPersonDetailsResponse {
  pub person_view: PersonView,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub site: Option<Site>,
  pub comments: Vec<CommentView>,
  pub posts: Vec<PostView>,
@ -223,11 +272,14 @@ pub struct BanPerson {
  pub ban: bool,
  /// Optionally remove or restore all their data. Useful for new troll accounts.
  /// If ban is true, then this means remove. If ban is false, it means restore.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub remove_or_restore_data: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
  /// A time that the ban will expire, in unix epoch seconds.
  ///
  /// An i64 unix timestamp is used for a simpler API client implementation.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub expires: Option<i64>,
 }

@ -273,9 +325,13 @@ pub struct BlockPersonResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get comment replies.
 pub struct GetReplies {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<CommentSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unread_only: Option<bool>,
 }

@ -294,9 +350,13 @@ pub struct GetRepliesResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get mentions for your user.
 pub struct GetPersonMentions {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<CommentSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unread_only: Option<bool>,
 }

@ -375,6 +435,7 @@ pub struct PasswordChangeAfterReset {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get a count of the number of reports.
 pub struct GetReportCount {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
 }

@ -384,9 +445,11 @@ pub struct GetReportCount {
 #[cfg_attr(feature = "full", ts(export))]
 /// A response for the number of reports.
 pub struct GetReportCountResponse {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
  pub comment_reports: i64,
  pub post_reports: i64,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub private_message_reports: Option<i64>,
 }

@ -436,7 +499,9 @@ pub struct UpdateTotpResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get your user's image / media uploads.
 pub struct ListMedia {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
 }

--- a/crates/api_common/src/post.rs
+++ b/crates/api_common/src/post.rs
@ -19,18 +19,26 @@ use ts_rs::TS;
 pub struct CreatePost {
  pub name: String,
  pub community_id: CommunityId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub url: Option<String>,
  /// An optional body for the post in markdown.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub body: Option<String>,
  /// An optional alt_text, usable for image posts.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub alt_text: Option<String>,
  /// A honeypot to catch bots. Should be None.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub honeypot: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub nsfw: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub language_id: Option<LanguageId>,
  /// Instead of fetching a thumbnail, use a custom one.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub custom_thumbnail: Option<String>,
  /// Time when this post should be scheduled. Null means publish immediately.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub scheduled_publish_time: Option<i64>,
 }

@ -45,9 +53,12 @@ pub struct PostResponse {
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "full", derive(TS))]
 #[cfg_attr(feature = "full", ts(export))]
+// TODO this should be made into a tagged enum
 /// Get a post. Needs either the post id, or comment_id.
 pub struct GetPost {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub id: Option<PostId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_id: Option<CommentId>,
 }

@ -70,21 +81,37 @@ pub struct GetPostResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get a list of posts.
 pub struct GetPosts {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub type_: Option<ListingType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<PostSortType>,
  /// DEPRECATED, use page_cursor
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_name: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub saved_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub liked_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub disliked_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_hidden: Option<bool>,
  /// If true, then show the read posts (even if your user setting is to hide them)
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_read: Option<bool>,
  /// If true, then show the nsfw posts (even if your user setting is to hide them)
+  #[cfg_attr(feature = "full", ts(optional))]
  pub show_nsfw: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
+  /// If true, then only show posts with no comments
+  pub no_comments_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page_cursor: Option<PaginationCursor>,
 }

@ -96,6 +123,7 @@ pub struct GetPosts {
 pub struct GetPostsResponse {
  pub posts: Vec<PostView>,
  /// the pagination cursor to use to fetch the next page
+  #[cfg_attr(feature = "full", ts(optional))]
  pub next_page: Option<PaginationCursor>,
 }

@ -116,17 +144,25 @@ pub struct CreatePostLike {
 /// Edit a post.
 pub struct EditPost {
  pub post_id: PostId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub name: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub url: Option<String>,
  /// An optional body for the post in markdown.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub body: Option<String>,
  /// An optional alt_text, usable for image posts.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub alt_text: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub nsfw: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub language_id: Option<LanguageId>,
  /// Instead of fetching a thumbnail, use a custom one.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub custom_thumbnail: Option<String>,
  /// Time when this post should be scheduled. Null means publish immediately.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub scheduled_publish_time: Option<i64>,
 }

@ -147,6 +183,7 @@ pub struct DeletePost {
 pub struct RemovePost {
  pub post_id: PostId,
  pub removed: bool,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -230,12 +267,18 @@ pub struct ResolvePostReport {
 #[cfg_attr(feature = "full", ts(export))]
 /// List post reports.
 pub struct ListPostReports {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
  /// Only shows the unresolved reports
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unresolved_only: Option<bool>,
+  // TODO make into tagged enum at some point
  /// if no community is given, it returns reports for all communities moderated by the auth user
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_id: Option<PostId>,
 }

@ -271,6 +314,7 @@ pub struct GetSiteMetadataResponse {
 pub struct LinkMetadata {
  #[serde(flatten)]
  pub opengraph_data: OpenGraphData,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub content_type: Option<String>,
 }

@ -280,9 +324,13 @@ pub struct LinkMetadata {
 #[cfg_attr(feature = "full", ts(export))]
 /// Site metadata, from its opengraph tags.
 pub struct OpenGraphData {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub title: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub description: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub(crate) image: Option<DbUrl>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub embed_video_url: Option<DbUrl>,
 }

@ -293,7 +341,9 @@ pub struct OpenGraphData {
 /// List post likes. Admins-only.
 pub struct ListPostLikes {
  pub post_id: PostId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
 }

--- a/crates/api_common/src/private_message.rs
+++ b/crates/api_common/src/private_message.rs
@ -47,9 +47,13 @@ pub struct MarkPrivateMessageAsRead {
 #[cfg_attr(feature = "full", ts(export))]
 /// Get your private messages.
 pub struct GetPrivateMessages {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unread_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub creator_id: Option<PersonId>,
 }

@ -102,9 +106,12 @@ pub struct ResolvePrivateMessageReport {
 /// List private message reports.
 // TODO , perhaps GetReports should be a tagged enum list too.
 pub struct ListPrivateMessageReports {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
  /// Only shows the unresolved reports
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unresolved_only: Option<bool>,
 }

--- a/crates/api_common/src/request.rs
+++ b/crates/api_common/src/request.rs
@ -175,7 +175,7 @@ pub async fn generate_post_link_metadata(
  };
  let updated_post = Post::update(&mut context.pool(), post.id, &form).await?;
  if let Some(send_activity) = send_activity(updated_post) {
-    ActivityChannel::submit_activity(send_activity, &context).await?;
+    ActivityChannel::submit_activity(send_activity, &context)?;
  }
  Ok(())
 }
--- a/crates/api_common/src/send_activity.rs
+++ b/crates/api_common/src/send_activity.rs
@ -59,6 +59,8 @@ pub enum SendActivityData {
    score: i16,
  },
  FollowCommunity(Community, Person, bool),
+  AcceptFollower(CommunityId, PersonId),
+  RejectFollower(CommunityId, PersonId),
  UpdateCommunity(Person, Community),
  DeleteCommunity(Person, Community, bool),
  RemoveCommunity {
@ -123,10 +125,7 @@ impl ActivityChannel {
    lock.recv().await
  }

-  pub async fn submit_activity(
-    data: SendActivityData,
-    _context: &Data<LemmyContext>,
-  ) -> LemmyResult<()> {
+  pub fn submit_activity(data: SendActivityData, _context: &Data<LemmyContext>) -> LemmyResult<()> {
    // could do `ACTIVITY_CHANNEL.keepalive_sender.lock()` instead and get rid of weak_sender,
    // not sure which way is more efficient
    if let Some(sender) = ACTIVITY_CHANNEL.weak_sender.upgrade() {
--- a/crates/api_common/src/site.rs
+++ b/crates/api_common/src/site.rs
@ -71,18 +71,31 @@ use ts_rs::TS;
 /// Searches the site, given a query string, and some optional filters.
 pub struct Search {
  pub q: String,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_name: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub creator_id: Option<PersonId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub type_: Option<SearchType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sort: Option<PostSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub listing_type: Option<ListingType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub title_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_url_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub saved_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub liked_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub disliked_only: Option<bool>,
 }

@ -115,9 +128,13 @@ pub struct ResolveObject {
 // TODO Change this to an enum
 /// The response of an apub object fetch.
 pub struct ResolveObjectResponse {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment: Option<CommentView>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post: Option<PostView>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community: Option<CommunityView>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub person: Option<PersonView>,
 }

@ -127,13 +144,21 @@ pub struct ResolveObjectResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Fetches the modlog.
 pub struct GetModlog {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub mod_person_id: Option<PersonId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_id: Option<CommunityId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub type_: Option<ModlogActionType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub other_person_id: Option<PersonId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_id: Option<PostId>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_id: Option<CommentId>,
 }

@ -167,50 +192,95 @@ pub struct GetModlogResponse {
 /// Creates a site. Should be done after first running lemmy.
 pub struct CreateSite {
  pub name: String,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sidebar: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub description: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub icon: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub banner: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub enable_nsfw: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_creation_admin_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub require_email_verification: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub application_question: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub private_instance: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_theme: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_listing_type: Option<ListingType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_listing_mode: Option<PostListingMode>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_sort_type: Option<PostSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_comment_sort_type: Option<CommentSortType>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub legal_information: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub application_email_admins: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub hide_modlog_mod_names: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub discussion_languages: Option<Vec<LanguageId>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub slur_filter_regex: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub actor_name_max_length: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_message: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_message_per_second: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_post: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_post_per_second: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_register: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_register_per_second: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_image: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_image_per_second: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_comment: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_comment_per_second: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_search: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_search_per_second: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub federation_enabled: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub federation_debug: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub captcha_enabled: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub captcha_difficulty: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub allowed_instances: Option<Vec<String>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub blocked_instances: Option<Vec<String>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub registration_mode: Option<RegistrationMode>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub oauth_registration: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub content_warning: Option<String>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_upvotes: Option<FederationMode>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_downvotes: Option<FederationMode>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_upvotes: Option<FederationMode>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_downvotes: Option<FederationMode>,
 }

@ -220,93 +290,142 @@ pub struct CreateSite {
 #[cfg_attr(feature = "full", ts(export))]
 /// Edits a site.
 pub struct EditSite {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub name: Option<String>,
+  /// A sidebar for the site, in markdown.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub sidebar: Option<String>,
  /// A shorter, one line description of your site.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub description: Option<String>,
  /// A url for your site's icon.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub icon: Option<String>,
  /// A url for your site's banner.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub banner: Option<String>,
  /// Whether to enable NSFW.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub enable_nsfw: Option<bool>,
  /// Limits community creation to admins only.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub community_creation_admin_only: Option<bool>,
  /// Whether to require email verification.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub require_email_verification: Option<bool>,
  /// Your application question form. This is in markdown, and can be many questions.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub application_question: Option<String>,
  /// Whether your instance is public, or private.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub private_instance: Option<bool>,
  /// The default theme. Usually "browser"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_theme: Option<String>,
  /// The default post listing type, usually "local"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_listing_type: Option<ListingType>,
  /// Default value for listing mode, usually "list"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_listing_mode: Option<PostListingMode>,
  /// The default post sort, usually "active"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_post_sort_type: Option<PostSortType>,
  /// The default comment sort, usually "hot"
+  #[cfg_attr(feature = "full", ts(optional))]
  pub default_comment_sort_type: Option<CommentSortType>,
  /// An optional page of legal information
+  #[cfg_attr(feature = "full", ts(optional))]
  pub legal_information: Option<String>,
  /// Whether to email admins when receiving a new application.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub application_email_admins: Option<bool>,
  /// Whether to hide moderator names from the modlog.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub hide_modlog_mod_names: Option<bool>,
  /// A list of allowed discussion languages.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub discussion_languages: Option<Vec<LanguageId>>,
  /// A regex string of items to filter.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub slur_filter_regex: Option<String>,
  /// The max length of actor names.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub actor_name_max_length: Option<i32>,
  /// The number of messages allowed in a given time frame.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_message: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_message_per_second: Option<i32>,
  /// The number of posts allowed in a given time frame.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_post: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_post_per_second: Option<i32>,
  /// The number of registrations allowed in a given time frame.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_register: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_register_per_second: Option<i32>,
  /// The number of image uploads allowed in a given time frame.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_image: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_image_per_second: Option<i32>,
  /// The number of comments allowed in a given time frame.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_comment: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_comment_per_second: Option<i32>,
  /// The number of searches allowed in a given time frame.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_search: Option<i32>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub rate_limit_search_per_second: Option<i32>,
  /// Whether to enable federation.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub federation_enabled: Option<bool>,
  /// Enables federation debugging.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub federation_debug: Option<bool>,
  /// Whether to enable captchas for signups.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub captcha_enabled: Option<bool>,
  /// The captcha difficulty. Can be easy, medium, or hard
+  #[cfg_attr(feature = "full", ts(optional))]
  pub captcha_difficulty: Option<String>,
  /// A list of allowed instances. If none are set, federation is open.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub allowed_instances: Option<Vec<String>>,
  /// A list of blocked instances.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub blocked_instances: Option<Vec<String>>,
  /// A list of blocked URLs
+  #[cfg_attr(feature = "full", ts(optional))]
  pub blocked_urls: Option<Vec<String>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub registration_mode: Option<RegistrationMode>,
  /// Whether to email admins for new reports.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reports_email_admins: Option<bool>,
  /// If present, nsfw content is visible by default. Should be displayed by frontends/clients
  /// when the site is first opened by a user.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub content_warning: Option<String>,
  /// Whether or not external auth methods can auto-register users.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub oauth_registration: Option<bool>,
  /// What kind of post upvotes your site allows.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_upvotes: Option<FederationMode>,
  /// What kind of post downvotes your site allows.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub post_downvotes: Option<FederationMode>,
  /// What kind of comment upvotes your site allows.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_upvotes: Option<FederationMode>,
  /// What kind of comment downvotes your site allows.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub comment_downvotes: Option<FederationMode>,
 }

@ -329,6 +448,7 @@ pub struct GetSiteResponse {
  pub site_view: SiteView,
  pub admins: Vec<PersonView>,
  pub version: String,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub my_user: Option<MyUserInfo>,
  pub all_languages: Vec<Language>,
  pub discussion_languages: Vec<LanguageId>,
@ -337,9 +457,12 @@ pub struct GetSiteResponse {
  /// deprecated, use /api/v3/custom_emoji/list
  pub custom_emojis: Vec<()>,
  /// If the site has any taglines, a random one is included here for displaying
+  #[cfg_attr(feature = "full", ts(optional))]
  pub tagline: Option<Tagline>,
  /// A list of external auth methods your site supports.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub oauth_providers: Option<Vec<PublicOAuthProvider>>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub admin_oauth_providers: Option<Vec<OAuthProvider>>,
  pub blocked_urls: Vec<LocalSiteUrlBlocklist>,
 }
@ -351,6 +474,7 @@ pub struct GetSiteResponse {
 /// A response of federated instances.
 pub struct GetFederatedInstancesResponse {
  /// Optional, because federation may be disabled.
+  #[cfg_attr(feature = "full", ts(optional))]
  pub federated_instances: Option<FederatedInstances>,
 }

@ -386,6 +510,7 @@ pub struct ReadableFederationState {
  #[serde(flatten)]
  internal_state: FederationQueueState,
  /// timestamp of the next retry attempt (null if fail count is 0)
+  #[cfg_attr(feature = "full", ts(optional))]
  next_retry: Option<DateTime<Utc>>,
 }

@ -410,6 +535,7 @@ pub struct InstanceWithFederationState {
  pub instance: Instance,
  /// if federation to this instance is or was active, show state of outgoing federation to this
  /// instance
+  #[cfg_attr(feature = "full", ts(optional))]
  pub federation_state: Option<ReadableFederationState>,
 }

@ -420,6 +546,7 @@ pub struct InstanceWithFederationState {
 /// Purges a person from the database. This will delete all content attached to that person.
 pub struct PurgePerson {
  pub person_id: PersonId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -430,6 +557,7 @@ pub struct PurgePerson {
 /// Purges a community from the database. This will delete all content attached to that community.
 pub struct PurgeCommunity {
  pub community_id: CommunityId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -440,6 +568,7 @@ pub struct PurgeCommunity {
 /// Purges a post from the database. This will delete all content attached to that post.
 pub struct PurgePost {
  pub post_id: PostId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -450,6 +579,7 @@ pub struct PurgePost {
 /// Purges a comment from the database. This will delete all content attached to that comment.
 pub struct PurgeComment {
  pub comment_id: CommentId,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub reason: Option<String>,
 }

@ -460,8 +590,11 @@ pub struct PurgeComment {
 /// Fetches a list of registration applications.
 pub struct ListRegistrationApplications {
  /// Only shows the unread applications (IE those without an admin actor)
+  #[cfg_attr(feature = "full", ts(optional))]
  pub unread_only: Option<bool>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
 }

@ -490,6 +623,7 @@ pub struct GetRegistrationApplication {
 pub struct ApproveRegistrationApplication {
  pub id: RegistrationApplicationId,
  pub approve: bool,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub deny_reason: Option<String>,
 }

--- a/crates/api_common/src/tagline.rs
+++ b/crates/api_common/src/tagline.rs
@ -50,6 +50,8 @@ pub struct ListTaglinesResponse {
 #[cfg_attr(feature = "full", ts(export))]
 /// Fetches a list of taglines.
 pub struct ListTaglines {
+  #[cfg_attr(feature = "full", ts(optional))]
  pub page: Option<i64>,
+  #[cfg_attr(feature = "full", ts(optional))]
  pub limit: Option<i64>,
 }
--- a/crates/api_common/src/utils.rs
+++ b/crates/api_common/src/utils.rs
@ -42,6 +42,7 @@ use lemmy_db_views::{
  structs::{LocalImageView, LocalUserView, SiteView},
 };
 use lemmy_db_views_actor::structs::{
+  CommunityFollowerView,
  CommunityModeratorView,
  CommunityPersonBanView,
  CommunityView,
@ -50,7 +51,10 @@ use lemmy_utils::{
  email::{send_email, translations::Lang},
  error::{LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult},
  rate_limit::{ActionType, BucketConfig},
-  settings::structs::{PictrsImageMode, Settings},
+  settings::{
+    structs::{PictrsImageMode, Settings},
+    SETTINGS,
+  },
  utils::{
    markdown::{image_links::markdown_rewrite_image_links, markdown_check_for_blocked_urls},
    slurs::{build_slur_regex, remove_slurs},
@ -162,7 +166,6 @@ pub async fn update_read_comments(
    person_id,
    post_id,
    read_comments,
-    ..PersonPostAggregatesForm::default()
  };

  PersonPostAggregates::upsert(pool, &person_post_agg_form).await?;
@ -213,7 +216,9 @@ pub async fn check_registration_application(
    let local_user_id = local_user_view.local_user.id;
    let registration = RegistrationApplication::find_by_local_user_id(pool, local_user_id).await?;
    if registration.admin_id.is_some() {
-      Err(LemmyErrorType::RegistrationDenied(registration.deny_reason))?
+      Err(LemmyErrorType::RegistrationDenied {
+        reason: registration.deny_reason,
+      })?
    } else {
      Err(LemmyErrorType::RegistrationApplicationIsPending)?
    }
@ -227,20 +232,17 @@ pub async fn check_registration_application(
 /// the user isn't banned.
 pub async fn check_community_user_action(
  person: &Person,
-  community_id: CommunityId,
+  community: &Community,
  pool: &mut DbPool<'_>,
 ) -> LemmyResult<()> {
  check_user_valid(person)?;
-  check_community_deleted_removed(community_id, pool).await?;
-  CommunityPersonBanView::check(pool, person.id, community_id).await?;
+  check_community_deleted_removed(community)?;
+  CommunityPersonBanView::check(pool, person.id, community.id).await?;
+  CommunityFollowerView::check_private_community_action(pool, person.id, community).await?;
  Ok(())
 }

-async fn check_community_deleted_removed(
-  community_id: CommunityId,
-  pool: &mut DbPool<'_>,
-) -> LemmyResult<()> {
-  let community = Community::read(pool, community_id).await?;
+pub fn check_community_deleted_removed(community: &Community) -> LemmyResult<()> {
  if community.deleted || community.removed {
    Err(LemmyErrorType::Deleted)?
  }
@ -253,16 +255,16 @@ async fn check_community_deleted_removed(
 /// removed/deleted.
 pub async fn check_community_mod_action(
  person: &Person,
-  community_id: CommunityId,
+  community: &Community,
  allow_deleted: bool,
  pool: &mut DbPool<'_>,
 ) -> LemmyResult<()> {
-  is_mod_or_admin(pool, person, community_id).await?;
-  CommunityPersonBanView::check(pool, person.id, community_id).await?;
+  is_mod_or_admin(pool, person, community.id).await?;
+  CommunityPersonBanView::check(pool, person.id, community.id).await?;

  // it must be possible to restore deleted community
  if !allow_deleted {
-    check_community_deleted_removed(community_id, pool).await?;
+    check_community_deleted_removed(community)?;
  }
  Ok(())
 }
@ -352,6 +354,16 @@ pub fn check_private_instance(
  }
 }

+/// If private messages are disabled, dont allow them to be sent / received
+#[tracing::instrument(skip_all)]
+pub fn check_private_messages_enabled(local_user_view: &LocalUserView) -> Result<(), LemmyError> {
+  if !local_user_view.local_user.enable_private_messages {
+    Err(LemmyErrorType::CouldntCreatePrivateMessage)?
+  } else {
+    Ok(())
+  }
+}
+
 #[tracing::instrument(skip_all)]
 pub async fn build_federated_instances(
  local_site: &LocalSite,
@ -973,12 +985,8 @@ pub fn generate_followers_url(actor_id: &DbUrl) -> Result<DbUrl, ParseError> {
  Ok(Url::parse(&format!("{actor_id}/followers"))?.into())
 }

-pub fn generate_inbox_url(actor_id: &DbUrl) -> Result<DbUrl, ParseError> {
-  Ok(Url::parse(&format!("{actor_id}/inbox"))?.into())
-}
-
-pub fn generate_shared_inbox_url(settings: &Settings) -> LemmyResult<DbUrl> {
-  let url = format!("{}/inbox", settings.get_protocol_and_hostname());
+pub fn generate_inbox_url() -> LemmyResult<DbUrl> {
+  let url = format!("{}/inbox", SETTINGS.get_protocol_and_hostname());
  Ok(Url::parse(&url)?.into())
 }

@ -1111,7 +1119,7 @@ async fn proxy_image_link_internal(

 /// Rewrite a link to go through `/api/v3/image_proxy` endpoint. This is only for remote urls and
 /// if image_proxy setting is enabled.
-pub(crate) async fn proxy_image_link(link: Url, context: &LemmyContext) -> LemmyResult<DbUrl> {
+pub async fn proxy_image_link(link: Url, context: &LemmyContext) -> LemmyResult<DbUrl> {
  proxy_image_link_internal(
    link,
    context.settings().pictrs_config()?.image_mode(),
--- a/crates/api_crud/Cargo.toml
+++ b/crates/api_crud/Cargo.toml
@ -34,5 +34,5 @@ serde_json = { workspace = true }
 serde = { workspace = true }
 serde_with = { workspace = true }

-[package.metadata.cargo-machete]
+[package.metadata.cargo-shear]
 ignored = ["futures"]
--- a/crates/api_crud/src/comment/create.rs
+++ b/crates/api_crud/src/comment/create.rs
@ -60,7 +60,12 @@ pub async fn create_comment(
  let post = post_view.post;
  let community_id = post_view.community.id;

-  check_community_user_action(&local_user_view.person, community_id, &mut context.pool()).await?;
+  check_community_user_action(
+    &local_user_view.person,
+    &post_view.community,
+    &mut context.pool(),
+  )
+  .await?;
  check_post_deleted_or_removed(&post)?;

  // Check if post is locked, no new comments
@ -123,7 +128,6 @@ pub async fn create_comment(
  // You like your own comment by default
  let like_form = CommentLikeForm {
    comment_id: inserted_comment.id,
-    post_id: post.id,
    person_id: local_user_view.person.id,
    score: 1,
  };
@ -135,8 +139,7 @@ pub async fn create_comment(
  ActivityChannel::submit_activity(
    SendActivityData::CreateComment(inserted_comment.clone()),
    &context,
-  )
-  .await?;
+  )?;

  // Update the read comments, so your own new comment doesn't appear as a +1 unread
  update_read_comments(
--- a/crates/api_crud/src/comment/delete.rs
+++ b/crates/api_crud/src/comment/delete.rs
@ -35,7 +35,7 @@ pub async fn delete_comment(

  check_community_user_action(
    &local_user_view.person,
-    orig_comment.community.id,
+    &orig_comment.community,
    &mut context.pool(),
  )
  .await?;
@ -76,8 +76,7 @@ pub async fn delete_comment(
      orig_comment.community,
    ),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(
    build_comment_response(
--- a/crates/api_crud/src/comment/remove.rs
+++ b/crates/api_crud/src/comment/remove.rs
@ -35,7 +35,7 @@ pub async fn remove_comment(

  check_community_mod_action(
    &local_user_view.person,
-    orig_comment.community.id,
+    &orig_comment.community,
    false,
    &mut context.pool(),
  )
@ -99,8 +99,7 @@ pub async fn remove_comment(
      reason: data.reason.clone(),
    },
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(
    build_comment_response(
--- a/crates/api_crud/src/comment/update.rs
+++ b/crates/api_crud/src/comment/update.rs
@ -45,7 +45,7 @@ pub async fn update_comment(

  check_community_user_action(
    &local_user_view.person,
-    orig_comment.community.id,
+    &orig_comment.community,
    &mut context.pool(),
  )
  .await?;
@ -97,8 +97,7 @@ pub async fn update_comment(
  ActivityChannel::submit_activity(
    SendActivityData::UpdateComment(updated_comment.clone()),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(
    build_comment_response(
--- a/crates/api_crud/src/community/create.rs
+++ b/crates/api_crud/src/community/create.rs
@ -1,3 +1,4 @@
+use super::check_community_visibility_allowed;
 use activitypub_federation::{config::Data, http_signatures::generate_actor_keypair};
 use actix_web::web::Json;
 use lemmy_api_common::{
@ -8,7 +9,6 @@ use lemmy_api_common::{
    generate_followers_url,
    generate_inbox_url,
    generate_local_apub_endpoint,
-    generate_shared_inbox_url,
    get_url_blocklist,
    is_admin,
    local_site_to_slur_regex,
@ -24,6 +24,7 @@ use lemmy_db_schema::{
      Community,
      CommunityFollower,
      CommunityFollowerForm,
+      CommunityFollowerState,
      CommunityInsertForm,
      CommunityModerator,
      CommunityModeratorForm,
@ -37,7 +38,11 @@ use lemmy_utils::{
  error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
  utils::{
    slurs::check_slurs,
-    validation::{is_valid_actor_name, is_valid_body_field},
+    validation::{
+      is_valid_actor_name,
+      is_valid_body_field,
+      site_or_community_description_length_check,
+    },
  },
 };

@ -58,8 +63,18 @@ pub async fn create_community(
  let url_blocklist = get_url_blocklist(&context).await?;
  check_slurs(&data.name, &slur_regex)?;
  check_slurs(&data.title, &slur_regex)?;
-  let description =
-    process_markdown_opt(&data.description, &slur_regex, &url_blocklist, &context).await?;
+  let sidebar = process_markdown_opt(&data.sidebar, &slur_regex, &url_blocklist, &context).await?;
+
+  // Ensure that the sidebar has fewer than the max num characters...
+  if let Some(sidebar) = &sidebar {
+    is_valid_body_field(sidebar, false)?;
+  }
+
+  let description = data.description.clone();
+  if let Some(desc) = &description {
+    site_or_community_description_length_check(desc)?;
+    check_slurs(desc, &slur_regex)?;
+  }

  let icon = diesel_url_create(data.icon.as_deref())?;
  let icon = proxy_image_link_api(icon, &context).await?;
@ -73,6 +88,8 @@ pub async fn create_community(
    is_valid_body_field(desc, false)?;
  }

+  check_community_visibility_allowed(data.visibility, &local_user_view)?;
+
  // Double check for duplicate community actor_ids
  let community_actor_id = generate_local_apub_endpoint(
    EndpointType::Community,
@ -89,6 +106,7 @@ pub async fn create_community(
  let keypair = generate_actor_keypair()?;

  let community_form = CommunityInsertForm {
+    sidebar,
    description,
    icon,
    banner,
@ -96,8 +114,7 @@ pub async fn create_community(
    actor_id: Some(community_actor_id.clone()),
    private_key: Some(keypair.private_key),
    followers_url: Some(generate_followers_url(&community_actor_id)?),
-    inbox_url: Some(generate_inbox_url(&community_actor_id)?),
-    shared_inbox_url: Some(generate_shared_inbox_url(context.settings())?),
+    inbox_url: Some(generate_inbox_url()?),
    posting_restricted_to_mods: data.posting_restricted_to_mods,
    visibility: data.visibility,
    ..CommunityInsertForm::new(
@ -126,7 +143,8 @@ pub async fn create_community(
  let community_follower_form = CommunityFollowerForm {
    community_id: inserted_community.id,
    person_id: local_user_view.person.id,
-    pending: false,
+    state: Some(CommunityFollowerState::Accepted),
+    approver_id: None,
  };

  CommunityFollower::follow(&mut context.pool(), &community_follower_form)
--- a/crates/api_crud/src/community/delete.rs
+++ b/crates/api_crud/src/community/delete.rs
@ -22,13 +22,13 @@ pub async fn delete_community(
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
  // Fetch the community mods
-  let community_id = data.community_id;
  let community_mods =
-    CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
+    CommunityModeratorView::for_community(&mut context.pool(), data.community_id).await?;

+  let community = Community::read(&mut context.pool(), data.community_id).await?;
  check_community_mod_action(
    &local_user_view.person,
-    community_id,
+    &community,
    true,
    &mut context.pool(),
  )
@ -54,8 +54,7 @@ pub async fn delete_community(
  ActivityChannel::submit_activity(
    SendActivityData::DeleteCommunity(local_user_view.person.clone(), community, data.deleted),
    &context,
-  )
-  .await?;
+  )?;

  build_community_response(&context, local_user_view, community_id).await
 }
--- a/crates/api_crud/src/community/mod.rs
+++ b/crates/api_crud/src/community/mod.rs
@ -1,5 +1,22 @@
+use lemmy_api_common::utils::is_admin;
+use lemmy_db_schema::CommunityVisibility;
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_utils::error::LemmyResult;
+
 pub mod create;
 pub mod delete;
 pub mod list;
 pub mod remove;
 pub mod update;
+
+/// For now only admins can make communities private, in order to prevent abuse.
+/// Need to implement admin approval for new communities to get rid of this.
+fn check_community_visibility_allowed(
+  visibility: Option<CommunityVisibility>,
+  local_user_view: &LocalUserView,
+) -> LemmyResult<()> {
+  if visibility == Some(lemmy_db_schema::CommunityVisibility::Private) {
+    is_admin(local_user_view)?;
+  }
+  Ok(())
+}
--- a/crates/api_crud/src/community/remove.rs
+++ b/crates/api_crud/src/community/remove.rs
@ -23,9 +23,10 @@ pub async fn remove_community(
  context: Data<LemmyContext>,
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
+  let community = Community::read(&mut context.pool(), data.community_id).await?;
  check_community_mod_action(
    &local_user_view.person,
-    data.community_id,
+    &community,
    true,
    &mut context.pool(),
  )
@ -65,8 +66,7 @@ pub async fn remove_community(
      removed: data.removed,
    },
    &context,
-  )
-  .await?;
+  )?;

  build_community_response(&context, local_user_view, community_id).await
 }
--- a/crates/api_crud/src/community/update.rs
+++ b/crates/api_crud/src/community/update.rs
@ -1,3 +1,4 @@
+use super::check_community_visibility_allowed;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
 use lemmy_api_common::{
@ -41,16 +42,19 @@ pub async fn update_community(
  let url_blocklist = get_url_blocklist(&context).await?;
  check_slurs_opt(&data.title, &slur_regex)?;

-  let description = diesel_string_update(
-    process_markdown_opt(&data.description, &slur_regex, &url_blocklist, &context)
+  let sidebar = diesel_string_update(
+    process_markdown_opt(&data.sidebar, &slur_regex, &url_blocklist, &context)
      .await?
      .as_deref(),
  );

-  if let Some(Some(desc)) = &description {
-    is_valid_body_field(desc, false)?;
+  if let Some(Some(sidebar)) = &sidebar {
+    is_valid_body_field(sidebar, false)?;
  }

+  check_community_visibility_allowed(data.visibility, &local_user_view)?;
+  let description = diesel_string_update(data.description.as_deref());
+
  let old_community = Community::read(&mut context.pool(), data.community_id).await?;

  let icon = diesel_url_update(data.icon.as_deref())?;
@ -64,7 +68,7 @@ pub async fn update_community(
  // Verify its a mod (only mods can edit it)
  check_community_mod_action(
    &local_user_view.person,
-    data.community_id,
+    &old_community,
    false,
    &mut context.pool(),
  )
@ -84,6 +88,7 @@ pub async fn update_community(

  let community_form = CommunityUpdateForm {
    title: data.title.clone(),
+    sidebar,
    description,
    icon,
    banner,
@ -102,8 +107,7 @@ pub async fn update_community(
  ActivityChannel::submit_activity(
    SendActivityData::UpdateCommunity(local_user_view.person.clone(), community),
    &context,
-  )
-  .await?;
+  )?;

  build_community_response(&context, local_user_view, community_id).await
 }
--- a/crates/api_crud/src/post/create.rs
+++ b/crates/api_crud/src/post/create.rs
@ -84,15 +84,9 @@ pub async fn create_post(
    is_valid_body_field(body, true)?;
  }

-  check_community_user_action(
-    &local_user_view.person,
-    data.community_id,
-    &mut context.pool(),
-  )
-  .await?;
+  let community = Community::read(&mut context.pool(), data.community_id).await?;
+  check_community_user_action(&local_user_view.person, &community, &mut context.pool()).await?;

-  let community_id = data.community_id;
-  let community = Community::read(&mut context.pool(), community_id).await?;
  if community.posting_restricted_to_mods {
    let community_id = data.community_id;
    CommunityModeratorView::check_is_community_moderator(
@ -106,7 +100,7 @@ pub async fn create_post(
  let language_id = validate_post_language(
    &mut context.pool(),
    data.language_id,
-    community_id,
+    data.community_id,
    local_user_view.local_user.id,
  )
  .await?;
@ -131,6 +125,7 @@ pub async fn create_post(
    .await
    .with_lemmy_type(LemmyErrorType::CouldntCreatePost)?;

+  let community_id = community.id;
  let federate_post = if scheduled_publish_time.is_none() {
    send_webmention(inserted_post.clone(), community);
    |post| Some(SendActivityData::CreatePost(post))
--- a/crates/api_crud/src/post/delete.rs
+++ b/crates/api_crud/src/post/delete.rs
@ -8,7 +8,10 @@ use lemmy_api_common::{
  utils::check_community_user_action,
 };
 use lemmy_db_schema::{
-  source::post::{Post, PostUpdateForm},
+  source::{
+    community::Community,
+    post::{Post, PostUpdateForm},
+  },
  traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
@ -28,12 +31,8 @@ pub async fn delete_post(
    Err(LemmyErrorType::CouldntUpdatePost)?
  }

-  check_community_user_action(
-    &local_user_view.person,
-    orig_post.community_id,
-    &mut context.pool(),
-  )
-  .await?;
+  let community = Community::read(&mut context.pool(), orig_post.community_id).await?;
+  check_community_user_action(&local_user_view.person, &community, &mut context.pool()).await?;

  // Verify that only the creator can delete
  if !Post::is_post_creator(local_user_view.person.id, orig_post.creator_id) {
@ -54,8 +53,7 @@ pub async fn delete_post(
  ActivityChannel::submit_activity(
    SendActivityData::DeletePost(post, local_user_view.person.clone(), data.0),
    &context,
-  )
-  .await?;
+  )?;

  build_post_response(
    &context,
--- a/crates/api_crud/src/post/mod.rs
+++ b/crates/api_crud/src/post/mod.rs
@ -2,7 +2,7 @@ use chrono::{DateTime, TimeZone, Utc};
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::source::post::Post;
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};

 pub mod create;
 pub mod delete;
--- a/crates/api_crud/src/post/remove.rs
+++ b/crates/api_crud/src/post/remove.rs
@ -9,6 +9,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{
  source::{
+    community::Community,
    local_user::LocalUser,
    moderator::{ModRemovePost, ModRemovePostForm},
    post::{Post, PostUpdateForm},
@ -26,11 +27,16 @@ pub async fn remove_post(
  local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
  let post_id = data.post_id;
+
+  // We cannot use PostView to avoid a database read here, as it doesn't return removed items
+  // by default. So we would have to pass in `is_mod_or_admin`, but that is impossible without
+  // knowing which community the post belongs to.
  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let community = Community::read(&mut context.pool(), orig_post.community_id).await?;

  check_community_mod_action(
    &local_user_view.person,
-    orig_post.community_id,
+    &community,
    false,
    &mut context.pool(),
  )
@ -77,8 +83,7 @@ pub async fn remove_post(
      removed: data.removed,
    },
    &context,
-  )
-  .await?;
+  )?;

  build_post_response(&context, orig_post.community_id, local_user_view, post_id).await
 }
--- a/crates/api_crud/src/post/update.rs
+++ b/crates/api_crud/src/post/update.rs
@ -24,7 +24,7 @@ use lemmy_db_schema::{
  traits::Crud,
  utils::{diesel_string_update, diesel_url_update, naive_now},
 };
-use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views::structs::{LocalUserView, PostView};
 use lemmy_utils::{
  error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
  utils::{
@ -87,31 +87,31 @@ pub async fn update_post(
  }

  let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id).await?;
+  let orig_post = PostView::read(&mut context.pool(), post_id, None, false).await?;

  check_community_user_action(
    &local_user_view.person,
-    orig_post.community_id,
+    &orig_post.community,
    &mut context.pool(),
  )
  .await?;

  // Verify that only the creator can edit
-  if !Post::is_post_creator(local_user_view.person.id, orig_post.creator_id) {
+  if !Post::is_post_creator(local_user_view.person.id, orig_post.post.creator_id) {
    Err(LemmyErrorType::NoPostEditAllowed)?
  }

  let language_id = validate_post_language(
    &mut context.pool(),
    data.language_id,
-    orig_post.community_id,
+    orig_post.post.community_id,
    local_user_view.local_user.id,
  )
  .await?;

  // handle changes to scheduled_publish_time
  let scheduled_publish_time = match (
-    orig_post.scheduled_publish_time,
+    orig_post.post.scheduled_publish_time,
    data.scheduled_publish_time,
  ) {
    // schedule time can be changed if post is still scheduled (and not published yet)
@ -143,12 +143,12 @@ pub async fn update_post(

  // send out federation/webmention if necessary
  match (
-    orig_post.scheduled_publish_time,
+    orig_post.post.scheduled_publish_time,
    data.scheduled_publish_time,
  ) {
    // schedule was removed, send create activity and webmention
    (Some(_), None) => {
-      let community = Community::read(&mut context.pool(), orig_post.community_id).await?;
+      let community = Community::read(&mut context.pool(), orig_post.community.id).await?;
      send_webmention(updated_post.clone(), community);
      generate_post_link_metadata(
        updated_post.clone(),
@ -174,7 +174,7 @@ pub async fn update_post(

  build_post_response(
    context.deref(),
-    orig_post.community_id,
+    orig_post.community.id,
    local_user_view,
    post_id,
  )
--- a/crates/api_crud/src/private_message/create.rs
+++ b/crates/api_crud/src/private_message/create.rs
@ -5,6 +5,7 @@ use lemmy_api_common::{
  private_message::{CreatePrivateMessage, PrivateMessageResponse},
  send_activity::{ActivityChannel, SendActivityData},
  utils::{
+    check_private_messages_enabled,
    get_interface_language,
    get_url_blocklist,
    local_site_to_slur_regex,
@ -46,6 +47,16 @@ pub async fn create_private_message(
  )
  .await?;

+  check_private_messages_enabled(&local_user_view)?;
+
+  // Don't allow local sends to people who have private messages disabled
+  let recipient_local_user_opt = LocalUserView::read_person(&mut context.pool(), data.recipient_id)
+    .await
+    .ok();
+  if let Some(recipient_local_user) = recipient_local_user_opt {
+    check_private_messages_enabled(&recipient_local_user)?;
+  }
+
  let private_message_form = PrivateMessageInsertForm::new(
    local_user_view.person.id,
    data.recipient_id,
@ -78,8 +89,7 @@ pub async fn create_private_message(
  ActivityChannel::submit_activity(
    SendActivityData::CreatePrivateMessage(view.clone()),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(PrivateMessageResponse {
    private_message_view: view,
--- a/crates/api_crud/src/private_message/delete.rs
+++ b/crates/api_crud/src/private_message/delete.rs
@ -42,8 +42,7 @@ pub async fn delete_private_message(
  ActivityChannel::submit_activity(
    SendActivityData::DeletePrivateMessage(local_user_view.person, private_message, data.deleted),
    &context,
-  )
-  .await?;
+  )?;

  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
  Ok(Json(PrivateMessageResponse {
--- a/crates/api_crud/src/private_message/update.rs
+++ b/crates/api_crud/src/private_message/update.rs
@ -59,8 +59,7 @@ pub async fn update_private_message(
  ActivityChannel::submit_activity(
    SendActivityData::UpdatePrivateMessage(view.clone()),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(PrivateMessageResponse {
    private_message_view: view,
--- a/crates/api_crud/src/site/create.rs
+++ b/crates/api_crud/src/site/create.rs
@ -6,7 +6,7 @@ use lemmy_api_common::{
  context::LemmyContext,
  site::{CreateSite, SiteResponse},
  utils::{
-    generate_shared_inbox_url,
+    generate_inbox_url,
    get_url_blocklist,
    is_admin,
    local_site_rate_limit_to_rate_limit_config,
@ -29,13 +29,13 @@ use lemmy_db_views::structs::{LocalUserView, SiteView};
 use lemmy_utils::{
  error::{LemmyErrorType, LemmyResult},
  utils::{
-    slurs::{check_slurs, check_slurs_opt},
+    slurs::check_slurs,
    validation::{
      build_and_check_regex,
      check_site_visibility_valid,
      is_valid_body_field,
-      site_description_length_check,
      site_name_length_check,
+      site_or_community_description_length_check,
    },
  },
 };
@ -55,7 +55,7 @@ pub async fn create_site(
  validate_create_payload(&local_site, &data)?;

  let actor_id: DbUrl = Url::parse(&context.settings().get_protocol_and_hostname())?.into();
-  let inbox_url = Some(generate_shared_inbox_url(context.settings())?);
+  let inbox_url = Some(generate_inbox_url()?);
  let keypair = generate_actor_keypair()?;

  let slur_regex = local_site_to_slur_regex(&local_site);
@ -167,8 +167,8 @@ fn validate_create_payload(local_site: &LocalSite, create_site: &CreateSite) ->
  check_slurs(&create_site.name, &slur_regex)?;

  if let Some(desc) = &create_site.description {
-    site_description_length_check(desc)?;
-    check_slurs_opt(&create_site.description, &slur_regex)?;
+    site_or_community_description_length_check(desc)?;
+    check_slurs(desc, &slur_regex)?;
  }

  site_default_post_listing_type_check(&create_site.default_post_listing_type)?;
--- a/crates/api_crud/src/site/update.rs
+++ b/crates/api_crud/src/site/update.rs
@ -40,8 +40,8 @@ use lemmy_utils::{
      check_site_visibility_valid,
      check_urls_are_valid,
      is_valid_body_field,
-      site_description_length_check,
      site_name_length_check,
+      site_or_community_description_length_check,
    },
  },
 };
@ -219,7 +219,7 @@ fn validate_update_payload(local_site: &LocalSite, edit_site: &EditSite) -> Lemm
  }

  if let Some(desc) = &edit_site.description {
-    site_description_length_check(desc)?;
+    site_or_community_description_length_check(desc)?;
    check_slurs_opt(&edit_site.description, &slur_regex)?;
  }

--- a/crates/api_crud/src/user/create.rs
+++ b/crates/api_crud/src/user/create.rs
@ -11,7 +11,6 @@ use lemmy_api_common::{
    check_user_valid,
    generate_inbox_url,
    generate_local_apub_endpoint,
-    generate_shared_inbox_url,
    honeypot_check,
    local_site_to_slur_regex,
    password_length_check,
@ -418,8 +417,7 @@ async fn create_person(
  // Register the new person
  let person_form = PersonInsertForm {
    actor_id: Some(actor_id.clone()),
-    inbox_url: Some(generate_inbox_url(&actor_id)?),
-    shared_inbox_url: Some(generate_shared_inbox_url(context.settings())?),
+    inbox_url: Some(generate_inbox_url()?),
    private_key: Some(actor_keypair.private_key),
    ..PersonInsertForm::new(username.clone(), actor_keypair.public_key, instance_id)
  };
--- a/crates/api_crud/src/user/delete.rs
+++ b/crates/api_crud/src/user/delete.rs
@ -45,8 +45,7 @@ pub async fn delete_account(
  ActivityChannel::submit_activity(
    SendActivityData::DeleteUser(local_user_view.person, data.delete_content),
    &context,
-  )
-  .await?;
+  )?;

  Ok(Json(SuccessResponse::default()))
 }
--- a/crates/apub/Cargo.toml
+++ b/crates/apub/Cargo.toml
@ -33,7 +33,6 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 strum = { workspace = true }
 url = { workspace = true }
-http = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 uuid = { workspace = true }
--- a/crates/apub/assets/lemmy/objects/group.json
+++ b/crates/apub/assets/lemmy/objects/group.json
@ -3,11 +3,13 @@
  "type": "Group",
  "preferredUsername": "tenforward",
  "name": "Ten Forward",
-  "summary": "<p>Lounge and recreation facility</p>\n<hr />\n<p>Welcome to the Enterprise!.</p>\n",
+  "summary": "A description of ten forward.",
+  "content": "<p>Lounge and recreation facility</p>\n<hr />\n<p>Welcome to the Enterprise!.</p>\n",
  "source": {
    "content": "Lounge and recreation facility\n\n---\n\nWelcome to the Enterprise!",
    "mediaType": "text/markdown"
  },
+  "mediaType": "text/html",
  "sensitive": false,
  "icon": {
    "type": "Image",
--- a/crates/apub/assets/mastodon/objects/note_1.json
+++ b/crates/apub/assets/mastodon/objects/note_1.json
--- a/crates/apub/assets/mastodon/objects/note_2.json
+++ b/crates/apub/assets/mastodon/objects/note_2.json
@ -0,0 +1,79 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "ostatus": "http://ostatus.org#",
+      "atomUri": "ostatus:atomUri",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "conversation": "ostatus:conversation",
+      "sensitive": "as:sensitive",
+      "toot": "http://joinmastodon.org/ns#",
+      "votersCount": "toot:votersCount",
+      "blurhash": "toot:blurhash",
+      "focalPoint": {
+        "@container": "@list",
+        "@id": "toot:focalPoint"
+      }
+    }
+  ],
+  "id": "https://floss.social/users/kde/statuses/113306831140126616",
+  "type": "Note",
+  "summary": null,
+  "inReplyTo": "https://floss.social/users/kde/statuses/113306824627995724",
+  "published": "2024-10-14T16:57:15Z",
+  "url": "https://floss.social/@kde/113306831140126616",
+  "attributedTo": "https://floss.social/users/kde",
+  "to": ["https://www.w3.org/ns/activitystreams#Public"],
+  "cc": [
+    "https://floss.social/users/kde/followers",
+    "https://lemmy.kde.social/c/kde",
+    "https://lemmy.kde.social/c/kde/followers"
+  ],
+  "sensitive": false,
+  "atomUri": "https://floss.social/users/kde/statuses/113306831140126616",
+  "inReplyToAtomUri": "https://floss.social/users/kde/statuses/113306824627995724",
+  "conversation": "tag:floss.social,2024-10-14:objectId=71424279:objectType=Conversation",
+  "content": "<p><span class=\"h-card\" translate=\"no\"><a href=\"https://lemmy.kde.social/c/kde\" class=\"u-url mention\">@<span>kde@lemmy.kde.social</span></a></span> </p><p>We also need funding 💶 to keep the gears turning! Please support us with a donation:</p><p><a href=\"https://kde.org/donate/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">kde.org/donate/</span><span class=\"invisible\"></span></a></p><p>[3/3]</p>",
+  "contentMap": {
+    "en": "<p><span class=\"h-card\" translate=\"no\"><a href=\"https://lemmy.kde.social/c/kde\" class=\"u-url mention\">@<span>kde@lemmy.kde.social</span></a></span> </p><p>We also need funding 💶 to keep the gears turning! Please support us with a donation:</p><p><a href=\"https://kde.org/donate/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">kde.org/donate/</span><span class=\"invisible\"></span></a></p><p>[3/3]</p>"
+  },
+  "attachment": [
+    {
+      "type": "Document",
+      "mediaType": "image/jpeg",
+      "url": "https://cdn.masto.host/floss/media_attachments/files/113/306/826/682/985/891/original/c8d906a2f2ab2334.jpg",
+      "name": "The KDE dragons Katie and Konqi stand on either side of a pot filling up with gold coins. Donate!",
+      "blurhash": "USQv:h-W-qI-^,W;RPs=^-R%NZxbo#sDobSc",
+      "focalPoint": [0.0, 0.0],
+      "width": 1500,
+      "height": 1095
+    }
+  ],
+  "tag": [
+    {
+      "type": "Mention",
+      "href": "https://lemmy.kde.social/c/kde",
+      "name": "@kde@lemmy.kde.social"
+    }
+  ],
+  "replies": {
+    "id": "https://floss.social/users/kde/statuses/113306831140126616/replies",
+    "type": "Collection",
+    "first": {
+      "type": "CollectionPage",
+      "next": "https://floss.social/users/kde/statuses/113306831140126616/replies?only_other_accounts=true&page=true",
+      "partOf": "https://floss.social/users/kde/statuses/113306831140126616/replies",
+      "items": []
+    }
+  },
+  "likes": {
+    "id": "https://floss.social/users/kde/statuses/113306831140126616/likes",
+    "type": "Collection",
+    "totalItems": 39
+  },
+  "shares": {
+    "id": "https://floss.social/users/kde/statuses/113306831140126616/shares",
+    "type": "Collection",
+    "totalItems": 24
+  }
+}
--- a/crates/apub/src/activities/block/block_user.rs
+++ b/crates/apub/src/activities/block/block_user.rs
@ -1,3 +1,4 @@
+use super::to_and_audience;
 use crate::{
  activities::{
    block::{generate_cc, SiteOrCommunity},
@ -7,6 +8,7 @@ use crate::{
    verify_is_public,
    verify_mod_action,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -15,7 +17,7 @@ use crate::{
 };
 use activitypub_federation::{
  config::Data,
-  kinds::{activity::BlockType, public},
+  kinds::activity::BlockType,
  protocol::verification::verify_domains_match,
  traits::{ActivityHandler, Actor},
 };
@ -39,10 +41,7 @@ use lemmy_db_schema::{
  },
  traits::{Bannable, Crud, Followable},
 };
-use lemmy_utils::{
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
+use lemmy_utils::error::{FederationError, LemmyError, LemmyResult};
 use url::Url;

 impl BlockUser {
@ -55,14 +54,10 @@ impl BlockUser {
    expires: Option<DateTime<Utc>>,
    context: &Data<LemmyContext>,
  ) -> LemmyResult<BlockUser> {
-    let audience = if let SiteOrCommunity::Community(c) = target {
-      Some(c.id().into())
-    } else {
-      None
-    };
+    let (to, audience) = to_and_audience(target)?;
    Ok(BlockUser {
      actor: mod_.id().into(),
-      to: vec![public()],
+      to,
      object: user.id().into(),
      cc: generate_cc(target, &mut context.pool()).await?,
      target: target.id(),
@ -128,14 +123,14 @@ impl ActivityHandler for BlockUser {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<LemmyContext>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    match self.target.dereference(context).await? {
      SiteOrCommunity::Site(site) => {
+        verify_is_public(&self.to, &self.cc)?;
        let domain = self
          .object
          .inner()
          .domain()
-          .ok_or(LemmyErrorType::UrlWithoutDomain)?;
+          .ok_or(FederationError::UrlWithoutDomain)?;
        if context.settings().hostname == domain {
          return Err(
            anyhow!("Site bans from remote instance can't affect user's home instance").into(),
@ -146,6 +141,7 @@ impl ActivityHandler for BlockUser {
        verify_domains_match(&site.id(), self.object.inner())?;
      }
      SiteOrCommunity::Community(community) => {
+        verify_visibility(&self.to, &self.cc, &community)?;
        verify_person_in_community(&self.actor, &community, context).await?;
        verify_mod_action(&self.actor, &community, context).await?;
      }
@ -197,11 +193,7 @@ impl ActivityHandler for BlockUser {
        CommunityPersonBan::ban(&mut context.pool(), &community_user_ban_form).await?;

        // Also unsubscribe them from the community, if they are subscribed
-        let community_follower_form = CommunityFollowerForm {
-          community_id: community.id,
-          person_id: blocked_person.id,
-          pending: false,
-        };
+        let community_follower_form = CommunityFollowerForm::new(community.id, blocked_person.id);
        CommunityFollower::unfollow(&mut context.pool(), &community_follower_form)
          .await
          .ok();
--- a/crates/apub/src/activities/block/mod.rs
+++ b/crates/apub/src/activities/block/mod.rs
@ -1,3 +1,4 @@
+use super::generate_to;
 use crate::{
  objects::{community::ApubCommunity, instance::ApubSite},
  protocol::{
@ -8,6 +9,7 @@ use crate::{
 use activitypub_federation::{
  config::Data,
  fetch::object_id::ObjectId,
+  kinds::public,
  traits::{Actor, Object},
 };
 use chrono::{DateTime, Utc};
@ -205,3 +207,13 @@ pub(crate) async fn send_ban_from_community(
    .await
  }
 }
+
+fn to_and_audience(
+  target: &SiteOrCommunity,
+) -> LemmyResult<(Vec<Url>, Option<ObjectId<ApubCommunity>>)> {
+  Ok(if let SiteOrCommunity::Community(c) = target {
+    (vec![generate_to(c)?], Some(c.id().into()))
+  } else {
+    (vec![public()], None)
+  })
+}
--- a/crates/apub/src/activities/block/undo_block_user.rs
+++ b/crates/apub/src/activities/block/undo_block_user.rs
@ -1,3 +1,4 @@
+use super::to_and_audience;
 use crate::{
  activities::{
    block::{generate_cc, SiteOrCommunity},
@ -5,6 +6,7 @@ use crate::{
    generate_activity_id,
    send_lemmy_activity,
    verify_is_public,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -13,7 +15,7 @@ use crate::{
 };
 use activitypub_federation::{
  config::Data,
-  kinds::{activity::UndoType, public},
+  kinds::activity::UndoType,
  protocol::verification::verify_domains_match,
  traits::{ActivityHandler, Actor},
 };
@ -44,11 +46,7 @@ impl UndoBlockUser {
    context: &Data<LemmyContext>,
  ) -> LemmyResult<()> {
    let block = BlockUser::new(target, user, mod_, None, reason, None, context).await?;
-    let audience = if let SiteOrCommunity::Community(c) = target {
-      Some(c.id().into())
-    } else {
-      None
-    };
+    let (to, audience) = to_and_audience(target)?;

    let id = generate_activity_id(
      UndoType::Undo,
@ -56,7 +54,7 @@ impl UndoBlockUser {
    )?;
    let undo = UndoBlockUser {
      actor: mod_.id().into(),
-      to: vec![public()],
+      to,
      object: block,
      cc: generate_cc(target, &mut context.pool()).await?,
      kind: UndoType::Undo,
@ -94,7 +92,6 @@ impl ActivityHandler for UndoBlockUser {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<LemmyContext>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    verify_domains_match(self.actor.inner(), self.object.actor.inner())?;
    self.object.verify(context).await?;
    Ok(())
@ -108,6 +105,7 @@ impl ActivityHandler for UndoBlockUser {
    let blocked_person = self.object.object.dereference(context).await?;
    match self.object.target.dereference(context).await? {
      SiteOrCommunity::Site(_site) => {
+        verify_is_public(&self.to, &self.cc)?;
        let blocked_person = Person::update(
          &mut context.pool(),
          blocked_person.id,
@ -135,6 +133,7 @@ impl ActivityHandler for UndoBlockUser {
        ModBan::create(&mut context.pool(), &form).await?;
      }
      SiteOrCommunity::Community(community) => {
+        verify_visibility(&self.to, &self.cc, &community)?;
        let community_user_ban_form = CommunityPersonBanForm {
          community_id: community.id,
          person_id: blocked_person.id,
--- a/crates/apub/src/activities/community/announce.rs
+++ b/crates/apub/src/activities/community/announce.rs
@ -2,9 +2,10 @@ use crate::{
  activities::{
    generate_activity_id,
    generate_announce_activity_id,
+    generate_to,
    send_lemmy_activity,
-    verify_is_public,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -18,7 +19,7 @@ use crate::{
 };
 use activitypub_federation::{
  config::Data,
-  kinds::{activity::AnnounceType, public},
+  kinds::activity::AnnounceType,
  traits::{ActivityHandler, Actor},
 };
 use lemmy_api_common::context::LemmyContext;
@ -26,7 +27,7 @@ use lemmy_db_schema::{
  source::{activity::ActivitySendTargets, community::CommunityFollower},
  CommunityVisibility,
 };
-use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{FederationError, LemmyError, LemmyErrorType, LemmyResult};
 use serde_json::Value;
 use url::Url;

@ -54,7 +55,7 @@ impl ActivityHandler for RawAnnouncableActivities {

    // This is only for sending, not receiving so we reject it.
    if let AnnouncableActivities::Page(_) = activity {
-      Err(LemmyErrorType::CannotReceivePage)?
+      Err(FederationError::CannotReceivePage)?
    }

    // Need to treat community as optional here because `Delete/PrivateMessage` gets routed through
@ -92,7 +93,7 @@ impl AnnounceActivity {
      generate_announce_activity_id(inner_kind, &context.settings().get_protocol_and_hostname())?;
    Ok(AnnounceActivity {
      actor: community.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(community)?],
      object: IdOrNestedObject::NestedObject(object),
      cc: community
        .followers_url
@ -154,7 +155,6 @@ impl ActivityHandler for AnnounceActivity {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, _context: &Data<Self::DataType>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    Ok(())
  }

@ -165,10 +165,11 @@ impl ActivityHandler for AnnounceActivity {

    // This is only for sending, not receiving so we reject it.
    if let AnnouncableActivities::Page(_) = object {
-      Err(LemmyErrorType::CannotReceivePage)?
+      Err(FederationError::CannotReceivePage)?
    }

    let community = object.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    can_accept_activity_in_community(&Some(community), context).await?;

    // verify here in order to avoid fetching the object twice over http
--- a/crates/apub/src/activities/community/collection_add.rs
+++ b/crates/apub/src/activities/community/collection_add.rs
@ -2,9 +2,10 @@ use crate::{
  activities::{
    community::send_activity_in_community,
    generate_activity_id,
-    verify_is_public,
+    generate_to,
    verify_mod_action,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -17,7 +18,7 @@ use crate::{
 use activitypub_federation::{
  config::Data,
  fetch::object_id::ObjectId,
-  kinds::{activity::AddType, public},
+  kinds::activity::AddType,
  traits::{ActivityHandler, Actor},
 };
 use lemmy_api_common::{
@ -53,7 +54,7 @@ impl CollectionAdd {
    )?;
    let add = CollectionAdd {
      actor: actor.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(community)?],
      object: added_mod.id(),
      target: generate_moderators_url(&community.actor_id)?.into(),
      cc: vec![community.id()],
@ -79,7 +80,7 @@ impl CollectionAdd {
    )?;
    let add = CollectionAdd {
      actor: actor.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(community)?],
      object: featured_post.ap_id.clone().into(),
      target: generate_featured_url(&community.actor_id)?.into(),
      cc: vec![community.id()],
@ -115,8 +116,8 @@ impl ActivityHandler for CollectionAdd {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<Self::DataType>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    verify_person_in_community(&self.actor, &community, context).await?;
    verify_mod_action(&self.actor, &community, context).await?;
    Ok(())
--- a/crates/apub/src/activities/community/collection_remove.rs
+++ b/crates/apub/src/activities/community/collection_remove.rs
@ -2,9 +2,10 @@ use crate::{
  activities::{
    community::send_activity_in_community,
    generate_activity_id,
-    verify_is_public,
+    generate_to,
    verify_mod_action,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -14,7 +15,7 @@ use crate::{
 use activitypub_federation::{
  config::Data,
  fetch::object_id::ObjectId,
-  kinds::{activity::RemoveType, public},
+  kinds::activity::RemoveType,
  traits::{ActivityHandler, Actor},
 };
 use lemmy_api_common::{
@ -48,7 +49,7 @@ impl CollectionRemove {
    )?;
    let remove = CollectionRemove {
      actor: actor.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(community)?],
      object: removed_mod.id(),
      target: generate_moderators_url(&community.actor_id)?.into(),
      id: id.clone(),
@ -74,7 +75,7 @@ impl CollectionRemove {
    )?;
    let remove = CollectionRemove {
      actor: actor.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(community)?],
      object: featured_post.ap_id.clone().into(),
      target: generate_featured_url(&community.actor_id)?.into(),
      cc: vec![community.id()],
@ -110,8 +111,8 @@ impl ActivityHandler for CollectionRemove {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<Self::DataType>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    verify_person_in_community(&self.actor, &community, context).await?;
    verify_mod_action(&self.actor, &community, context).await?;
    Ok(())
--- a/crates/apub/src/activities/community/lock_page.rs
+++ b/crates/apub/src/activities/community/lock_page.rs
@ -3,9 +3,10 @@ use crate::{
    check_community_deleted_or_removed,
    community::send_activity_in_community,
    generate_activity_id,
-    verify_is_public,
+    generate_to,
    verify_mod_action,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -18,7 +19,7 @@ use crate::{
 use activitypub_federation::{
  config::Data,
  fetch::object_id::ObjectId,
-  kinds::{activity::UndoType, public},
+  kinds::activity::UndoType,
  traits::ActivityHandler,
 };
 use lemmy_api_common::context::LemmyContext;
@ -49,8 +50,8 @@ impl ActivityHandler for LockPage {
  }

  async fn verify(&self, context: &Data<Self::DataType>) -> Result<(), Self::Error> {
-    verify_is_public(&self.to, &self.cc)?;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    verify_person_in_community(&self.actor, &community, context).await?;
    check_community_deleted_or_removed(&community)?;
    verify_mod_action(&self.actor, &community, context).await?;
@ -92,8 +93,8 @@ impl ActivityHandler for UndoLockPage {
  }

  async fn verify(&self, context: &Data<Self::DataType>) -> Result<(), Self::Error> {
-    verify_is_public(&self.to, &self.cc)?;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    verify_person_in_community(&self.actor, &community, context).await?;
    check_community_deleted_or_removed(&community)?;
    verify_mod_action(&self.actor, &community, context).await?;
@ -137,7 +138,7 @@ pub(crate) async fn send_lock_post(
  let community_id = community.actor_id.inner().clone();
  let lock = LockPage {
    actor: actor.actor_id.clone().into(),
-    to: vec![public()],
+    to: vec![generate_to(&community)?],
    object: ObjectId::from(post.ap_id),
    cc: vec![community_id.clone()],
    kind: LockType::Lock,
@ -153,7 +154,7 @@ pub(crate) async fn send_lock_post(
    )?;
    let undo = UndoLockPage {
      actor: lock.actor.clone(),
-      to: vec![public()],
+      to: vec![generate_to(&community)?],
      cc: lock.cc.clone(),
      kind: UndoType::Undo,
      id,
--- a/crates/apub/src/activities/community/update.rs
+++ b/crates/apub/src/activities/community/update.rs
@ -2,9 +2,10 @@ use crate::{
  activities::{
    community::send_activity_in_community,
    generate_activity_id,
-    verify_is_public,
+    generate_to,
    verify_mod_action,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -13,7 +14,7 @@ use crate::{
 };
 use activitypub_federation::{
  config::Data,
-  kinds::{activity::UpdateType, public},
+  kinds::activity::UpdateType,
  traits::{ActivityHandler, Actor, Object},
 };
 use lemmy_api_common::context::LemmyContext;
@ -42,7 +43,7 @@ pub(crate) async fn send_update_community(
  )?;
  let update = UpdateCommunity {
    actor: actor.id().into(),
-    to: vec![public()],
+    to: vec![generate_to(&community)?],
    object: Box::new(community.clone().into_json(&context).await?),
    cc: vec![community.id()],
    kind: UpdateType::Update,
@ -77,8 +78,8 @@ impl ActivityHandler for UpdateCommunity {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<Self::DataType>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    verify_person_in_community(&self.actor, &community, context).await?;
    verify_mod_action(&self.actor, &community, context).await?;
    ApubCommunity::verify(&self.object, &community.actor_id.clone().into(), context).await?;
@ -106,8 +107,14 @@ impl ActivityHandler for UpdateCommunity {
      icon: Some(self.object.icon.map(|i| i.url.into())),
      banner: Some(self.object.image.map(|i| i.url.into())),
      followers_url: self.object.followers.map(Into::into),
-      inbox_url: Some(self.object.inbox.into()),
-      shared_inbox_url: Some(self.object.endpoints.map(|e| e.shared_inbox.into())),
+      inbox_url: Some(
+        self
+          .object
+          .endpoints
+          .map(|e| e.shared_inbox)
+          .unwrap_or(self.object.inbox)
+          .into(),
+      ),
      moderators_url: self.object.attributed_to.map(Into::into),
      posting_restricted_to_mods: self.object.posting_restricted_to_mods,
      featured_url: self.object.featured.map(Into::into),
--- a/crates/apub/src/activities/create_or_update/comment.rs
+++ b/crates/apub/src/activities/create_or_update/comment.rs
@ -3,8 +3,9 @@ use crate::{
    check_community_deleted_or_removed,
    community::send_activity_in_community,
    generate_activity_id,
-    verify_is_public,
+    generate_to,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -18,7 +19,6 @@ use crate::{
 use activitypub_federation::{
  config::Data,
  fetch::object_id::ObjectId,
-  kinds::public,
  protocol::verification::{verify_domains_match, verify_urls_match},
  traits::{ActivityHandler, Actor, Object},
 };
@ -70,7 +70,7 @@ impl CreateOrUpdateNote {

    let create_or_update = CreateOrUpdateNote {
      actor: person.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(&community)?],
      cc: note.cc.clone(),
      tag: note.tag.clone(),
      object: note,
@ -118,9 +118,9 @@ impl ActivityHandler for CreateOrUpdateNote {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<Self::DataType>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    let post = self.object.get_parents(context).await?.0;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;

    verify_person_in_community(&self.actor, &community, context).await?;
    verify_domains_match(self.actor.inner(), self.object.id.inner())?;
@ -153,7 +153,6 @@ impl ActivityHandler for CreateOrUpdateNote {
    // author likes their own comment by default
    let like_form = CommentLikeForm {
      comment_id: comment.id,
-      post_id: comment.post_id,
      person_id: comment.creator_id,
      score: 1,
    };
--- a/crates/apub/src/activities/create_or_update/post.rs
+++ b/crates/apub/src/activities/create_or_update/post.rs
@ -3,8 +3,9 @@ use crate::{
    check_community_deleted_or_removed,
    community::send_activity_in_community,
    generate_activity_id,
-    verify_is_public,
+    generate_to,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  insert_received_activity,
@ -16,7 +17,6 @@ use crate::{
 };
 use activitypub_federation::{
  config::Data,
-  kinds::public,
  protocol::verification::{verify_domains_match, verify_urls_match},
  traits::{ActivityHandler, Actor, Object},
 };
@ -49,7 +49,7 @@ impl CreateOrUpdatePage {
    )?;
    Ok(CreateOrUpdatePage {
      actor: actor.id().into(),
-      to: vec![public()],
+      to: vec![generate_to(community)?],
      object: post.into_json(context).await?,
      cc: vec![community.id()],
      kind,
@ -102,8 +102,8 @@ impl ActivityHandler for CreateOrUpdatePage {

  #[tracing::instrument(skip_all)]
  async fn verify(&self, context: &Data<LemmyContext>) -> LemmyResult<()> {
-    verify_is_public(&self.to, &self.cc)?;
    let community = self.community(context).await?;
+    verify_visibility(&self.to, &self.cc, &community)?;
    verify_person_in_community(&self.actor, &community, context).await?;
    check_community_deleted_or_removed(&community)?;
    verify_domains_match(self.actor.inner(), self.object.id.inner())?;
--- a/crates/apub/src/activities/deletion/delete.rs
+++ b/crates/apub/src/activities/deletion/delete.rs
@ -27,7 +27,7 @@ use lemmy_db_schema::{
  },
  traits::{Crud, Reportable},
 };
-use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{FederationError, LemmyError, LemmyErrorType, LemmyResult};
 use url::Url;

 #[async_trait::async_trait]
@ -84,7 +84,7 @@ impl Delete {
  pub(in crate::activities::deletion) fn new(
    actor: &ApubPerson,
    object: DeletableObjects,
-    to: Url,
+    to: Vec<Url>,
    community: Option<&Community>,
    summary: Option<String>,
    context: &Data<LemmyContext>,
@ -96,7 +96,7 @@ impl Delete {
    let cc: Option<Url> = community.map(|c| c.actor_id.clone().into());
    Ok(Delete {
      actor: actor.actor_id.clone().into(),
-      to: vec![to],
+      to,
      object: IdOrNestedObject::Id(object.id()),
      cc: cc.into_iter().collect(),
      kind: DeleteType::Delete,
@ -118,7 +118,7 @@ pub(in crate::activities) async fn receive_remove_action(
  match DeletableObjects::read_from_db(object, context).await? {
    DeletableObjects::Community(community) => {
      if community.local {
-        Err(LemmyErrorType::OnlyLocalAdminCanRemoveCommunity)?
+        Err(FederationError::OnlyLocalAdminCanRemoveCommunity)?
      }
      let form = ModRemoveCommunityForm {
        mod_person_id: actor.id,
--- a/crates/apub/src/activities/deletion/mod.rs
+++ b/crates/apub/src/activities/deletion/mod.rs
@ -1,11 +1,12 @@
+use super::{generate_to, verify_is_public};
 use crate::{
  activities::{
    community::send_activity_in_community,
    send_lemmy_activity,
-    verify_is_public,
    verify_mod_action,
    verify_person,
    verify_person_in_community,
+    verify_visibility,
  },
  activity_lists::AnnouncableActivities,
  objects::{
@ -59,11 +60,12 @@ pub(crate) async fn send_apub_delete_in_community(
 ) -> LemmyResult<()> {
  let actor = ApubPerson::from(actor);
  let is_mod_action = reason.is_some();
+  let to = vec![generate_to(&community)?];
  let activity = if deleted {
-    let delete = Delete::new(&actor, object, public(), Some(&community), reason, context)?;
+    let delete = Delete::new(&actor, object, to, Some(&community), reason, context)?;
    AnnouncableActivities::Delete(delete)
  } else {
-    let undo = UndoDelete::new(&actor, object, public(), Some(&community), reason, context)?;
+    let undo = UndoDelete::new(&actor, object, to, Some(&community), reason, context)?;
    AnnouncableActivities::UndoDelete(undo)
  };
  send_activity_in_community(
@ -92,10 +94,10 @@ pub(crate) async fn send_apub_delete_private_message(
  let deletable = DeletableObjects::PrivateMessage(pm.into());
  let inbox = ActivitySendTargets::to_inbox(recipient.shared_inbox_or_inbox());
  if deleted {
-    let delete: Delete = Delete::new(actor, deletable, recipient.id(), None, None, &context)?;
+    let delete: Delete = Delete::new(actor, deletable, vec![recipient.id()], None, None, &context)?;
    send_lemmy_activity(&context, delete, actor, inbox, true).await?;
  } else {
-    let undo = UndoDelete::new(actor, deletable, recipient.id(), None, None, &context)?;
+    let undo = UndoDelete::new(actor, deletable, vec![recipient.id()], None, None, &context)?;
    send_lemmy_activity(&context, undo, actor, inbox, true).await?;
  };
  Ok(())
@ -109,7 +111,7 @@ pub async fn send_apub_delete_user(
  let person: ApubPerson = person.into();

  let deletable = DeletableObjects::Person(person.clone());
-  let mut delete: Delete = Delete::new(&person, deletable, public(), None, None, &context)?;
+  let mut delete: Delete = Delete::new(&person, deletable, vec![public()], None, None, &context)?;
  delete.remove_data = Some(remove_data);

  let inboxes = ActivitySendTargets::to_all_instances();
@ -170,7 +172,7 @@ pub(in crate::activities) async fn verify_delete_activity(
  let object = DeletableObjects::read_from_db(activity.object.id(), context).await?;
  match object {
    DeletableObjects::Community(community) => {
-      verify_is_public(&activity.to, &[])?;
+      verify_visibility(&activity.to, &[], &community)?;
      if community.local {
        // can only do this check for local community, in remote case it would try to fetch the
        // deleted community (which fails)
@ -185,22 +187,24 @@ pub(in crate::activities) async fn verify_delete_activity(
      verify_urls_match(person.actor_id.inner(), activity.object.id())?;
    }
    DeletableObjects::Post(p) => {
-      verify_is_public(&activity.to, &[])?;
+      let community = activity.community(context).await?;
+      verify_visibility(&activity.to, &[], &community)?;
      verify_delete_post_or_comment(
        &activity.actor,
        &p.ap_id.clone().into(),
-        &activity.community(context).await?,
+        &community,
        is_mod_action,
        context,
      )
      .await?;
    }
    DeletableObjects::Comment(c) => {
-      verify_is_public(&activity.to, &[])?;
+      let community = activity.community(context).await?;
+      verify_visibility(&activity.to, &[], &community)?;
      verify_delete_post_or_comment(
        &activity.actor,
        &c.ap_id.clone().into(),
-        &activity.community(context).await?,
+        &community,
        is_mod_action,
        context,
      )
--- a/crates/apub/src/activities/deletion/undo_delete.rs
+++ b/crates/apub/src/activities/deletion/undo_delete.rs
@ -25,7 +25,7 @@ use lemmy_db_schema::{
  },
  traits::Crud,
 };
-use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{FederationError, LemmyError, LemmyErrorType, LemmyResult};
 use url::Url;

 #[async_trait::async_trait]
@ -68,7 +68,7 @@ impl UndoDelete {
  pub(in crate::activities::deletion) fn new(
    actor: &ApubPerson,
    object: DeletableObjects,
-    to: Url,
+    to: Vec<Url>,
    community: Option<&Community>,
    summary: Option<String>,
    context: &Data<LemmyContext>,
@ -82,7 +82,7 @@ impl UndoDelete {
    let cc: Option<Url> = community.map(|c| c.actor_id.clone().into());
    Ok(UndoDelete {
      actor: actor.actor_id.clone().into(),
-      to: vec![to],
+      to,
      object,
      cc: cc.into_iter().collect(),
      kind: UndoType::Undo,
@ -100,7 +100,7 @@ impl UndoDelete {
    match DeletableObjects::read_from_db(object, context).await? {
      DeletableObjects::Community(community) => {
        if community.local {
-          Err(LemmyErrorType::OnlyLocalAdminCanRestoreCommunity)?
+          Err(FederationError::OnlyLocalAdminCanRestoreCommunity)?
        }
        let form = ModRemoveCommunityForm {
          mod_person_id: actor.id,
--- a/crates/apub/src/activities/following/follow.rs
+++ b/crates/apub/src/activities/following/follow.rs
@ -20,7 +20,7 @@ use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{
  source::{
    activity::ActivitySendTargets,
-    community::{CommunityFollower, CommunityFollowerForm},
+    community::{CommunityFollower, CommunityFollowerForm, CommunityFollowerState},
    person::{PersonFollower, PersonFollowerForm},
  },
  traits::Followable,
@ -102,21 +102,25 @@ impl ActivityHandler for Follow {
          pending: false,
        };
        PersonFollower::follow(&mut context.pool(), &form).await?;
+        AcceptFollow::send(self, context).await?;
      }
      UserOrCommunity::Community(c) => {
+        let state = Some(match c.visibility {
+          CommunityVisibility::Public => CommunityFollowerState::Accepted,
+          CommunityVisibility::Private => CommunityFollowerState::ApprovalRequired,
          // Dont allow following local-only community via federation.
-        if c.visibility != CommunityVisibility::Public {
-          return Err(LemmyErrorType::NotFound.into());
-        }
+          CommunityVisibility::LocalOnly => return Err(LemmyErrorType::NotFound.into()),
+        });
        let form = CommunityFollowerForm {
-          community_id: c.id,
-          person_id: actor.id,
-          pending: false,
+          state,
+          ..CommunityFollowerForm::new(c.id, actor.id)
        };
        CommunityFollower::follow(&mut context.pool(), &form).await?;
+        if c.visibility == CommunityVisibility::Public {
+          AcceptFollow::send(self, context).await?;
        }
      }
-
-    AcceptFollow::send(self, context).await
+    }
+    Ok(())
  }
 }
--- a/crates/apub/src/activities/following/mod.rs
+++ b/crates/apub/src/activities/following/mod.rs
@ -1,15 +1,26 @@
+use super::generate_activity_id;
 use crate::{
  objects::{community::ApubCommunity, person::ApubPerson},
-  protocol::activities::following::{follow::Follow, undo_follow::UndoFollow},
+  protocol::activities::following::{
+    accept::AcceptFollow,
+    follow::Follow,
+    reject::RejectFollow,
+    undo_follow::UndoFollow,
+  },
 };
-use activitypub_federation::config::Data;
+use activitypub_federation::{config::Data, kinds::activity::FollowType};
 use lemmy_api_common::context::LemmyContext;
-use lemmy_db_schema::source::{community::Community, person::Person};
+use lemmy_db_schema::{
+  newtypes::{CommunityId, PersonId},
+  source::{community::Community, person::Person},
+  traits::Crud,
+};
 use lemmy_utils::error::LemmyResult;

-pub mod accept;
-pub mod follow;
-pub mod undo_follow;
+pub(crate) mod accept;
+pub(crate) mod follow;
+pub(crate) mod reject;
+pub(crate) mod undo_follow;

 pub async fn send_follow_community(
  community: Community,
@ -25,3 +36,29 @@ pub async fn send_follow_community(
    UndoFollow::send(&actor, &community, context).await
  }
 }
+
+pub async fn send_accept_or_reject_follow(
+  community_id: CommunityId,
+  person_id: PersonId,
+  accepted: bool,
+  context: &Data<LemmyContext>,
+) -> LemmyResult<()> {
+  let community = Community::read(&mut context.pool(), community_id).await?;
+  let person = Person::read(&mut context.pool(), person_id).await?;
+
+  let follow = Follow {
+    actor: person.actor_id.into(),
+    to: Some([community.actor_id.clone().into()]),
+    object: community.actor_id.into(),
+    kind: FollowType::Follow,
+    id: generate_activity_id(
+      FollowType::Follow,
+      &context.settings().get_protocol_and_hostname(),
+    )?,
+  };
+  if accepted {
+    AcceptFollow::send(follow, context).await
+  } else {
+    RejectFollow::send(follow, context).await
+  }
+}
--- a/crates/apub/src/activities/following/reject.rs
+++ b/crates/apub/src/activities/following/reject.rs
@ -0,0 +1,79 @@
+use crate::{
+  activities::{generate_activity_id, send_lemmy_activity},
+  insert_received_activity,
+  protocol::activities::following::{follow::Follow, reject::RejectFollow},
+};
+use activitypub_federation::{
+  config::Data,
+  kinds::activity::RejectType,
+  protocol::verification::verify_urls_match,
+  traits::{ActivityHandler, Actor},
+};
+use lemmy_api_common::context::LemmyContext;
+use lemmy_db_schema::{
+  source::{
+    activity::ActivitySendTargets,
+    community::{CommunityFollower, CommunityFollowerForm},
+  },
+  traits::Followable,
+};
+use lemmy_utils::error::{LemmyError, LemmyResult};
+use url::Url;
+
+impl RejectFollow {
+  #[tracing::instrument(skip_all)]
+  pub async fn send(follow: Follow, context: &Data<LemmyContext>) -> LemmyResult<()> {
+    let user_or_community = follow.object.dereference_local(context).await?;
+    let person = follow.actor.clone().dereference(context).await?;
+    let reject = RejectFollow {
+      actor: user_or_community.id().into(),
+      to: Some([person.id().into()]),
+      object: follow,
+      kind: RejectType::Reject,
+      id: generate_activity_id(
+        RejectType::Reject,
+        &context.settings().get_protocol_and_hostname(),
+      )?,
+    };
+    let inbox = ActivitySendTargets::to_inbox(person.shared_inbox_or_inbox());
+    send_lemmy_activity(context, reject, &user_or_community, inbox, true).await
+  }
+}
+
+/// Handle rejected follows
+#[async_trait::async_trait]
+impl ActivityHandler for RejectFollow {
+  type DataType = LemmyContext;
+  type Error = LemmyError;
+
+  fn id(&self) -> &Url {
+    &self.id
+  }
+
+  fn actor(&self) -> &Url {
+    self.actor.inner()
+  }
+
+  #[tracing::instrument(skip_all)]
+  async fn verify(&self, context: &Data<LemmyContext>) -> LemmyResult<()> {
+    verify_urls_match(self.actor.inner(), self.object.object.inner())?;
+    self.object.verify(context).await?;
+    if let Some(to) = &self.to {
+      verify_urls_match(to[0].inner(), self.object.actor.inner())?;
+    }
+    Ok(())
+  }
+
+  #[tracing::instrument(skip_all)]
+  async fn receive(self, context: &Data<LemmyContext>) -> LemmyResult<()> {
+    insert_received_activity(&self.id, context).await?;
+    let community = self.actor.dereference(context).await?;
+    let person = self.object.actor.dereference(context).await?;
+
+    // remove the follow
+    let form = CommunityFollowerForm::new(community.id, person.id);
+    CommunityFollower::unfollow(&mut context.pool(), &form).await?;
+
+    Ok(())
+  }
+}
--- a/crates/apub/src/activities/following/undo_follow.rs
+++ b/crates/apub/src/activities/following/undo_follow.rs
@ -90,11 +90,7 @@ impl ActivityHandler for UndoFollow {
        PersonFollower::unfollow(&mut context.pool(), &form).await?;
      }
      UserOrCommunity::Community(c) => {
-        let form = CommunityFollowerForm {
-          community_id: c.id,
-          person_id: person.id,
-          pending: false,
-        };
+        let form = CommunityFollowerForm::new(c.id, person.id);
        CommunityFollower::unfollow(&mut context.pool(), &form).await?;
      }
    }
--- a/crates/apub/src/activities/mod.rs
+++ b/crates/apub/src/activities/mod.rs
@ -30,6 +30,7 @@ use activitypub_federation::{
  traits::{ActivityHandler, Actor},
 };
 use anyhow::anyhow;
+use following::send_accept_or_reject_follow;
 use lemmy_api_common::{
  context::LemmyContext,
  send_activity::{ActivityChannel, SendActivityData},
@ -40,9 +41,10 @@ use lemmy_db_schema::{
    community::Community,
  },
  traits::Crud,
+  CommunityVisibility,
 };
 use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView};
-use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{FederationError, LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult};
 use serde::Serialize;
 use tracing::info;
 use url::{ParseError, Url};
@ -81,7 +83,7 @@ pub(crate) async fn verify_person_in_community(
 ) -> LemmyResult<()> {
  let person = person_id.dereference(context).await?;
  if person.banned {
-    Err(LemmyErrorType::PersonIsBannedFromSite(
+    Err(FederationError::PersonIsBannedFromSite(
      person.actor_id.to_string(),
    ))?
  }
@ -114,19 +116,41 @@ pub(crate) async fn verify_mod_action(

 pub(crate) fn verify_is_public(to: &[Url], cc: &[Url]) -> LemmyResult<()> {
  if ![to, cc].iter().any(|set| set.contains(&public())) {
-    Err(LemmyErrorType::ObjectIsNotPublic)?
+    Err(FederationError::ObjectIsNotPublic)?
  } else {
    Ok(())
  }
 }

+/// Returns an error if object visibility doesnt match community visibility
+/// (ie content in private community must also be private).
+pub(crate) fn verify_visibility(to: &[Url], cc: &[Url], community: &Community) -> LemmyResult<()> {
+  use CommunityVisibility::*;
+  let object_is_public = [to, cc].iter().any(|set| set.contains(&public()));
+  match community.visibility {
+    Public if !object_is_public => Err(FederationError::ObjectIsNotPublic)?,
+    Private if object_is_public => Err(FederationError::ObjectIsNotPrivate)?,
+    LocalOnly => Err(LemmyErrorType::NotFound.into()),
+    _ => Ok(()),
+  }
+}
+
+/// Marks object as public only if the community is public
+pub(crate) fn generate_to(community: &Community) -> LemmyResult<Url> {
+  if community.visibility == CommunityVisibility::Public {
+    Ok(public())
+  } else {
+    Ok(Url::parse(&format!("{}/followers", community.actor_id))?)
+  }
+}
+
 pub(crate) fn verify_community_matches<T>(a: &ObjectId<ApubCommunity>, b: T) -> LemmyResult<()>
 where
  T: Into<ObjectId<ApubCommunity>>,
 {
  let b: ObjectId<ApubCommunity> = b.into();
  if a != &b {
-    Err(LemmyErrorType::InvalidCommunity)?
+    Err(FederationError::InvalidCommunity)?
  } else {
    Ok(())
  }
@ -134,7 +158,7 @@ where

 pub(crate) fn check_community_deleted_or_removed(community: &Community) -> LemmyResult<()> {
  if community.deleted || community.removed {
-    Err(LemmyErrorType::CannotCreatePostOrCommentInDeletedOrRemovedCommunity)?
+    Err(FederationError::CannotCreatePostOrCommentInDeletedOrRemovedCommunity)?
  } else {
    Ok(())
  }
@ -367,6 +391,12 @@ pub async fn match_outgoing_activities(
        community,
        reason,
      } => Report::send(ObjectId::from(object_id), actor, community, reason, context).await,
+      AcceptFollower(community_id, person_id) => {
+        send_accept_or_reject_follow(community_id, person_id, true, &context).await
+      }
+      RejectFollower(community_id, person_id) => {
+        send_accept_or_reject_follow(community_id, person_id, false, &context).await
+      }
    }
  };
  fed_task.await?;
--- a/crates/apub/src/activities/voting/mod.rs
+++ b/crates/apub/src/activities/voting/mod.rs
@ -62,7 +62,6 @@ async fn vote_comment(
  let comment_id = comment.id;
  let like_form = CommentLikeForm {
    comment_id,
-    post_id: comment.post_id,
    person_id: actor.id,
    score: vote_type.into(),
  };
--- a/Show more
+++ b/Show more