From: Dessalines Date: Thu, 18 Mar 2021 20:30:29 +0000 (-0400) Subject: Merge branch 'main' into split_user_table X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/static/%7B%60https:/README.ja.md?a=commitdiff_plain;h=8d9fab038911dbaf475d96eb4504d0012701e7e3;p=lemmy.git Merge branch 'main' into split_user_table --- 8d9fab038911dbaf475d96eb4504d0012701e7e3 diff --cc crates/apub/src/activities/send/community.rs index 9cef95b6,185f4b57..af77a473 --- a/crates/apub/src/activities/send/community.rs +++ b/crates/apub/src/activities/send/community.rs @@@ -3,7 -3,8 +3,8 @@@ use crate:: activity_queue::{send_activity_single_dest, send_to_community_followers}, check_is_apub_id_valid, extensions::context::lemmy_context, - fetcher::user::get_or_fetch_and_upsert_user, + fetcher::person::get_or_fetch_and_upsert_person, + insert_activity, ActorType, }; use activitystreams::{