gf4
/
lemmy
mirror of https://github.com/LemmyNet/lemmy
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yerba/main'

pull/1442/head
Dessalines 2021-02-18 16:19:39 -05:00
parent 8088055d38 15d0f54a88
commit 9845366a36
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/apub/src/fetcher/search.rs
View File

@ -41,8 +41,8 @@ use log::debug;
use url::Url; use url::Url;
/// The types of ActivityPub objects that can be fetched directly by searching for their ID. /// The types of ActivityPub objects that can be fetched directly by searching for their ID.
#[serde(untagged)]
#[derive(serde::Deserialize, Debug)] #[derive(serde::Deserialize, Debug)]
#[serde(untagged)]
enum SearchAcceptedObjects { enum SearchAcceptedObjects {
Person(Box<PersonExt>), Person(Box<PersonExt>),
Group(Box<GroupExt>), Group(Box<GroupExt>),

3
crates/db_queries/src/source/activity.rs
View File

@ -110,7 +110,8 @@ impl Activity_ for Activity {
.sql(" AND activity.data -> 'object' ->> 'type' = 'Create'") .sql(" AND activity.data -> 'object' ->> 'type' = 'Create'")
.sql(" AND activity.data -> 'object' -> 'object' ->> 'type' = 'Page'") .sql(" AND activity.data -> 'object' -> 'object' ->> 'type' = 'Page'")
.sql(" AND activity.data ->> 'actor' = ") .sql(" AND activity.data ->> 'actor' = ")
.bind::<Text, _>(community_actor_id), .bind::<Text, _>(community_actor_id)
.sql(" ORDER BY activity.id DESC"),
) )
.limit(20) .limit(20)
.get_results(conn)?; .get_results(conn)?;