Fix redundant method chains
This commit is contained in:
		
							parent
							
								
									4cdc1a3655
								
							
						
					
					
						commit
						0775c8f3f9
					
				| @ -303,9 +303,7 @@ fn get_proxy_config() -> Option<ProxyConfig> { | ||||
|                 if only_domains.contains(domain) | ||||
|                     || only_domains | ||||
|                         .iter() | ||||
|                         .filter(|target| domain.ends_with(&format!(".{}", target))) | ||||
|                         .next() | ||||
|                         .is_some() | ||||
|                         .any(|target| domain.ends_with(&format!(".{}", target))) | ||||
|                 { | ||||
|                     Some(proxy_url.clone()) | ||||
|                 } else { | ||||
| @ -317,7 +315,6 @@ fn get_proxy_config() -> Option<ProxyConfig> { | ||||
|         }) | ||||
|     } else { | ||||
|         reqwest::Proxy::all(proxy_url) | ||||
|             .ok() | ||||
|             .expect("Invalid PROXY_URL") | ||||
|     }; | ||||
|     Some(ProxyConfig { | ||||
|  | ||||
| @ -123,8 +123,7 @@ impl Post { | ||||
|             .filter(posts::published.eq(true)) | ||||
|             .count() | ||||
|             .load(conn)? | ||||
|             .iter() | ||||
|             .next() | ||||
|             .get(0) | ||||
|             .cloned() | ||||
|             .ok_or(Error::NotFound) | ||||
|     } | ||||
| @ -287,17 +286,16 @@ impl Post { | ||||
|     } | ||||
| 
 | ||||
|     pub fn get_receivers_urls(&self, conn: &Connection) -> Result<Vec<String>> { | ||||
|         let followers = self | ||||
|             .get_authors(conn)? | ||||
|             .into_iter() | ||||
|             .filter_map(|a| a.get_followers(conn).ok()) | ||||
|             .collect::<Vec<Vec<User>>>(); | ||||
|         Ok(followers.into_iter().fold(vec![], |mut acc, f| { | ||||
|             for x in f { | ||||
|                 acc.push(x.ap_url); | ||||
|             } | ||||
|             acc | ||||
|         })) | ||||
|         Ok(self | ||||
|            .get_authors(conn)? | ||||
|            .into_iter() | ||||
|            .filter_map(|a| a.get_followers(conn).ok()) | ||||
|            .fold(vec![], |mut acc, f| { | ||||
|                for x in f { | ||||
|                    acc.push(x.ap_url); | ||||
|                } | ||||
|                acc | ||||
|            })) | ||||
|     } | ||||
| 
 | ||||
|     pub fn to_activity(&self, conn: &Connection) -> Result<LicensedArticle> { | ||||
|  | ||||
| @ -45,7 +45,7 @@ pub fn upload( | ||||
|     let (_, boundary) = ct | ||||
|         .params() | ||||
|         .find(|&(k, _)| k == "boundary") | ||||
|         .ok_or_else(|| status::BadRequest(Some("No boundary")))?; | ||||
|         .ok_or(status::BadRequest(Some("No boundary")))?; | ||||
| 
 | ||||
|     if let SaveResult::Full(entries) = Multipart::with_body(data.open(), boundary).save().temp() { | ||||
|         let fields = entries.fields; | ||||
| @ -53,7 +53,7 @@ pub fn upload( | ||||
|         let filename = fields | ||||
|             .get("file") | ||||
|             .and_then(|v| v.iter().next()) | ||||
|             .ok_or_else(|| status::BadRequest(Some("No file uploaded")))? | ||||
|             .ok_or(status::BadRequest(Some("No file uploaded")))? | ||||
|             .headers | ||||
|             .filename | ||||
|             .clone(); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user