jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 13:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ChannelRef, use the full Channel object.

Browse Source
This commit is contained in:
Paul Makles
2020-08-03 11:01:05 +02:00
parent b0f8abef33
commit fa6ed75ed8
6 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/message.rs
View File

@@ -1,8 +1,8 @@
use super::get_collection;
use crate::guards::channel::ChannelRef;
use crate::notifications;
use crate::notifications::events::message::Create;
use crate::notifications::events::Notification;
use crate::database::channel::Channel;
use crate::routes::channel::ChannelType;
use bson::{doc, to_bson, UtcDateTime};
@@ -32,7 +32,7 @@ pub struct Message {
// ? pub fn send_message();
// ? handle websockets?
impl Message {
pub fn send(&self, target: &ChannelRef) -> bool {
pub fn send(&self, target: &Channel) -> bool {
if get_collection("messages")
.insert_one(to_bson(&self).unwrap().as_document().unwrap().clone(), None)
.is_ok()

6
src/database/permissions.rs
View File

@@ -1,8 +1,8 @@
use super::mutual::has_mutual_connection;
use crate::database::channel::Channel;
use crate::database::guild::Member;
use crate::database::user::UserRelationship;
use crate::guards::auth::UserRef;
use crate::guards::channel::ChannelRef;
use crate::guards::guild::{get_member, GuildRef};
use num_enum::TryFromPrimitive;
@@ -88,7 +88,7 @@ pub fn get_relationship(a: &UserRef, b: &UserRef) -> Relationship {
pub struct PermissionCalculator {
pub user: UserRef,
pub channel: Option<ChannelRef>,
pub channel: Option<Channel>,
pub guild: Option<GuildRef>,
pub member: Option<Member>,
}
@@ -103,7 +103,7 @@ impl PermissionCalculator {
}
}
pub fn channel(self, channel: ChannelRef) -> PermissionCalculator {
pub fn channel(self, channel: Channel) -> PermissionCalculator {
PermissionCalculator {
channel: Some(channel),
..self