grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adding back in post fetching.

Browse source
This commit is contained in:
Dessalines 2020-04-25 11:49:15 -04:00
parent 122bb3857a
commit c16fb9d00a
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
server/src/apub/fetcher.rs
View file

@ -39,6 +39,7 @@ where
pub enum SearchAcceptedObjects { pub enum SearchAcceptedObjects {
Person(Box<PersonExt>), Person(Box<PersonExt>),
Group(Box<GroupExt>), Group(Box<GroupExt>),
Page(Box<Page>),
} }
/// Attempt to parse the query as URL, and fetch an ActivityPub object from it. /// Attempt to parse the query as URL, and fetch an ActivityPub object from it.
@ -69,6 +70,10 @@ pub fn search_by_apub_id(query: &str, conn: &PgConnection) -> Result<SearchRespo
// fetch_community_outbox(&c, conn)?; // fetch_community_outbox(&c, conn)?;
response.communities = vec![CommunityView::read(conn, community.id, None)?]; response.communities = vec![CommunityView::read(conn, community.id, None)?];
} }
SearchAcceptedObjects::Page(p) => {
let p = upsert_post(&PostForm::from_apub(&p, conn)?, conn)?;
response.posts = vec![PostView::read(conn, p.id, None)?];
}
} }
Ok(response) Ok(response)
} }
@ -137,15 +142,14 @@ pub fn get_or_fetch_and_upsert_remote_community(
} }
} }
// TODO Maybe add post, comment searching / caching at a later time fn upsert_post(post_form: &PostForm, conn: &PgConnection) -> Result<Post, Error> {
// fn upsert_post(post_form: &PostForm, conn: &PgConnection) -> Result<Post, Error> { let existing = Post::read_from_apub_id(conn, &post_form.ap_id);
// let existing = Post::read_from_apub_id(conn, &post_form.ap_id); match existing {
// match existing { Err(NotFound {}) => Ok(Post::create(conn, &post_form)?),
// Err(NotFound {}) => Ok(Post::create(conn, &post_form)?), Ok(p) => Ok(Post::update(conn, p.id, &post_form)?),
// Ok(p) => Ok(Post::update(conn, p.id, &post_form)?), Err(e) => Err(Error::from(e)),
// Err(e) => Err(Error::from(e)), }
// } }
// }
// TODO It should not be fetching data from a community outbox. // TODO It should not be fetching data from a community outbox.
// All posts, comments, comment likes, etc should be posts to our community_inbox // All posts, comments, comment likes, etc should be posts to our community_inbox

1
server/src/apub/mod.rs
View file

@ -39,6 +39,7 @@ use crate::api::site::SearchResponse;
use crate::db::community::{Community, CommunityFollower, CommunityFollowerForm, CommunityForm}; use crate::db::community::{Community, CommunityFollower, CommunityFollowerForm, CommunityForm};
use crate::db::community_view::{CommunityFollowerView, CommunityView}; use crate::db::community_view::{CommunityFollowerView, CommunityView};
use crate::db::post::{Post, PostForm}; use crate::db::post::{Post, PostForm};
use crate::db::post_view::PostView;
use crate::db::user::{UserForm, User_}; use crate::db::user::{UserForm, User_};
use crate::db::user_view::UserView; use crate::db::user_view::UserView;
use crate::db::{Crud, Followable, SearchType}; use crate::db::{Crud, Followable, SearchType};