Use User::delete_activity07() instead of delete_activity()

src/routes/instance.rs

@@ -11,7 +11,7 @@ use validator::{Validate, ValidationErrors};
 use crate::inbox;
 use crate::routes::{errors::ErrorPage, rocket_uri_macro_static_files, Page, RespondOrRedirect};
 use crate::template_utils::{IntoContext, Ructe};
-use plume_common::activity_pub::{broadcast, inbox::FromId};
+use plume_common::activity_pub::{broadcast07, inbox::FromId};
 use plume_models::{
     admin::*,
     blocklisted_emails::*,
@@ -382,8 +382,8 @@ fn ban(id: i32, conn: &Connection, worker: &ScheduledThreadPool) -> Result<(), E
         )
         .unwrap();
         let target = User::one_by_instance(&*conn)?;
-        let delete_act = u.delete_activity(&*conn)?;
-        worker.execute(move || broadcast(&u, delete_act, target, CONFIG.proxy().cloned()));
+        let delete_act = u.delete_activity07(&*conn)?;
+        worker.execute(move || broadcast07(&u, delete_act, target, CONFIG.proxy().cloned()));
     }
 
     Ok(())

src/routes/user.rs

@@ -18,7 +18,7 @@ use crate::routes::{
 };
 use crate::template_utils::{IntoContext, Ructe};
 use crate::utils::requires_login;
-use plume_common::activity_pub::{broadcast, ActivityStream, ApRequest, Id};
+use plume_common::activity_pub::{broadcast, broadcast07, ActivityStream, ApRequest, Id};
 use plume_common::utils::md_to_html;
 use plume_models::{
     blogs::Blog,
@@ -386,10 +386,10 @@ pub fn delete(
         account.delete(&conn)?;
 
         let target = User::one_by_instance(&conn)?;
-        let delete_act = account.delete_activity(&conn)?;
+        let delete_act = account.delete_activity07(&conn)?;
         rockets
             .worker
-            .execute(move || broadcast(&account, delete_act, target, CONFIG.proxy().cloned()));
+            .execute(move || broadcast07(&account, delete_act, target, CONFIG.proxy().cloned()));
 
         if let Some(cookie) = cookies.get_private(AUTH_COOKIE) {
             cookies.remove_private(cookie);