From 3a63d502d9fadea8d44ee51e0288a63e4cbd8d8d Mon Sep 17 00:00:00 2001 From: Paul Makles <paulmakles@gmail.com> Date: Tue, 19 Jan 2021 13:07:11 +0000 Subject: [PATCH] Cargo fmt. --- src/database/entities/message.rs | 10 ++++++---- src/notifications/events.rs | 7 ++----- src/routes/channels/delete_channel.rs | 2 +- src/routes/channels/message_edit.rs | 4 +++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/database/entities/message.rs b/src/database/entities/message.rs index fd38f94..e48775c 100644 --- a/src/database/entities/message.rs +++ b/src/database/entities/message.rs @@ -78,10 +78,12 @@ impl Message { })?; let channel = self.channel.clone(); - ClientboundNotification::MessageDelete { id: self.id.clone() } - .publish(channel) - .await - .ok(); + ClientboundNotification::MessageDelete { + id: self.id.clone(), + } + .publish(channel) + .await + .ok(); Ok(()) } diff --git a/src/notifications/events.rs b/src/notifications/events.rs index e51ff9a..f370af8 100644 --- a/src/notifications/events.rs +++ b/src/notifications/events.rs @@ -112,10 +112,7 @@ pub fn prehandle_hook(notification: &ClientboundNotification) { pub fn posthandle_hook(notification: &ClientboundNotification) { match ¬ification { ClientboundNotification::ChannelDelete { id } => { - get_hive() - .hive - .drop_topic(&id) - .ok(); + get_hive().hive.drop_topic(&id).ok(); } ClientboundNotification::UserRelationship { id, user, status } => { if status == &RelationshipStatus::None { @@ -123,7 +120,7 @@ pub fn posthandle_hook(notification: &ClientboundNotification) { .hive .unsubscribe(&id.to_string(), &user.to_string()) .ok(); - } + } } _ => {} } diff --git a/src/routes/channels/delete_channel.rs b/src/routes/channels/delete_channel.rs index ac871c5..b328b5d 100644 --- a/src/routes/channels/delete_channel.rs +++ b/src/routes/channels/delete_channel.rs @@ -66,7 +66,7 @@ pub async fn req(user: User, target: Ref) -> Result<()> { target.publish_update(json!({ "owner": new_owner })).await?; } else { - return target.delete().await + return target.delete().await; } } else { get_collection("channels") diff --git a/src/routes/channels/message_edit.rs b/src/routes/channels/message_edit.rs index cedba51..10bed64 100644 --- a/src/routes/channels/message_edit.rs +++ b/src/routes/channels/message_edit.rs @@ -50,5 +50,7 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result< with: "message", })?; - message.publish_update(json!({ "content": edit.content, "edited": DateTime(edited) })).await + message + .publish_update(json!({ "content": edit.content, "edited": DateTime(edited) })) + .await } -- GitLab