summaryrefslogtreecommitdiffstats
path: root/server/src/apub
diff options
context:
space:
mode:
authorFelix <me@nutomic.com>2020-03-05 11:32:29 +0100
committerFelix <me@nutomic.com>2020-03-05 11:32:29 +0100
commit91ae9a9d490a26303a7b74e4ac3263a5acc5c81a (patch)
tree49427a1d18e7415cf69defb40b310be3c784b68b /server/src/apub
parent1f29e9179607761e8830b3f712c0245ed4fd4b9b (diff)
Revert "pull in activitypub library"
Diffstat (limited to 'server/src/apub')
-rw-r--r--server/src/apub/community.rs2
-rw-r--r--server/src/apub/post.rs2
-rw-r--r--server/src/apub/puller.rs2
-rw-r--r--server/src/apub/user.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/server/src/apub/community.rs b/server/src/apub/community.rs
index 79eb6839..ee3edc1f 100644
--- a/server/src/apub/community.rs
+++ b/server/src/apub/community.rs
@@ -1,9 +1,9 @@
-use crate::activitypub::{actor::Group, collection::UnorderedCollection, context};
use crate::apub::make_apub_endpoint;
use crate::db::community::Community;
use crate::db::community_view::CommunityFollowerView;
use crate::db::establish_unpooled_connection;
use crate::to_datetime_utc;
+use activitypub::{actor::Group, collection::UnorderedCollection, context};
use actix_web::body::Body;
use actix_web::web::Path;
use actix_web::HttpResponse;
diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs
index 50b87c87..ebb17129 100644
--- a/server/src/apub/post.rs
+++ b/server/src/apub/post.rs
@@ -1,7 +1,7 @@
-use crate::activitypub::{context, object::Page};
use crate::apub::make_apub_endpoint;
use crate::db::post::Post;
use crate::to_datetime_utc;
+use activitypub::{context, object::Page};
impl Post {
pub fn as_page(&self) -> Page {
diff --git a/server/src/apub/puller.rs b/server/src/apub/puller.rs
index 3ab4c69b..93fa99e7 100644
--- a/server/src/apub/puller.rs
+++ b/server/src/apub/puller.rs
@@ -1,12 +1,12 @@
extern crate reqwest;
use self::reqwest::Error;
-use crate::activitypub::actor::Group;
use crate::api::community::{GetCommunityResponse, ListCommunitiesResponse};
use crate::api::post::GetPosts;
use crate::db::community_view::CommunityView;
use crate::naive_now;
use crate::settings::Settings;
+use activitypub::actor::Group;
use serde_json::Value;
// TODO: right now all of the data is requested on demand, for production we will need to store
diff --git a/server/src/apub/user.rs b/server/src/apub/user.rs
index fb31e4b6..5f2421f1 100644
--- a/server/src/apub/user.rs
+++ b/server/src/apub/user.rs
@@ -1,8 +1,8 @@
-use crate::activitypub::{actor::Person, context};
use crate::apub::make_apub_endpoint;
use crate::db::establish_unpooled_connection;
use crate::db::user::User_;
use crate::to_datetime_utc;
+use activitypub::{actor::Person, context};
use actix_web::body::Body;
use actix_web::web::Path;
use actix_web::HttpResponse;