Page MenuHomePhabricator
Differential D9112

[lib/native] Remain consistent with url naming pattern
ClosedPublic
Actions

Authored by rohan on Sep 8 2023, 7:52 AM.
Tags
None
Referenced Files
F6285317: D9112.id30937.diff
Fri, Apr 25, 8:57 PM
F6284995: D9112.id30937.diff
Fri, Apr 25, 8:50 PM
F6284269: D9112.id30937.diff
Fri, Apr 25, 8:36 PM
F6283367: D9112.id30937.diff
Fri, Apr 25, 8:19 PM
Unknown Object (File)
Thu, Apr 24, 5:03 PM
Unknown Object (File)
Thu, Apr 24, 4:53 PM
Unknown Object (File)
Thu, Apr 17, 11:06 AM
Unknown Object (File)
Thu, Apr 17, 5:51 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
atul
ginsu
Commits
rCOMM67bdf1ce42ff: [lib/native] Remain consistent with url naming pattern
Summary

Quick follow up for this comment. Though we no longer use parseKeysFromQRCodeURL, we have parseInstallReferrerFromInviteLinkURL. I decided to
match the convention with inviteLinkUrl and qrCodeLinkUrl, so I've renamed parseInstallReferrerFromInviteLinkURL to parseInstallReferrerFromInviteLinkUrl.

Test Plan

Ran flow and confirmed no errors

Diff Detail

Repository
rCOMM Comm
Branch
names
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

rohan created this revision.Sep 8 2023, 7:52 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptSep 8 2023, 7:52 AM
rohan mentioned this in D8934: [keyserver/lib/web/native] Support external cameras scanning the QR code.Sep 8 2023, 7:53 AM
Harbormaster completed remote builds in B22452: Diff 30869.Sep 8 2023, 8:10 AM
rohan requested review of this revision.Sep 8 2023, 8:10 AM
ginsu accepted this revision.Sep 8 2023, 8:57 AM
This revision is now accepted and ready to land.Sep 8 2023, 8:57 AM
ginsu requested changes to this revision.Sep 8 2023, 9:01 AM

