diff --git a/Cargo.lock b/Cargo.lock index 60b1992..08b56e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,6 +211,19 @@ dependencies = [ "memchr", ] +[[package]] +name = "ammonia" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" +dependencies = [ + "html5ever", + "maplit", + "once_cell", + "tendril", + "url", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -585,6 +598,16 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + [[package]] name = "futures" version = "0.3.28" @@ -1006,6 +1029,36 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +[[package]] +name = "html2pango" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22f189d26bf7cf4652dbe49da86f3a27628f745469365f1d2575ea8caf54eaf" +dependencies = [ + "ammonia", + "anyhow", + "html5ever", + "linkify", + "maplit", + "markup5ever_rcdom", + "once_cell", + "regex", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "http" version = "0.2.9" @@ -1226,7 +1279,9 @@ dependencies = [ name = "lemoa" version = "0.1.0" dependencies = [ + "html2pango", "lemmy_api_common", + "markdown", "relm4", "relm4-components", "reqwest", @@ -1273,6 +1328,15 @@ version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +[[package]] +name = "linkify" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" +dependencies = [ + "memchr", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -1313,6 +1377,55 @@ version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "markdown" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef3aab6a1d529b112695f72beec5ee80e729cb45af58663ec902c8fac764ecdd" +dependencies = [ + "lazy_static", + "pipeline", + "regex", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" +dependencies = [ + "html5ever", + "markup5ever", + "tendril", + "xml5ever", +] + [[package]] name = "memchr" version = "2.5.0" @@ -1373,6 +1486,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + [[package]] name = "num-traits" version = "0.2.15" @@ -1524,6 +1643,44 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.0" @@ -1556,6 +1713,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pipeline" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" + [[package]] name = "pkg-config" version = "0.3.27" @@ -1568,6 +1731,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -1915,6 +2084,12 @@ dependencies = [ "libc", ] +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + [[package]] name = "slab" version = "0.4.8" @@ -1949,6 +2124,32 @@ dependencies = [ "lock_api", ] +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", +] + [[package]] name = "strum" version = "0.24.1" @@ -2023,6 +2224,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + [[package]] name = "thiserror" version = "1.0.40" @@ -2366,6 +2578,12 @@ dependencies = [ "serde", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "uuid" version = "1.3.4" @@ -2653,3 +2871,14 @@ checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] + +[[package]] +name = "xml5ever" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" +dependencies = [ + "log", + "mac", + "markup5ever", +] diff --git a/Cargo.toml b/Cargo.toml index b0b8c6a..1bd3a11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,4 +9,6 @@ relm4-components = { version = "0.6.0", features = ["web"] } reqwest = { version = "0.11.16", features = ["json", "blocking"] } serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" -lemmy_api_common = { git = "https://github.com/LemmyNet/lemmy.git", tag = "0.17.2" } \ No newline at end of file +lemmy_api_common = { git = "https://github.com/LemmyNet/lemmy.git", tag = "0.17.2" } +markdown = "0.3.0" +html2pango = "0.5.0" diff --git a/src/components/comment_row.rs b/src/components/comment_row.rs index 8bd16d7..b8ae8f8 100644 --- a/src/components/comment_row.rs +++ b/src/components/comment_row.rs @@ -4,6 +4,7 @@ use gtk::prelude::*; use relm4_components::web_image::WebImage; use crate::util::get_web_image_url; +use crate::util::markdown_to_pango_markup; #[derive(Debug)] pub struct CommentRow { @@ -56,8 +57,9 @@ impl FactoryComponent for CommentRow { }, gtk::Label { - set_label: &self.comment.comment.content, + set_markup: &markdown_to_pango_markup(self.comment.comment.content.clone()), set_halign: gtk::Align::Start, + set_use_markup: true, }, gtk::Label { diff --git a/src/components/community_page.rs b/src/components/community_page.rs index 32f3f9e..f3290f7 100644 --- a/src/components/community_page.rs +++ b/src/components/community_page.rs @@ -1,3 +1,4 @@ +use crate::util::markdown_to_pango_markup; use lemmy_api_common::{community::GetCommunityResponse, lemmy_db_views::structs::PostView}; use relm4::{prelude::*, factory::FactoryVecDeque}; use gtk::prelude::*; @@ -47,7 +48,8 @@ impl SimpleComponent for CommunityPage { }, gtk::Label { #[watch] - set_text: &model.info.clone().community_view.community.description.unwrap_or("".to_string()), + set_markup: &markdown_to_pango_markup(model.info.clone().community_view.community.description.unwrap_or("".to_string())), + set_use_markup: true, }, gtk::Label { #[watch] diff --git a/src/components/post_page.rs b/src/components/post_page.rs index d5fd41f..04316e1 100644 --- a/src/components/post_page.rs +++ b/src/components/post_page.rs @@ -3,7 +3,7 @@ use relm4::{prelude::*, factory::FactoryVecDeque}; use gtk::prelude::*; use relm4_components::web_image::WebImage; -use crate::{api, util::{get_web_image_msg, get_web_image_url}}; +use crate::{api, util::{get_web_image_msg, get_web_image_url, markdown_to_pango_markup}}; use super::comment_row::CommentRow; @@ -50,8 +50,9 @@ impl SimpleComponent for PostPage { }, gtk::Label { #[watch] - set_text: &model.info.clone().post_view.post.body.unwrap_or("".to_string()), + set_markup: &markdown_to_pango_markup(model.info.post_view.post.body.clone().unwrap_or("".to_string())), set_margin_top: 10, + set_use_markup: true, }, gtk::Box { diff --git a/src/components/profile_page.rs b/src/components/profile_page.rs index 93207a3..ce817b0 100644 --- a/src/components/profile_page.rs +++ b/src/components/profile_page.rs @@ -4,6 +4,7 @@ use gtk::prelude::*; use relm4_components::web_image::WebImage; use crate::util::get_web_image_msg; +use crate::util::markdown_to_pango_markup; use super::post_row::PostRow; @@ -44,7 +45,8 @@ impl SimpleComponent for ProfilePage { }, gtk::Label { #[watch] - set_text: &model.info.person_view.person.bio.clone().unwrap_or("".to_string()), + set_markup: &markdown_to_pango_markup(model.info.person_view.person.bio.clone().unwrap_or("".to_string())), + set_use_markup: true, }, gtk::Box { diff --git a/src/util.rs b/src/util.rs index 73000bf..546b1e9 100644 --- a/src/util.rs +++ b/src/util.rs @@ -12,3 +12,7 @@ pub fn get_web_image_url(url: Option) -> String { url.to_string() } else { String::from("") } } + +pub fn markdown_to_pango_markup(text: String) -> String { + return html2pango::markup_html(&markdown::to_html(&text)).unwrap_or(text) +} \ No newline at end of file