aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the canapi::Provider impl for Post

Browse Source
This commit is contained in:
Bat 2018-09-25 20:10:18 +01:00
parent 1500267125
commit 472da486e9
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plume-models/src/comments.rs
View File

@ -3,7 +3,6 @@ use activitypub::{
link, link,
object::{Note} object::{Note}
}; };
use canapi::Provider;
use chrono; use chrono;
use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods, dsl::any}; use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods, dsl::any};
use serde_json; use serde_json;

1
plume-models/src/likes.rs
View File

@ -1,5 +1,4 @@
use activitypub::activity; use activitypub::activity;
use canapi::Provider;
use chrono; use chrono;
use diesel::{self, PgConnection, QueryDsl, RunQueryDsl, ExpressionMethods}; use diesel::{self, PgConnection, QueryDsl, RunQueryDsl, ExpressionMethods};

30
plume-models/src/posts.rs
View File

@ -5,7 +5,7 @@ use activitypub::{
}; };
use canapi::{Error, Provider}; use canapi::{Error, Provider};
use chrono::{NaiveDateTime, TimeZone, Utc}; use chrono::{NaiveDateTime, TimeZone, Utc};
use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods, BelongingToDsl, dsl::any, Expression, BoolExpressionMethods}; use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods, BelongingToDsl, dsl::any};
use heck::KebabCase; use heck::KebabCase;
use serde_json; use serde_json;
@ -70,20 +70,18 @@ impl Provider<PgConnection> for Post {
} }
fn list(conn: &PgConnection, filter: PostEndpoint) -> Vec<PostEndpoint> { fn list(conn: &PgConnection, filter: PostEndpoint) -> Vec<PostEndpoint> {
let mut filters = Vec::new(); let mut query = posts::table.into_boxed();
if let Some(title) = filter.title { if let Some(title) = filter.title {
filters.push(posts::title.eq(title)); query = query.filter(posts::title.eq(title));
}
if let Some(subtitle) = filter.subtitle {
query = query.filter(posts::subtitle.eq(subtitle));
}
if let Some(content) = filter.content {
query = query.filter(posts::content.eq(content));
} }
let filters = filters.into_iter(); query.get_results::<Post>(conn).map(|ps| ps.into_iter()
let res = if let Some(first_filter) = filters.next() {
posts::table.filter(filters.fold(first_filter, |q, f| q.and(f)))
.get_results::<Post>(conn)
} else {
posts::table.get_results::<Post>(conn)
};
res.map(|ps| ps.into_iter()
.map(|p| PostEndpoint { .map(|p| PostEndpoint {
id: Some(p.id), id: Some(p.id),
title: Some(p.title.clone()), title: Some(p.title.clone()),
@ -94,12 +92,12 @@ impl Provider<PgConnection> for Post {
).unwrap_or(vec![]) ).unwrap_or(vec![])
} }
fn create(conn: &PgConnection, query: PostEndpoint) -> Result<PostEndpoint, Error> { fn create(_conn: &PgConnection, _query: PostEndpoint) -> Result<PostEndpoint, Error> {
unimplemented!()
} }
fn update(conn: &PgConnection, id: i32, new_data: PostEndpoint) -> Result<PostEndpoint, Error> { fn update(_conn: &PgConnection, _id: i32, _new_data: PostEndpoint) -> Result<PostEndpoint, Error> {
unimplemented!()
} }
fn delete(conn: &PgConnection, id: i32) { fn delete(conn: &PgConnection, id: i32) {