actually after doing a quick global search it seems like the pattern is to have url be "URL" (it's not perfect throughout the codebase, but seems like the majority of cases go with all caps) . Could we make inviteLinkUrl => inviteLinkURL and qrCodeLinkUrl => qrCodeLinkURL

This revision now requires changes to proceed.Sep 8 2023, 9:01 AM
rohan updated this revision to Diff 30874.Sep 8 2023, 9:56 AM

Rename all instances of '...Url' with '...URL'

Harbormaster completed remote builds in B22457: Diff 30874.Sep 8 2023, 10:14 AM
ginsu accepted this revision.Sep 8 2023, 5:47 PM
This revision is now accepted and ready to land.Sep 8 2023, 5:47 PM
Closed by commit rCOMM67bdf1ce42ff: [lib/native] Remain consistent with url naming pattern (authored by rohan). · Explain WhySep 11 2023, 12:49 PM
This revision was automatically updated to reflect the committed changes.
rohan added a commit: rCOMM67bdf1ce42ff: [lib/native] Remain consistent with url naming pattern.

Revision Contents
Changeset List

PathSize
lib/
facts/
4 lines
native/
navigation/
4 lines

Diff 30869

View Options

lib/facts/links.js

Show All 21 Lines
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos, rawThreadInfosFromServerThreadInfos,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js'; import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
type InitialRoles = { type InitialRoles = {
+default: RoleInfo, +default: RoleInfo,
+creator: RoleInfo, +creator: RoleInfo,
}; };
async function createInitialRolesForNewThread( async function createInitialRolesForNewThread(
threadID: string, threadID: string,
threadType: ThreadType, threadType: ThreadType,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines const hasPermission = await checkThreadPermission(
viewer, viewer,
request.community, request.community,
threadPermissions.CHANGE_ROLE, threadPermissions.CHANGE_ROLE,
); );
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_credentials'); throw new ServerError('invalid_credentials');
} }
const { community, name, permissions, action } = request; const { community, existingRoleID, name, permissions, action } = request;
for (const permission of permissions) { for (const permission of permissions) {
if (!userSurfacedPermissionsSet.has(permission)) { if (!userSurfacedPermissionsSet.has(permission)) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
} }
const [id] = await createIDs('roles', 1); const [id] = await createIDs('roles', 1);
Show All 31 Lines): Promise<RoleModificationResult> {
let query = SQL``; let query = SQL``;
if (action === 'create_role') { if (action === 'create_role') {
query = SQL` query = SQL`
INSERT INTO roles (id, thread, name, permissions, creation_time) INSERT INTO roles (id, thread, name, permissions, creation_time)
VALUES (${row}) VALUES (${row})
`; `;
} else if (action === 'edit_role') { } else if (action === 'edit_role') {
throw new ServerError("unimplemented: can't edit roles yet"); query = SQL`
UPDATE roles
SET name = ${name}, permissions = ${permissionsBlob}
WHERE id = ${existingRoleID}
`;
} }
await dbQuery(query); await dbQuery(query);
// The `updateRole` needs to occur after the role has been updated
// in the database because it will want the most up to date role info
// (permissions / name)
if (action === 'edit_role') {
atulUnsubmitted
Not Done
Inline Actions

Instead of two separate (action === 'edit_role') blocks, could we merge the two?

We could move await dbQuery(query); within both the (action === 'create_role') (line 139) and else if (action === 'edit_role') (line 144) blocks?

Not a huge deal, whatever you prefer

atul: Instead of two separate `(action === 'edit_role')` blocks, could we merge the two? We could…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah we can, that should be cleaner too

rohan: Yeah we can, that should be cleaner too
if (!existingRoleID) {
throw new ServerError('invalid_parameters');
}
const membersWithRole = threadInfo.members.filter(
memberInfo => memberInfo.role === existingRoleID,
);
await updateRole(
viewer,
{
threadID: community,
role: existingRoleID,
memberIDs: membersWithRole.map(memberInfo => memberInfo.id),
atulUnsubmitted
Not Done
Inline Actions

Should we add this .map to the end of the .filter on lines 162-164?

atul: Should we add this `.map` to the end of the `.filter` on lines 162-164?
rohanAuthorUnsubmitted
Done
Inline Actions

Sure that makes sense

rohan: Sure that makes sense
},
{ silenceNewMessages: true },
);
}
const fetchServerThreadInfosResult = await fetchServerThreadInfos({ const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community, threadID: community,
}); });
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult; const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community]; const serverThreadInfo = serverThreadInfos[community];
if (!serverThreadInfo) { if (!serverThreadInfo) {
throw new ServerError('internal_error'); throw new ServerError('internal_error');
Show All 32 Lines
View Options

native/navigation/deep-links-context-provider.react.js

Show All 21 Lines
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { import {
fetchThreadInfos, fetchThreadInfos,
fetchServerThreadInfos, fetchServerThreadInfos,
rawThreadInfosFromServerThreadInfos, rawThreadInfosFromServerThreadInfos,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js'; import { checkThreadPermission } from '../fetchers/thread-permission-fetchers.js';
import type { Viewer } from '../session/viewer.js'; import type { Viewer } from '../session/viewer.js';
import { updateRole } from '../updaters/thread-updaters.js';
type InitialRoles = { type InitialRoles = {
+default: RoleInfo, +default: RoleInfo,
+creator: RoleInfo, +creator: RoleInfo,
}; };
async function createInitialRolesForNewThread( async function createInitialRolesForNewThread(
threadID: string, threadID: string,
threadType: ThreadType, threadType: ThreadType,
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines const hasPermission = await checkThreadPermission(
viewer, viewer,
request.community, request.community,
threadPermissions.CHANGE_ROLE, threadPermissions.CHANGE_ROLE,
); );
if (!hasPermission) { if (!hasPermission) {
throw new ServerError('invalid_credentials'); throw new ServerError('invalid_credentials');
} }
const { community, name, permissions, action } = request; const { community, existingRoleID, name, permissions, action } = request;
for (const permission of permissions) { for (const permission of permissions) {
if (!userSurfacedPermissionsSet.has(permission)) { if (!userSurfacedPermissionsSet.has(permission)) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
} }
const [id] = await createIDs('roles', 1); const [id] = await createIDs('roles', 1);
Show All 31 Lines): Promise<RoleModificationResult> {
let query = SQL``; let query = SQL``;
if (action === 'create_role') { if (action === 'create_role') {
query = SQL` query = SQL`
INSERT INTO roles (id, thread, name, permissions, creation_time) INSERT INTO roles (id, thread, name, permissions, creation_time)
VALUES (${row}) VALUES (${row})
`; `;
} else if (action === 'edit_role') { } else if (action === 'edit_role') {
throw new ServerError("unimplemented: can't edit roles yet"); query = SQL`
UPDATE roles
SET name = ${name}, permissions = ${permissionsBlob}
WHERE id = ${existingRoleID}
`;
} }
await dbQuery(query); await dbQuery(query);
// The `updateRole` needs to occur after the role has been updated
// in the database because it will want the most up to date role info
// (permissions / name)
if (action === 'edit_role') {
atulUnsubmitted
Not Done
Inline Actions

Instead of two separate (action === 'edit_role') blocks, could we merge the two?

We could move await dbQuery(query); within both the (action === 'create_role') (line 139) and else if (action === 'edit_role') (line 144) blocks?

Not a huge deal, whatever you prefer

atul: Instead of two separate `(action === 'edit_role')` blocks, could we merge the two? We could…
rohanAuthorUnsubmitted
Done
Inline Actions

Yeah we can, that should be cleaner too

rohan: Yeah we can, that should be cleaner too
if (!existingRoleID) {
throw new ServerError('invalid_parameters');
}
const membersWithRole = threadInfo.members.filter(
memberInfo => memberInfo.role === existingRoleID,
);
await updateRole(
viewer,
{
threadID: community,
role: existingRoleID,
memberIDs: membersWithRole.map(memberInfo => memberInfo.id),
atulUnsubmitted
Not Done
Inline Actions

Should we add this .map to the end of the .filter on lines 162-164?

atul: Should we add this `.map` to the end of the `.filter` on lines 162-164?
rohanAuthorUnsubmitted
Done
Inline Actions

Sure that makes sense

rohan: Sure that makes sense
},
{ silenceNewMessages: true },
);
}
const fetchServerThreadInfosResult = await fetchServerThreadInfos({ const fetchServerThreadInfosResult = await fetchServerThreadInfos({
threadID: community, threadID: community,
}); });
const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult; const { threadInfos: serverThreadInfos } = fetchServerThreadInfosResult;
const serverThreadInfo = serverThreadInfos[community]; const serverThreadInfo = serverThreadInfos[community];
if (!serverThreadInfo) { if (!serverThreadInfo) {
throw new ServerError('internal_error'); throw new ServerError('internal_error');
Show All 32 Lines