Merge remote-tracking branch 'github/main' into main

diff --cc server/Cargo.lock
Simple merge

diff --cc server/Cargo.toml
Simple merge

diff --cc server/src/apub/extensions/signatures.rs
index e37bde25090579d0f34c63cde225fe37ce0dc35d,7245364e760a70e7cb7e3b6265c3f243b1301a17..efc8dccfc8c9f5c9f9c75ac20d2347c255462da9
--- 1/server/src/apub/extensions/signatures.rs
--- 2/server/src/apub/extensions/signatures.rs
+++ b/server/src/apub/extensions/signatures.rs
@@@ -1,7 -1,8 +1,8 @@@
  use crate::{apub::ActorType, LemmyError};
 +use activitystreams::unparsed::UnparsedMutExt;
  use activitystreams_ext::UnparsedExtension;
 -use activitystreams_new::unparsed::UnparsedMutExt;
  use actix_web::{client::ClientRequest, HttpRequest};
+ use anyhow::anyhow;
  use http_signature_normalization_actix::{
    digest::{DigestClient, SignExt},
    Config,

diff --cc server/src/apub/fetcher.rs
index 51f3a50b410ed3c49d49650c840149591408d26a,c9de9159b1566c66f242930fbd14016ca58682d1..4425757de24289f416402e3ef840cfc7cb9eac71
--- 1/server/src/apub/fetcher.rs
--- 2/server/src/apub/fetcher.rs
+++ b/server/src/apub/fetcher.rs
@@@ -15,8 -15,9 +15,9 @@@ use crate::
    DbPool,
    LemmyError,
  };
 -use activitystreams_new::{base::BaseExt, collection::OrderedCollection, object::Note, prelude::*};
 +use activitystreams::{base::BaseExt, collection::OrderedCollection, object::Note, prelude::*};
  use actix_web::client::Client;
+ use anyhow::anyhow;
  use chrono::NaiveDateTime;
  use diesel::{result::Error::NotFound, PgConnection};
  use lemmy_db::{

diff --cc server/src/apub/inbox/activities/undo.rs
index 6c90fc814e73d33f2615bb56c0b1dcaff788ebed,b22d71dddb90c7bb0ff478500c96deffd57e948c..edfcf372ade4d51bfb6782c303c15053a4302db9
--- 1/server/src/apub/inbox/activities/undo.rs
--- 2/server/src/apub/inbox/activities/undo.rs
+++ b/server/src/apub/inbox/activities/undo.rs
@@@ -20,8 -20,9 +20,9 @@@ use crate::
    DbPool,
    LemmyError,
  };
 -use activitystreams_new::{activity::*, base::AnyBase, object::Note, prelude::*};
 +use activitystreams::{activity::*, base::AnyBase, object::Note, prelude::*};
  use actix_web::{client::Client, HttpResponse};
+ use anyhow::anyhow;
  use lemmy_db::{
    comment::{Comment, CommentForm, CommentLike, CommentLikeForm},
    comment_view::CommentView,

diff --cc server/src/apub/inbox/community_inbox.rs
Simple merge

diff --cc server/src/apub/mod.rs
index 0af19dcd80ef978e36603a127a1f0e00732631a3,fb0cc66f6b854f736c3a71bd6ed9c17b492cb87a..e86032f616ad6caf1ff03f05a4eba4ba4b9461bd
--- 1/server/src/apub/mod.rs
--- 2/server/src/apub/mod.rs
+++ b/server/src/apub/mod.rs
@@@ -26,10 -27,9 +26,10 @@@ use activitystreams::
    object::{Page, Tombstone},
    prelude::*,
  };
 +use activitystreams_ext::{Ext1, Ext2};
  use actix_web::{body::Body, client::Client, HttpResponse};
+ use anyhow::anyhow;
  use chrono::NaiveDateTime;
- use failure::_core::fmt::Debug;
  use lemmy_db::{activity::do_insert_activity, user::User_};
  use lemmy_utils::{convert_datetime, get_apub_protocol_string, settings::Settings, MentionData};
  use log::debug;