From 9b04fb96e65e8838dd30b4a6f4c754e6ecb01462 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Tue, 3 May 2022 02:12:59 +0900
Subject: [PATCH] Remote trailing 07 in inbox.rs

---
 plume-models/src/inbox.rs | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/plume-models/src/inbox.rs b/plume-models/src/inbox.rs
index 86472590..fdf4056e 100644
--- a/plume-models/src/inbox.rs
+++ b/plume-models/src/inbox.rs
@@ -1,7 +1,4 @@
-use activitystreams::activity::{
-    Announce as Announce07, Create as Create07, Delete as Delete07, Follow as Follow07,
-    Like as Like07, Undo as Undo07, Update as Update07,
-};
+use activitystreams::activity::{Announce, Create, Delete, Follow, Like, Undo, Update};
 
 use crate::{
     comments::Comment,
@@ -51,18 +48,18 @@ impl_into_inbox_result! {
 
 pub fn inbox(conn: &DbConn, act: serde_json::Value) -> Result<InboxResult, Error> {
     Inbox::handle(conn, act)
-        .with::<User, Announce07, Post>(CONFIG.proxy())
-        .with::<User, Create07, Comment>(CONFIG.proxy())
-        .with::<User, Create07, Post>(CONFIG.proxy())
-        .with::<User, Delete07, Comment>(CONFIG.proxy())
-        .with::<User, Delete07, Post>(CONFIG.proxy())
-        .with::<User, Delete07, User>(CONFIG.proxy())
-        .with::<User, Follow07, User>(CONFIG.proxy())
-        .with::<User, Like07, Post>(CONFIG.proxy())
-        .with::<User, Undo07, Reshare>(CONFIG.proxy())
-        .with::<User, Undo07, follows::Follow>(CONFIG.proxy())
-        .with::<User, Undo07, likes::Like>(CONFIG.proxy())
-        .with::<User, Update07, PostUpdate>(CONFIG.proxy())
+        .with::<User, Announce, Post>(CONFIG.proxy())
+        .with::<User, Create, Comment>(CONFIG.proxy())
+        .with::<User, Create, Post>(CONFIG.proxy())
+        .with::<User, Delete, Comment>(CONFIG.proxy())
+        .with::<User, Delete, Post>(CONFIG.proxy())
+        .with::<User, Delete, User>(CONFIG.proxy())
+        .with::<User, Follow, User>(CONFIG.proxy())
+        .with::<User, Like, Post>(CONFIG.proxy())
+        .with::<User, Undo, Reshare>(CONFIG.proxy())
+        .with::<User, Undo, follows::Follow>(CONFIG.proxy())
+        .with::<User, Undo, likes::Like>(CONFIG.proxy())
+        .with::<User, Update, PostUpdate>(CONFIG.proxy())
         .done()
 }