bugfix: PP для модеров, подправка окна и скрытие инфы (#6470)

* bugfix: PP для модеров, подправка окна и скрытие инфы * prettier
ss220-space · Jan 27, 2025 · b0b1ecc · b0b1ecc
1 parent 7ea48e8
commit b0b1ecc
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/code/modules/admin/player_options_panel.dm b/code/modules/admin/player_options_panel.dm
@@ -329,7 +329,7 @@
 
 
 /datum/vuap_personal/ui_state(mob/user)
-	return GLOB.admin_state
+	return GLOB.admin_mod_state
 
 /datum/admins/proc/vuap_open(ckey, mob/M)
 	if (!check_rights(NONE))

diff --git a/code/modules/tgui/states/admin_mod.dm b/code/modules/tgui/states/admin_mod.dm
@@ -0,0 +1,12 @@
+/**
+ * tgui state: mod_state
+ *
+ * Checks that the user is admin or mod, end-of-story.
+ */
+
+GLOBAL_DATUM_INIT(admin_mod_state, /datum/ui_state/admin_mod_state, new)
+
+/datum/ui_state/admin_mod_state/can_use_topic(src_object, mob/user, atom/ui_source)
+	if(check_rights_for(user.client, R_ADMIN) || check_rights_for(user.client, R_MOD))
+		return UI_INTERACTIVE
+	return UI_CLOSE
diff --git a/paradise.dme b/paradise.dme
@@ -3278,6 +3278,7 @@
 #include "code\modules\tgui\states\hands.dm"
 #include "code\modules\tgui\states\human_adjacent.dm"
 #include "code\modules\tgui\states\inventory.dm"
+#include "code\modules\tgui\states\admin_mod.dm"
 #include "code\modules\tgui\states\not_incapacitated.dm"
 #include "code\modules\tgui\states\notcontained.dm"
 #include "code\modules\tgui\states\observer.dm"

diff --git a/tgui/packages/tgui/interfaces/PlayerPanel.tsx b/tgui/packages/tgui/interfaces/PlayerPanel.tsx
@@ -1,4 +1,4 @@
-import { useBackend } from '../backend';
+import { useBackend, useLocalState } from '../backend';
 import { Box, Button, Section, Table, Stack, Grid } from '../components';
 import { Window } from '../layouts';
 
@@ -103,6 +103,8 @@ export const PlayerPanel = (props, context) => {
 
 const PlayerInformation = (props, context) => {
   const { act, data } = useBackend<playerData>(context);
+  const [hideIP, setIP] = useLocalState(context, 'show_ip', false);
+  const [hideCID, setCID] = useLocalState(context, 'show_cid', false);
 
   const handleAction = (action: string, params = {}) => {
     act(action, { selectedPlayerCkey: data.ckey, ...params });
@@ -119,28 +121,38 @@ const PlayerInformation = (props, context) => {
             <Table.Cell>{data.ckey}</Table.Cell>
           </Table.Row>
           <Table.Row>
-            <Table.Cell bold>IP Address:</Table.Cell>
-            <Table.Cell>{data.ipAddress}</Table.Cell>
+            <Table.Cell bold>Rank:</Table.Cell>
+            <Table.Cell>{data.rank}</Table.Cell>
             <Table.Cell bold>Discord:</Table.Cell>
             <Table.Cell>{data.discord}</Table.Cell>
           </Table.Row>
           <Table.Row>
-            <Table.Cell bold>Rank:</Table.Cell>
-            <Table.Cell>{data.rank}</Table.Cell>
+            <Table.Cell bold>Account Registered:</Table.Cell>
+            <Table.Cell>{data.accountRegistered}</Table.Cell>
             <Table.Cell bold>Byond Version:</Table.Cell>
             <Table.Cell>{data.byondVersion}</Table.Cell>
           </Table.Row>
           <Table.Row>
-            <Table.Cell bold>Mob Type:</Table.Cell>
-            <Table.Cell>{data.mobType}</Table.Cell>
             <Table.Cell bold>CID:</Table.Cell>
-            <Table.Cell>{data.CID}</Table.Cell>
+            <Table.Cell>
+              <Button
+                content={!hideCID ? 'Hidden' : data.CID}
+                onClick={() => setCID(!hideCID)}
+              />
+            </Table.Cell>
+            <Table.Cell bold>IP Address:</Table.Cell>
+            <Table.Cell>
+              <Button
+                content={!hideIP ? 'Hidden' : data.ipAddress}
+                onClick={() => setIP(!hideIP)}
+              />
+            </Table.Cell>
           </Table.Row>
           <Table.Row>
+            <Table.Cell bold>Mob Type:</Table.Cell>
+            <Table.Cell>{data.mobType}</Table.Cell>
             <Table.Cell bold>Game State:</Table.Cell>
             <Table.Cell>{data.gameState}</Table.Cell>
-            <Table.Cell bold>Account Registered:</Table.Cell>
-            <Table.Cell>{data.accountRegistered}</Table.Cell>
           </Table.Row>
           <Table.Row>
             <Table.Cell bold>Related By CID:</Table.Cell>

diff --git a/tgui/packages/tgui/interfaces/VethPlayerPanel.js b/tgui/packages/tgui/interfaces/VethPlayerPanel.js
@@ -40,7 +40,7 @@ export const VethPlayerPanel = (props, context) => {
 
   return (
     <Box>
-      <Window title="Player Panel Veth" width={1000} height={640}>
+      <Window title="Player Panel Veth" width={1100} height={640}>
         <Window.Content>
           <Section>
             <Button

diff --git a/tgui/public/tgui.bundle.js b/tgui/public/tgui.bundle.js