From 52d0b0133ce0e68b23af91e585da2f5ccb2d8341 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 6 Oct 2021 14:46:39 +0100
Subject: [PATCH 1/2] Hide kick & ban options in UserInfo when looking at own
 profile

---
 src/components/views/right_panel/UserInfo.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 3ac4088182..829710185d 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -535,6 +535,8 @@ interface IBaseProps {
 const RoomKickButton: React.FC<IBaseProps> = ({ member, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
+    // don't render this button on our own profile, we don't want to kick ourselves
+    if (member.userId === cli.getUserId()) return null;
     // check if user can be kicked/disinvited
     if (member.membership !== "invite" && member.membership !== "join") return null;
 
@@ -659,6 +661,9 @@ const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
 const BanToggleButton: React.FC<IBaseProps> = ({ member, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
+    // don't render this button on our own profile, we don't want to ban ourselves and can't unban ourselves anyhow
+    if (member.userId === cli.getUserId()) return null;
+
     const onBanOrUnban = async () => {
         const { finished } = Modal.createTrackedDialog(
             'Confirm User Action Dialog',

From ab98549fff4cce1df885e20e031484a3f81f0369 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 6 Oct 2021 17:08:32 +0100
Subject: [PATCH 2/2] move the logic to the parent so that the section hiding
 works

---
 src/components/views/right_panel/UserInfo.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 829710185d..7de38b587f 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -535,8 +535,6 @@ interface IBaseProps {
 const RoomKickButton: React.FC<IBaseProps> = ({ member, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
-    // don't render this button on our own profile, we don't want to kick ourselves
-    if (member.userId === cli.getUserId()) return null;
     // check if user can be kicked/disinvited
     if (member.membership !== "invite" && member.membership !== "join") return null;
 
@@ -661,9 +659,6 @@ const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
 const BanToggleButton: React.FC<IBaseProps> = ({ member, startUpdating, stopUpdating }) => {
     const cli = useContext(MatrixClientContext);
 
-    // don't render this button on our own profile, we don't want to ban ourselves and can't unban ourselves anyhow
-    if (member.userId === cli.getUserId()) return null;
-
     const onBanOrUnban = async () => {
         const { finished } = Modal.createTrackedDialog(
             'Confirm User Action Dialog',
@@ -822,7 +817,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     const isMe = me.userId === member.userId;
     const canAffectUser = member.powerLevel < me.powerLevel || isMe;
 
-    if (canAffectUser && me.powerLevel >= kickPowerLevel) {
+    if (!isMe && canAffectUser && me.powerLevel >= kickPowerLevel) {
         kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
     if (me.powerLevel >= redactPowerLevel && (!SpaceStore.spacesEnabled || !room.isSpaceRoom())) {
@@ -830,10 +825,10 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
             <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
         );
     }
-    if (canAffectUser && me.powerLevel >= banPowerLevel) {
+    if (!isMe && canAffectUser && me.powerLevel >= banPowerLevel) {
         banButton = <BanToggleButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
-    if (canAffectUser && me.powerLevel >= editPowerLevel && !room.isSpaceRoom()) {
+    if (!isMe && canAffectUser && me.powerLevel >= editPowerLevel && !room.isSpaceRoom()) {
         muteButton = (
             <MuteToggleButton
                 member={member}