From 00de6c93d67fb44204d765d1947822e26224b918 Mon Sep 17 00:00:00 2001 From: DylanCa Date: Fri, 29 Dec 2023 03:00:07 +0100 Subject: [PATCH] Reformatted whole project --- src/client/ipc.rs | 18 +++++++++--------- src/client/mod.rs | 2 +- src/lib.rs | 17 +++++------------ src/models/activity.rs | 14 +++++--------- src/models/activity_data/activity_flag.rs | 2 +- src/models/activity_data/asset.rs | 13 +++++++------ src/models/activity_data/button.rs | 7 ++----- src/models/activity_data/emoji.rs | 14 ++++---------- src/models/activity_data/mod.rs | 8 ++++---- src/models/activity_data/party.rs | 9 +++------ src/models/activity_data/secret.rs | 15 ++++++++------- src/models/activity_data/timestamp.rs | 10 +++------- src/models/client/commands.rs | 2 +- src/models/client/event.rs | 7 +++---- src/models/client/mod.rs | 4 ++-- src/models/client/payload.rs | 6 +++--- src/models/mod.rs | 2 +- 17 files changed, 62 insertions(+), 88 deletions(-) diff --git a/src/client/ipc.rs b/src/client/ipc.rs index ebb6a20..b6730a2 100644 --- a/src/client/ipc.rs +++ b/src/client/ipc.rs @@ -1,15 +1,13 @@ -use std::os::unix::net::UnixStream; -use std::env::var; -use std::error::Error; -use std::io::{Read, Write}; -use std::path::PathBuf; use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt}; use log::debug; use serde_json::{json, Value}; +use std::env::var; +use std::error::Error; +use std::io::{Read, Write}; +use std::os::unix::net::UnixStream; +use std::path::PathBuf; -use crate::models::client::{payload::Payload, - payload::OpCode, - commands::Commands}; +use crate::models::client::{commands::Commands, payload::OpCode, payload::Payload}; pub struct DiscordClient { pub id: String, @@ -23,7 +21,9 @@ impl DiscordClient { socket: None, }; - client.connect().expect("Could not connect to client. Is Discord running ?"); + client + .connect() + .expect("Could not connect to client. Is Discord running ?"); client } diff --git a/src/client/mod.rs b/src/client/mod.rs index 1350c45..ce14ad3 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -1 +1 @@ -pub mod ipc; \ No newline at end of file +pub mod ipc; diff --git a/src/lib.rs b/src/lib.rs index fa3a6bc..3060a76 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,15 +3,8 @@ pub mod models; pub use client::ipc::DiscordClient; pub use models::activity::Activity; -pub use models::activity_data::{activity_flag::ActivityFlag, - activity_type::ActivityType, - asset::Asset, - button::Button, - emoji::Emoji, - party::Party, - secret::Secret, - timestamp::Timestamp}; -pub use models::client::{payload::Payload, - event::EventName, - event::EventData}; - +pub use models::activity_data::{ + activity_flag::ActivityFlag, activity_type::ActivityType, asset::Asset, button::Button, + emoji::Emoji, party::Party, secret::Secret, timestamp::Timestamp, +}; +pub use models::client::{event::EventData, event::EventName, payload::Payload}; diff --git a/src/models/activity.rs b/src/models/activity.rs index 82589f1..ad36ceb 100644 --- a/src/models/activity.rs +++ b/src/models/activity.rs @@ -1,12 +1,8 @@ +use crate::models::activity_data::{ + activity_flag::ActivityFlag, activity_type::ActivityType, asset::Asset, button::Button, + emoji::Emoji, party::Party, secret::Secret, timestamp::Timestamp, +}; use serde::Serialize; -use crate::models::activity_data::{activity_type::ActivityType, - activity_flag::ActivityFlag, - asset::Asset, - button::Button, - emoji::Emoji, - party::Party, - secret::Secret, - timestamp::Timestamp, }; /// Test Doc #[derive(Serialize, Debug)] @@ -161,4 +157,4 @@ impl Activity { self.buttons = buttons; self } -} \ No newline at end of file +} diff --git a/src/models/activity_data/activity_flag.rs b/src/models/activity_data/activity_flag.rs index 7a0acc6..2ff1bad 100644 --- a/src/models/activity_data/activity_flag.rs +++ b/src/models/activity_data/activity_flag.rs @@ -11,4 +11,4 @@ pub enum ActivityFlag { PartyPrivacyFriends = 64, PartyPrivacyVoiceChannel = 128, Embedded = 256, -} \ No newline at end of file +} diff --git a/src/models/activity_data/asset.rs b/src/models/activity_data/asset.rs index 9783674..9a2f937 100644 --- a/src/models/activity_data/asset.rs +++ b/src/models/activity_data/asset.rs @@ -16,16 +16,17 @@ pub struct Asset { } impl Asset { - pub fn new(large_image: Option, - large_text: Option, - small_image: Option, - small_text: Option, + pub fn new( + large_image: Option, + large_text: Option, + small_image: Option, + small_text: Option, ) -> Asset { Self { large_image, large_text, small_image, - small_text + small_text, } } -} \ No newline at end of file +} diff --git a/src/models/activity_data/button.rs b/src/models/activity_data/button.rs index 43ea31a..b0bfe83 100644 --- a/src/models/activity_data/button.rs +++ b/src/models/activity_data/button.rs @@ -8,9 +8,6 @@ pub struct Button { impl Button { pub fn new(label: String, url: String) -> Button { - Self { - label, - url - } + Self { label, url } } -} \ No newline at end of file +} diff --git a/src/models/activity_data/emoji.rs b/src/models/activity_data/emoji.rs index 9d86e4d..7dca8a5 100644 --- a/src/models/activity_data/emoji.rs +++ b/src/models/activity_data/emoji.rs @@ -8,17 +8,11 @@ pub struct Emoji { id: Option, #[serde(skip_serializing_if = "Option::is_none")] - animated: Option + animated: Option, } impl Emoji { - pub fn new(name: String, - id: Option, - animated: Option) -> Emoji { - Self { - name, - id, - animated - } + pub fn new(name: String, id: Option, animated: Option) -> Emoji { + Self { name, id, animated } } -} \ No newline at end of file +} diff --git a/src/models/activity_data/mod.rs b/src/models/activity_data/mod.rs index af1b4ae..bb2153b 100644 --- a/src/models/activity_data/mod.rs +++ b/src/models/activity_data/mod.rs @@ -1,8 +1,8 @@ +pub mod activity_flag; pub mod activity_type; -pub mod timestamp; +pub mod asset; +pub mod button; pub mod emoji; pub mod party; -pub mod asset; pub mod secret; -pub mod activity_flag; -pub mod button; \ No newline at end of file +pub mod timestamp; diff --git a/src/models/activity_data/party.rs b/src/models/activity_data/party.rs index 115b05f..d7219d3 100644 --- a/src/models/activity_data/party.rs +++ b/src/models/activity_data/party.rs @@ -6,14 +6,11 @@ pub struct Party { id: Option, #[serde(skip_serializing_if = "Option::is_none")] - size: Option<(i8, i8)> + size: Option<(i8, i8)>, } impl Party { pub fn new(id: Option, size: Option<(i8, i8)>) -> Party { - Self { - id, - size - } + Self { id, size } } -} \ No newline at end of file +} diff --git a/src/models/activity_data/secret.rs b/src/models/activity_data/secret.rs index 7878130..ebbfafb 100644 --- a/src/models/activity_data/secret.rs +++ b/src/models/activity_data/secret.rs @@ -9,18 +9,19 @@ pub struct Secret { spectate: Option, #[serde(skip_serializing_if = "Option::is_none")] - instanced_match: Option + instanced_match: Option, } impl Secret { - pub fn new(join: Option, - spectate: Option, - instanced_match: Option) -> Secret { + pub fn new( + join: Option, + spectate: Option, + instanced_match: Option, + ) -> Secret { Self { join, spectate, - instanced_match + instanced_match, } } - -} \ No newline at end of file +} diff --git a/src/models/activity_data/timestamp.rs b/src/models/activity_data/timestamp.rs index c3dc3c7..48f32be 100644 --- a/src/models/activity_data/timestamp.rs +++ b/src/models/activity_data/timestamp.rs @@ -10,11 +10,7 @@ pub struct Timestamp { } impl Timestamp { - pub fn new(start: Option, - end: Option) -> Timestamp { - Self { - start, - end, - } + pub fn new(start: Option, end: Option) -> Timestamp { + Self { start, end } } -} \ No newline at end of file +} diff --git a/src/models/client/commands.rs b/src/models/client/commands.rs index c3fcc96..22e7ed0 100644 --- a/src/models/client/commands.rs +++ b/src/models/client/commands.rs @@ -1,5 +1,5 @@ pub enum Commands { - SetActivity + SetActivity, } impl Commands { diff --git a/src/models/client/event.rs b/src/models/client/event.rs index fb628cb..6de2592 100644 --- a/src/models/client/event.rs +++ b/src/models/client/event.rs @@ -5,18 +5,17 @@ use crate::models::activity::Activity; #[derive(Serialize, Debug)] #[serde(untagged)] pub enum EventData { - Activity(Activity) + Activity(Activity), } pub enum EventName { - Activity + Activity, } - impl EventName { pub fn as_string(&self) -> String { match self { EventName::Activity => "activity".into(), } } -} \ No newline at end of file +} diff --git a/src/models/client/mod.rs b/src/models/client/mod.rs index 73d0cc6..0fc080d 100644 --- a/src/models/client/mod.rs +++ b/src/models/client/mod.rs @@ -1,3 +1,3 @@ -pub mod payload; +pub mod commands; pub mod event; -pub mod commands; \ No newline at end of file +pub mod payload; diff --git a/src/models/client/payload.rs b/src/models/client/payload.rs index db89045..e03c6a1 100644 --- a/src/models/client/payload.rs +++ b/src/models/client/payload.rs @@ -1,5 +1,5 @@ -use serde::Serialize; use crate::models::client::event::{EventData, EventName}; +use serde::Serialize; pub enum OpCode { HANDSHAKE, @@ -16,7 +16,7 @@ impl Payload { pub fn new(event_name: EventName, event_data: EventData) -> Self { Self { event_name: event_name.as_string(), - event_data + event_data, } } -} \ No newline at end of file +} diff --git a/src/models/mod.rs b/src/models/mod.rs index 43d8f9f..443e22c 100644 --- a/src/models/mod.rs +++ b/src/models/mod.rs @@ -1,3 +1,3 @@ -pub mod activity_data; pub mod activity; +pub mod activity_data; pub mod client;