properly fetch markdown content when editing posts

Author: aryanchoudharypro

src/commands.rs

@@ -411,8 +411,7 @@ pub fn handle_ui_command(cmd: UiCommand, ctx: &mut UiCommandContext<'_>) {
 			}
 		}
 		UiCommand::EditPost => {
-			let (status, max_post_chars, enter_to_send) =
-				(get_selected_status(state).cloned(), state.max_post_chars, state.config.enter_to_send);
+			let status = get_selected_status(state).cloned();
 			let Some(status) = status else {
 				live_region.announce("No post selected");
 				return;
@@ -427,46 +426,8 @@ pub fn handle_ui_command(cmd: UiCommand, ctx: &mut UiCommandContext<'_>) {
 				live_region.announce("Cannot verify ownership");
 				return;
 			}
-			let Some((edit, config)) =
-				dialogs::prompt_for_edit(frame, target, max_post_chars, &state.poll_limits, enter_to_send)
-			else {
-				return;
-			};
 			if let Some(handle) = &state.network_handle {
-				state.pending_post = Some(crate::PendingPost {
-					config,
-					operation: crate::PostOperation::Edit { status_id: target.id.clone() },
-					last_result: edit.clone(),
-				});
-				let media = edit
-					.media
-					.into_iter()
-					.map(|item| {
-						if item.is_existing {
-							network::EditMedia::Existing(item.path)
-						} else {
-							network::EditMedia::New(network::MediaUpload {
-								path: item.path,
-								description: item.description,
-							})
-						}
-					})
-					.collect();
-
-				handle.send(NetworkCommand::EditStatus {
-					status_id: target.id.clone(),
-					content: edit.content,
-					sensitive: edit.sensitive,
-					spoiler_text: edit.spoiler_text,
-					language: edit.language,
-					media,
-					poll: edit.poll.map(|poll| network::PollData {
-						options: poll.options,
-						expires_in: poll.expires_in,
-						multiple: poll.multiple,
-						hide_totals: poll.hide_totals,
-					}),
-				});
+				handle.send(NetworkCommand::FetchStatusSource { status: Box::new(target.clone()) });
 			} else {
 				live_region.announce("Network not available");
 			}
@@ -2777,3 +2738,51 @@ fn close_timeline(
 	}
 	update_window_title(state, frame);
 }
+
+pub fn run_edit_post_dialog(
+	frame: &Frame,
+	state: &mut AppState,
+	target: &crate::mastodon::Status,
+	source_text: Option<&str>,
+) {
+	let max_post_chars = state.max_post_chars;
+	let enter_to_send = state.config.enter_to_send;
+	let Some((edit, config)) =
+		dialogs::prompt_for_edit(frame, target, source_text, max_post_chars, &state.poll_limits, enter_to_send)
+	else {
+		return;
+	};
+	if let Some(handle) = &state.network_handle {
+		state.pending_post = Some(crate::PendingPost {
+			config,
+			operation: crate::PostOperation::Edit { status_id: target.id.clone() },
+			last_result: edit.clone(),
+		});
+		let media = edit
+			.media
+			.into_iter()
+			.map(|item| {
+				if item.is_existing {
+					network::EditMedia::Existing(item.path)
+				} else {
+					network::EditMedia::New(network::MediaUpload { path: item.path, description: item.description })
+				}
+			})
+			.collect();
+
+		handle.send(NetworkCommand::EditStatus {
+			status_id: target.id.clone(),
+			content: edit.content,
+			sensitive: edit.sensitive,
+			spoiler_text: edit.spoiler_text,
+			language: edit.language,
+			media,
+			poll: edit.poll.map(|poll| network::PollData {
+				options: poll.options,
+				expires_in: poll.expires_in,
+				multiple: poll.multiple,
+				hide_totals: poll.hide_totals,
+			}),
+		});
+	}
+}

src/mastodon.rs

@@ -107,6 +107,16 @@ pub struct Status {
 	pub filtered: Vec<FilterResult>,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+#[allow(dead_code)]
+pub struct StatusSource {
+	pub id: String,
+	#[serde(default)]
+	pub text: String,
+	#[serde(default)]
+	pub spoiler_text: String,
+}
+
 #[derive(Debug, Clone, Deserialize)]
 #[allow(dead_code)]
 pub struct FilterResult {
@@ -1963,6 +1973,20 @@ impl MastodonClient {
 		Ok(account)
 	}
 
+	pub fn fetch_status_source(&self, access_token: &str, status_id: &str) -> Result<StatusSource> {
+		let url = self.base_url.join(&format!("api/v1/statuses/{status_id}/source"))?;
+		let response = self
+			.http
+			.get(url)
+			.bearer_auth(access_token)
+			.send()
+			.context("Failed to fetch status source")?
+			.error_for_status()
+			.context("Instance rejected request")?;
+		let source: StatusSource = response.json().context("Invalid source response")?;
+		Ok(source)
+	}
+
 	pub fn edit_status(
 		&self,
 		access_token: &str,

src/network.rs

@@ -75,6 +75,9 @@ pub enum NetworkCommand {
 		timeline_type: TimelineType,
 		status_id: String,
 	},
+	FetchStatusSource {
+		status: Box<Status>,
+	},
 	ResolveStatusForThread {
 		url: String,
 	},
@@ -320,6 +323,10 @@ pub enum NetworkResponse {
 	StatusResolvedForQuote {
 		result: Result<Status>,
 	},
+	StatusSourceFetched {
+		status: Box<Status>,
+		result: Result<crate::mastodon::StatusSource>,
+	},
 	AccountLookupResult {
 		handle: String,
 		result: Result<Account>,
@@ -755,6 +762,10 @@ fn network_loop(
 					NetworkResponse::TimelineLoaded { timeline_type, result, max_id: None },
 				);
 			}
+			Ok(NetworkCommand::FetchStatusSource { status }) => {
+				let result = client.fetch_status_source(access_token, &status.id);
+				send_response(responses, ui_waker, NetworkResponse::StatusSourceFetched { status, result });
+			}
 			Ok(NetworkCommand::ResolveStatusForThread { url }) => {
 				let result = client
 					.search(access_token, &url, SearchType::Statuses, Some(1), None)

src/responses.rs

@@ -485,6 +485,24 @@ pub fn process_network_responses(ctx: &mut NetworkResponseContext<'_>) {
 			NetworkResponse::StatusResolvedForQuote { result: Ok(focus) } => {
 				ui_tx.send(crate::commands::UiCommand::PromptForQuote(Box::new(focus))).unwrap();
 			}
+			NetworkResponse::StatusSourceFetched { mut status, result } => {
+				let source_text = match result {
+					Ok(source) => {
+						if !source.spoiler_text.is_empty() {
+							status.spoiler_text = source.spoiler_text;
+						}
+						Some(source.text)
+					}
+					Err(err) => {
+						live_region.announce(&format!(
+							"Could not fetch source text, editing with stripped HTML: {}",
+							summarize_api_error(&err)
+						));
+						None
+					}
+				};
+				crate::commands::run_edit_post_dialog(frame, state, &status, source_text.as_deref());
+			}
 			NetworkResponse::StatusResolvedForQuote { result: Err(err) } => {
 				live_region.announce(&format!("Failed to resolve post for quote: {}", summarize_api_error(&err)));
 			}

src/ui/dialogs/compose.rs

@@ -1222,6 +1222,7 @@ pub fn prompt_for_reply(
 pub fn prompt_for_edit(
 	frame: &Frame,
 	status: &Status,
+	source_text: Option<&str>,
 	max_chars: Option<usize>,
 	poll_limits: &PollLimits,
 	enter_to_send: bool,
@@ -1253,7 +1254,7 @@ pub fn prompt_for_edit(
 		ComposeDialogConfig {
 			title_prefix: "Edit Post".to_string(),
 			ok_label: "Save".to_string(),
-			initial_content: status.display_text(),
+			initial_content: source_text.map(ToOwned::to_owned).unwrap_or_else(|| status.display_text()),
 			initial_cw,
 			initial_sensitive: status.sensitive,
 			initial_language: status.language.clone(),