native/ios/Comm.xcodeproj/project.pbxproj
146 ↗	(On Diff #38396)	how about adding to makefile on Android?
web/shared-worker/queries/synced-metadata-queries.test.js
11–12 ↗	(On Diff #38396)	I think you can add more specific types or you don;t have to use `?` operator below when calling methods
63–65 ↗	(On Diff #38396)	looks like the test name is not correct with what the test is doing
web/shared-worker/types/sqlite-query-executor.js
129 ↗	(On Diff #38396)	match param names here with native code for clarity

This revision is now accepted and ready to land.Mar 28 2024, 4:44 AM

will added inline comments.Mar 28 2024, 8:59 AM

native/ios/Comm.xcodeproj/project.pbxproj
146 ↗	(On Diff #38396)	I think I understand what's going on. A similar issue was mentioned in https://phab.comm.dev/D11300?vs=37980&id=38151#toc, where I didn't include `IntegrityThreadHash.h` in project.pbxproj. I just removed `SyncedMetadataEntry.h` from project.pbxproj and everything still seems to compile. This explains why `CommunityInfo.h` wasn't included in `project.pbxproj` in its diff stack. I think I can remove all references to `SyncedMetadataEntry.h` in project.pbxproj and create a follow-up task to remove `IntegrityThreadHash.h` as well. I believe this means we don't need to include them in the android Makefile

review feedback

will marked 3 inline comments as done.Mar 28 2024, 9:41 AM

Harbormaster completed remote builds in B27777: Diff 38467.Mar 28 2024, 9:55 AM

will mentioned this in D11444: [native] Fix up project.pbxproj after yarn cleaninstall.Mar 28 2024, 4:16 PM

will added inline comments.Mar 28 2024, 4:23 PM

native/ios/Comm.xcodeproj/project.pbxproj
146 ↗	(On Diff #38396)	Linear issue for removing `IntegrityThreadHash.h`: https://linear.app/comm/issue/ENG-7601/remove-integritythreadhashh-from-native-projectpbxproj

Closed by commit rCOMMf947cab385e0: [sqlite] add methods to operate on synced metadata table (authored by will). · Explain WhyApr 2 2024, 11:21 PM

This revision was automatically updated to reflect the committed changes.

will added a commit: rCOMMf947cab385e0: [sqlite] add methods to operate on synced metadata table.

Revision Contents
Changeset List

Path

Size

native/

cpp/

CommonCpp/

DatabaseManagers/

DatabaseQueryExecutor.h

7 lines

SQLiteQueryExecutor.h

6 lines

SQLiteQueryExecutor.cpp

46 lines

entities/

SyncedMetadataEntry.h

24 lines

web/

cpp/

SQLiteQueryExecutorBindings.cpp

8 lines

shared-worker/

_generated/

comm-query-executor.js

comm_query_executor.wasm

queries/

synced-metadata-queries.test.js

98 lines

types/

sqlite-query-executor.js

8 lines

Diff 38691

View Options

native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h

	// @flow			// @flow

				import t, { type TInterface } from 'tcomb';

				import { tID, tShape } from '../utils/validation-utils.js';

	export type CommunityInfo = {			export type CommunityInfo = {
	+farcasterChannelID: ?string,			+farcasterChannelID: ?string,
	};			};

	export type CommunityInfos = { +[threadID: string]: CommunityInfo };			export type CommunityInfos = { +[threadID: string]: CommunityInfo };

	export type CommunityStore = {			export type CommunityStore = {
	+communityInfos: CommunityInfos,			+communityInfos: CommunityInfos,
	};			};

	export type AddCommunityPayload = {			export type AddCommunityPayload = {
	+id: string,			+id: string,
	+newCommunityInfo: CommunityInfo,			+newCommunityInfo: CommunityInfo,
	};			};

				export type ServerCommunityInfo = {
				+id: string,
				+farcasterChannelID: ?string,
				};

				export const serverCommunityInfoValidator: TInterface<ServerCommunityInfo> =
				tShape<ServerCommunityInfo>({
				id: tID,
				farcasterChannelID: t.maybe(t.String),
				});

				export type FetchCommunityInfosResponse = {
				+communityInfos: $ReadOnlyArray<ServerCommunityInfo>,
				};

	export type CreateOrUpdateFarcasterChannelTagRequest = {			export type CreateOrUpdateFarcasterChannelTagRequest = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	};			};

	export type CreateOrUpdateFarcasterChannelTagResponse = {			export type CreateOrUpdateFarcasterChannelTagResponse = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	Show All 10 Lines

View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

	// @flow			// @flow

				import t, { type TInterface } from 'tcomb';

				import { tID, tShape } from '../utils/validation-utils.js';

	export type CommunityInfo = {			export type CommunityInfo = {
	+farcasterChannelID: ?string,			+farcasterChannelID: ?string,
	};			};

	export type CommunityInfos = { +[threadID: string]: CommunityInfo };			export type CommunityInfos = { +[threadID: string]: CommunityInfo };

	export type CommunityStore = {			export type CommunityStore = {
	+communityInfos: CommunityInfos,			+communityInfos: CommunityInfos,
	};			};

	export type AddCommunityPayload = {			export type AddCommunityPayload = {
	+id: string,			+id: string,
	+newCommunityInfo: CommunityInfo,			+newCommunityInfo: CommunityInfo,
	};			};

				export type ServerCommunityInfo = {
				+id: string,
				+farcasterChannelID: ?string,
				};

				export const serverCommunityInfoValidator: TInterface<ServerCommunityInfo> =
				tShape<ServerCommunityInfo>({
				id: tID,
				farcasterChannelID: t.maybe(t.String),
				});

				export type FetchCommunityInfosResponse = {
				+communityInfos: $ReadOnlyArray<ServerCommunityInfo>,
				};

	export type CreateOrUpdateFarcasterChannelTagRequest = {			export type CreateOrUpdateFarcasterChannelTagRequest = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	};			};

	export type CreateOrUpdateFarcasterChannelTagResponse = {			export type CreateOrUpdateFarcasterChannelTagResponse = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	Show All 10 Lines

View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

	// @flow			// @flow

				import t, { type TInterface } from 'tcomb';

				import { tID, tShape } from '../utils/validation-utils.js';

	export type CommunityInfo = {			export type CommunityInfo = {
	+farcasterChannelID: ?string,			+farcasterChannelID: ?string,
	};			};

	export type CommunityInfos = { +[threadID: string]: CommunityInfo };			export type CommunityInfos = { +[threadID: string]: CommunityInfo };

	export type CommunityStore = {			export type CommunityStore = {
	+communityInfos: CommunityInfos,			+communityInfos: CommunityInfos,
	};			};

	export type AddCommunityPayload = {			export type AddCommunityPayload = {
	+id: string,			+id: string,
	+newCommunityInfo: CommunityInfo,			+newCommunityInfo: CommunityInfo,
	};			};

				export type ServerCommunityInfo = {
				+id: string,
				+farcasterChannelID: ?string,
				};

				export const serverCommunityInfoValidator: TInterface<ServerCommunityInfo> =
				tShape<ServerCommunityInfo>({
				id: tID,
				farcasterChannelID: t.maybe(t.String),
				});

				export type FetchCommunityInfosResponse = {
				+communityInfos: $ReadOnlyArray<ServerCommunityInfo>,
				};

	export type CreateOrUpdateFarcasterChannelTagRequest = {			export type CreateOrUpdateFarcasterChannelTagRequest = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	};			};

	export type CreateOrUpdateFarcasterChannelTagResponse = {			export type CreateOrUpdateFarcasterChannelTagResponse = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	Show All 10 Lines

View Options

native/cpp/CommonCpp/DatabaseManagers/entities/SyncedMetadataEntry.h

	// @flow			// @flow

				import t, { type TInterface } from 'tcomb';

				import { tID, tShape } from '../utils/validation-utils.js';

	export type CommunityInfo = {			export type CommunityInfo = {
	+farcasterChannelID: ?string,			+farcasterChannelID: ?string,
	};			};

	export type CommunityInfos = { +[threadID: string]: CommunityInfo };			export type CommunityInfos = { +[threadID: string]: CommunityInfo };

	export type CommunityStore = {			export type CommunityStore = {
	+communityInfos: CommunityInfos,			+communityInfos: CommunityInfos,
	};			};

	export type AddCommunityPayload = {			export type AddCommunityPayload = {
	+id: string,			+id: string,
	+newCommunityInfo: CommunityInfo,			+newCommunityInfo: CommunityInfo,
	};			};

				export type ServerCommunityInfo = {
				+id: string,
				+farcasterChannelID: ?string,
				};

				export const serverCommunityInfoValidator: TInterface<ServerCommunityInfo> =
				tShape<ServerCommunityInfo>({
				id: tID,
				farcasterChannelID: t.maybe(t.String),
				});

				export type FetchCommunityInfosResponse = {
				+communityInfos: $ReadOnlyArray<ServerCommunityInfo>,
				};

	export type CreateOrUpdateFarcasterChannelTagRequest = {			export type CreateOrUpdateFarcasterChannelTagRequest = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	};			};

	export type CreateOrUpdateFarcasterChannelTagResponse = {			export type CreateOrUpdateFarcasterChannelTagResponse = {
	+commCommunityID: string,			+commCommunityID: string,
	+farcasterChannelID: string,			+farcasterChannelID: string,
	Show All 10 Lines