Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Group): Prevent members from removing others #1906

Merged
merged 7 commits into from
Mar 8, 2024
Merged

fix(Group): Prevent members from removing others #1906

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e4975ce
refactor(Group): Indicate group creator on manage members modal
lgmarchi Mar 6, 2024
0ef4999
refactor(Group): Remove options, for non group creator of remove othe…
lgmarchi Mar 6, 2024
db539cb
refactor(Group): Just let possibility for members add other users, bu…
lgmarchi Mar 6, 2024
826d8ca
Merge branch 'dev' into fix-group-creator-not-possible-to-remove-othe…
stavares843 Mar 6, 2024
f03d73a
Improve code
lgmarchi Mar 7, 2024
373da26
Merge remote-tracking branch 'origin/fix-group-creator-not-possible-t…
lgmarchi Mar 7, 2024
ddad76d
Merge branch 'dev' into fix-group-creator-not-possible-to-remove-othe…
dariusc93 Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 58 additions & 23 deletions ui/src/layouts/chats/presentation/chat/edit_group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};

use common::{
icons::outline::Shape as Icon,
icons::Icon as IconElement,
language::get_local_text,
state::{Identity, State},
warp_runner::{RayGunCmd, WarpCmd},
Expand Down Expand Up @@ -44,6 +45,16 @@ pub fn EditGroup(cx: Scope) -> Element {
// show the ADD or REMOVE components, default to Remove
let edit_group_action = use_state(cx, || EditGroupAction::Remove);
let conv_id = state.read().get_active_chat().unwrap().id;
let creator_id_vector = Vec::from_iter(
state
.read()
.get_active_chat()
.unwrap()
.creator
.iter()
.cloned(),
);
let creator_id = creator_id_vector.first().cloned()?;
lgmarchi marked this conversation as resolved.
Show resolved Hide resolved

let friends_did_already_in_group = state.read().get_active_chat().unwrap().participants;

Expand Down Expand Up @@ -111,6 +122,9 @@ pub fn EditGroup(cx: Scope) -> Element {
}
});

let creator_did2 = creator_id.clone();
let am_i_group_creator = creator_id == state.read().did_key();

cx.render(rsx!(
div {
id: "edit-members",
Expand Down Expand Up @@ -162,13 +176,16 @@ pub fn EditGroup(cx: Scope) -> Element {
aria_label: "friend-group",
friends.iter().map(
|_friend| {
let is_group_creator = creator_did2.clone() == _friend.clone().did_key();
rsx!(
friend_row {
add_or_remove: if *edit_group_action.current() == EditGroupAction::Add {
"add".into()
} else {
"remove".into()
},
friend_is_group_creator: is_group_creator,
am_i_group_creator: am_i_group_creator,
friend: _friend.clone(),
minimal: minimal,
conv_id: conv_id,
Expand Down Expand Up @@ -196,6 +213,8 @@ pub fn EditGroup(cx: Scope) -> Element {
#[derive(Props, Eq, PartialEq)]
pub struct FriendRowProps {
add_or_remove: String,
friend_is_group_creator: bool,
am_i_group_creator: bool,
minimal: bool,
friend: Identity,
conv_id: Uuid,
Expand Down Expand Up @@ -272,34 +291,50 @@ fn friend_row(cx: Scope<FriendRowProps>) -> Element {
_friend.username(),
},
},
Button {
aria_label: if cx.props.add_or_remove == "add" {
get_local_text("uplink.add")
} else {
get_local_text("uplink.remove")
},
icon: if cx.props.add_or_remove == "add" {
Icon::UserPlus
} else {
Icon::UserMinus
},
text: if cx.props.minimal { String::new() }
else if cx.props.add_or_remove == "add" {
if cx.props.friend_is_group_creator {
rsx!(
div {
class: "group-creator-container",
IconElement {
icon: Icon::Satellite
}
span {
class: "group-creator-text",
get_local_text("messages.group-creator-label")
}
}
)
}
if cx.props.am_i_group_creator || cx.props.add_or_remove == "add" {
rsx!(Button {
aria_label: if cx.props.add_or_remove == "add" {
get_local_text("uplink.add")
} else {
get_local_text("uplink.remove")
}
,
onpress: move |_| {
let mut friends = selected_friends.get().clone();
friends.clear();
selected_friends.set(vec![_friend.did_key()].into_iter().collect());
if cx.props.add_or_remove == "add" {
ch.send(ChanCmd::AddParticipants);
},
icon: if cx.props.add_or_remove == "add" {
Icon::UserPlus
} else {
ch.send(ChanCmd::RemoveParticipants);
Icon::UserMinus
},
text: if cx.props.minimal { String::new() }
else if cx.props.add_or_remove == "add" {
get_local_text("uplink.add")
} else {
get_local_text("uplink.remove")
}
,
onpress: move |_| {
let mut friends = selected_friends.get().clone();
friends.clear();
selected_friends.set(vec![_friend.did_key()].into_iter().collect());
if cx.props.add_or_remove == "add" {
ch.send(ChanCmd::AddParticipants);
} else {
ch.send(ChanCmd::RemoveParticipants);
}
}
}
})
}
}
))
Expand Down
Loading