Edit indicator
This commit is contained in:
parent
aa7c8c85df
commit
14ecf3cf60
31
src/post.rs
31
src/post.rs
@ -86,7 +86,7 @@ async fn parse_post(json: &serde_json::Value) -> Post {
|
|||||||
name: val(post, "author"),
|
name: val(post, "author"),
|
||||||
flair: Flair {
|
flair: Flair {
|
||||||
flair_parts: parse_rich_flair(
|
flair_parts: parse_rich_flair(
|
||||||
val(post, "author_flair_type"),
|
post["data"]["author_flair_type"].as_str().unwrap_or_default(),
|
||||||
post["data"]["author_flair_richtext"].as_array(),
|
post["data"]["author_flair_richtext"].as_array(),
|
||||||
post["data"]["author_flair_text"].as_str(),
|
post["data"]["author_flair_text"].as_str(),
|
||||||
),
|
),
|
||||||
@ -108,7 +108,7 @@ async fn parse_post(json: &serde_json::Value) -> Post {
|
|||||||
},
|
},
|
||||||
flair: Flair {
|
flair: Flair {
|
||||||
flair_parts: parse_rich_flair(
|
flair_parts: parse_rich_flair(
|
||||||
val(post, "link_flair_type"),
|
post["data"]["link_flair_type"].as_str().unwrap_or_default(),
|
||||||
post["data"]["link_flair_richtext"].as_array(),
|
post["data"]["link_flair_richtext"].as_array(),
|
||||||
post["data"]["link_flair_text"].as_str(),
|
post["data"]["link_flair_text"].as_str(),
|
||||||
),
|
),
|
||||||
@ -144,14 +144,22 @@ async fn parse_comments(json: &serde_json::Value, post_link: &str, post_author:
|
|||||||
|
|
||||||
// For each comment, retrieve the values to build a Comment object
|
// For each comment, retrieve the values to build a Comment object
|
||||||
for comment in comment_data {
|
for comment in comment_data {
|
||||||
let unix_time = comment["data"]["created_utc"].as_f64().unwrap_or_default();
|
let kind = comment["kind"].as_str().unwrap_or_default().to_string();
|
||||||
|
let data = &comment["data"];
|
||||||
|
|
||||||
|
let unix_time = data["created_utc"].as_f64().unwrap_or_default();
|
||||||
let (rel_time, created) = time(unix_time);
|
let (rel_time, created) = time(unix_time);
|
||||||
|
|
||||||
let score = comment["data"]["score"].as_i64().unwrap_or(0);
|
let edited = match data["edited"].as_f64() {
|
||||||
|
Some(stamp) => time(stamp),
|
||||||
|
None => (String::new(), String::new()),
|
||||||
|
};
|
||||||
|
|
||||||
|
let score = data["score"].as_i64().unwrap_or(0);
|
||||||
let body = rewrite_urls(&val(&comment, "body_html"));
|
let body = rewrite_urls(&val(&comment, "body_html"));
|
||||||
|
|
||||||
let replies: Vec<Comment> = if comment["data"]["replies"].is_object() {
|
let replies: Vec<Comment> = if data["replies"].is_object() {
|
||||||
parse_comments(&comment["data"]["replies"], post_link, post_author, highlighted_comment).await
|
parse_comments(&data["replies"], post_link, post_author, highlighted_comment).await
|
||||||
} else {
|
} else {
|
||||||
Vec::new()
|
Vec::new()
|
||||||
};
|
};
|
||||||
@ -164,7 +172,7 @@ async fn parse_comments(json: &serde_json::Value, post_link: &str, post_author:
|
|||||||
|
|
||||||
comments.push(Comment {
|
comments.push(Comment {
|
||||||
id,
|
id,
|
||||||
kind: comment["kind"].as_str().unwrap_or_default().to_string(),
|
kind,
|
||||||
parent_id: parent_info[1].to_string(),
|
parent_id: parent_info[1].to_string(),
|
||||||
parent_kind: parent_info[0].to_string(),
|
parent_kind: parent_info[0].to_string(),
|
||||||
post_link: post_link.to_string(),
|
post_link: post_link.to_string(),
|
||||||
@ -174,22 +182,23 @@ async fn parse_comments(json: &serde_json::Value, post_link: &str, post_author:
|
|||||||
name: val(&comment, "author"),
|
name: val(&comment, "author"),
|
||||||
flair: Flair {
|
flair: Flair {
|
||||||
flair_parts: parse_rich_flair(
|
flair_parts: parse_rich_flair(
|
||||||
val(&comment, "author_flair_type"),
|
data["author_flair_type"].as_str().unwrap_or_default(),
|
||||||
comment["data"]["author_flair_richtext"].as_array(),
|
data["author_flair_richtext"].as_array(),
|
||||||
comment["data"]["author_flair_text"].as_str(),
|
data["author_flair_text"].as_str(),
|
||||||
),
|
),
|
||||||
background_color: val(&comment, "author_flair_background_color"),
|
background_color: val(&comment, "author_flair_background_color"),
|
||||||
foreground_color: val(&comment, "author_flair_text_color"),
|
foreground_color: val(&comment, "author_flair_text_color"),
|
||||||
},
|
},
|
||||||
distinguished: val(&comment, "distinguished"),
|
distinguished: val(&comment, "distinguished"),
|
||||||
},
|
},
|
||||||
score: if comment["data"]["score_hidden"].as_bool().unwrap_or_default() {
|
score: if data["score_hidden"].as_bool().unwrap_or_default() {
|
||||||
"•".to_string()
|
"•".to_string()
|
||||||
} else {
|
} else {
|
||||||
format_num(score)
|
format_num(score)
|
||||||
},
|
},
|
||||||
rel_time,
|
rel_time,
|
||||||
created,
|
created,
|
||||||
|
edited,
|
||||||
replies,
|
replies,
|
||||||
highlighted,
|
highlighted,
|
||||||
});
|
});
|
||||||
|
62
src/utils.rs
62
src/utils.rs
@ -91,6 +91,7 @@ pub struct Comment {
|
|||||||
pub score: String,
|
pub score: String,
|
||||||
pub rel_time: String,
|
pub rel_time: String,
|
||||||
pub created: String,
|
pub created: String,
|
||||||
|
pub edited: (String, String),
|
||||||
pub replies: Vec<Comment>,
|
pub replies: Vec<Comment>,
|
||||||
pub highlighted: bool,
|
pub highlighted: bool,
|
||||||
}
|
}
|
||||||
@ -209,17 +210,21 @@ pub fn format_num(num: i64) -> String {
|
|||||||
pub async fn media(data: &Value) -> (String, Media, Vec<GalleryMedia>) {
|
pub async fn media(data: &Value) -> (String, Media, Vec<GalleryMedia>) {
|
||||||
let post_type: &str;
|
let post_type: &str;
|
||||||
let mut gallery = Vec::new();
|
let mut gallery = Vec::new();
|
||||||
|
|
||||||
// If post is a video, return the video
|
// If post is a video, return the video
|
||||||
let url = if data["preview"]["reddit_video_preview"]["fallback_url"].is_string() {
|
let url = if data["preview"]["reddit_video_preview"]["fallback_url"].is_string() {
|
||||||
|
// Return video preview
|
||||||
post_type = "video";
|
post_type = "video";
|
||||||
format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap_or_default())
|
format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap_or_default())
|
||||||
} else if data["secure_media"]["reddit_video"]["fallback_url"].is_string() {
|
} else if data["secure_media"]["reddit_video"]["fallback_url"].is_string() {
|
||||||
|
// Return reddit video
|
||||||
post_type = "video";
|
post_type = "video";
|
||||||
format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap_or_default())
|
format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap_or_default())
|
||||||
} else if data["post_hint"].as_str().unwrap_or("") == "image" {
|
} else if data["post_hint"].as_str().unwrap_or("") == "image" {
|
||||||
// Handle images, whether GIFs or pics
|
// Handle images, whether GIFs or pics
|
||||||
let preview = data["preview"]["images"][0].clone();
|
let preview = &data["preview"]["images"][0];
|
||||||
let mp4 = &preview["variants"]["mp4"];
|
let mp4 = &preview["variants"]["mp4"];
|
||||||
|
|
||||||
if mp4.is_object() {
|
if mp4.is_object() {
|
||||||
// Return the mp4 if the media is a gif
|
// Return the mp4 if the media is a gif
|
||||||
post_type = "gif";
|
post_type = "gif";
|
||||||
@ -230,17 +235,22 @@ pub async fn media(data: &Value) -> (String, Media, Vec<GalleryMedia>) {
|
|||||||
format_url(preview["source"]["url"].as_str().unwrap_or_default())
|
format_url(preview["source"]["url"].as_str().unwrap_or_default())
|
||||||
}
|
}
|
||||||
} else if data["is_self"].as_bool().unwrap_or_default() {
|
} else if data["is_self"].as_bool().unwrap_or_default() {
|
||||||
|
// If type is self, return permalink
|
||||||
post_type = "self";
|
post_type = "self";
|
||||||
data["permalink"].as_str().unwrap_or_default().to_string()
|
data["permalink"].as_str().unwrap_or_default().to_string()
|
||||||
} else if data["is_gallery"].as_bool().unwrap_or_default() {
|
} else if data["is_gallery"].as_bool().unwrap_or_default() {
|
||||||
|
// If this post contains a gallery of images
|
||||||
post_type = "gallery";
|
post_type = "gallery";
|
||||||
gallery = data["gallery_data"]["items"]
|
gallery = data["gallery_data"]["items"]
|
||||||
.as_array()
|
.as_array()
|
||||||
.unwrap_or(&Vec::<Value>::new())
|
.unwrap_or(&Vec::<Value>::new())
|
||||||
.iter()
|
.iter()
|
||||||
.map(|item| {
|
.map(|item| {
|
||||||
|
// For each image in gallery
|
||||||
let media_id = item["media_id"].as_str().unwrap_or_default();
|
let media_id = item["media_id"].as_str().unwrap_or_default();
|
||||||
let image = &data["media_metadata"][media_id]["s"];
|
let image = &data["media_metadata"][media_id]["s"];
|
||||||
|
|
||||||
|
// Construct gallery items
|
||||||
GalleryMedia {
|
GalleryMedia {
|
||||||
url: format_url(image["u"].as_str().unwrap_or_default()),
|
url: format_url(image["u"].as_str().unwrap_or_default()),
|
||||||
width: image["x"].as_i64().unwrap_or_default(),
|
width: image["x"].as_i64().unwrap_or_default(),
|
||||||
@ -250,27 +260,31 @@ pub async fn media(data: &Value) -> (String, Media, Vec<GalleryMedia>) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect::<Vec<GalleryMedia>>();
|
.collect::<Vec<GalleryMedia>>();
|
||||||
|
|
||||||
data["url"].as_str().unwrap_or_default().to_string()
|
data["url"].as_str().unwrap_or_default().to_string()
|
||||||
} else {
|
} else {
|
||||||
|
// If type can't be determined, return url
|
||||||
post_type = "link";
|
post_type = "link";
|
||||||
data["url"].as_str().unwrap_or_default().to_string()
|
data["url"].as_str().unwrap_or_default().to_string()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let source = &data["preview"]["images"][0]["source"];
|
||||||
|
|
||||||
(
|
(
|
||||||
post_type.to_string(),
|
post_type.to_string(),
|
||||||
Media {
|
Media {
|
||||||
url,
|
url,
|
||||||
width: data["preview"]["images"][0]["source"]["width"].as_i64().unwrap_or_default(),
|
width: source["width"].as_i64().unwrap_or_default(),
|
||||||
height: data["preview"]["images"][0]["source"]["height"].as_i64().unwrap_or_default(),
|
height: source["height"].as_i64().unwrap_or_default(),
|
||||||
poster: format_url(data["preview"]["images"][0]["source"]["url"].as_str().unwrap_or_default()),
|
poster: format_url(source["url"].as_str().unwrap_or_default()),
|
||||||
},
|
},
|
||||||
gallery,
|
gallery,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_rich_flair(flair_type: String, rich_flair: Option<&Vec<Value>>, text_flair: Option<&str>) -> Vec<FlairPart> {
|
pub fn parse_rich_flair(flair_type: &str, rich_flair: Option<&Vec<Value>>, text_flair: Option<&str>) -> Vec<FlairPart> {
|
||||||
// Parse type of flair
|
// Parse type of flair
|
||||||
match flair_type.as_str() {
|
match flair_type {
|
||||||
// If flair contains emojis and text
|
// If flair contains emojis and text
|
||||||
"richtext" => match rich_flair {
|
"richtext" => match rich_flair {
|
||||||
Some(rich) => rich
|
Some(rich) => rich
|
||||||
@ -318,7 +332,7 @@ pub fn time(created: f64) -> (String, String) {
|
|||||||
format!("{}m ago", time_delta.whole_minutes())
|
format!("{}m ago", time_delta.whole_minutes())
|
||||||
};
|
};
|
||||||
|
|
||||||
(rel_time, time.format("%b %d %Y, %H:%M UTC"))
|
(rel_time, time.format("%b %d %Y, %H:%M:%S UTC"))
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@ -355,13 +369,15 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
|
|||||||
|
|
||||||
// For each post from posts list
|
// For each post from posts list
|
||||||
for post in post_list {
|
for post in post_list {
|
||||||
let (rel_time, created) = time(post["data"]["created_utc"].as_f64().unwrap_or_default());
|
let data = &post["data"];
|
||||||
let score = post["data"]["score"].as_i64().unwrap_or_default();
|
|
||||||
let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
|
let (rel_time, created) = time(data["created_utc"].as_f64().unwrap_or_default());
|
||||||
|
let score = data["score"].as_i64().unwrap_or_default();
|
||||||
|
let ratio: f64 = data["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
|
||||||
let title = val(post, "title");
|
let title = val(post, "title");
|
||||||
|
|
||||||
// Determine the type of media along with the media URL
|
// Determine the type of media along with the media URL
|
||||||
let (post_type, media, gallery) = media(&post["data"]).await;
|
let (post_type, media, gallery) = media(&data).await;
|
||||||
|
|
||||||
posts.push(Post {
|
posts.push(Post {
|
||||||
id: val(post, "id"),
|
id: val(post, "id"),
|
||||||
@ -372,16 +388,16 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
|
|||||||
name: val(post, "author"),
|
name: val(post, "author"),
|
||||||
flair: Flair {
|
flair: Flair {
|
||||||
flair_parts: parse_rich_flair(
|
flair_parts: parse_rich_flair(
|
||||||
val(post, "author_flair_type"),
|
data["author_flair_type"].as_str().unwrap_or_default(),
|
||||||
post["data"]["author_flair_richtext"].as_array(),
|
data["author_flair_richtext"].as_array(),
|
||||||
post["data"]["author_flair_text"].as_str(),
|
data["author_flair_text"].as_str(),
|
||||||
),
|
),
|
||||||
background_color: val(post, "author_flair_background_color"),
|
background_color: val(post, "author_flair_background_color"),
|
||||||
foreground_color: val(post, "author_flair_text_color"),
|
foreground_color: val(post, "author_flair_text_color"),
|
||||||
},
|
},
|
||||||
distinguished: val(post, "distinguished"),
|
distinguished: val(post, "distinguished"),
|
||||||
},
|
},
|
||||||
score: if post["data"]["hide_score"].as_bool().unwrap_or_default() {
|
score: if data["hide_score"].as_bool().unwrap_or_default() {
|
||||||
"•".to_string()
|
"•".to_string()
|
||||||
} else {
|
} else {
|
||||||
format_num(score)
|
format_num(score)
|
||||||
@ -390,17 +406,17 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
|
|||||||
post_type,
|
post_type,
|
||||||
thumbnail: Media {
|
thumbnail: Media {
|
||||||
url: format_url(val(post, "thumbnail").as_str()),
|
url: format_url(val(post, "thumbnail").as_str()),
|
||||||
width: post["data"]["thumbnail_width"].as_i64().unwrap_or_default(),
|
width: data["thumbnail_width"].as_i64().unwrap_or_default(),
|
||||||
height: post["data"]["thumbnail_height"].as_i64().unwrap_or_default(),
|
height: data["thumbnail_height"].as_i64().unwrap_or_default(),
|
||||||
poster: "".to_string(),
|
poster: "".to_string(),
|
||||||
},
|
},
|
||||||
media,
|
media,
|
||||||
domain: val(post, "domain"),
|
domain: val(post, "domain"),
|
||||||
flair: Flair {
|
flair: Flair {
|
||||||
flair_parts: parse_rich_flair(
|
flair_parts: parse_rich_flair(
|
||||||
val(post, "link_flair_type"),
|
data["link_flair_type"].as_str().unwrap_or_default(),
|
||||||
post["data"]["link_flair_richtext"].as_array(),
|
data["link_flair_richtext"].as_array(),
|
||||||
post["data"]["link_flair_text"].as_str(),
|
data["link_flair_text"].as_str(),
|
||||||
),
|
),
|
||||||
background_color: val(post, "link_flair_background_color"),
|
background_color: val(post, "link_flair_background_color"),
|
||||||
foreground_color: if val(post, "link_flair_text_color") == "dark" {
|
foreground_color: if val(post, "link_flair_text_color") == "dark" {
|
||||||
@ -410,13 +426,13 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
flags: Flags {
|
flags: Flags {
|
||||||
nsfw: post["data"]["over_18"].as_bool().unwrap_or_default(),
|
nsfw: data["over_18"].as_bool().unwrap_or_default(),
|
||||||
stickied: post["data"]["stickied"].as_bool().unwrap_or_default(),
|
stickied: data["stickied"].as_bool().unwrap_or_default(),
|
||||||
},
|
},
|
||||||
permalink: val(post, "permalink"),
|
permalink: val(post, "permalink"),
|
||||||
rel_time,
|
rel_time,
|
||||||
created,
|
created,
|
||||||
comments: format_num(post["data"]["num_comments"].as_i64().unwrap_or_default()),
|
comments: format_num(data["num_comments"].as_i64().unwrap_or_default()),
|
||||||
gallery,
|
gallery,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -889,6 +889,12 @@ a.search_subreddit:hover {
|
|||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.edited {
|
||||||
|
opacity: 0.4;
|
||||||
|
font-style: italic;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
.line {
|
.line {
|
||||||
width: 2px;
|
width: 2px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
<small class="author_flair">{% call utils::render_flair(author.flair.flair_parts) %}</small>
|
<small class="author_flair">{% call utils::render_flair(author.flair.flair_parts) %}</small>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<span class="created" title="{{ created }}">{{ rel_time }}</span>
|
<span class="created" title="{{ created }}">{{ rel_time }}</span>
|
||||||
|
{% if edited.0 != "".to_string() %}<span class="edited" title="{{ edited.1 }}">edited {{ edited.0 }}</span>{% endif %}
|
||||||
</summary>
|
</summary>
|
||||||
<div class="comment_body {% if highlighted %}highlighted{% endif %}">{{ body }}</div>
|
<div class="comment_body {% if highlighted %}highlighted{% endif %}">{{ body }}</div>
|
||||||
<blockquote class="replies">{% for c in replies -%}{{ c.render().unwrap() }}{%- endfor %}
|
<blockquote class="replies">{% for c in replies -%}{{ c.render().unwrap() }}{%- endfor %}
|
||||||
|
Loading…
Reference in New Issue
Block a user