diff options
author | Felix <me@nutomic.com> | 2020-05-14 14:26:44 +0200 |
---|---|---|
committer | Felix <me@nutomic.com> | 2020-05-14 14:26:44 +0200 |
commit | 11acc7225eaa4d0fac9c6168c3d1cb4c80a56e41 (patch) | |
tree | fe6025f811ce90b060b2776ff55e0a32cc52e26a /server/src/apub/private_message.rs | |
parent | a1ad21ec56dea6926329f3e56fcc7d9817557b57 (diff) |
Add helper function for Activity::create()
Diffstat (limited to 'server/src/apub/private_message.rs')
-rw-r--r-- | server/src/apub/private_message.rs | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/server/src/apub/private_message.rs b/server/src/apub/private_message.rs index 2fb8f6ac..4e111b8f 100644 --- a/server/src/apub/private_message.rs +++ b/server/src/apub/private_message.rs @@ -85,14 +85,7 @@ impl ApubObjectType for PrivateMessage { .set_actor_xsd_any_uri(creator.actor_id.to_owned())? .set_object_base_box(note)?; - // Insert the sent activity into the activity table - let activity_form = activity::ActivityForm { - user_id: creator.id, - data: serde_json::to_value(&create)?, - local: true, - updated: None, - }; - activity::Activity::create(&conn, &activity_form)?; + insert_activity(&conn, creator.id, &create, true)?; send_activity( &create, @@ -121,14 +114,7 @@ impl ApubObjectType for PrivateMessage { .set_actor_xsd_any_uri(creator.actor_id.to_owned())? .set_object_base_box(note)?; - // Insert the sent activity into the activity table - let activity_form = activity::ActivityForm { - user_id: creator.id, - data: serde_json::to_value(&update)?, - local: true, - updated: None, - }; - activity::Activity::create(&conn, &activity_form)?; + insert_activity(&conn, creator.id, &update, true)?; send_activity( &update, @@ -156,14 +142,7 @@ impl ApubObjectType for PrivateMessage { .set_actor_xsd_any_uri(creator.actor_id.to_owned())? .set_object_base_box(note)?; - // Insert the sent activity into the activity table - let activity_form = activity::ActivityForm { - user_id: creator.id, - data: serde_json::to_value(&delete)?, - local: true, - updated: None, - }; - activity::Activity::create(&conn, &activity_form)?; + insert_activity(&conn, creator.id, &delete, true)?; send_activity( &delete, @@ -206,14 +185,7 @@ impl ApubObjectType for PrivateMessage { .set_actor_xsd_any_uri(creator.actor_id.to_owned())? .set_object_base_box(delete)?; - // Insert the sent activity into the activity table - let activity_form = activity::ActivityForm { - user_id: creator.id, - data: serde_json::to_value(&undo)?, - local: true, - updated: None, - }; - activity::Activity::create(&conn, &activity_form)?; + insert_activity(&conn, creator.id, &undo, true)?; send_activity( &undo, |