Skip to content

Commit

Permalink
add justfile
Browse files Browse the repository at this point in the history
  • Loading branch information
foxzool committed Jul 1, 2024
1 parent 9bd37c5 commit 778d624
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 17 deletions.
16 changes: 16 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# From: https://docs.github.com/en/github/getting-started-with-github/configuring-git-to-handle-line-endings
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.rs text eol=lf
*.toml text eol=lf

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.ttf binary
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
/.idea
.env
/tmp
/**/target
crates/*/target
**/*.rs.bk
Cargo.lock
2 changes: 1 addition & 1 deletion examples/api/drive/v1/files/upload_all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ async fn main() {
.parent_node("nodcnBh4MAgg2GpI5IkRVZuw3Jd")
.size(file_size as i32)
.checksum(checksum.to_string())
.file(buffer.into())
.file(buffer)
.build();

// 发起请求
Expand Down
2 changes: 1 addition & 1 deletion examples/api/im/v1/create_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async fn main() {
println!("response: {:?}", resp);
}
Err(err) => {
println!("send message http error: {} ", err.to_string());
println!("send message http error: {} ", err);
}
}
}
17 changes: 12 additions & 5 deletions examples/ws_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@ use std::{env, sync::Arc};
use dotenvy::dotenv;
use lazy_static::lazy_static;
use log::info;
use serde_json::json;
use tokio::sync::Mutex;

use open_lark::{
client::{ws_client::LarkWsClient, LarkClient},
client::{LarkClient, ws_client::LarkWsClient},
event::dispatcher::EventDispatcherHandler,
service::im::v1::{
chats::ListChatRequest, p2_im_message_read_v1::P2ImMessageReadV1,
message::{CreateMessageRequest, CreateMessageRequestBody},
p2_im_message_read_v1::P2ImMessageReadV1,
p2_im_message_receive_v1::P2ImMessageReceiveV1,
},
};
use open_lark::service::im::v1::message::{CreateMessageRequest, CreateMessageRequestBody, MessageText};

#[tokio::main]
async fn main() {
Expand Down Expand Up @@ -67,7 +66,15 @@ async fn handle_p2_im_message_receive_v1(
.build();

// 发起请求
api_client.lock().await.im.v1.message.create(req, None).await.unwrap();
api_client
.lock()
.await
.im
.v1
.message
.create(req, None)
.await
.unwrap();
}

fn handle_p2_im_message_read_v1(data: P2ImMessageReadV1) {
Expand Down
3 changes: 3 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lint:
@echo "Lint"
cargo clippy --workspace --all-targets --all-features -- -Dwarnings
14 changes: 7 additions & 7 deletions src/client/ws_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use std::{
};

use futures_util::{
stream::{SplitSink, SplitStream},
SinkExt, StreamExt,
SinkExt,
stream::{SplitSink, SplitStream}, StreamExt,
};
use lark_websocket_protobuf::pbbp2::{Frame, Header};
use log::{debug, error, info, trace};
Expand All @@ -16,8 +16,8 @@ use serde_json::json;
use tokio::{net::TcpStream, sync::mpsc, time::Interval};
use tokio_tungstenite::{
connect_async,
tungstenite::protocol::{frame::coding::CloseCode, Message},
MaybeTlsStream, WebSocketStream,
MaybeTlsStream,
tungstenite::protocol::{frame::coding::CloseCode, Message}, WebSocketStream,
};
use url::Url;

Expand Down Expand Up @@ -167,7 +167,7 @@ impl LarkWsClient {
if val.is_none() {
let mut buf = vec![Vec::new(); sum];
buf[seq] = bs.to_vec();
self.cache.set(&msg_id, buf, 5);
self.cache.set(msg_id, buf, 5);
return None;
}

Expand All @@ -176,7 +176,7 @@ impl LarkWsClient {
let mut pl = Vec::new();
for v in val.iter() {
if v.is_empty() {
self.cache.set(&msg_id, val, 5);
self.cache.set(msg_id, val, 5);
return None;
}
pl.extend_from_slice(v);
Expand Down Expand Up @@ -448,7 +448,7 @@ async fn client_loop(

let res = ctx.process_loop().await;
match res {
Ok(()) => return,
Ok(()) => (),
Err(err) => {
ctx.send_event(WsEvent::Error(err));
}
Expand Down
2 changes: 0 additions & 2 deletions src/service/im/v1/p2_im_message_receive_v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ mod test {

use crate::event::context::EventContext;

use super::*;

#[test]
fn test_decode() {
let p1 = json!({"schema":"2.0","header":{"event_id":"7db4fd0bb90cfa6127e3aaa446d39b37","token
Expand Down

0 comments on commit 778d624

Please sign in to comment.