chore: format better
This commit is contained in:
parent
278025c2e6
commit
fc6abbdae3
6 changed files with 28 additions and 21 deletions
3
rustfmt.toml
Normal file
3
rustfmt.toml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
unstable_features = true
|
||||||
|
group_imports = "StdExternalCrate"
|
||||||
|
imports_granularity = "Module"
|
|
@ -1,4 +1,6 @@
|
||||||
{ pkgs ? import (import ./npins).nixpkgs { } }:
|
{
|
||||||
|
pkgs ? import (import ./npins).nixpkgs { },
|
||||||
|
}:
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgs.cargo
|
pkgs.cargo
|
||||||
|
@ -7,6 +9,6 @@ pkgs.mkShell {
|
||||||
pkgs.signal-cli
|
pkgs.signal-cli
|
||||||
pkgs.rustc
|
pkgs.rustc
|
||||||
pkgs.rust-analyzer
|
pkgs.rust-analyzer
|
||||||
pkgs.rustfmt
|
(pkgs.rustfmt.override { asNightly = true; })
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
22
src/main.rs
22
src/main.rs
|
@ -1,20 +1,18 @@
|
||||||
mod jsonrpc;
|
mod jsonrpc;
|
||||||
mod transform;
|
mod transform;
|
||||||
mod transports;
|
mod transports;
|
||||||
use crate::jsonrpc::RpcClient;
|
|
||||||
use irc::client::ClientStream;
|
|
||||||
use jsonrpsee::core::client::SubscriptionClientT;
|
|
||||||
use log;
|
|
||||||
use serde_json::Value;
|
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use transform::Bridge;
|
|
||||||
|
|
||||||
use jsonrpsee::core::client::Subscription;
|
|
||||||
use pretty_env_logger;
|
|
||||||
|
|
||||||
use futures::future::try_join;
|
use futures::future::try_join;
|
||||||
use futures::prelude::*;
|
use futures::prelude::*;
|
||||||
use irc::client::prelude::*;
|
use irc::client::prelude::*;
|
||||||
|
use irc::client::ClientStream;
|
||||||
|
use jsonrpsee::core::client::{Subscription, SubscriptionClientT};
|
||||||
|
use serde_json::Value;
|
||||||
|
use transform::Bridge;
|
||||||
|
use {log, pretty_env_logger};
|
||||||
|
|
||||||
|
use crate::jsonrpc::RpcClient;
|
||||||
|
|
||||||
const CHANNEL: &str = "#hackens-signal";
|
const CHANNEL: &str = "#hackens-signal";
|
||||||
const MEDIA_DIR: &str = "./www";
|
const MEDIA_DIR: &str = "./www";
|
||||||
|
@ -149,7 +147,11 @@ async fn handle_signal(
|
||||||
.map_err(|e| format!("error while sending to irc: {e}"))?;
|
.map_err(|e| format!("error while sending to irc: {e}"))?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(Err(err)) => return Err(format!("error while retrieving messages from signal: {err}")),
|
Some(Err(err)) => {
|
||||||
|
return Err(format!(
|
||||||
|
"error while retrieving messages from signal: {err}"
|
||||||
|
))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use irc::client::prelude::*;
|
|
||||||
use serde_json::Map;
|
|
||||||
use serde_json::Value;
|
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
|
use irc::client::prelude::*;
|
||||||
|
use serde_json::{Map, Value};
|
||||||
use tokio::fs::copy;
|
use tokio::fs::copy;
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
|
|
|
@ -15,11 +15,10 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
|
use futures_util::stream::StreamExt;
|
||||||
use jsonrpsee::core::{
|
use futures_util::{Sink, SinkExt, Stream};
|
||||||
async_trait,
|
use jsonrpsee::core::async_trait;
|
||||||
client::{ReceivedMessage, TransportReceiverT, TransportSenderT},
|
use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT};
|
||||||
};
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
pub mod ipc;
|
pub mod ipc;
|
||||||
|
|
|
@ -15,8 +15,9 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
use bytes::BytesMut;
|
|
||||||
use std::{io, str};
|
use std::{io, str};
|
||||||
|
|
||||||
|
use bytes::BytesMut;
|
||||||
use tokio_util::codec::{Decoder, Encoder};
|
use tokio_util::codec::{Decoder, Encoder};
|
||||||
|
|
||||||
type Separator = u8;
|
type Separator = u8;
|
||||||
|
|
Loading…
Reference in a new issue