Resolve merge conflicts

This commit is contained in:
Robin 2021-01-23 10:55:11 +01:00
commit b2ad2f636c
9 changed files with 57 additions and 70 deletions

View file

@ -287,7 +287,7 @@ pub fn time(created: f64) -> (String, String) {
// val() function used to parse JSON from Reddit APIs
pub fn val(j: &Value, k: &str) -> String {
String::from(j["data"][k].as_str().unwrap_or_default())
j["data"][k].as_str().unwrap_or_default().to_string()
}
// Fetch posts of a user or subreddit and return a vector of posts and the "after" value