[sqlite] Add missing spaces in getInboundP2PMessagesByID query
ClosedPublic
Actions

Authored by angelika on Nov 13 2024, 6:15 AM.

Details

Reviewers

kamil
ashoat

Commits

rCOMMadd745dbaf17: [sqlite] Add missing spaces in getInboundP2PMessagesByID query

Summary

Fixes https://phab.comm.dev/D13897?id=45735#inline-78478

Test Plan

It's just formatting changes

Diff Detail

Repository

rCOMM Comm

Branch

graszka22/spaces

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

angelika created this revision.Nov 13 2024, 6:15 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptNov 13 2024, 6:15 AM

Harbormaster returned this revision to the author for changes because remote builds failed.Nov 13 2024, 6:32 AM

Harbormaster failed remote builds in B32647: Diff 45793!

Run emscripten

Harbormaster completed remote builds in B32648: Diff 45794.Nov 13 2024, 6:55 AM

angelika requested review of this revision.Nov 13 2024, 6:55 AM

ashoat accepted this revision.Nov 13 2024, 7:23 AM

This revision is now accepted and ready to land.Nov 13 2024, 7:23 AM

Closed by commit rCOMMadd745dbaf17: [sqlite] Add missing spaces in getInboundP2PMessagesByID query (authored by angelika). · Explain WhyNov 13 2024, 11:22 AM

This revision was automatically updated to reflect the committed changes.

angelika added a commit: rCOMMadd745dbaf17: [sqlite] Add missing spaces in getInboundP2PMessagesByID query.

Revision Contents
Changeset List

Path

Size

native/

cpp/

CommonCpp/

DatabaseManagers/

SQLiteQueryExecutor.cpp

4 lines

web/

shared-worker/

_generated/

comm_query_executor.wasm

Diff 45794

View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

	// @flow			// @flow

	import invariant from 'invariant';			import invariant from 'invariant';
	import * as React from 'react';			import * as React from 'react';

	import { logOutActionTypes, useLogOut } from '../actions/user-actions.js';			import { logOutActionTypes, useLogOut } from '../actions/user-actions.js';
	import { connectionSelector } from '../selectors/keyserver-selectors.js';			import {
				connectionSelector,
				cookieSelector,
				} from '../selectors/keyserver-selectors.js';
	import { IdentityClientContext } from '../shared/identity-client-context.js';			import { IdentityClientContext } from '../shared/identity-client-context.js';
				import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js';
	import type { BaseSocketProps } from '../socket/socket.react.js';			import type { BaseSocketProps } from '../socket/socket.react.js';
	import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';			import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
	import { useSelector } from '../utils/redux-utils.js';			import { useSelector } from '../utils/redux-utils.js';
	import { usingCommServicesAccessToken } from '../utils/services-utils.js';			import { usingCommServicesAccessToken } from '../utils/services-utils.js';
	import { ashoatKeyserverID } from '../utils/validation-utils.js';			import { ashoatKeyserverID } from '../utils/validation-utils.js';

	type Props = {			type Props = {
	...BaseSocketProps,			...BaseSocketProps,
	+keyserverID: string,			+keyserverID: string,
	+socketComponent: React.ComponentType<BaseSocketProps>,			+socketComponent: React.ComponentType<BaseSocketProps>,
	};			};
	function KeyserverConnectionHandler(props: Props) {			function KeyserverConnectionHandler(props: Props) {
	const { socketComponent: Socket, keyserverID, ...rest } = props;			const { socketComponent: Socket, keyserverID, ...rest } = props;

	const dispatchActionPromise = useDispatchActionPromise();			const dispatchActionPromise = useDispatchActionPromise();
	const callLogOut = useLogOut();			const callLogOut = useLogOut();

	const hasConnectionIssue = useSelector(			const hasConnectionIssue = useSelector(
	state => !!connectionSelector(keyserverID)(state)?.connectionIssue,			state => !!connectionSelector(keyserverID)(state)?.connectionIssue,
	);			);
				const cookie = useSelector(cookieSelector(keyserverID));

	React.useEffect(() => {			React.useEffect(() => {
	if (hasConnectionIssue) {			if (hasConnectionIssue) {
	void dispatchActionPromise(logOutActionTypes, callLogOut());			void dispatchActionPromise(logOutActionTypes, callLogOut());
	}			}
	}, [callLogOut, hasConnectionIssue, dispatchActionPromise]);			}, [callLogOut, hasConnectionIssue, dispatchActionPromise]);

	const identityClient = React.useContext(			const identityClient = React.useContext(
	IdentityClientContext,			IdentityClientContext,
	)?.identityClient;			)?.identityClient;
	invariant(identityClient, 'Identity client should be set');			invariant(identityClient, 'Identity client should be set');

				const olmSessionCreator = React.useContext(OlmSessionCreatorContext);
				invariant(olmSessionCreator, 'Olm session creator should be set');

	React.useEffect(() => {			React.useEffect(() => {
	if (!usingCommServicesAccessToken) {			if (!usingCommServicesAccessToken) {
	return;			return;
	}			}

	void (async () => {			void (async () => {
	try {			try {
				const keyserverKeys =
	await identityClient.getKeyserverKeys(keyserverID);			await identityClient.getKeyserverKeys(keyserverID);

				await olmSessionCreator.notificationsSessionCreator(
				cookie,
				keyserverKeys.identityKeysBlob.notificationIdentityPublicKeys,
				keyserverKeys.notifInitializationInfo,
				keyserverID,
				);
	} catch (e) {			} catch (e) {
	console.log(			console.log(
	`Error getting keys for keyserver with id ${keyserverID}`,			`Error getting keys for keyserver with id ${keyserverID}`,
	e,			e,
	);			);
	}			}
	})();			})();
	}, [keyserverID, identityClient]);			}, [keyserverID, identityClient, olmSessionCreator, cookie]);

	if (keyserverID !== ashoatKeyserverID) {			if (keyserverID !== ashoatKeyserverID) {
	return null;			return null;
	}			}
	return <Socket {...rest} />;			return <Socket {...rest} />;
	}			}

	const Handler: React.ComponentType<Props> = React.memo<Props>(			const Handler: React.ComponentType<Props> = React.memo<Props>(
	KeyserverConnectionHandler,			KeyserverConnectionHandler,
	);			);

	export default Handler;			export default Handler;