aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/hooks/wolfram_alpha.rs22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/hooks/wolfram_alpha.rs b/src/hooks/wolfram_alpha.rs
index 5584935..1e7b6d8 100644
--- a/src/hooks/wolfram_alpha.rs
+++ b/src/hooks/wolfram_alpha.rs
@@ -32,6 +32,16 @@ struct SubPod {
plaintext: String,
}
+fn clean_result_text(text: &str) -> String {
+ text
+ // Remove newlines
+ .replace("\n", "; ")
+ // Remove multiple whitespace
+ .split_whitespace()
+ .collect::<Vec<&str>>()
+ .join(" ")
+}
+
/// Reduces all 'pod' plaintexts to a single string.
/// Same as gonzobot does it.
fn to_single_string(wa_res: WaResponse) -> String {
@@ -44,7 +54,7 @@ fn to_single_string(wa_res: WaResponse) -> String {
let subpod_texts = pod
.subpods
.iter()
- .map(|subpod| subpod.plaintext.clone())
+ .map(|subpod| clean_result_text(&subpod.plaintext))
.collect::<Vec<String>>()
.join(", ");
@@ -143,6 +153,8 @@ pub async fn wa(bot: &crate::Bot, msg: Message) -> Result<()> {
#[cfg(test)]
mod tests {
+ use crate::hooks::wolfram_alpha::clean_result_text;
+
use super::{get_input_query, get_wa_user_short_url, wa_query};
use anyhow::{Error, Result};
use mockito::{self, Matcher};
@@ -221,6 +233,14 @@ mod tests {
Ok(())
}
+ #[test]
+ fn test_clean_result_text() {
+ assert_eq!(
+ clean_result_text("Newlines\nand multiple\n\n whitespace is removed."),
+ "Newlines; and multiple; ; whitespace is removed.",
+ )
+ }
+
#[tokio::test]
async fn test_query_result_parsing() -> Result<(), Error> {
let body = include_str!("../../tests/resources/wolfram_alpha_api_response.json");
hover-highlight'> 2024-08-12add catinatorMax Audron-7/+299 2024-08-12update flaresolverrMax Audron-1/+1 2024-08-12update powerdns configMax Audron-5/+5 2024-08-12update garage config to 1.0Max Audron-2/+3 2024-08-12update to nixos 24.05Max Audron-27/+21 2024-07-03add acc serverMax Audron-2/+23 2024-03-29add rtmp and laplaceMax Audron-1/+200 2024-03-29add hydra secretsMax Audron-0/+0 2024-03-29add hydra secretsMax Audron-5/+35 2024-03-19extend postgresql hpa for podman ipsMax Audron-1/+1 2024-03-02update authentikMax Audron-8/+6 2024-03-02setup gitea oidcMax Audron-5/+18 2024-02-28add giteaMax Audron-2/+39 2024-02-28remove gitlab moduleMax Audron-25/+0 2024-02-26update d3fus phone wg pubkeyMarcin Maselko-1/+1 2024-02-26added d3fus nass to wg configMarcin Maselko-0/+9 2024-02-21set minecraft memoryMax Audron-0/+1 2024-02-21add minecraft server and move palworld to games moduleMax Audron-3/+56 2024-02-21set network manually for ns serversMax Audron-0/+51 2024-02-20update nixpkgs-unstableMax Audron-3/+3 2024-02-19update d3fus fritzbox wg portMarcin Maselko-1/+1 2024-02-19add xonotic serverMax Audron-1/+10