Page MenuHomePhabricator
Differential D12739

[native] Introduce getRelatedMessages to CommCoreModule
ClosedPublic
Actions

Authored by ashoat on Jul 14 2024, 6:12 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 5:53 AM
Unknown Object (File)
Tue, Mar 11, 10:25 PM
Unknown Object (File)
Tue, Mar 11, 8:05 PM
Unknown Object (File)
Tue, Mar 11, 9:39 AM
Unknown Object (File)
Wed, Feb 26, 6:02 AM
Unknown Object (File)
Wed, Feb 26, 6:02 AM
Unknown Object (File)
Wed, Feb 26, 6:02 AM
Unknown Object (File)
Wed, Feb 26, 6:02 AM
View All Files
Subscribers
None

Details

Reviewers
kamil
tomek
marcin
Commits
rCOMMa272644bd405: [native] Introduce getRelatedMessages to CommCoreModule
Summary

This diff introduces the code on native to interface with our new getRelatedMessages API.

Depends on D12738

Test Plan
  1. In combination with later diffs, I tested a patch on both native and web that hit getRelatedMessages with a specific message ID and confirmed that it returned the message
  2. I tested a message ID that did not exist and confirmed I got undefined back

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Jul 14 2024, 6:12 PM
ashoat added a child revision: D12740: [lib] Introduce getRelatedMessages to SQLiteAPI.
Harbormaster completed remote builds in B30312: Diff 42272.Jul 14 2024, 6:34 PM
ashoat requested review of this revision.Jul 14 2024, 6:34 PM
marcin accepted this revision.Jul 15 2024, 2:58 AM
marcin added inline comments.
native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
2616–2620 ↗(On Diff #42272)

This formatting looks strange. Did you run yarn clang-format-all? It doesn't get executed automatically during commit, Dev must execute it manually to achieve formatting.

This revision is now accepted and ready to land.Jul 15 2024, 2:58 AM
marcin added inline comments.Jul 15 2024, 4:07 AM
native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
2616–2620 ↗(On Diff #42272)

Sorry for the confusion - after talking to @kamil I found that this sentence:

It doesn't get executed automatically during commit, Dev must execute it manually to achieve formatting.

is only true if someone has commit hooks disabled.

ashoat added inline comments.Jul 15 2024, 4:59 AM
native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
2616–2620 ↗(On Diff #42272)

I can confirm that running yarn clang-format-all yields no changes

ashoat retitled this revision from [native] Introduce getLatestMessageEdit to CommCoreModule to [native] Introduce getRelatedMessages to CommCoreModule.Jul 15 2024, 7:02 PM
ashoat edited the summary of this revision. (Show Details)
ashoat edited the test plan for this revision. (Show Details)
ashoat edited the test plan for this revision. (Show Details)
ashoat updated this revision to Diff 42311.Jul 15 2024, 7:14 PM

Rework into getRelatedMessages, which can be reused for rendering search results

ashoat retitled this revision from [native] Introduce getRelatedMessages to CommCoreModule to [native] Introduce getRelatedMessages to CommCoreModule.Jul 15 2024, 7:14 PM
ashoat edited the summary of this revision. (Show Details)
Harbormaster failed remote builds in B30349: Diff 42311!Jul 15 2024, 7:30 PM
ashoat updated this revision to Diff 42317.Jul 15 2024, 7:58 PM

Rebase

Harbormaster failed remote builds in B30355: Diff 42317!Jul 15 2024, 8:35 PM
ashoat updated this revision to Diff 42334.Jul 16 2024, 4:09 AM

Rebase

Harbormaster completed remote builds in B30371: Diff 42334.Jul 16 2024, 4:26 AM
Closed by commit rCOMMa272644bd405: [native] Introduce getRelatedMessages to CommCoreModule (authored by ashoat). · Explain WhyJul 16 2024, 6:46 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMMa272644bd405: [native] Introduce getRelatedMessages to CommCoreModule.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
2 lines
36 lines
_generated/
schema/
1 line

Diff 42370

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/_generated/commJSI-generated.cpp

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/_generated/commJSI.h

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

native/schema/CommCoreModuleSchema.js

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines