Skip to content
This repository has been archived by the owner on Apr 16, 2024. It is now read-only.

Commit

Permalink
fix http bool
Browse files Browse the repository at this point in the history
  • Loading branch information
super1207 committed Apr 16, 2024
1 parent deecea9 commit 2e1c8da
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
2 changes: 0 additions & 2 deletions src/cqtool.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use std::collections::HashMap;

use regex::Regex;


fn cq_text_encode(data:&str) -> String {
let mut ret_str:String = String::new();
Expand Down
27 changes: 14 additions & 13 deletions src/kook_onebot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ impl KookOnebot {
let group_name = it2.get("name").ok_or("get name err")?.as_str().ok_or("name not str")?;

let tp = it2.get("type").ok_or("get type err")?.as_i64().ok_or("type not i64")?;
let is_category = it2.get("is_category").ok_or("get is_category err")?.as_bool().ok_or("is_category not bool")?;
let is_category = get_json_bool(it2, "is_category");

if !is_category && tp == 1 {
ret_arr.push(GroupInfo {
Expand All @@ -287,7 +287,7 @@ impl KookOnebot {
let items = ret_json.get("items").ok_or("get items err")?.as_array().ok_or("items not arr")?;
for it in items {
let role;
let is_master = it.get("is_master").ok_or("get is_master err")?.as_bool().ok_or("is_master not bool")?;
let is_master = get_json_bool(it, "is_master");
if is_master {
role = "owner";
}else{
Expand Down Expand Up @@ -325,7 +325,7 @@ impl KookOnebot {
let ret_json = self.http_get_json(&format!("/guild/user-list?guild_id={guild_id}&page={page}"),false).await?;
for it in ret_json.get("items").ok_or("items not found")?.as_array().ok_or("items not arr")? {
let role;
let is_master = it.get("is_master").ok_or("get is_master err")?.as_bool().ok_or("is_master not bool")?;
let is_master = get_json_bool(it, "is_master");
if is_master {
role = "owner";
}else{
Expand Down Expand Up @@ -371,7 +371,7 @@ impl KookOnebot {
let group_name = it2.get("name").ok_or("get name err")?.as_str().ok_or("name not str")?;

let tp = it2.get("type").ok_or("get type err")?.as_i64().ok_or("type not i64")?;
let is_category = it2.get("is_category").ok_or("get is_category err")?.as_bool().ok_or("is_category not bool")?;
let is_category = get_json_bool(it2, "is_category");

if !is_category && tp == 1 {
ret_arr.push(GroupInfo {
Expand Down Expand Up @@ -1270,13 +1270,7 @@ impl KookOnebot {
}

fn get_auto_escape_from_params(&self,params:&serde_json::Value) -> bool {
let mut is_auto_escape = false;
let auto_escape_opt = params.get("auto_escape");
if auto_escape_opt.is_some() {
if auto_escape_opt.unwrap().is_boolean() {
is_auto_escape = auto_escape_opt.unwrap().as_bool().unwrap();
}
}
let is_auto_escape = get_json_bool(params, "auto_escape");
return is_auto_escape;
}

Expand Down Expand Up @@ -1621,7 +1615,7 @@ impl KookOnebot {
"retcode":0,
"data": {
"app_name":"kook-onebot",
"app_version":"0.0.14",
"app_version":"0.1.0",
"protocol_version":"v11"
},
"echo":echo
Expand Down Expand Up @@ -1705,7 +1699,14 @@ fn get_json_bool(js:&serde_json::Value,key:&str) -> bool {
if let Some(j) = js.get(key) {
if j.is_boolean() {
return j.as_bool().unwrap();
} else {
} else if j.is_string(){
if j.as_str().unwrap() == "true" {
return true;
} else {
return false;
}
}
else {
return false;
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
)).with_max_level(tracing::Level::INFO)
.init();

log::warn!("欢迎使用KookOnebot by super1207!!! v0.0.14");
log::warn!("欢迎使用KookOnebot by super1207!!! v0.1.0");

log::warn!("开源地址:https://github.com/super1207/KookOneBot");

Expand Down

0 comments on commit 2e1c8da

Please sign in to comment.