summaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorFelix Ableitner <me@nutomic.com>2020-03-14 22:03:05 +0100
committerFelix Ableitner <me@nutomic.com>2020-03-14 22:03:05 +0100
commit8ebcc7ac021963ad3c5284bdf7fa3197c49223ed (patch)
treed94df574e0eb82087ad9b009ff946171c440dfbf /server/src
parent5896a9d251f13e4387fe34e0f8cd21317494ec15 (diff)
Implemented basics for post federation, plus a bunch of other stuff
Diffstat (limited to 'server/src')
-rw-r--r--server/src/api/community.rs6
-rw-r--r--server/src/api/post.rs5
-rw-r--r--server/src/apub/post.rs7
-rw-r--r--server/src/apub/puller.rs106
-rw-r--r--server/src/lib.rs1
-rw-r--r--server/src/routes/federation.rs2
6 files changed, 96 insertions, 31 deletions
diff --git a/server/src/api/community.rs b/server/src/api/community.rs
index 0f104c2d..a07b15d7 100644
--- a/server/src/api/community.rs
+++ b/server/src/api/community.rs
@@ -34,12 +34,13 @@ pub struct CommunityResponse {
pub community: CommunityView,
}
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
pub struct ListCommunities {
sort: String,
page: Option<i64>,
limit: Option<i64>,
auth: Option<String>,
+ local_only: Option<bool>,
}
#[derive(Serialize, Deserialize, Debug)]
@@ -342,7 +343,8 @@ impl Perform<ListCommunitiesResponse> for Oper<ListCommunities> {
fn perform(&self, conn: &PgConnection) -> Result<ListCommunitiesResponse, Error> {
let data: &ListCommunities = &self.data;
- if Settings::get().federation_enabled {
+ let local_only = data.local_only.unwrap_or(false);
+ if Settings::get().federation_enabled && !local_only {
return Ok(ListCommunitiesResponse {
communities: get_all_communities()?,
});
diff --git a/server/src/api/post.rs b/server/src/api/post.rs
index e19d4ee9..1602626b 100644
--- a/server/src/api/post.rs
+++ b/server/src/api/post.rs
@@ -44,9 +44,9 @@ pub struct GetPosts {
auth: Option<String>,
}
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
pub struct GetPostsResponse {
- posts: Vec<PostView>,
+ pub posts: Vec<PostView>,
}
#[derive(Serialize, Deserialize)]
@@ -222,7 +222,6 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> {
let data: &GetPosts = &self.data;
if Settings::get().federation_enabled {
- dbg!(&data);
// TODO: intercept here (but the type is wrong)
//get_remote_community_posts(get_posts.community_id.unwrap())
}
diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs
index 6950e561..61b5a78d 100644
--- a/server/src/apub/post.rs
+++ b/server/src/apub/post.rs
@@ -22,9 +22,10 @@ impl PostView {
oprops.set_content_xsd_string(body.to_owned())?;
}
- if let Some(_url) = &self.url {
- // TODO: crashes here
- //oprops.set_url_xsd_any_uri(url.to_owned())?;
+ // TODO: hacky code because we get self.url == Some("")
+ let url = self.url.as_ref();
+ if url.is_some() && !url.unwrap().is_empty() {
+ oprops.set_url_xsd_any_uri(url.unwrap().to_owned())?;
}
if let Some(u) = self.updated {
diff --git a/server/src/apub/puller.rs b/server/src/apub/puller.rs
index edadb7bf..50a6cd69 100644
--- a/server/src/apub/puller.rs
+++ b/server/src/apub/puller.rs
@@ -3,21 +3,27 @@ extern crate reqwest;
use crate::api::community::{GetCommunityResponse, ListCommunitiesResponse};
use crate::api::post::GetPostsResponse;
use crate::db::community_view::CommunityView;
+use crate::db::post_view::PostView;
+use crate::naive_now;
use crate::settings::Settings;
use activitystreams::actor::apub::Group;
use activitystreams::collection::apub::{OrderedCollection, UnorderedCollection};
+use activitystreams::object::apub::Page;
+use activitystreams::object::ObjectBox;
use failure::Error;
-
-// TODO: right now all of the data is requested on demand, for production we will need to store
-// things in the local database to not ruin the performance
+use log::warn;
+use serde::Deserialize;
fn fetch_communities_from_instance(domain: &str) -> Result<Vec<CommunityView>, Error> {
// TODO: check nodeinfo to make sure we are dealing with a lemmy instance
// -> means we need proper nodeinfo json classes instead of inline generation
// TODO: follow pagination (seems like page count is missing?)
// TODO: see if there is any standard for discovering remote actors, so we dont have to rely on lemmy apis
- let communities_uri = format!("http://{}/api/v1/communities/list?sort=Hot", domain);
- let communities1: ListCommunitiesResponse = reqwest::get(&communities_uri)?.json()?;
+ let communities_uri = format!(
+ "http://{}/api/v1/communities/list?sort=Hot&local_only=true",
+ domain
+ );
+ let communities1 = fetch_remote_object::<ListCommunitiesResponse>(&communities_uri)?;
let mut communities2 = communities1.communities;
for c in &mut communities2 {
c.name = format_community_name(&c.name, domain);
@@ -25,7 +31,6 @@ fn fetch_communities_from_instance(domain: &str) -> Result<Vec<CommunityView>, E
Ok(communities2)
}
-// TODO: this should be cached or stored in the database
fn get_remote_community_uri(identifier: &str) -> String {
let x: Vec<&str> = identifier.split('@').collect();
let name = x[0].replace("!", "");
@@ -33,29 +38,84 @@ fn get_remote_community_uri(identifier: &str) -> String {
format!("http://{}/federation/c/{}", instance, name)
}
+fn fetch_remote_object<Response>(uri: &str) -> Result<Response, Error>
+where
+ Response: for<'de> Deserialize<'de>,
+{
+ // TODO: should cache responses here when we are in production
+ // TODO: this function should return a future
+ let x: Response = reqwest::get(uri)?.json()?;
+ Ok(x)
+}
+
pub fn get_remote_community_posts(identifier: &str) -> Result<GetPostsResponse, Error> {
- let community: Group = reqwest::get(&get_remote_community_uri(identifier))?.json()?;
+ let community = fetch_remote_object::<Group>(&get_remote_community_uri(identifier))?;
let outbox_uri = &community.ap_actor_props.get_outbox().to_string();
- let outbox: OrderedCollection = reqwest::get(outbox_uri)?.json()?;
+ let outbox = fetch_remote_object::<OrderedCollection>(outbox_uri)?;
let items = outbox.collection_props.get_many_items_object_boxs();
- dbg!(items);
- unimplemented!()
+
+ let posts: Vec<PostView> = items
+ .unwrap()
+ .map(|obox: &ObjectBox| {
+ let page: Page = obox.clone().to_concrete::<Page>().unwrap();
+ // TODO: need to populate this
+ PostView {
+ id: -1,
+ name: page.object_props.get_name_xsd_string().unwrap().to_string(),
+ url: None,
+ body: None,
+ creator_id: -1,
+ community_id: -1,
+ removed: false,
+ locked: false,
+ published: naive_now(),
+ updated: None,
+ deleted: false,
+ nsfw: false,
+ stickied: false,
+ embed_title: None,
+ embed_description: None,
+ embed_html: None,
+ thumbnail_url: None,
+ banned: false,
+ banned_from_community: false,
+ creator_name: "".to_string(),
+ creator_avatar: None,
+ community_name: "".to_string(),
+ community_removed: false,
+ community_deleted: false,
+ community_nsfw: false,
+ number_of_comments: -1,
+ score: -1,
+ upvotes: -1,
+ downvotes: -1,
+ hot_rank: -1,
+ newest_activity_time: naive_now(),
+ user_id: None,
+ my_vote: None,
+ subscribed: None,
+ read: None,
+ saved: None,
+ }
+ })
+ .collect();
+ Ok(GetPostsResponse { posts })
}
pub fn get_remote_community(identifier: &str) -> Result<GetCommunityResponse, failure::Error> {
- let community: Group = reqwest::get(&get_remote_community_uri(identifier))?.json()?;
+ let community = fetch_remote_object::<Group>(&get_remote_community_uri(identifier))?;
let followers_uri = &community
.ap_actor_props
.get_followers()
.unwrap()
.to_string();
let outbox_uri = &community.ap_actor_props.get_outbox().to_string();
- let outbox: OrderedCollection = reqwest::get(outbox_uri)?.json()?;
- // TODO: this need to be done in get_remote_community_posts() (meaning we need to store the outbox uri?)
- let followers: UnorderedCollection = reqwest::get(followers_uri)?.json()?;
+ let outbox = fetch_remote_object::<OrderedCollection>(outbox_uri)?;
+ let followers = fetch_remote_object::<UnorderedCollection>(followers_uri)?;
+ // TODO: this is only for testing until we can call that function from GetPosts
+ // (once string ids are supported)
+ //dbg!(get_remote_community_posts(identifier)?);
- // TODO: looks like a bunch of data is missing from the activitypub response
- // TODO: i dont think simple numeric ids are going to work, we probably need something like uuids
Ok(GetCommunityResponse {
moderators: vec![],
admins: vec![],
@@ -106,18 +166,20 @@ pub fn get_remote_community(identifier: &str) -> Result<GetCommunityResponse, fa
})
}
-pub fn get_following_instances() -> Result<Vec<String>, Error> {
- let instance_list = match Settings::get().federated_instance.clone() {
+pub fn get_following_instances() -> Vec<String> {
+ match Settings::get().federated_instance.clone() {
Some(f) => vec![f, Settings::get().hostname.clone()],
None => vec![Settings::get().hostname.clone()],
- };
- Ok(instance_list)
+ }
}
pub fn get_all_communities() -> Result<Vec<CommunityView>, Error> {
let mut communities_list: Vec<CommunityView> = vec![];
- for instance in &get_following_instances()? {
- communities_list.append(fetch_communities_from_instance(instance)?.as_mut());
+ for instance in &get_following_instances() {
+ match fetch_communities_from_instance(instance) {
+ Ok(mut c) => communities_list.append(c.as_mut()),
+ Err(e) => warn!("Failed to fetch instance list from remote instance: {}", e),
+ };
}
Ok(communities_list)
}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 3336ae4d..bf3c3c0a 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -15,6 +15,7 @@ pub extern crate dotenv;
pub extern crate jsonwebtoken;
pub extern crate lettre;
pub extern crate lettre_email;
+extern crate log;
pub extern crate rand;
pub extern crate regex;
pub extern crate serde;
diff --git a/server/src/routes/federation.rs b/server/src/routes/federation.rs
index 0be051eb..99b4d2c0 100644
--- a/server/src/routes/federation.rs
+++ b/server/src/routes/federation.rs
@@ -28,7 +28,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
"/federation/u/{user_name}",
web::get().to(apub::user::get_apub_user),
)
- // TODO: this is a very quick and dirty implementation for http api calls
+ // TODO: we should be able to remove this but somehow that breaks the remote community list
.route(
"/api/v1/communities/list",
web::get().to(