Rename: activity07() -> activity()

src/api/posts.rs

@@ -193,14 +193,14 @@ pub fn create(
         for m in mentions.into_iter() {
             Mention::from_activity(
                 &conn,
-                &Mention::build_activity07(&conn, &m)?,
+                &Mention::build_activity(&conn, &m)?,
                 post.id,
                 true,
                 true,
             )?;
         }
 
-        let act = post.create_activity07(&conn)?;
+        let act = post.create_activity(&conn)?;
         let dest = User::one_by_instance(&conn)?;
         worker.execute(move || broadcast(&author, act, dest, CONFIG.proxy().cloned()));
     }

src/routes/blogs.rs

@@ -49,7 +49,7 @@ pub fn activity_details(
     _ap: ApRequest,
 ) -> Option<ActivityStream<CustomGroup>> {
     let blog = Blog::find_by_fqn(&conn, &name).ok()?;
-    Some(ActivityStream::new(blog.to_activity07(&conn).ok()?))
+    Some(ActivityStream::new(blog.to_activity(&conn).ok()?))
 }
 
 #[get("/blogs/new")]

src/routes/comments.rs

@@ -66,14 +66,14 @@ pub fn create(
             )
             .expect("comments::create: insert error");
             let new_comment = comm
-                .create_activity07(&conn)
+                .create_activity(&conn)
                 .expect("comments::create: activity error");
 
             // save mentions
             for ment in mentions {
                 Mention::from_activity(
                     &conn,
-                    &Mention::build_activity07(&conn, &ment)
+                    &Mention::build_activity(&conn, &ment)
                         .expect("comments::create: build mention error"),
                     comm.id,
                     false,
@@ -187,7 +187,7 @@ pub fn activity_pub(
     conn: DbConn,
 ) -> Option<ActivityStream<Note>> {
     Comment::get(&conn, id)
-        .and_then(|c| c.to_activity07(&conn))
+        .and_then(|c| c.to_activity(&conn))
         .ok()
         .map(ActivityStream::new)
 }

src/routes/instance.rs

@@ -382,7 +382,7 @@ fn ban(id: i32, conn: &Connection, worker: &ScheduledThreadPool) -> Result<(), E
         )
         .unwrap();
         let target = User::one_by_instance(&*conn)?;
-        let delete_act = u.delete_activity07(&*conn)?;
+        let delete_act = u.delete_activity(&*conn)?;
         worker.execute(move || broadcast(&u, delete_act, target, CONFIG.proxy().cloned()));
     }
 

src/routes/likes.rs

@@ -27,7 +27,7 @@ pub fn create(
         Timeline::add_to_all_timelines(&conn, &post, Kind::Like(&user))?;
 
         let dest = User::one_by_instance(&*conn)?;
-        let act = like.to_activity07(&*conn)?;
+        let act = like.to_activity(&*conn)?;
         rockets
             .worker
             .execute(move || broadcast(&user, act, dest, CONFIG.proxy().cloned()));

src/routes/posts.rs

@@ -113,7 +113,7 @@ pub fn activity_details(
     let post = Post::find_by_slug(&conn, &slug, blog.id).map_err(|_| None)?;
     if post.published {
         Ok(ActivityStream::new(
-            post.to_activity07(&conn)
+            post.to_activity(&conn)
                 .map_err(|_| String::from("Post serialization error"))?,
         ))
     } else {
@@ -312,7 +312,7 @@ pub fn update(
                     &conn,
                     mentions
                         .into_iter()
-                        .filter_map(|m| Mention::build_activity07(&conn, &m).ok())
+                        .filter_map(|m| Mention::build_activity(&conn, &m).ok())
                         .collect(),
                 )
                 .expect("post::update: mentions error");
@@ -325,7 +325,7 @@ pub fn update(
                 .filter(|t| !t.is_empty())
                 .collect::<HashSet<_>>()
                 .into_iter()
-                .filter_map(|t| Tag::build_activity07(t.to_string()).ok())
+                .filter_map(|t| Tag::build_activity(t.to_string()).ok())
                 .collect::<Vec<_>>();
             post.update_tags07(&conn, tags)
                 .expect("post::update: tags error");
@@ -334,7 +334,7 @@ pub fn update(
                 .into_iter()
                 .collect::<HashSet<_>>()
                 .into_iter()
-                .filter_map(|t| Tag::build_activity07(t).ok())
+                .filter_map(|t| Tag::build_activity(t).ok())
                 .collect::<Vec<_>>();
             post.update_hashtags07(&conn, hashtags)
                 .expect("post::update: hashtags error");
@@ -342,7 +342,7 @@ pub fn update(
             if post.published {
                 if newly_published {
                     let act = post
-                        .create_activity07(&conn)
+                        .create_activity(&conn)
                         .expect("post::update: act error");
                     let dest = User::one_by_instance(&conn).expect("post::update: dest error");
                     rockets
@@ -352,7 +352,7 @@ pub fn update(
                     Timeline::add_to_all_timelines(&conn, &post, Kind::Original).ok();
                 } else {
                     let act = post
-                        .update_activity07(&conn)
+                        .update_activity(&conn)
                         .expect("post::update: act error");
                     let dest = User::one_by_instance(&conn).expect("posts::update: dest error");
                     rockets
@@ -532,8 +532,7 @@ pub fn create(
             for m in mentions {
                 Mention::from_activity(
                     &conn,
-                    &Mention::build_activity07(&conn, &m)
-                        .expect("post::create: mention build error"),
+                    &Mention::build_activity(&conn, &m).expect("post::create: mention build error"),
                     post.id,
                     true,
                     true,
@@ -542,7 +541,7 @@ pub fn create(
             }
 
             let act = post
-                .create_activity07(&conn)
+                .create_activity(&conn)
                 .expect("posts::create: activity error");
             let dest = User::one_by_instance(&conn).expect("posts::create: dest error");
             let worker = &rockets.worker;

src/routes/reshares.rs

@@ -27,7 +27,7 @@ pub fn create(
         Timeline::add_to_all_timelines(&conn, &post, Kind::Reshare(&user))?;
 
         let dest = User::one_by_instance(&conn)?;
-        let act = reshare.to_activity07(&conn)?;
+        let act = reshare.to_activity(&conn)?;
         rockets
             .worker
             .execute(move || broadcast(&user, act, dest, CONFIG.proxy().cloned()));

src/routes/user.rs

@@ -125,7 +125,7 @@ pub fn follow(
         )?;
         f.notify(&conn)?;
 
-        let act = f.to_activity07(&conn)?;
+        let act = f.to_activity(&conn)?;
         let msg = i18n!(rockets.intl.catalog, "You are now following {}."; target.name());
         rockets
             .worker
@@ -271,7 +271,7 @@ pub fn activity_details(
     _ap: ApRequest,
 ) -> Option<ActivityStream<CustomPerson>> {
     let user = User::find_by_fqn(&conn, &name).ok()?;
-    Some(ActivityStream::new(user.to_activity07(&conn).ok()?))
+    Some(ActivityStream::new(user.to_activity(&conn).ok()?))
 }
 
 #[get("/users/new")]
@@ -386,7 +386,7 @@ pub fn delete(
         account.delete(&conn)?;
 
         let target = User::one_by_instance(&conn)?;
-        let delete_act = account.delete_activity07(&conn)?;
+        let delete_act = account.delete_activity(&conn)?;
         rockets
             .worker
             .execute(move || broadcast(&account, delete_act, target, CONFIG.proxy().cloned()));