From fd341bdb22e778afeedd2f09363144c26a879a2c Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Mon, 2 May 2022 23:57:42 +0900
Subject: [PATCH] Use User::outbox07() instead of outbox()

---
 plume-models/src/users.rs | 40 ---------------------------------------
 src/routes/user.rs        |  8 +++++---
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/plume-models/src/users.rs b/plume-models/src/users.rs
index 4967892f..343f61ef 100644
--- a/plume-models/src/users.rs
+++ b/plume-models/src/users.rs
@@ -7,7 +7,6 @@ use crate::{
 use activitypub::{
     activity::Delete,
     actor::Person,
-    collection::OrderedCollection,
     object::{Image, Tombstone},
     Activity, CustomObject, Endpoint,
 };
@@ -470,26 +469,9 @@ impl User {
             .load::<User>(conn)
             .map_err(Error::from)
     }
-    pub fn outbox(&self, conn: &Connection) -> Result<ActivityStream<OrderedCollection>> {
-        Ok(ActivityStream::new(self.outbox_collection(conn)?))
-    }
     pub fn outbox07(&self, conn: &Connection) -> Result<ActivityStream<OrderedCollection07>> {
         Ok(ActivityStream::new(self.outbox_collection07(conn)?))
     }
-    pub fn outbox_collection(&self, conn: &Connection) -> Result<OrderedCollection> {
-        let mut coll = OrderedCollection::default();
-        let first = &format!("{}?page=1", &self.outbox_url);
-        let last = &format!(
-            "{}?page={}",
-            &self.outbox_url,
-            self.get_activities_count(conn) / i64::from(ITEMS_PER_PAGE) + 1
-        );
-        coll.collection_props.set_first_link(Id::new(first))?;
-        coll.collection_props.set_last_link(Id::new(last))?;
-        coll.collection_props
-            .set_total_items_u64(self.get_activities_count(conn) as u64)?;
-        Ok(coll)
-    }
     pub fn outbox_collection07(&self, conn: &Connection) -> Result<OrderedCollection07> {
         let mut coll = OrderedCollection07::new();
         let first = &format!("{}?page=1", &self.outbox_url);
@@ -1770,28 +1752,6 @@ pub(crate) mod tests {
         });
     }
 
-    #[test]
-    fn outbox_collection() {
-        let conn = db();
-        conn.test_transaction::<_, Error, _>(|| {
-            let (_pages, users, _blogs) = fill_pages(&conn);
-            let user = &users[0];
-            let act = user.outbox_collection(&conn)?;
-
-            let expected = json!({
-                "first": "https://plu.me/@/admin/outbox?page=1",
-                "items": null,
-                "last": "https://plu.me/@/admin/outbox?page=5",
-                "totalItems": 51,
-                "type": "OrderedCollection",
-            });
-
-            assert_json_eq!(to_value(act)?, expected);
-
-            Ok(())
-        });
-    }
-
     #[test]
     fn outbox_collection07() {
         let conn = db();
diff --git a/src/routes/user.rs b/src/routes/user.rs
index a5d42dda..da5b1a19 100644
--- a/src/routes/user.rs
+++ b/src/routes/user.rs
@@ -1,5 +1,7 @@
 use activitypub::collection::OrderedCollection;
-use activitystreams::collection::OrderedCollectionPage;
+use activitystreams::collection::{
+    OrderedCollection as OrderedCollection07, OrderedCollectionPage,
+};
 use diesel::SaveChangesDsl;
 use rocket::{
     http::{uri::Uri, ContentType, Cookies},
@@ -527,9 +529,9 @@ pub fn create(
 }
 
 #[get("/@/<name>/outbox")]
-pub fn outbox(name: String, conn: DbConn) -> Option<ActivityStream<OrderedCollection>> {
+pub fn outbox(name: String, conn: DbConn) -> Option<ActivityStream<OrderedCollection07>> {
     let user = User::find_by_fqn(&conn, &name).ok()?;
-    user.outbox(&conn).ok()
+    user.outbox07(&conn).ok()
 }
 #[get("/@/<name>/outbox?<page>")]
 pub fn outbox_page(