From: Felix Ableitner <me@nutomic.com>
Date: Sat, 1 Aug 2020 15:42:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/main' into main
X-Git-Url: http://these/git/%22%7Burl%7D/%22https:/image.com/%7B%60%24%7BghostArchiveUrl%7D/%7BallRss%7D?a=commitdiff_plain;h=e4d5614f3f4a8ebe3fbdd3256b22a06d2150335e;p=lemmy.git

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

e4d5614f3f4a8ebe3fbdd3256b22a06d2150335e
diff --cc server/src/apub/extensions/signatures.rs
index e37bde25,7245364e..efc8dccf
--- a/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 51f3a50b,c9de9159..4425757d
--- a/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 6c90fc81,b22d71dd..edfcf372
--- a/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/mod.rs
index 0af19dcd,fb0cc66f..e86032f6
--- a/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;