Page MenuHomePhabricator
Differential D6891

[desktop/web] Expose callbacks needed for desktop notifications
ClosedPublic
Actions

Authored by michal on Feb 24 2023, 9:34 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 12:50 AM
Unknown Object (File)
Wed, Apr 9, 12:18 AM
Unknown Object (File)
Tue, Apr 8, 9:19 PM
Unknown Object (File)
Tue, Apr 8, 9:18 PM
Unknown Object (File)
Sun, Apr 6, 8:19 AM
Unknown Object (File)
Wed, Apr 2, 11:08 AM
Unknown Object (File)
Wed, Apr 2, 11:08 AM
Unknown Object (File)
Wed, Apr 2, 11:08 AM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
tomek
inka
kamil
Commits
rCOMMbad1e6527635: [desktop/web] Expose callbacks needed for desktop notifications
Summary

For macos notifs we need to expose two functionalities from the web app to the desktop app:

  • setting the device_token that we will get from native macos api
  • navigate to a thread after a notification is clicked
Test Plan

Tested with the rest of the stack, if the device token is set correctly and the app navigates to a thread.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
desktop/
src/
12 lines
lib/
types/
6 lines
web/
push-notif/
33 lines

Diff 23300

View Options

desktop/src/preload.js

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import bots from 'lib/facts/bots.js'; import bots from 'lib/facts/bots.js';
import genesis from 'lib/facts/genesis.js';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types-enum.js'; import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { threadTypes } from 'lib/types/thread-types-enum.js'; import { threadTypes } from 'lib/types/thread-types-enum.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { deleteThread } from '../deleters/thread-deleters.js'; import { deleteThread } from '../deleters/thread-deleters.js';
import { createScriptViewer } from '../session/scripts.js'; import { createScriptViewer } from '../session/scripts.js';
import { fetchOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchOlmAccount } from '../updaters/olm-account-updater.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines async () => {
} }
}, },
], ],
[ [
47, 47,
() => () =>
dbQuery(SQL`ALTER TABLE cookies MODIFY COLUMN hash char(64) NOT NULL`), dbQuery(SQL`ALTER TABLE cookies MODIFY COLUMN hash char(64) NOT NULL`),
], ],
[
48,
async () => {
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL`
UPDATE memberships mm
LEFT JOIN (
SELECT m.thread, MAX(m.id) AS message FROM messages m
WHERE m.type != ${messageTypes.CREATE_SUB_THREAD}
AND m.thread = ${genesis.id}
GROUP BY m.thread
) all_users_query ON mm.thread = all_users_query.thread
LEFT JOIN (
SELECT m.thread, stm.user, MAX(m.id) AS message FROM messages m
LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD}
AND stm.thread = m.content
WHERE JSON_EXTRACT(stm.permissions, ${visibleExtractString}) IS TRUE
AND m.thread = ${genesis.id}
GROUP BY m.thread, stm.user
) last_subthread_message_for_user_query
ON mm.thread = last_subthread_message_for_user_query.thread
AND mm.user = last_subthread_message_for_user_query.user
SET
mm.last_message = GREATEST(COALESCE(all_users_query.message, 0),
COALESCE(last_subthread_message_for_user_query.message, 0))
WHERE mm.thread = ${genesis.id};
`;
await dbQuery(query);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 114 Lines • Show Last 20 Lines
View Options

lib/types/electron-types.js

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import bots from 'lib/facts/bots.js'; import bots from 'lib/facts/bots.js';
import genesis from 'lib/facts/genesis.js';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types-enum.js'; import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { threadTypes } from 'lib/types/thread-types-enum.js'; import { threadTypes } from 'lib/types/thread-types-enum.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { deleteThread } from '../deleters/thread-deleters.js'; import { deleteThread } from '../deleters/thread-deleters.js';
import { createScriptViewer } from '../session/scripts.js'; import { createScriptViewer } from '../session/scripts.js';
import { fetchOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchOlmAccount } from '../updaters/olm-account-updater.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines async () => {
} }
}, },
], ],
[ [
47, 47,
() => () =>
dbQuery(SQL`ALTER TABLE cookies MODIFY COLUMN hash char(64) NOT NULL`), dbQuery(SQL`ALTER TABLE cookies MODIFY COLUMN hash char(64) NOT NULL`),
], ],
[
48,
async () => {
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL`
UPDATE memberships mm
LEFT JOIN (
SELECT m.thread, MAX(m.id) AS message FROM messages m
WHERE m.type != ${messageTypes.CREATE_SUB_THREAD}
AND m.thread = ${genesis.id}
GROUP BY m.thread
) all_users_query ON mm.thread = all_users_query.thread
LEFT JOIN (
SELECT m.thread, stm.user, MAX(m.id) AS message FROM messages m
LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD}
AND stm.thread = m.content
WHERE JSON_EXTRACT(stm.permissions, ${visibleExtractString}) IS TRUE
AND m.thread = ${genesis.id}
GROUP BY m.thread, stm.user
) last_subthread_message_for_user_query
ON mm.thread = last_subthread_message_for_user_query.thread
AND mm.user = last_subthread_message_for_user_query.user
SET
mm.last_message = GREATEST(COALESCE(all_users_query.message, 0),
COALESCE(last_subthread_message_for_user_query.message, 0))
WHERE mm.thread = ${genesis.id};
`;
await dbQuery(query);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 114 Lines • Show Last 20 Lines
View Options

web/push-notif/push-notifs-handler.js

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import bots from 'lib/facts/bots.js'; import bots from 'lib/facts/bots.js';
import genesis from 'lib/facts/genesis.js';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types-enum.js'; import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { threadTypes } from 'lib/types/thread-types-enum.js'; import { threadTypes } from 'lib/types/thread-types-enum.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { deleteThread } from '../deleters/thread-deleters.js'; import { deleteThread } from '../deleters/thread-deleters.js';
import { createScriptViewer } from '../session/scripts.js'; import { createScriptViewer } from '../session/scripts.js';
import { fetchOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchOlmAccount } from '../updaters/olm-account-updater.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines async () => {
} }
}, },
], ],
[ [
47, 47,
() => () =>
dbQuery(SQL`ALTER TABLE cookies MODIFY COLUMN hash char(64) NOT NULL`), dbQuery(SQL`ALTER TABLE cookies MODIFY COLUMN hash char(64) NOT NULL`),
], ],
[
48,
async () => {
const visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;
const query = SQL`
UPDATE memberships mm
LEFT JOIN (
SELECT m.thread, MAX(m.id) AS message FROM messages m
WHERE m.type != ${messageTypes.CREATE_SUB_THREAD}
AND m.thread = ${genesis.id}
GROUP BY m.thread
) all_users_query ON mm.thread = all_users_query.thread
LEFT JOIN (
SELECT m.thread, stm.user, MAX(m.id) AS message FROM messages m
LEFT JOIN memberships stm ON m.type = ${messageTypes.CREATE_SUB_THREAD}
AND stm.thread = m.content
WHERE JSON_EXTRACT(stm.permissions, ${visibleExtractString}) IS TRUE
AND m.thread = ${genesis.id}
GROUP BY m.thread, stm.user
) last_subthread_message_for_user_query
ON mm.thread = last_subthread_message_for_user_query.thread
AND mm.user = last_subthread_message_for_user_query.user
SET
mm.last_message = GREATEST(COALESCE(all_users_query.message, 0),
COALESCE(last_subthread_message_for_user_query.message, 0))
WHERE mm.thread = ${genesis.id};
`;
await dbQuery(query);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 114 Lines • Show Last 20 Lines