HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

Merge remote-tracking branch 'origin/main' into livekit

Browse Source
This commit is contained in:
Zomatree
2025-06-02 02:11:51 +01:00
parent 48e0b48ea9
commit ea1c165d80
89 changed files with 1662 additions and 1651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,16 +308,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
}
@@ -424,7 +422,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
@@ -432,7 +430,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
@@ -440,7 +438,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
@@ -448,7 +446,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