Page MenuHomePhorge
Files F32215253

D8422.1765159046.diff
No OneTemporary
Actions

Size
8 KB
Referenced Files
None
Subscribers
None

D8422.1765159046.diff
View Options

diff --git a/keyserver/src/creators/role-creator.js b/keyserver/src/creators/role-creator.js
--- a/keyserver/src/creators/role-creator.js
+++ b/keyserver/src/creators/role-creator.js
@@ -11,11 +11,18 @@
import type {
RoleInfo,
RoleModificationRequest,
+ RoleModificationResult,
} from 'lib/types/thread-types.js';
+import { updateTypes } from 'lib/types/update-types-enum.js';
import { ServerError } from 'lib/utils/errors.js';
import createIDs from './id-creator.js';
+import { createUpdates } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js';
+import {
+ fetchServerThreadInfos,
+ rawThreadInfosFromServerThreadInfos,
+} from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js';
@@ -74,7 +81,7 @@
async function modifyRole(
viewer: Viewer,
request: RoleModificationRequest,
-): Promise<void> {
+): Promise<RoleModificationResult> {
const hasPermission = await checkThreadPermission(
viewer,
request.community,
@@ -120,6 +127,44 @@
}
await dbQuery(query);
+
+ const fetchServerThreadInfosResult = await fetchServerThreadInfos(
+ SQL`t.id = ${community}`,
+ );
+ const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
+ const serverThreadInfo = serverThreadInfos[community];
+
+ if (!serverThreadInfo) {
+ throw new ServerError('internal_error');
+ }
+
+ const updateDatas = [];
+ for (const memberInfo of serverThreadInfo.members) {
+ updateDatas.push({
+ type: updateTypes.UPDATE_THREAD,
+ userID: memberInfo.id,
+ time,
+ threadID: community,
+ });
+ }
+
+ const { viewerUpdates } = await createUpdates(updateDatas, {
+ viewer,
+ updatesForCurrentSession: 'return',
+ });
+
+ const { threadInfos: rawThreadInfos } = rawThreadInfosFromServerThreadInfos(
+ viewer,
+ fetchServerThreadInfosResult,
+ );
+ const rawThreadInfo = rawThreadInfos[community];
+
+ return {
+ threadInfo: rawThreadInfo,
+ updatesResult: {
+ newUpdates: viewerUpdates,
+ },
+ };
}
export { createInitialRolesForNewThread, modifyRole };
diff --git a/keyserver/src/responders/thread-responders.js b/keyserver/src/responders/thread-responders.js
--- a/keyserver/src/responders/thread-responders.js
+++ b/keyserver/src/responders/thread-responders.js
@@ -28,6 +28,7 @@
type ToggleMessagePinRequest,
type ToggleMessagePinResult,
type RoleModificationRequest,
+ type RoleModificationResult,
rawThreadInfoValidator,
} from 'lib/types/thread-types.js';
import { serverUpdateInfoValidator } from 'lib/types/update-types.js';
@@ -364,16 +365,29 @@
action: t.enums.of(['create_role', 'edit_role']),
});
+export const roleModificationResultValidator: TInterface<RoleModificationResult> =
+ tShape<RoleModificationResult>({
+ threadInfo: t.maybe(rawThreadInfoValidator),
+ updatesResult: tShape({
+ newUpdates: t.list(serverUpdateInfoValidator),
+ }),
+ });
+
async function roleModificationResponder(
viewer: Viewer,
input: mixed,
-): Promise<void> {
+): Promise<RoleModificationResult> {
const request = await validateInput(
viewer,
roleModificationRequestInputValidator,
input,
);
- await modifyRole(viewer, request);
+ const response = await modifyRole(viewer, request);
+ return validateOutput(
+ viewer.platformDetails,
+ roleModificationResultValidator,
+ response,
+ );
}
export {
diff --git a/lib/actions/thread-actions.js b/lib/actions/thread-actions.js
--- a/lib/actions/thread-actions.js
+++ b/lib/actions/thread-actions.js
@@ -15,6 +15,7 @@
ToggleMessagePinRequest,
ToggleMessagePinResult,
RoleModificationRequest,
+ RoleModificationPayload,
} from '../types/thread-types.js';
import type { CallServerEndpoint } from '../utils/call-server-endpoint.js';
import { values } from '../utils/objects.js';
@@ -194,12 +195,21 @@
};
};
+const modifyCommunityRoleActionTypes = Object.freeze({
+ started: 'MODIFY_COMMUNITY_ROLE_STARTED',
+ success: 'MODIFY_COMMUNITY_ROLE_SUCCESS',
+ failed: 'MODIFY_COMMUNITY_ROLE_FAILED',
+});
const modifyCommunityRole =
(
callServerEndpoint: CallServerEndpoint,
- ): ((request: RoleModificationRequest) => Promise<void>) =>
+ ): ((request: RoleModificationRequest) => Promise<RoleModificationPayload>) =>
async request => {
- await callServerEndpoint('modify_community_role', request);
+ const response = await callServerEndpoint('modify_community_role', request);
+ return {
+ threadInfo: response.threadInfo,
+ updatesResult: response.updatesResult,
+ };
};
export {
@@ -220,5 +230,6 @@
fetchThreadMedia,
toggleMessagePinActionTypes,
toggleMessagePin,
+ modifyCommunityRoleActionTypes,
modifyCommunityRole,
};
diff --git a/lib/reducers/thread-reducer.js b/lib/reducers/thread-reducer.js
--- a/lib/reducers/thread-reducer.js
+++ b/lib/reducers/thread-reducer.js
@@ -17,6 +17,7 @@
changeThreadMemberRolesActionTypes,
joinThreadActionTypes,
leaveThreadActionTypes,
+ modifyCommunityRoleActionTypes,
} from '../actions/thread-actions.js';
import {
logOutActionTypes,
@@ -220,7 +221,8 @@
action.type === changeThreadMemberRolesActionTypes.success ||
action.type === incrementalStateSyncActionType ||
action.type === processUpdatesActionType ||
- action.type === newThreadActionTypes.success
+ action.type === newThreadActionTypes.success ||
+ action.type === modifyCommunityRoleActionTypes.success
) {
const { newUpdates } = action.payload.updatesResult;
if (newUpdates.length === 0) {
diff --git a/lib/types/redux-types.js b/lib/types/redux-types.js
--- a/lib/types/redux-types.js
+++ b/lib/types/redux-types.js
@@ -104,6 +104,7 @@
NewThreadResult,
ThreadJoinPayload,
ToggleMessagePinResult,
+ RoleModificationPayload,
} from './thread-types.js';
import type { ClientUpdatesResultWithUserInfos } from './update-types.js';
import type { CurrentUserInfo, UserStore } from './user-types.js';
@@ -1159,6 +1160,22 @@
+error: true,
+payload: Error,
+loadingInfo: LoadingInfo,
+ }
+ | {
+ +type: 'MODIFY_COMMUNITY_ROLE_STARTED',
+ +loadingInfo?: LoadingInfo,
+ +payload?: void,
+ }
+ | {
+ +type: 'MODIFY_COMMUNITY_ROLE_SUCCESS',
+ +payload: RoleModificationPayload,
+ +loadingInfo: LoadingInfo,
+ }
+ | {
+ +type: 'MODIFY_COMMUNITY_ROLE_FAILED',
+ +error: true,
+ +payload: Error,
+ +loadingInfo: LoadingInfo,
};
export type ActionPayload = ?(Object | Array<*> | $ReadOnlyArray<*> | string);
diff --git a/lib/types/thread-types.js b/lib/types/thread-types.js
--- a/lib/types/thread-types.js
+++ b/lib/types/thread-types.js
@@ -439,6 +439,20 @@
+action: 'create_role' | 'edit_role',
};
+export type RoleModificationResult = {
+ +threadInfo: RawThreadInfo,
+ +updatesResult: {
+ +newUpdates: $ReadOnlyArray<ServerUpdateInfo>,
+ },
+};
+
+export type RoleModificationPayload = {
+ +threadInfo: RawThreadInfo,
+ +updatesResult: {
+ +newUpdates: $ReadOnlyArray<ClientUpdateInfo>,
+ },
+};
+
// We can show a max of 3 sidebars inline underneath their parent in the chat
// tab. If there are more, we show a button that opens a modal to see the rest
export const maxReadSidebars = 3;
diff --git a/native/roles/create-roles-header-right-button.react.js b/native/roles/create-roles-header-right-button.react.js
--- a/native/roles/create-roles-header-right-button.react.js
+++ b/native/roles/create-roles-header-right-button.react.js
@@ -4,8 +4,14 @@
import * as React from 'react';
import { TouchableOpacity, Text } from 'react-native';
-import { modifyCommunityRole } from 'lib/actions/thread-actions.js';
-import { useServerCall } from 'lib/utils/action-utils.js';
+import {
+ modifyCommunityRole,
+ modifyCommunityRoleActionTypes,
+} from 'lib/actions/thread-actions.js';
+import {
+ useServerCall,
+ useDispatchActionPromise,
+} from 'lib/utils/action-utils.js';
import type { NavigationRoute } from '../navigation/route-names';
import { useStyles } from '../themes/colors.js';
@@ -20,18 +26,23 @@
const styles = useStyles(unboundStyles);
const callModifyCommunityRole = useServerCall(modifyCommunityRole);
+ const dispatchActionPromise = useDispatchActionPromise();
const onCreate = React.useCallback(() => {
- callModifyCommunityRole({
- community: threadInfo.id,
- action,
- name: roleName,
- permissions: rolePermissions,
- });
+ dispatchActionPromise(
+ modifyCommunityRoleActionTypes,
+ callModifyCommunityRole({
+ community: threadInfo.id,
+ action,
+ name: roleName,
+ permissions: rolePermissions,
+ }),
+ );
navigation.goBack();
}, [
callModifyCommunityRole,
+ dispatchActionPromise,
threadInfo,
action,
roleName,

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 8, 1:57 AM (20 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5846769
Default Alt Text
D8422.1765159046.diff (8 KB)

Event Timeline