jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

refactor: some clippy recommendations

Browse Source
This commit is contained in:
izzy
2025-05-13 10:48:56 +01:00
parent 2aff76c369
commit 69ae767175
29 changed files with 67 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/core/database/src/util/bridge/v0.rs
View File

@@ -1,7 +1,7 @@
use revolt_models::v0::*;
use revolt_permissions::{calculate_user_permissions, UserPermission};
use crate::{util::permissions::DatabasePermissionQuery, Database, FileUsedFor};
use crate::{util::permissions::DatabasePermissionQuery, Database};
impl crate::Bot {
pub fn into_public_bot(self, user: crate::User) -> PublicBot {
@@ -488,7 +488,7 @@ impl crate::Message {
reactions: self.reactions,
interactions: self.interactions.into(),
masquerade: self.masquerade.map(Into::into),
flags: self.flags.map(|flags| flags as u32).unwrap_or_default(),
flags: self.flags.unwrap_or_default(),
pinned: self.pinned,
}
}
@@ -517,7 +517,7 @@ impl From<crate::PartialMessage> for PartialMessage {
reactions: value.reactions,
interactions: value.interactions.map(Into::into),
masquerade: value.masquerade.map(Into::into),
flags: value.flags.map(|flags| flags as u32),
flags: value.flags,
pinned: value.pinned,
}
}

6
crates/core/database/src/util/bulk_permissions.rs
View File

@@ -87,7 +87,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
}
}
pub fn channel(self, channel: &'z Channel) -> BulkDatabasePermissionQuery {
pub fn channel(self, channel: &'z Channel) -> BulkDatabasePermissionQuery<'z> {
BulkDatabasePermissionQuery {
channel: Some(channel.clone()),
..self
@@ -109,7 +109,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
}
}
pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery {
pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery<'z> {
BulkDatabasePermissionQuery {
members: Some(members.to_owned()),
cached_member_perms: None,
@@ -120,7 +120,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
}
}
pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery {
pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery<'z> {
BulkDatabasePermissionQuery {
users: Some(users.to_owned()),
cached_member_perms: None,

26
crates/core/database/src/util/permissions.rs
View File

@@ -305,16 +305,14 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
/// Are we a recipient of this channel?
async fn are_we_part_of_the_channel(&mut self) -> bool {
if let Some(channel) = &self.channel {
match channel {
Cow::Borrowed(Channel::DirectMessage { recipients, .. })
| Cow::Owned(Channel::DirectMessage { recipients, .. })
| Cow::Borrowed(Channel::Group { recipients, .. })
| Cow::Owned(Channel::Group { recipients, .. }) => {
recipients.contains(&self.perspective.id)
}
_ => false,
}
if let Some(
Cow::Borrowed(Channel::DirectMessage { recipients, .. })
| Cow::Owned(Channel::DirectMessage { recipients, .. })
| Cow::Borrowed(Channel::Group { recipients, .. })
| Cow::Owned(Channel::Group { recipients, .. }),
) = &self.channel
{
recipients.contains(&self.perspective.id)
} else {
false
}
@@ -420,7 +418,7 @@ impl<'a> DatabasePermissionQuery<'a> {
}
/// Use user
pub fn user(self, user: &'a User) -> DatabasePermissionQuery {
pub fn user(self, user: &'a User) -> DatabasePermissionQuery<'a> {
DatabasePermissionQuery {
user: Some(Cow::Borrowed(user)),
..self
@@ -428,7 +426,7 @@ impl<'a> DatabasePermissionQuery<'a> {
}
/// Use channel
pub fn channel(self, channel: &'a Channel) -> DatabasePermissionQuery {
pub fn channel(self, channel: &'a Channel) -> DatabasePermissionQuery<'a> {
DatabasePermissionQuery {
channel: Some(Cow::Borrowed(channel)),
..self
@@ -436,7 +434,7 @@ impl<'a> DatabasePermissionQuery<'a> {
}
/// Use server
pub fn server(self, server: &'a Server) -> DatabasePermissionQuery {
pub fn server(self, server: &'a Server) -> DatabasePermissionQuery<'a> {
DatabasePermissionQuery {
server: Some(Cow::Borrowed(server)),
..self
@@ -444,7 +442,7 @@ impl<'a> DatabasePermissionQuery<'a> {
}
/// Use member
pub fn member(self, member: &'a Member) -> DatabasePermissionQuery {
pub fn member(self, member: &'a Member) -> DatabasePermissionQuery<'a> {
DatabasePermissionQuery {
member: Some(Cow::Borrowed(member)),
..self