Skip to content

Commit 69d9223

Browse files
committed
remove further mutables
1 parent 11fda13 commit 69d9223

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

src/backend/nc_request.rs

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,7 @@ impl NCRequest {
291291
token: &str,
292292
) -> Result<NCReqDataMessage, Box<dyn Error>> {
293293
let url_string = self.base_url.clone() + "/ocs/v2.php/apps/spreed/api/v1/chat/" + token;
294-
let mut params = HashMap::new();
295-
params.insert("message".to_owned(), message.clone());
294+
let params = HashMap::from([("message", message)]);
296295
let url = Url::parse_with_params(&url_string, params)?;
297296
let response = self.request_post(url).await?;
298297

@@ -316,13 +315,10 @@ impl NCRequest {
316315
name: &str,
317316
) -> Result<Vec<NCReqDataUser>, Box<dyn Error>> {
318317
let url_string = self.base_url.clone() + "/ocs/v2.php/core/autocomplete/get";
319-
let mut params = HashMap::new();
320-
params.insert("limit".to_owned(), "200".to_string());
321-
params.insert("search".to_owned(), name.to_string());
322-
318+
let params = HashMap::from([("limit", "200"), ("search", name)]);
323319
let url = Url::parse_with_params(&url_string, params)?;
324-
325320
let response = self.request(url).await?;
321+
326322
match response.status() {
327323
reqwest::StatusCode::OK => {
328324
let text = response.text().await?;
@@ -352,8 +348,7 @@ impl NCRequest {
352348
+ "/ocs/v2.php/apps/spreed/api/v4/room/"
353349
+ token
354350
+ "/participants";
355-
let mut params = HashMap::new();
356-
params.insert("includeStatus".to_owned(), "true".to_string());
351+
let params = HashMap::from([("includeStatus", "true")]);
357352
let url = Url::parse_with_params(&url_string, params)?;
358353

359354
let response = self.request(url).await?;
@@ -394,10 +389,11 @@ impl NCRequest {
394389
last_timestamp: Option<i64>,
395390
) -> Result<(Vec<NCReqDataRoom>, i64), Box<dyn Error>> {
396391
let url_string = self.base_url.clone() + "/ocs/v2.php/apps/spreed/api/v4/room";
397-
let mut params = HashMap::new();
398-
if let Some(timestamp) = last_timestamp {
399-
params.insert("modifiedSince".to_owned(), timestamp.to_string());
400-
}
392+
let params = if let Some(timestamp) = last_timestamp {
393+
HashMap::from([("modifiedSince", timestamp.to_string())])
394+
} else {
395+
HashMap::new()
396+
};
401397
let url = Url::parse_with_params(&url_string, &params)?;
402398
let response = self.request(url).await?;
403399
match response.status() {
@@ -466,18 +462,23 @@ impl NCRequest {
466462
last_message: Option<i32>,
467463
) -> Result<Option<Vec<NCReqDataMessage>>, Box<dyn Error>> {
468464
let url_string = self.base_url.clone() + "/ocs/v2.php/apps/spreed/api/v1/chat/" + token;
469-
let mut params = HashMap::new();
470-
params.insert("limit".to_owned(), maxMessage.to_string());
471-
params.insert("setReadMarker".to_owned(), "0".to_owned());
472-
if let Some(lastId) = last_message {
465+
let params = if let Some(lastId) = last_message {
473466
log::debug!("Last MessageID {}", lastId);
474-
params.insert("lastKnownMessageId".to_owned(), lastId.to_string());
475-
params.insert("lookIntoFuture".to_owned(), "1".to_owned());
476-
params.insert("timeout".to_owned(), "0".to_owned());
477-
params.insert("includeLastKnown".to_owned(), "0".to_owned());
467+
HashMap::from([
468+
("limit", maxMessage.to_string()),
469+
("setReadMarker", "0".into()),
470+
("lookIntoFuture", "1".to_owned()),
471+
("lastKnownMessageId", lastId.to_string()),
472+
("timeout", "0".to_owned()),
473+
("includeLastKnown", "0".to_owned()),
474+
])
478475
} else {
479-
params.insert("lookIntoFuture".to_owned(), "0".to_owned());
480-
}
476+
HashMap::from([
477+
("limit", maxMessage.to_string()),
478+
("setReadMarker", "0".into()),
479+
("lookIntoFuture", "0".into()),
480+
])
481+
};
481482
let url = Url::parse_with_params(&url_string, &params)?;
482483
let response = self.request(url).await?;
483484
match response.status() {
@@ -542,8 +543,10 @@ impl NCRequest {
542543

543544
fn dump_json_to_log(&self, url: &str, text: &str) -> Result<(), Box<dyn Error>> {
544545
if let Some(path) = &self.json_dump_path {
545-
let mut name = path.clone();
546-
name.push(url.replace('/', "_"));
546+
let name: String = url
547+
.chars()
548+
.map(|ch| if ch == '/' { '_' } else { ch })
549+
.collect();
547550
let mut file = File::create(name)?;
548551
let pretty_text = jzon::stringify_pretty(jzon::parse(text)?, 2);
549552
file.write_all(pretty_text.as_bytes())?;

0 commit comments

Comments
 (0)