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

Add feed for all

Browse source
This commit is contained in:
Felix Ableitner 2019-12-01 20:01:38 +01:00
parent 49fea8a883
commit dd1c9227f8
2 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
server/src/feeds.rs
View file

@ -15,20 +15,47 @@ use diesel::result::Error;
use std::str::FromStr; use std::str::FromStr;
use self::rss::Guid; use self::rss::Guid;
use serde::Deserialize; use serde::Deserialize;
use strum::ParseError;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct Params { pub struct Params {
sort: Option<String>, sort: Option<String>,
} }
enum RequestType {
All,
Community,
User,
}
pub fn get_all_feed(info: web::Query<Params>) -> HttpResponse<Body> {
let sort_type = get_sort_type(info);
if sort_type.is_err() {
return HttpResponse::BadRequest().finish();
}
let result = get_feed_internal(&sort_type.unwrap(), RequestType::All, None);
return match result {
Ok(rss) => HttpResponse::Ok()
.content_type("application/rss+xml")
.body(rss),
Err(_) => HttpResponse::InternalServerError().finish(),
};
}
pub fn get_feed(path: web::Path<(char, String)>, info: web::Query<Params>) -> HttpResponse<Body> { pub fn get_feed(path: web::Path<(char, String)>, info: web::Query<Params>) -> HttpResponse<Body> {
let sort_query = info.sort.clone().unwrap_or(SortType::Hot.to_string()); let sort_type = get_sort_type(info);
let sort_type: SortType = match SortType::from_str(&sort_query) { if sort_type.is_err() {
Ok(sort) => sort, return HttpResponse::BadRequest().finish();
Err(_) => return HttpResponse::BadRequest().finish(), }
let request_type = match path.0 {
'u' => RequestType::User,
'c' => RequestType::Community,
_ => return HttpResponse::NotFound().finish(),
}; };
let result = get_feed_internal(path, &sort_type); let result = get_feed_internal(&sort_type.unwrap(), request_type, Some(path.1.clone()));
if result.is_ok() { if result.is_ok() {
let rss = result.unwrap(); let rss = result.unwrap();
return HttpResponse::Ok() return HttpResponse::Ok()
@ -43,15 +70,21 @@ pub fn get_feed(path: web::Path<(char, String)>, info: web::Query<Params>) -> Ht
} }
} }
fn get_feed_internal(info: web::Path<(char, String)>, sort_type: &SortType) -> Result<String, Error> { fn get_sort_type(info: web::Query<Params>) -> Result<SortType, ParseError> {
let sort_query = info.sort.clone().unwrap_or(SortType::Hot.to_string());
return SortType::from_str(&sort_query);
}
fn get_feed_internal(sort_type: &SortType, request_type: RequestType, name: Option<String>)
-> Result<String, Error> {
let conn = establish_connection(); let conn = establish_connection();
let mut community_id: Option<i32> = None; let mut community_id: Option<i32> = None;
let mut creator_id: Option<i32> = None; let mut creator_id: Option<i32> = None;
match info.0 { match request_type {
'c' => community_id = Some(Community::read_from_name(&conn,info.1.clone())?.id), RequestType::All =>(),
'u' => creator_id = Some(User_::find_by_email_or_username(&conn,&info.1)?.id), RequestType::Community => community_id = Some(Community::read_from_name(&conn,name.unwrap())?.id),
_ => return Err(Error::NotFound), RequestType::User => creator_id = Some(User_::find_by_email_or_username(&conn,&name.unwrap())?.id),
} }
let post = PostView::list(&conn, let post = PostView::list(&conn,

2
server/src/main.rs
View file

@ -206,7 +206,7 @@ fn main() {
.route("/feeds/{type}/{name}.xml", web::get().to(feeds::get_feed)) .route("/feeds/{type}/{name}.xml", web::get().to(feeds::get_feed))
// TODO: probably need a different function for this (or just handle all of /feeds? // TODO: probably need a different function for this (or just handle all of /feeds?
// TODO: would be nice to use ListingType, but that doesnt include user // TODO: would be nice to use ListingType, but that doesnt include user
.route("/feeds/all.xml", web::get().to(feeds::get_feed)) .route("/feeds/all.xml", web::get().to(feeds::get_all_feed))
// static resources // static resources
.service(actix_files::Files::new("/static", front_end_dir())) .service(actix_files::Files::new("/static", front_end_dir()))
}) })