From: Dessalines <tyhou13@gmx.com>
Date: Thu, 1 Oct 2020 20:57:47 +0000 (-0500)
Subject: Merge branch 'main' into no-send-blocked-dess
X-Git-Url: http://these/git/%7B%60https:/%7B%60css/themes/%22https:/nerdica.net/README.ja.md?a=commitdiff_plain;h=f5b511ccce8b7f814c29cc306343172c0c0eee34;p=lemmy.git

Merge branch 'main' into no-send-blocked-dess
---

f5b511ccce8b7f814c29cc306343172c0c0eee34
diff --cc lemmy_apub/src/activity_queue.rs
index 960e126b,ca026332..7602fe2f
--- a/lemmy_apub/src/activity_queue.rs
+++ b/lemmy_apub/src/activity_queue.rs
@@@ -1,10 -1,4 +1,10 @@@
 -use crate::{check_is_apub_id_valid, extensions::signatures::sign_and_send, ActorType};
 +use crate::{
 +  check_is_apub_id_valid,
 +  community::do_announce,
-   extensions::signatures::sign,
++  extensions::signatures::sign_and_send,
 +  insert_activity,
 +  ActorType,
 +};
  use activitystreams::{
    base::{Extends, ExtendsExt},
    object::AsObject,