Skip to content

Commit 97712fe

Browse files
fix: remove deprecated admin-role detection
1 parent 6beb941 commit 97712fe

4 files changed

Lines changed: 0 additions & 41 deletions

File tree

packages/api/src/EmbeddedChatApi.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -618,27 +618,6 @@ export default class EmbeddedChatApi {
618618
}
619619
}
620620

621-
async getUsersInRole(role: string) {
622-
try {
623-
return await this._restRequest(`/v1/roles.getUsersInRole?role=${role}`);
624-
} catch (err: any) {
625-
console.error(err instanceof Error ? err.message : String(err));
626-
return err;
627-
}
628-
}
629-
630-
async getUserRoles() {
631-
try {
632-
const response = await this.getUsersInRole("admin");
633-
if (response && response.success) {
634-
return { result: response.users };
635-
}
636-
return { result: [] };
637-
} catch (err) {
638-
console.error(err instanceof Error ? err.message : err);
639-
return { result: [] };
640-
}
641-
}
642621

643622
async sendTypingStatus(username: string, typing: boolean) {
644623
try {

packages/react/src/hooks/useFetchChatData.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const useFetchChatData = (showRoles) => {
1313
const { RCInstance } = useContext(RCContext);
1414
const setMessages = useMessageStore((state) => state.setMessages);
1515
const setMessagesOffset = useMessageStore((state) => state.setMessagesOffset);
16-
const setAdmins = useMemberStore((state) => state.setAdmins);
1716
const setMemberRoles = useMemberStore((state) => state.setMemberRoles);
1817
const permissionsRef = useRef(null);
1918
const setStarredMessages = useStarredMessageStore(
@@ -159,11 +158,6 @@ const useFetchChatData = (showRoles) => {
159158

160159
if (showRoles) {
161160
const { roles } = await RCInstance.getChannelRoles(channelIsPrivate);
162-
const fetchedRoles = await RCInstance.getUserRoles();
163-
const fetchedAdmins = fetchedRoles?.result;
164-
165-
const adminUsernames = fetchedAdmins?.map((user) => user.username);
166-
setAdmins(adminUsernames);
167161

168162
const rolesObj =
169163
roles?.length > 0
@@ -184,7 +178,6 @@ const useFetchChatData = (showRoles) => {
184178
RCInstance,
185179
showRoles,
186180
setMessages,
187-
setAdmins,
188181
setMemberRoles,
189182
]
190183
);

packages/react/src/store/memberStore.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ const useMemberStore = create((set) => ({
55
showMembers: false,
66
setShowMembers: (showMembers) => set(() => ({ showMembers })),
77
memberRoles: {},
8-
admins: [],
98
setMemberRoles: (memberRoles) => set((state) => ({ ...state, memberRoles })),
10-
setAdmins: (admins) => set(() => ({ admins })),
119
setMembersHandler: (memberList) => set(() => ({ members: memberList })),
1210
}));
1311

packages/react/src/views/Message/MessageHeader.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const MessageHeader = ({
3232
const showUsername = ECOptions?.showUsername;
3333
const showName = ECOptions?.showName;
3434
const channelLevelRoles = useMemberStore((state) => state.memberRoles);
35-
const admins = useMemberStore((state) => state.admins);
3635

3736
const isPinned = message.pinned;
3837
const isStarred =
@@ -137,16 +136,6 @@ const MessageHeader = ({
137136
)}
138137
{!message.t && ECOptions?.showRoles && isRoles && (
139138
<>
140-
{admins?.includes(message?.u?.username) && (
141-
<Box
142-
as="span"
143-
css={styles.userRole}
144-
className={appendClassNames('ec-message-user-role')}
145-
>
146-
Admin
147-
</Box>
148-
)}
149-
150139
{channelLevelRoles[message.u.username]?.roles?.map((role, index) => (
151140
<Box
152141
key={index}

0 commit comments

Comments
 (0)