ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Profile: Allow adding members to non-admins, fix online status (#1823)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-04-19 15:11:38 +02:00
parent b06bbe1197
commit 747974b24a
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/gramjs/methods/chats.ts
View File

@ -990,10 +990,12 @@ export async function fetchMembers(
} }
updateLocalDb(result); updateLocalDb(result);
const { users, userStatusesById } = buildApiUsersAndStatuses(result.users);
return { return {
members: buildChatMembers(result), members: buildChatMembers(result),
users: result.users.map(buildApiUser).filter<ApiUser>(Boolean as any), users,
userStatusesById,
}; };
} }

5
src/components/right/Profile.tsx
View File

@ -23,7 +23,7 @@ import {
} from '../../config'; } from '../../config';
import { IS_TOUCH_ENV } from '../../util/environment'; import { IS_TOUCH_ENV } from '../../util/environment';
import { import {
getHasAdminRight, isChatAdmin, isChatChannel, isChatGroup, isUserBot, isUserId, getHasAdminRight, isChatAdmin, isChatChannel, isChatGroup, isUserBot, isUserId, isUserRightBanned,
} from '../../global/helpers'; } from '../../global/helpers';
import { import {
selectChatMessages, selectChatMessages,
@ -522,7 +522,8 @@ export default memo(withGlobal<OwnProps>(
const members = chat?.fullInfo?.members; const members = chat?.fullInfo?.members;
const areMembersHidden = hasMembersTab && chat const areMembersHidden = hasMembersTab && chat
&& (chat.isForbidden || (chat.fullInfo && !chat.fullInfo.canViewMembers)); && (chat.isForbidden || (chat.fullInfo && !chat.fullInfo.canViewMembers));
const canAddMembers = hasMembersTab && chat && (getHasAdminRight(chat, 'inviteUsers') || chat.isCreator); const canAddMembers = hasMembersTab && chat
&& (getHasAdminRight(chat, 'inviteUsers') || !isUserRightBanned(chat, 'inviteUsers') || chat.isCreator);
const canDeleteMembers = hasMembersTab && chat && (getHasAdminRight(chat, 'banUsers') || chat.isCreator); const canDeleteMembers = hasMembersTab && chat && (getHasAdminRight(chat, 'banUsers') || chat.isCreator);
const activeDownloadIds = selectActiveDownloadIds(global, chatId); const activeDownloadIds = selectActiveDownloadIds(global, chatId);

3
src/global/actions/api/chats.ts
View File

@ -942,13 +942,14 @@ addActionHandler('loadMoreMembers', async (global) => {
return; return;
} }
const { members, users } = result; const { members, users, userStatusesById } = result;
if (!members || !members.length) { if (!members || !members.length) {
return; return;
} }
global = getGlobal(); global = getGlobal();
global = addUsers(global, buildCollectionByKey(users, 'id')); global = addUsers(global, buildCollectionByKey(users, 'id'));
global = addUserStatuses(global, userStatusesById);
global = addChatMembers(global, chat, members); global = addChatMembers(global, chat, members);
setGlobal(global); setGlobal(global);
}); });