summaryrefslogtreecommitdiffstats
path: root/server/src/apub
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/apub')
-rw-r--r--server/src/apub/comment.rs3
-rw-r--r--server/src/apub/community.rs3
-rw-r--r--server/src/apub/mod.rs17
-rw-r--r--server/src/apub/post.rs3
-rw-r--r--server/src/apub/private_message.rs3
-rw-r--r--server/src/apub/user.rs3
6 files changed, 20 insertions, 12 deletions
diff --git a/server/src/apub/comment.rs b/server/src/apub/comment.rs
index 7c77a1c7..d18908d0 100644
--- a/server/src/apub/comment.rs
+++ b/server/src/apub/comment.rs
@@ -28,8 +28,9 @@ use activitystreams::{
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
context,
link::Mention,
- object::{kind::NoteType, properties::ObjectProperties, Note, Tombstone},
+ object::{kind::NoteType, properties::ObjectProperties, Note},
};
+use activitystreams_new::object::Tombstone;
use actix_web::{body::Body, web::Path, HttpResponse, Result};
use diesel::PgConnection;
use failure::Error;
diff --git a/server/src/apub/community.rs b/server/src/apub/community.rs
index a81e21cf..79615aca 100644
--- a/server/src/apub/community.rs
+++ b/server/src/apub/community.rs
@@ -28,12 +28,13 @@ use activitystreams::{
collection::UnorderedCollection,
context,
endpoint::EndpointProperties,
- object::{properties::ObjectProperties, Tombstone},
+ object::properties::ObjectProperties,
Activity,
Base,
BaseBox,
};
use activitystreams_ext::Ext3;
+use activitystreams_new::object::Tombstone;
use actix_web::{body::Body, web::Path, HttpResponse, Result};
use diesel::PgConnection;
use failure::{Error, _core::fmt::Debug};
diff --git a/server/src/apub/mod.rs b/server/src/apub/mod.rs
index 805e6a0c..5260e309 100644
--- a/server/src/apub/mod.rs
+++ b/server/src/apub/mod.rs
@@ -25,9 +25,14 @@ use crate::{
use activitystreams::{
activity::Follow,
actor::{properties::ApActorProperties, Group, Person},
- object::{Page, Tombstone},
+ object::Page,
};
use activitystreams_ext::{Ext1, Ext2, Ext3};
+use activitystreams_new::{
+ base::BaseExt,
+ object::{Tombstone, TombstoneExt},
+ primitives::XsdString,
+};
use actix_web::{body::Body, HttpResponse, Result};
use chrono::NaiveDateTime;
use diesel::PgConnection;
@@ -132,12 +137,10 @@ fn create_tombstone(
) -> Result<Tombstone, Error> {
if deleted {
if let Some(updated) = updated {
- let mut tombstone = Tombstone::default();
- tombstone.object_props.set_id(object_id)?;
- tombstone
- .tombstone_props
- .set_former_type_xsd_string(former_type)?
- .set_deleted(convert_datetime(updated))?;
+ let mut tombstone = Tombstone::new();
+ tombstone.set_id(object_id.parse()?);
+ tombstone.set_former_type(former_type.parse::<XsdString>()?);
+ tombstone.set_deleted(convert_datetime(updated).into());
Ok(tombstone)
} else {
Err(format_err!(
diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs
index f53af309..3f86d34d 100644
--- a/server/src/apub/post.rs
+++ b/server/src/apub/post.rs
@@ -27,10 +27,11 @@ use crate::{
use activitystreams::{
activity::{Create, Delete, Dislike, Like, Remove, Undo, Update},
context,
- object::{kind::PageType, properties::ObjectProperties, AnyImage, Image, Page, Tombstone},
+ object::{kind::PageType, properties::ObjectProperties, AnyImage, Image, Page},
BaseBox,
};
use activitystreams_ext::Ext1;
+use activitystreams_new::object::Tombstone;
use actix_web::{body::Body, web::Path, HttpResponse, Result};
use diesel::PgConnection;
use failure::Error;
diff --git a/server/src/apub/private_message.rs b/server/src/apub/private_message.rs
index a222b1fe..a700043b 100644
--- a/server/src/apub/private_message.rs
+++ b/server/src/apub/private_message.rs
@@ -18,8 +18,9 @@ use crate::{
use activitystreams::{
activity::{Create, Delete, Undo, Update},
context,
- object::{kind::NoteType, properties::ObjectProperties, Note, Tombstone},
+ object::{kind::NoteType, properties::ObjectProperties, Note},
};
+use activitystreams_new::object::Tombstone;
use actix_web::Result;
use diesel::PgConnection;
use failure::Error;
diff --git a/server/src/apub/user.rs b/server/src/apub/user.rs
index 0a651d1f..77b012fd 100644
--- a/server/src/apub/user.rs
+++ b/server/src/apub/user.rs
@@ -21,9 +21,10 @@ use activitystreams::{
actor::{properties::ApActorProperties, Person},
context,
endpoint::EndpointProperties,
- object::{properties::ObjectProperties, AnyImage, Image, Tombstone},
+ object::{properties::ObjectProperties, AnyImage, Image},
};
use activitystreams_ext::Ext2;
+use activitystreams_new::object::Tombstone;
use actix_web::{body::Body, web::Path, HttpResponse, Result};
use diesel::PgConnection;
use failure::Error;