fix default templates and stripp any trailing dashes from copyed posts

Author: aryanchoudharypro

src/commands.rs

@@ -512,8 +512,16 @@ pub fn handle_ui_command(cmd: UiCommand, ctx: &mut UiCommandContext<'_>) {
 			options.boost_template = strip_stats(&options.boost_template);
 			options.quote_template = strip_stats(&options.quote_template);
 			let is_expanded = state.cw_expanded.contains(entry.id());
-			let text = entry.display_text(&options, is_expanded);
-			if text.trim().is_empty() {
+			let mut text = entry.display_text(&options, is_expanded).trim().to_string();
+			while text.ends_with(" -") || text.ends_with(',') {
+				if text.ends_with(" -") {
+					text.truncate(text.len() - 2);
+				} else if text.ends_with(',') {
+					text.pop();
+				}
+				text = text.trim().to_string();
+			}
+			if text.is_empty() {
 				live_region.announce("Post has no text");
 				return;
 			}

src/template.rs

@@ -1,8 +1,8 @@
 use minijinja::{Environment, context};
 
-pub const DEFAULT_POST_TEMPLATE: &str = "{{ author }}: {{ content }} - {{ media }}{{ poll }} - {{ relative_time }}, {{ visibility }}{% if reply_count %}, {{ reply_count }}{% endif %}{% if boost_count %}, {{ boost_count }}{% endif %}{% if favorite_count %}, {{ favorite_count }}{% endif %}{% if client %}, via {{ client }}{% endif %}";
-pub const DEFAULT_BOOST_TEMPLATE: &str = "{{ booster }} boosted {{ author }}: {{ content }} - {{ media }}{{ poll }}{% if quote_author %} - Quoting {{ quote_author }} ({{ quote_username }}): {{ quote_content }}{{ quote_media }}{{ quote_poll }}{% endif %} - {{ relative_time }}, {{ visibility }}{% if reply_count %}, {{ reply_count }}{% endif %}{% if boost_count %}, {{ boost_count }}{% endif %}{% if favorite_count %}, {{ favorite_count }}{% endif %}{% if client %}, via {{ client }}{% endif %}";
-pub const DEFAULT_QUOTE_TEMPLATE: &str = "{{ author }}: {{ content }} - Quoting {{ quote_author }} ({{ quote_username }}): {{ quote_content }} - {{ quote_media }}{{ quote_poll }} - {{ relative_time }}, {{ visibility }}{% if reply_count %}, {{ reply_count }}{% endif %}{% if boost_count %}, {{ boost_count }}{% endif %}{% if favorite_count %}, {{ favorite_count }}{% endif %}{% if client %}, via {{ client }}{% endif %}";
+pub const DEFAULT_POST_TEMPLATE: &str = "{{ author }}: {{ content }}{% if media or poll %} - {{ media }}{{ poll }}{% endif %} - {{ relative_time }}, {{ visibility }}{% if reply_count %}, {{ reply_count }}{% endif %}{% if boost_count %}, {{ boost_count }}{% endif %}{% if favorite_count %}, {{ favorite_count }}{% endif %}{% if client %}, via {{ client }}{% endif %}";
+pub const DEFAULT_BOOST_TEMPLATE: &str = "{{ booster }} boosted {{ author }}: {{ content }}{% if media or poll %} - {{ media }}{{ poll }}{% endif %}{% if quote_author %} - Quoting {{ quote_author }} ({{ quote_username }}): {{ quote_content }}{% if quote_media or quote_poll %} - {{ quote_media }}{{ quote_poll }}{% endif %}{% endif %} - {{ relative_time }}, {{ visibility }}{% if reply_count %}, {{ reply_count }}{% endif %}{% if boost_count %}, {{ boost_count }}{% endif %}{% if favorite_count %}, {{ favorite_count }}{% endif %}{% if client %}, via {{ client }}{% endif %}";
+pub const DEFAULT_QUOTE_TEMPLATE: &str = "{{ author }}: {{ content }}{% if media or poll %} - {{ media }}{{ poll }}{% endif %} - Quoting {{ quote_author }} ({{ quote_username }}): {{ quote_content }}{% if quote_media or quote_poll %} - {{ quote_media }}{{ quote_poll }}{% endif %} - {{ relative_time }}, {{ visibility }}{% if reply_count %}, {{ reply_count }}{% endif %}{% if boost_count %}, {{ boost_count }}{% endif %}{% if favorite_count %}, {{ favorite_count }}{% endif %}{% if client %}, via {{ client }}{% endif %}";
 pub const DEFAULT_WINDOW_TITLE_TEMPLATE: &str = "Fedra - {{ account }}";
 
 pub struct WindowTitleTemplateVars {