backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable string_slice lint

Browse source 
Also swaps out vendored HTML-escaping code for a dependency that I
imagine has decent testing considering all of its reverse depedencies.
This commit is contained in:
Charles Hall 2024-05-12 19:08:12 -07:00
parent 9abe4799db
commit 844b32f097
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
7 changed files with 35 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/service/admin.rs
View file

@ -33,9 +33,7 @@ use tracing::warn;
use crate::{
api::client_server::{leave_all_rooms, AUTO_GEN_PASSWORD_LENGTH},
services,
utils::{self, HtmlEscape},
Error, PduEvent, Result,
services, utils, Error, PduEvent, Result,
};
use super::pdu::PduBuilder;
@ -516,7 +514,7 @@ impl Service {
} else {
"PDU was accepted"
},
HtmlEscape(&json_text)
html_escape::encode_safe(&json_text)
),
)
}
@ -897,29 +895,15 @@ impl Service {
// Look for a `[commandbody]()` tag. If it exists, use all lines below it that
// start with a `#` in the USAGE section.
let mut text_lines: Vec<&str> = text.lines().collect();
let mut command_body = String::new();
if let Some(line_index) = text_lines
let command_body = text_lines
.iter()
.position(|line| *line == "[commandbody]()")
{
text_lines.remove(line_index);
while text_lines
.get(line_index)
.map(|line| line.starts_with('#'))
.unwrap_or(false)
{
command_body += if text_lines[line_index].starts_with("# ") {
&text_lines[line_index][2..]
} else {
&text_lines[line_index][1..]
};
command_body += "[nobr]\n";
text_lines.remove(line_index);
}
}
.skip_while(|x| x != &&"[commandbody]()")
.skip(1)
.map_while(|&x| x.strip_prefix('#'))
.map(|x| x.strip_prefix(' ').unwrap_or(x))
.collect::<String>();
text_lines.retain(|x| x != &"[commandbody]()");
let text = text_lines.join("\n");
// Improve the usage section