Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug where channel invitations would show up in the channels section

Browse source 
Block non-members from reading channel information
WIP: Make sure Arc::make_mut() works
This commit is contained in:
Mikayla 2023-08-08 11:47:13 -07:00
parent 6a7245b92b
commit d00f6a490c
No known key found for this signature in database
5 changed files with 138 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/collab/src/rpc.rs
View file

@ -2210,14 +2210,15 @@ async fn invite_channel_member(
) -> Result<()> {
let db = session.db().await;
let channel_id = ChannelId::from_proto(request.channel_id);
let channel = db
.get_channel(channel_id, session.user_id)
.await?
.ok_or_else(|| anyhow!("channel not found"))?;
let invitee_id = UserId::from_proto(request.user_id);
db.invite_channel_member(channel_id, invitee_id, session.user_id, request.admin)
.await?;
let (channel, _) = db
.get_channel(channel_id, session.user_id)
.await?
.ok_or_else(|| anyhow!("channel not found"))?;
let mut update = proto::UpdateChannels::default();
update.channel_invitations.push(proto::Channel {
id: channel.id.to_proto(),
@ -2275,18 +2276,27 @@ async fn set_channel_member_admin(
db.set_channel_member_admin(channel_id, session.user_id, member_id, request.admin)
.await?;
let channel = db
let (channel, has_accepted) = db
.get_channel(channel_id, member_id)
.await?
.ok_or_else(|| anyhow!("channel not found"))?;
let mut update = proto::UpdateChannels::default();
update.channels.push(proto::Channel {
id: channel.id.to_proto(),
name: channel.name,
parent_id: None,
user_is_admin: request.admin,
});
if has_accepted {
update.channels.push(proto::Channel {
id: channel.id.to_proto(),
name: channel.name,
parent_id: None,
user_is_admin: request.admin,
});
} else {
update.channel_invitations.push(proto::Channel {
id: channel.id.to_proto(),
name: channel.name,
parent_id: None,
user_is_admin: request.admin,
});
}
for connection_id in session
.connection_pool()