Browse Source

migrate tombstone

pull/43/head
Felix Ableitner 2 years ago
parent
commit
3999e0485e
  1. 3
      server/src/apub/comment.rs
  2. 3
      server/src/apub/community.rs
  3. 17
      server/src/apub/mod.rs
  4. 3
      server/src/apub/post.rs
  5. 3
      server/src/apub/private_message.rs
  6. 3
      server/src/apub/user.rs

3
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;

3
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};

17
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!(

3
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;

3
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;

3
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;

Loading…
Cancel
Save