Merge branch 'main' into import-partial-backup

Dont exit early when running only scheduled tasks (#4707 )
* Dont exit early when running only scheduled tasks (fixes #4709) * fix
24 changed files with 1955 additions and 2070 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -16,9 +16,9 @@ checksum = "8f27d075294830fcab6f66e320dab524bc6d048f4a151698e153205559113772"

 [[package]]
 name = "activitypub_federation"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54fe65c4a4b57712d8e436f1fb86ff37e10b56f011f4233fbbfa8c669163e9d"
+checksum = "ac8ff2d0151ce9ac02eb29e4a58b41d28693f141f7963d4bfabd2f9d402ecec7"
 dependencies = [
 "activitystreams-kinds",
 "actix-web",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -99,7 +99,7 @@ lemmy_db_views = { version = "=0.19.4-beta.6", path = "./crates/db_views" }
 lemmy_db_views_actor = { version = "=0.19.4-beta.6", path = "./crates/db_views_actor" }
 lemmy_db_views_moderator = { version = "=0.19.4-beta.6", path = "./crates/db_views_moderator" }
 lemmy_federate = { version = "=0.19.4-beta.6", path = "./crates/federate" }
-activitypub_federation = { version = "0.5.5", default-features = false, features = [
+activitypub_federation = { version = "0.5.6", default-features = false, features = [
  "actix-web",
 ] }
 diesel = "2.1.6"
--- a/api_tests/pnpm-lock.yaml
+++ b/api_tests/pnpm-lock.yaml
--- a/crates/api/src/local_user/add_admin.rs
+++ b/crates/api/src/local_user/add_admin.rs
@ -29,7 +29,7 @@ pub async fn add_admin(
    .await?
    .ok_or(LemmyErrorType::ObjectNotLocal)?;

-  let added_admin = LocalUser::update(
+  LocalUser::update(
    &mut context.pool(),
    added_local_user.local_user.id,
    &LocalUserUpdateForm {
@ -43,7 +43,7 @@ pub async fn add_admin(
  // Mod tables
  let form = ModAddForm {
    mod_person_id: local_user_view.person.id,
-    other_person_id: added_admin.person_id,
+    other_person_id: added_local_user.person.id,
    removed: Some(!data.added),
  };

--- a/crates/api/src/local_user/save_settings.rs
+++ b/crates/api/src/local_user/save_settings.rs
@ -141,11 +141,7 @@ pub async fn save_user_settings(
    ..Default::default()
  };

-  // Ignore errors, because 'no fields updated' will return an error.
-  // https://github.com/LemmyNet/lemmy/issues/4076
-  LocalUser::update(&mut context.pool(), local_user_id, &local_user_form)
-    .await
-    .ok();
+  LocalUser::update(&mut context.pool(), local_user_id, &local_user_form).await?;

  // Update the vote display modes
  let vote_display_modes_form = LocalUserVoteDisplayModeUpdateForm {
--- a/crates/api/src/local_user/verify_email.rs
+++ b/crates/api/src/local_user/verify_email.rs
@ -9,12 +9,10 @@ use lemmy_db_schema::{
  source::{
    email_verification::EmailVerification,
    local_user::{LocalUser, LocalUserUpdateForm},
-    person::Person,
  },
-  traits::Crud,
  RegistrationMode,
 };
-use lemmy_db_views::structs::SiteView;
+use lemmy_db_views::structs::{LocalUserView, SiteView};
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};

 pub async fn verify_email(
@ -38,7 +36,7 @@ pub async fn verify_email(
  };
  let local_user_id = verification.local_user_id;

-  let local_user = LocalUser::update(&mut context.pool(), local_user_id, &form).await?;
+  LocalUser::update(&mut context.pool(), local_user_id, &form).await?;

  EmailVerification::delete_old_tokens_for_local_user(&mut context.pool(), local_user_id).await?;

@ -46,12 +44,16 @@ pub async fn verify_email(
  if site_view.local_site.registration_mode == RegistrationMode::RequireApplication
    && site_view.local_site.application_email_admins
  {
-    let person = Person::read(&mut context.pool(), local_user.person_id)
+    let local_user = LocalUserView::read(&mut context.pool(), local_user_id)
      .await?
      .ok_or(LemmyErrorType::CouldntFindPerson)?;

-    send_new_applicant_email_to_admins(&person.name, &mut context.pool(), context.settings())
-      .await?;
+    send_new_applicant_email_to_admins(
+      &local_user.person.name,
+      &mut context.pool(),
+      context.settings(),
+    )
+    .await?;
  }

  Ok(Json(SuccessResponse::default()))
--- a/crates/api_common/src/person.rs
+++ b/crates/api_common/src/person.rs
@ -40,7 +40,7 @@ pub struct Register {
  pub username: String,
  pub password: Sensitive<String>,
  pub password_verify: Sensitive<String>,
-  pub show_nsfw: bool,
+  pub show_nsfw: Option<bool>,
  /// email is mandatory if email verification is enabled on the server
  pub email: Option<Sensitive<String>>,
  /// The UUID of the captcha item.
--- a/crates/api_crud/src/user/create.rs
+++ b/crates/api_crud/src/user/create.rs
@ -142,12 +142,17 @@ pub async fn register(
    .map(|lang_str| lang_str.split('-').next().unwrap_or_default().to_string())
    .collect();

+  // Show nsfw content if param is true, or if content_warning exists
+  let show_nsfw = data
+    .show_nsfw
+    .unwrap_or(site_view.site.content_warning.is_some());
+
  // Create the local user
  let local_user_form = LocalUserInsertForm::builder()
    .person_id(inserted_person.id)
    .email(data.email.as_deref().map(str::to_lowercase))
    .password_encrypted(data.password.to_string())
-    .show_nsfw(Some(data.show_nsfw))
+    .show_nsfw(Some(show_nsfw))
    .accepted_application(accepted_application)
    .default_listing_type(Some(local_site.default_post_listing_type))
    .post_listing_mode(Some(local_site.default_post_listing_mode))
--- a/crates/apub/assets/wordpress/activities/announce.json
+++ b/crates/apub/assets/wordpress/activities/announce.json
@ -0,0 +1,49 @@
+{
+  "@context": ["https://www.w3.org/ns/activitystreams"],
+  "id": "https://pfefferle.org/lemmy-part-4/#activity#activity",
+  "type": "Announce",
+  "audience": "https://pfefferle.org/@pfefferle.org",
+  "published": "2024-05-03T12:32:29Z",
+  "updated": "2024-05-06T08:20:33Z",
+  "to": [
+    "https://www.w3.org/ns/activitystreams#Public",
+    "https://pfefferle.org/wp-json/activitypub/1.0/actors/1/followers"
+  ],
+  "cc": [],
+  "object": {
+    "id": "https://pfefferle.org/lemmy-part-4/#activity",
+    "type": "Update",
+    "audience": "https://pfefferle.org/@pfefferle.org",
+    "published": "2024-05-03T12:32:29Z",
+    "updated": "2024-05-06T08:20:33Z",
+    "to": [
+      "https://www.w3.org/ns/activitystreams#Public",
+      "https://pfefferle.org/wp-json/activitypub/1.0/actors/1/followers"
+    ],
+    "cc": [],
+    "object": {
+      "id": "https://pfefferle.org/lemmy-part-4/",
+      "type": "Article",
+      "attachment": [],
+      "attributedTo": "https://pfefferle.org/author/pfefferle/",
+      "audience": "https://pfefferle.org/@pfefferle.org",
+      "content": "\u003Cp\u003EIdentifies one or more entities that represent the total population of entities for which the object can considered to be relevant. Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.          \u003C/p\u003E",
+      "contentMap": {
+        "en": "\u003Cp\u003EIdentifies one or more entities that represent the total population of entities for which the object can considered to be relevant. Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.          \u003C/p\u003E"
+      },
+      "name": "Lemmy (Part 4)",
+      "published": "2024-05-03T12:32:29Z",
+      "summary": "Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant. Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object can considered to be relevant.Identifies one or more entities that represent the total population of entities for which the object [...]",
+      "tag": [],
+      "updated": "2024-05-06T08:20:33Z",
+      "url": "https://pfefferle.org/lemmy-part-4/",
+      "to": [
+        "https://www.w3.org/ns/activitystreams#Public",
+        "https://pfefferle.org/wp-json/activitypub/1.0/actors/1/followers"
+      ],
+      "cc": []
+    },
+    "actor": "https://pfefferle.org/author/pfefferle/"
+  },
+  "actor": "https://pfefferle.org/@pfefferle.org"
+}
--- a/crates/apub/assets/wordpress/objects/group.json
+++ b/crates/apub/assets/wordpress/objects/group.json
@ -0,0 +1,66 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://w3id.org/security/v1",
+    "https://purl.archive.org/socialweb/webfinger",
+    {
+      "schema": "http://schema.org#",
+      "toot": "http://joinmastodon.org/ns#",
+      "webfinger": "https://webfinger.net/#",
+      "lemmy": "https://join-lemmy.org/ns#",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+      "PropertyValue": "schema:PropertyValue",
+      "value": "schema:value",
+      "Hashtag": "as:Hashtag",
+      "featured": {
+        "@id": "toot:featured",
+        "@type": "@id"
+      },
+      "featuredTags": {
+        "@id": "toot:featuredTags",
+        "@type": "@id"
+      },
+      "moderators": {
+        "@id": "lemmy:moderators",
+        "@type": "@id"
+      },
+      "postingRestrictedToMods": "lemmy:postingRestrictedToMods",
+      "discoverable": "toot:discoverable",
+      "indexable": "toot:indexable",
+      "resource": "webfinger:resource"
+    }
+  ],
+  "id": "https://pfefferle.org/@pfefferle.org",
+  "type": "Group",
+  "attachment": [],
+  "attributedTo": "https://pfefferle.org/wp-json/activitypub/1.0/collections/moderators",
+  "name": "Matthias Pfefferle",
+  "icon": {
+    "type": "Image",
+    "url": "https://pfefferle.org/wp-content/uploads/2023/06/cropped-BeLItBV-_400x400.jpg"
+  },
+  "published": "2024-04-03T16:58:22Z",
+  "summary": "<p>Webworker, blogger und podcaster</p>\n",
+  "tag": [],
+  "url": "https://pfefferle.org/@pfefferle.org",
+  "inbox": "https://pfefferle.org/wp-json/activitypub/1.0/users/0/inbox",
+  "outbox": "https://pfefferle.org/wp-json/activitypub/1.0/users/0/outbox",
+  "following": "https://pfefferle.org/wp-json/activitypub/1.0/users/0/following",
+  "followers": "https://pfefferle.org/wp-json/activitypub/1.0/users/0/followers",
+  "preferredUsername": "pfefferle.org",
+  "endpoints": {
+    "sharedInbox": "https://pfefferle.org/wp-json/activitypub/1.0/inbox"
+  },
+  "publicKey": {
+    "id": "https://pfefferle.org/@pfefferle.org#main-key",
+    "owner": "https://pfefferle.org/@pfefferle.org",
+    "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuq8xeLMFcaCwPFBhgMRE\n/dDh2XKoNXFXnixctmK8BXSuuLMxucm3I/8NyhIvb3LqU+uP1fO8F0ecUbk2sN+x\nKag5vIV6yKXzJ8ILMWQ9AaELpXDmMZqL0zal0LUJRAOkDgPDovDAoq6tx++yDoV0\njdVbf9CoZKit1cz2ZrEuE5dswq3J/z9+c6POkhCkWEX5TPJzkOrmnjkvrXxGHUJ2\nA3+P+VaZhd5cmvqYosSpYNJshxCdev12pIF78OnYLiYiyXlgGHU+7uQR0M4tTcij\n6cUdLkms9m+b6H3ctXntPn410e5YLFPldjAYzQB5wHVdFZsWtyrbqfYdCa+KkKpA\nvwIDAQAB\n-----END PUBLIC KEY-----\n"
+  },
+  "manuallyApprovesFollowers": false,
+  "featured": "https://pfefferle.org/wp-json/activitypub/1.0/users/0/collections/featured",
+  "moderators": "https://pfefferle.org/wp-json/activitypub/1.0/collections/moderators",
+  "discoverable": true,
+  "indexable": true,
+  "webfinger": "pfefferle.org@pfefferle.org",
+  "postingRestrictedToMods": true
+}
--- a/crates/apub/assets/wordpress/objects/note.json
+++ b/crates/apub/assets/wordpress/objects/note.json
@ -0,0 +1,24 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "Hashtag": "as:Hashtag"
+    }
+  ],
+  "id": "https://pfefferle.org?c=148",
+  "type": "Note",
+  "attributedTo": "https://pfefferle.org/author/pfefferle/",
+  "content": "<p>Nice! Hello from WordPress!</p>",
+  "contentMap": {
+    "en": "<p>Nice! Hello from WordPress!</p>"
+  },
+  "inReplyTo": "https://socialhub.activitypub.rocks/ap/object/ce040f1ead95964f6dbbf1084b81432d",
+  "published": "2024-04-30T15:21:13Z",
+  "tag": [],
+  "url": "https://pfefferle.org?c=148",
+  "to": [
+    "https://www.w3.org/ns/activitystreams#Public",
+    "https://pfefferle.org/wp-json/activitypub/1.0/users/0/followers"
+  ],
+  "cc": []
+}
--- a/crates/apub/assets/wordpress/objects/page.json
+++ b/crates/apub/assets/wordpress/objects/page.json
@ -0,0 +1,26 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "Hashtag": "as:Hashtag"
+    }
+  ],
+  "id": "https://pfefferle.org/this-is-a-test-federation/",
+  "type": "Article",
+  "attachment": [],
+  "attributedTo": "https://pfefferle.org/author/pfefferle/",
+  "content": "<p>with Discource!</p>",
+  "contentMap": {
+    "en": "<p>with Discource!</p>"
+  },
+  "name": "This is a test-federation",
+  "published": "2024-04-30T15:16:41Z",
+  "summary": "with Discource! [...]",
+  "tag": [],
+  "url": "https://pfefferle.org/this-is-a-test-federation/",
+  "to": [
+    "https://www.w3.org/ns/activitystreams#Public",
+    "https://pfefferle.org/wp-json/activitypub/1.0/users/1/followers"
+  ],
+  "cc": []
+}
--- a/crates/apub/assets/wordpress/objects/person.json
+++ b/crates/apub/assets/wordpress/objects/person.json
@ -0,0 +1,74 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://w3id.org/security/v1",
+    "https://purl.archive.org/socialweb/webfinger",
+    {
+      "schema": "http://schema.org#",
+      "toot": "http://joinmastodon.org/ns#",
+      "webfinger": "https://webfinger.net/#",
+      "lemmy": "https://join-lemmy.org/ns#",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+      "PropertyValue": "schema:PropertyValue",
+      "value": "schema:value",
+      "Hashtag": "as:Hashtag",
+      "featured": {
+        "@id": "toot:featured",
+        "@type": "@id"
+      },
+      "featuredTags": {
+        "@id": "toot:featuredTags",
+        "@type": "@id"
+      },
+      "moderators": {
+        "@id": "lemmy:moderators",
+        "@type": "@id"
+      },
+      "postingRestrictedToMods": "lemmy:postingRestrictedToMods",
+      "discoverable": "toot:discoverable",
+      "indexable": "toot:indexable",
+      "resource": "webfinger:resource"
+    }
+  ],
+  "id": "https://pfefferle.org/author/pfefferle/",
+  "type": "Person",
+  "attachment": [
+    {
+      "type": "PropertyValue",
+      "name": "Blog",
+      "value": "<a rel=\"me\" title=\"https://pfefferle.org/\" target=\"_blank\" href=\"https://pfefferle.org/\">pfefferle.org</a>"
+    },
+    {
+      "type": "PropertyValue",
+      "name": "Profile",
+      "value": "<a rel=\"me\" title=\"https://pfefferle.org/author/pfefferle/\" target=\"_blank\" href=\"https://pfefferle.org/author/pfefferle/\">pfefferle.org</a>"
+    }
+  ],
+  "name": "Matthias Pfefferle",
+  "icon": {
+    "type": "Image",
+    "url": "https://secure.gravatar.com/avatar/a2bdca7870e859658cece96c044b3be5?s=120&#038;d=mm&#038;r=g"
+  },
+  "published": "2014-02-10T15:23:08Z",
+  "summary": "<p>Ich arbeite als Open Web Lead für Automattic.</p>\n",
+  "tag": [],
+  "url": "https://pfefferle.org/author/pfefferle/",
+  "inbox": "https://pfefferle.org/wp-json/activitypub/1.0/users/1/inbox",
+  "outbox": "https://pfefferle.org/wp-json/activitypub/1.0/users/1/outbox",
+  "following": "https://pfefferle.org/wp-json/activitypub/1.0/users/1/following",
+  "followers": "https://pfefferle.org/wp-json/activitypub/1.0/users/1/followers",
+  "preferredUsername": "matthias",
+  "endpoints": {
+    "sharedInbox": "https://pfefferle.org/wp-json/activitypub/1.0/inbox"
+  },
+  "publicKey": {
+    "id": "https://pfefferle.org/author/pfefferle/#main-key",
+    "owner": "https://pfefferle.org/author/pfefferle/",
+    "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvTA5RA40nOsso04RSwyX\nHXTojRPUMlIlArDcSy3M5GUJp9/xbxSUOdBjqd31KKB1GIi3vrLmD1Qi/ZqS95Qy\nw2Zd3xOsCg+o9bsyOG+O6Y8Lu+HEB5JKLUbNHdiSviakJ8wGadH9Wm4WIiN20y+q\n/u6lgxgiWfZ2CFCN6SOc28fUKi9NmKvXK+M12BhFfy1tC5KWXKDm0UbfI1+dmqhR\n3Ffe6vEsCI/YIVVdWxQ9kouOd0XSHOGdslktkepRO7IP9i9TdwyeCa0WWRoeO5Wa\ntVpc1Y0WuNbTM2ksIXTg0G+rO1/6KO/hrHnGu3RCfb/ZIHK5L/aWYb9B3PG3LyKV\n+wIDAQAB\n-----END PUBLIC KEY-----\n"
+  },
+  "manuallyApprovesFollowers": false,
+  "featured": "https://pfefferle.org/wp-json/activitypub/1.0/users/1/collections/featured",
+  "discoverable": true,
+  "indexable": true,
+  "webfinger": "matthias@pfefferle.org"
+}
--- a/crates/apub/src/api/user_settings_backup.rs
+++ b/crates/apub/src/api/user_settings_backup.rs
@ -133,8 +133,7 @@ pub async fn import_settings(
    local_user_view.local_user.id,
    &local_user_form,
  )
-  .await
-  .ok();
+  .await?;

  // Update the vote display mode settings
  let vote_display_mode_form = LocalUserVoteDisplayModeUpdateForm {
--- a/crates/apub/src/http/mod.rs
+++ b/crates/apub/src/http/mod.rs
@ -20,7 +20,8 @@ use lemmy_db_schema::{
 };
 use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 use serde::{Deserialize, Serialize};
-use std::ops::Deref;
+use std::{ops::Deref, time::Duration};
+use tokio::time::timeout;
 use url::Url;

 mod comment;
@ -30,13 +31,22 @@ mod post;
 pub mod routes;
 pub mod site;

+const INCOMING_ACTIVITY_TIMEOUT: Duration = Duration::from_secs(9);
+
 pub async fn shared_inbox(
  request: HttpRequest,
  body: Bytes,
  data: Data<LemmyContext>,
 ) -> LemmyResult<HttpResponse> {
-  receive_activity::<SharedInboxActivities, UserOrCommunity, LemmyContext>(request, body, &data)
+  let receive_fut =
+    receive_activity::<SharedInboxActivities, UserOrCommunity, LemmyContext>(request, body, &data);
+  // Set a timeout shorter than `REQWEST_TIMEOUT` for processing incoming activities. This is to
+  // avoid taking a long time to process an incoming activity when a required data fetch times out.
+  // In this case our own instance would timeout and be marked as dead by the sender. Better to
+  // consider the activity broken and move on.
+  timeout(INCOMING_ACTIVITY_TIMEOUT, receive_fut)
    .await
+    .map_err(|_| LemmyErrorType::InboxTimeout)?
 }

 /// Convert the data to json and turn it into an HTTP Response with the correct ActivityPub
--- a/crates/apub/src/objects/instance.rs
+++ b/crates/apub/src/objects/instance.rs
@ -100,7 +100,7 @@ impl Object for ApubSite {
      kind: ApplicationType::Application,
      id: self.id().into(),
      name: self.name.clone(),
-      preferred_username: data.domain().to_string(),
+      preferred_username: Some(data.domain().to_string()),
      content: self.sidebar.as_ref().map(|d| markdown_to_html(d)),
      source: self.sidebar.clone().map(Source::new),
      summary: self.description.clone(),
--- a/crates/apub/src/protocol/activities/mod.rs
+++ b/crates/apub/src/protocol/activities/mod.rs
@ -96,4 +96,10 @@ mod tests {
    test_json::<Report>("assets/mbin/activities/flag.json")?;
    Ok(())
  }
+
+  #[test]
+  fn test_parse_wordpress_activities() -> LemmyResult<()> {
+    test_json::<AnnounceActivity>("assets/wordpress/activities/announce.json")?;
+    Ok(())
+  }
 }
--- a/crates/apub/src/protocol/objects/instance.rs
+++ b/crates/apub/src/protocol/objects/instance.rs
@ -22,7 +22,7 @@ pub struct Instance {
  /// site name
  pub(crate) name: String,
  /// instance domain, necessary for mastodon authorized fetch
-  pub(crate) preferred_username: String,
+  pub(crate) preferred_username: Option<String>,
  pub(crate) inbox: Url,
  /// mandatory field in activitypub, lemmy currently serves an empty outbox
  pub(crate) outbox: Url,
--- a/crates/apub/src/protocol/objects/mod.rs
+++ b/crates/apub/src/protocol/objects/mod.rs
@ -206,4 +206,13 @@ mod tests {
    test_json::<Person>("assets/nodebb/objects/person.json")?;
    Ok(())
  }
+
+  #[test]
+  fn test_parse_object_wordpress() -> LemmyResult<()> {
+    test_json::<Group>("assets/wordpress/objects/group.json")?;
+    test_json::<Page>("assets/wordpress/objects/page.json")?;
+    test_json::<Person>("assets/wordpress/objects/person.json")?;
+    test_json::<Note>("assets/wordpress/objects/note.json")?;
+    Ok(())
+  }
 }
--- a/crates/apub/src/protocol/objects/page.rs
+++ b/crates/apub/src/protocol/objects/page.rs
@ -233,6 +233,10 @@ impl ActivityHandler for Page {
 #[async_trait::async_trait]
 impl InCommunity for Page {
  async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
+    if let Some(audience) = &self.audience {
+      return audience.dereference(context).await;
+    }
+
    let community = match &self.attributed_to {
      AttributedTo::Lemmy(_) => {
        let mut iter = self.to.iter().merge(self.cc.iter());
@ -243,7 +247,7 @@ impl InCommunity for Page {
              break c;
            }
          } else {
-            Err(LemmyErrorType::NoCommunityFoundInCc)?
+            Err(LemmyErrorType::CouldntFindCommunity)?;
          }
        }
      }
@ -251,11 +255,12 @@ impl InCommunity for Page {
        p.iter()
          .find(|a| a.kind == PersonOrGroupType::Group)
          .map(|a| ObjectId::<ApubCommunity>::from(a.id.clone().into_inner()))
-          .ok_or(LemmyErrorType::PageDoesNotSpecifyGroup)?
+          .ok_or(LemmyErrorType::CouldntFindCommunity)?
          .dereference(context)
          .await?
      }
    };
+
    if let Some(audience) = &self.audience {
      verify_community_matches(audience, community.actor_id.clone())?;
    }
--- a/crates/db_schema/src/impls/local_user.rs
+++ b/crates/db_schema/src/impls/local_user.rs
@ -55,12 +55,17 @@ impl LocalUser {
    pool: &mut DbPool<'_>,
    local_user_id: LocalUserId,
    form: &LocalUserUpdateForm,
-  ) -> Result<LocalUser, Error> {
+  ) -> Result<usize, Error> {
    let conn = &mut get_conn(pool).await?;
-    diesel::update(local_user::table.find(local_user_id))
+    let res = diesel::update(local_user::table.find(local_user_id))
      .set(form)
-      .get_result::<Self>(conn)
-      .await
+      .execute(conn)
+      .await;
+    // Diesel will throw an error if the query is all Nones (not updating anything), ignore this.
+    match res {
+      Err(Error::QueryBuilderError(_)) => Ok(0),
+      other => other,
+    }
  }

  pub async fn delete(pool: &mut DbPool<'_>, id: LocalUserId) -> Result<usize, Error> {
--- a/crates/utils/src/error.rs
+++ b/crates/utils/src/error.rs
@ -99,8 +99,6 @@ pub enum LemmyErrorType {
  PersonIsBannedFromSite(String),
  InvalidVoteValue,
  PageDoesNotSpecifyCreator,
-  PageDoesNotSpecifyGroup,
-  NoCommunityFoundInCc,
  NoEmailSetup,
  LocalSiteNotSetup,
  EmailSmtpServerNeedsAPort,
@ -177,6 +175,7 @@ pub enum LemmyErrorType {
  InvalidBotAction,
  CantBlockLocalInstance,
  UrlWithoutDomain,
+  InboxTimeout,
  Unknown(String),
 }

--- a/scripts/postgres_15_to_16_upgrade.sh
+++ b/scripts/postgres_15_to_16_upgrade.sh
@ -4,39 +4,39 @@ set -e
 echo "Do not stop in the middle of this upgrade, wait until you see the message: Upgrade complete."

 echo "Stopping lemmy and all services..."
-sudo docker-compose stop
+sudo docker compose stop

 echo "Make sure postgres is started..."
-sudo docker-compose up -d postgres
+sudo docker compose up -d postgres
 echo "Waiting..."
 sleep 20s

 echo "Exporting the Database to 15_16.dump.sql ..."
-sudo docker-compose exec -T postgres pg_dumpall -c -U lemmy > 15_16_dump.sql
+sudo docker compose exec -T postgres pg_dumpall -c -U lemmy | sudo tee 15_16_dump.sql > /dev/null
 echo "Done."

 echo "Stopping postgres..."
-sudo docker-compose stop postgres
+sudo docker compose stop postgres
 echo "Waiting..."
 sleep 20s

 echo "Removing the old postgres folder"
 sudo rm -rf volumes/postgres

-echo "Updating docker-compose to use postgres version 16."
-sed -i "s/image: postgres:.*/image: postgres:16-alpine/" ./docker-compose.yml
+echo "Updating docker compose to use postgres version 16."
+sudo sed -i "s/image: .*postgres:.*/image: docker.io/postgres:16-alpine/" ./docker-compose.yml

 echo "Starting up new postgres..."
-sudo docker-compose up -d postgres
+sudo docker compose up -d postgres
 echo "Waiting..."
 sleep 20s

 echo "Importing the database...."
-cat 15_16_dump.sql | sudo docker-compose exec -T postgres psql -U lemmy
+sudo cat 15_16_dump.sql | sudo docker compose exec -T postgres psql -U lemmy
 echo "Done."

 echo "Starting up lemmy..."
-sudo docker-compose up -d
+sudo docker compose up -d

 echo "A copy of your old database is at 15_16.dump.sql . You can delete this file if the upgrade went smoothly."
 echo "Upgrade complete."
--- a/src/lib.rs
+++ b/src/lib.rs
@ -160,10 +160,10 @@ pub async fn start_lemmy_server(args: CmdArgs) -> LemmyResult<()> {
    rate_limit_cell.clone(),
  );

-  if !args.disable_scheduled_tasks {
+  let scheduled_tasks = (!args.disable_scheduled_tasks).then(|| {
    // Schedules various cleanup tasks for the DB
-    let _scheduled_tasks = tokio::task::spawn(scheduled_tasks::setup(context.clone()));
-  }
+    tokio::task::spawn(scheduled_tasks::setup(context.clone()))
+  });

  if let Some(prometheus) = SETTINGS.prometheus.clone() {
    serve_prometheus(prometheus, context.clone())?;
@ -218,7 +218,7 @@ pub async fn start_lemmy_server(args: CmdArgs) -> LemmyResult<()> {
  let mut interrupt = tokio::signal::unix::signal(SignalKind::interrupt())?;
  let mut terminate = tokio::signal::unix::signal(SignalKind::terminate())?;

-  if server.is_some() || federate.is_some() {
+  if server.is_some() || federate.is_some() || scheduled_tasks.is_some() {
    tokio::select! {
      _ = tokio::signal::ctrl_c() => {
        tracing::warn!("Received ctrl-c, shutting down gracefully...");
Author	SHA1	Message	Date
SleeplessOne1917	b287627879	Merge branch 'main' into import-partial-backup	2 weeks ago
Nutomic	b4f9ef24a5	Dont exit early when running only scheduled tasks (#4707 ) * Dont exit early when running only scheduled tasks (fixes #4709) * fix	2 weeks ago
Nutomic	866d752a3c	Instance.preferred_username should be optional (fixes #4701 ) (#4713 )	2 weeks ago
Nutomic	e0b1d0553d	Add timeout for processing incoming activities (#4708 ) * Add timeout for processing incoming activities * move to const	2 weeks ago
Felix Ableitner	8862d61d40	Dont throw error on empty LocalUser::update	2 weeks ago
Nutomic	7c146272c3	Federate with wordpress, improvements for NodeBB, Discourse federation (#4692 ) * Federate with wordpress * upgrade apub lib with fix * Also read post's community from `audience` * cleanup * cargo update * upgrade apub lib * add wordpress test activity	2 weeks ago
Nutomic	cfdc732d3a	On registration set show_nsfw based on site.content_warning (#4616 ) Co-authored-by: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>	2 weeks ago
Tim Coombs	522f974e30	fix: use docker compose v2 (#4622 ) * fix: use docker compose v2 * Using sudo tee. * fix: correct postgres sed command --------- Co-authored-by: Dessalines <tyhou13@gmx.com> Co-authored-by: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>	2 weeks ago