From d4d5b23c7d545311b4bd0a737f315ff611bc9544 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Mon, 12 Feb 2024 21:23:38 +0000 Subject: [PATCH] fix: use a valid default permission set for groups --- crates/core/database/fixtures/group_with_members.json | 2 +- crates/core/database/src/util/permissions.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/core/database/fixtures/group_with_members.json b/crates/core/database/fixtures/group_with_members.json index 1eeeb0ba..a4544176 100644 --- a/crates/core/database/fixtures/group_with_members.json +++ b/crates/core/database/fixtures/group_with_members.json @@ -23,6 +23,6 @@ "channel_type": "Group", "name": "My Group", "owner": "__ID:0__", - "recipients": ["__ID:0__", "__ID:1__", "__ID:2__"] + "recipients": ["__ID:0__", "__ID:1__"] } ] diff --git a/crates/core/database/src/util/permissions.rs b/crates/core/database/src/util/permissions.rs index 28972c06..3aaf09f6 100644 --- a/crates/core/database/src/util/permissions.rs +++ b/crates/core/database/src/util/permissions.rs @@ -2,7 +2,7 @@ use std::borrow::Cow; use revolt_permissions::{ calculate_user_permissions, ChannelType, Override, PermissionQuery, PermissionValue, - RelationshipStatus, + RelationshipStatus, DEFAULT_PERMISSION_DIRECT_MESSAGE, }; use crate::{Channel, Database, Member, Server, User}; @@ -209,7 +209,7 @@ impl PermissionQuery for DatabasePermissionQuery<'_> { match channel { Cow::Borrowed(Channel::Group { permissions, .. }) | Cow::Owned(Channel::Group { permissions, .. }) => Override { - allow: permissions.unwrap_or_default() as u64, + allow: permissions.unwrap_or(*DEFAULT_PERMISSION_DIRECT_MESSAGE as i64) as u64, deny: 0, }, Cow::Borrowed(Channel::TextChannel {