Page MenuHomePhabricator
Differential D4539

[web] Rename thread to chat
ClosedPublic
Actions

Authored by inka on Jul 14 2022, 8:09 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 24, 5:28 PM
Unknown Object (File)
Wed, Apr 23, 9:51 AM
Unknown Object (File)
Wed, Apr 23, 6:02 AM
Unknown Object (File)
Wed, Apr 23, 6:02 AM
Unknown Object (File)
Wed, Apr 23, 6:02 AM
Unknown Object (File)
Wed, Apr 23, 6:02 AM
Unknown Object (File)
Wed, Apr 23, 6:02 AM
Unknown Object (File)
Wed, Apr 23, 6:02 AM
View All Files
Subscribers
• abosh
• adrian
atul

Details

Reviewers
tomek
ashoat
• jacek
• abosh
Commits
rCOMM4c883c8ccb46: [web] Rename thread to chat
Summary

Linear issue:
https://linear.app/comm/issue/ENG-1357/rename-sidebar-to-thread-in-product-copy
Diff renames thread to chat in all strings displayed to the user in web

Test Plan

Checked if strings changed as expected in web.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

inka created this revision.Jul 14 2022, 8:09 AM
Herald added subscribers: • abosh, atul, • adrian. · View Herald TranscriptJul 14 2022, 8:09 AM
Harbormaster completed remote builds in B10534: Diff 14498.Jul 14 2022, 8:22 AM
inka requested review of this revision.Jul 14 2022, 8:22 AM
• abosh requested changes to this revision.Jul 14 2022, 8:28 AM
• abosh added inline comments.
web/modals/threads/confirm-leave-thread-modal.react.js
39 ↗(On Diff #14498)

Should this be capitalized to match the capitalized "t" in the old version of the code? In my opinion, the lowercase 'chat' looks nicer but wanted to confirm.

image.png (504×1 px, 66 KB)

This revision now requires changes to proceed.Jul 14 2022, 8:28 AM
• abosh mentioned this in D4469: [web] Introduce "Create new chat" button.Jul 14 2022, 9:55 AM
ashoat requested changes to this revision.Jul 14 2022, 12:58 PM
ashoat mentioned this in D4536: [lib,keyserver] Rename thread to chat.
ashoat added inline comments.
web/chat/thread-menu.react.js
217 ↗(On Diff #14498)
  1. Actually, in this rare case we are already using the correct term! "Promote" is something that applies to sidebars, which we are calling "threads" going forward.
  2. On native we use "Promote to channel", I think. Should we consider using the same language here?
web/modals/chat/sidebar-promote-modal.react.js
29 ↗(On Diff #14498)

Same comment as above – consider "Promote to channel" for consistency with native

35 ↗(On Diff #14498)

Let's say "Promoting a sidebar to a channel cannot be undone."

(I assume sidebar -> thread will be handled in a separate diff)

41 ↗(On Diff #14498)

Same comment as above – consider "Promote to channel" for consistency with native

web/modals/threads/confirm-leave-thread-modal.react.js
39 ↗(On Diff #14498)

I agree that lowercase is better here

web/modals/threads/subchannels/subchannels-modal.react.js
116 ↗(On Diff #14498)

Let's say "channel" instead of "chat", since subchannels can only exist inside another channel (or community, which we can consider a special kind of channel)

• abosh attached a referenced file: F102696: image.png. (Show Details)Jul 14 2022, 1:31 PM
inka added inline comments.Jul 15 2022, 2:00 AM
web/chat/thread-menu.react.js
217 ↗(On Diff #14498)

What should I do about the upper- and lowercase?

image.png (272×214 px, 12 KB)

We will then have the following buttons next to each other:
"Promote to channel"
"Leave Chat"
Since we're also changing "Yes, leave Chat" to "Yes, leave channel" maybe all buttons should have that casing convention?

web/modals/chat/sidebar-promote-modal.react.js
35 ↗(On Diff #14498)

Yes, I will be making separate diffs for sidebar -> thread renaming.

inka updated this revision to Diff 14514.Jul 15 2022, 2:01 AM

Rename chat to channel in some places, as requested

Harbormaster completed remote builds in B10549: Diff 14514.Jul 15 2022, 2:13 AM
inka attached a referenced file: F103289: image.png. (Show Details)Jul 15 2022, 6:40 AM
• abosh accepted this revision.Jul 15 2022, 12:08 PM
ashoat accepted this revision.Jul 17 2022, 7:40 AM

This looks great!!

Separately, one note regarding the whole diff stack – even though there might not be a formal dependency relationship, it would make reviewing a little easier if the related diffs (D4536, D4538, and this one) were put in a diff stack. More details about that workflow here.

A good rule of thumb is that if you have multiple commits in a branch, then you should have multiple diffs in a stack. In this case it's probably a good idea to have these commits in the same branch, so it's probably a good idea to have these diffs in a stack.

web/chat/thread-menu.react.js
217 ↗(On Diff #14498)

Good question!! Thanks for catching this.

I agree it would be good to be consistent. Can you submit a separate diff to change "Leave Chat" to "Leave chat"?

This revision is now accepted and ready to land.Jul 17 2022, 7:40 AM
ashoat mentioned this in D4545: [lib, native, web] Rename sidebar to thread.Jul 17 2022, 8:53 AM
inka updated this revision to Diff 14563.Jul 18 2022, 1:35 AM

Updating prevoius diffs

inka added a child revision: D4538: [native] Rename thread to chat.Jul 18 2022, 1:38 AM
inka removed a child revision: D4538: [native] Rename thread to chat.
inka added a parent revision: D4538: [native] Rename thread to chat.
inka added a child revision: D4545: [lib, native, web] Rename sidebar to thread.
Harbormaster completed remote builds in B10575: Diff 14563.Jul 18 2022, 1:47 AM
inka added a child revision: D4550: [web] Unify MenuItem casing.Jul 18 2022, 2:37 AM
inka added inline comments.
web/chat/thread-menu.react.js
217 ↗(On Diff #14498)

Sure, done!

inka marked 8 inline comments as done.Jul 18 2022, 4:35 AM
inka added a comment.Jul 18 2022, 5:14 AM
In D4539#129572, @ashoat wrote:

This looks great!!

Separately, one note regarding the whole diff stack – even though there might not be a formal dependency relationship, it would make reviewing a little easier if the related diffs (D4536, D4538, and this one) were put in a diff stack. More details about that workflow here.

A good rule of thumb is that if you have multiple commits in a branch, then you should have multiple diffs in a stack. In this case it's probably a good idea to have these commits in the same branch, so it's probably a good idea to have these diffs in a stack.

Right! I added appropriate parent and child revisions to my diffs

ashoat added a comment.Jul 18 2022, 11:36 AM

Thank you!

inka updated this revision to Diff 14626.Jul 19 2022, 3:47 AM

Rebase

Harbormaster failed remote builds in B10632: Diff 14626!Jul 19 2022, 3:53 AM
Harbormaster completed remote builds in B10632: Diff 14626.Jul 19 2022, 4:20 AM
Closed by commit rCOMM4c883c8ccb46: [web] Rename thread to chat (authored by Inka Sokołowska <inkasokolowska@Inkas-MacBook-Pro.local>, committed by • InkaSokolowska). · Explain WhyJul 19 2022, 4:29 AM
This revision was automatically updated to reflect the committed changes.
• InkaSokolowska added a commit: rCOMM4c883c8ccb46: [web] Rename thread to chat.

Revision Contents
Changeset List

Diff 14626

View Options

web/calendar/filter-panel.react.js

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines attempt_delete_file(
"Failed to delete unencrypted database."); "Failed to delete unencrypted database.");
attempt_rename_file( attempt_rename_file(
temp_encrypted_db_path, temp_encrypted_db_path,
SQLiteQueryExecutor::sqliteFilePath, SQLiteQueryExecutor::sqliteFilePath,
"Failed to move encrypted database to default location."); "Failed to move encrypted database to default location.");
Logger::log("Encryption completed successfully."); Logger::log("Encryption completed successfully.");
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
typedef bool ShouldBeInTransaction; typedef bool ShouldBeInTransaction;
typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction> typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>
SQLiteMigration; SQLiteMigration;
std::vector<std::pair<uint, SQLiteMigration>> migrations{ std::vector<std::pair<uint, SQLiteMigration>> migrations{
{{1, {create_drafts_table, true}}, {{1, {create_drafts_table, true}},
{2, {rename_threadID_to_key, true}}, {2, {rename_threadID_to_key, true}},
{4, {create_persist_account_table, true}}, {4, {create_persist_account_table, true}},
{5, {create_persist_sessions_table, true}}, {5, {create_persist_sessions_table, true}},
Show All 28 Linesvoid SQLiteQueryExecutor::migrate() const {
int current_user_version = sqlite3_column_int(user_version_stmt, 0); int current_user_version = sqlite3_column_int(user_version_stmt, 0);
sqlite3_finalize(user_version_stmt); sqlite3_finalize(user_version_stmt);
std::stringstream version_msg; std::stringstream version_msg;
version_msg << "db version: " << current_user_version << std::endl; version_msg << "db version: " << current_user_version << std::endl;
Logger::log(version_msg.str()); Logger::log(version_msg.str());
if (current_user_version == 0) {
SQLiteQueryExecutor::getStorage().sync_schema();
Logger::log("Creating new database, syncing structure with ORM storage.");
auto latest_version = migrations.back().first;
std::stringstream update_version;
update_version << "PRAGMA user_version=" << latest_version << ";";
auto update_version_str = update_version.str();
char *error;
sqlite3_exec(db, update_version_str.c_str(), nullptr, nullptr, &error);
if (error) {
std::ostringstream errorStream;
errorStream << "Error saving database version: " << error;
Logger::log(errorStream.str());
marcinUnsubmitted
Not Done
Inline Actions

How is application going to function if this error occurs? In most places we the runtime error to kill the app if database operation fails since application is not going to work correctly. I just want to know whether it is also the case here.

marcin: How is application going to function if this error occurs? In most places we the runtime error…
sqlite3_free(error);
}
return;
}
for (const auto &[idx, migration] : migrations) { for (const auto &[idx, migration] : migrations) {
if (idx <= current_user_version) { if (idx <= current_user_version) {
continue; continue;
} }
const auto &[applyMigration, shouldBeInTransaction] = migration; const auto &[applyMigration, shouldBeInTransaction] = migration;
std::stringstream migration_msg; std::stringstream migration_msg;
Show All 28 Linesvoid SQLiteQueryExecutor::assign_encryption_key() {
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
std::string encryptionKey = comm::crypto::Tools::generateRandomHexString( std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
SQLiteQueryExecutor::sqlcipherEncryptionKeySize); SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
commSecureStore.set( commSecureStore.set(
SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey); SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
SQLiteQueryExecutor::encryptionKey = encryptionKey; SQLiteQueryExecutor::encryptionKey = encryptionKey;
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
void SQLiteQueryExecutor::initialize(std::string &databasePath) { void SQLiteQueryExecutor::initialize(std::string &databasePath) {
std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() { std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
SQLiteQueryExecutor::sqliteFilePath = databasePath; SQLiteQueryExecutor::sqliteFilePath = databasePath;
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
folly::Optional<std::string> maybeEncryptionKey = folly::Optional<std::string> maybeEncryptionKey =
commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID); commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);
if (file_exists(databasePath) && maybeEncryptionKey) { if (file_exists(databasePath) && maybeEncryptionKey) {
▲ Show 20 Lines • Show All 277 Lines • Show Last 20 Lines
View Options

web/chat/chat-input-bar.react.js

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines attempt_delete_file(
"Failed to delete unencrypted database."); "Failed to delete unencrypted database.");
attempt_rename_file( attempt_rename_file(
temp_encrypted_db_path, temp_encrypted_db_path,
SQLiteQueryExecutor::sqliteFilePath, SQLiteQueryExecutor::sqliteFilePath,
"Failed to move encrypted database to default location."); "Failed to move encrypted database to default location.");
Logger::log("Encryption completed successfully."); Logger::log("Encryption completed successfully.");
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
typedef bool ShouldBeInTransaction; typedef bool ShouldBeInTransaction;
typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction> typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>
SQLiteMigration; SQLiteMigration;
std::vector<std::pair<uint, SQLiteMigration>> migrations{ std::vector<std::pair<uint, SQLiteMigration>> migrations{
{{1, {create_drafts_table, true}}, {{1, {create_drafts_table, true}},
{2, {rename_threadID_to_key, true}}, {2, {rename_threadID_to_key, true}},
{4, {create_persist_account_table, true}}, {4, {create_persist_account_table, true}},
{5, {create_persist_sessions_table, true}}, {5, {create_persist_sessions_table, true}},
Show All 28 Linesvoid SQLiteQueryExecutor::migrate() const {
int current_user_version = sqlite3_column_int(user_version_stmt, 0); int current_user_version = sqlite3_column_int(user_version_stmt, 0);
sqlite3_finalize(user_version_stmt); sqlite3_finalize(user_version_stmt);
std::stringstream version_msg; std::stringstream version_msg;
version_msg << "db version: " << current_user_version << std::endl; version_msg << "db version: " << current_user_version << std::endl;
Logger::log(version_msg.str()); Logger::log(version_msg.str());
if (current_user_version == 0) {
SQLiteQueryExecutor::getStorage().sync_schema();
Logger::log("Creating new database, syncing structure with ORM storage.");
auto latest_version = migrations.back().first;
std::stringstream update_version;
update_version << "PRAGMA user_version=" << latest_version << ";";
auto update_version_str = update_version.str();
char *error;
sqlite3_exec(db, update_version_str.c_str(), nullptr, nullptr, &error);
if (error) {
std::ostringstream errorStream;
errorStream << "Error saving database version: " << error;
Logger::log(errorStream.str());
marcinUnsubmitted
Not Done
Inline Actions

How is application going to function if this error occurs? In most places we the runtime error to kill the app if database operation fails since application is not going to work correctly. I just want to know whether it is also the case here.

marcin: How is application going to function if this error occurs? In most places we the runtime error…
sqlite3_free(error);
}
return;
}
for (const auto &[idx, migration] : migrations) { for (const auto &[idx, migration] : migrations) {
if (idx <= current_user_version) { if (idx <= current_user_version) {
continue; continue;
} }
const auto &[applyMigration, shouldBeInTransaction] = migration; const auto &[applyMigration, shouldBeInTransaction] = migration;
std::stringstream migration_msg; std::stringstream migration_msg;
Show All 28 Linesvoid SQLiteQueryExecutor::assign_encryption_key() {
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
std::string encryptionKey = comm::crypto::Tools::generateRandomHexString( std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
SQLiteQueryExecutor::sqlcipherEncryptionKeySize); SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
commSecureStore.set( commSecureStore.set(
SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey); SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
SQLiteQueryExecutor::encryptionKey = encryptionKey; SQLiteQueryExecutor::encryptionKey = encryptionKey;
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
void SQLiteQueryExecutor::initialize(std::string &databasePath) { void SQLiteQueryExecutor::initialize(std::string &databasePath) {
std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() { std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
SQLiteQueryExecutor::sqliteFilePath = databasePath; SQLiteQueryExecutor::sqliteFilePath = databasePath;
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
folly::Optional<std::string> maybeEncryptionKey = folly::Optional<std::string> maybeEncryptionKey =
commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID); commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);
if (file_exists(databasePath) && maybeEncryptionKey) { if (file_exists(databasePath) && maybeEncryptionKey) {
▲ Show 20 Lines • Show All 277 Lines • Show Last 20 Lines
View Options

web/chat/chat-thread-list.react.js

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines attempt_delete_file(
"Failed to delete unencrypted database."); "Failed to delete unencrypted database.");
attempt_rename_file( attempt_rename_file(
temp_encrypted_db_path, temp_encrypted_db_path,
SQLiteQueryExecutor::sqliteFilePath, SQLiteQueryExecutor::sqliteFilePath,
"Failed to move encrypted database to default location."); "Failed to move encrypted database to default location.");
Logger::log("Encryption completed successfully."); Logger::log("Encryption completed successfully.");
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
typedef bool ShouldBeInTransaction; typedef bool ShouldBeInTransaction;
typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction> typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>
SQLiteMigration; SQLiteMigration;
std::vector<std::pair<uint, SQLiteMigration>> migrations{ std::vector<std::pair<uint, SQLiteMigration>> migrations{
{{1, {create_drafts_table, true}}, {{1, {create_drafts_table, true}},
{2, {rename_threadID_to_key, true}}, {2, {rename_threadID_to_key, true}},
{4, {create_persist_account_table, true}}, {4, {create_persist_account_table, true}},
{5, {create_persist_sessions_table, true}}, {5, {create_persist_sessions_table, true}},
Show All 28 Linesvoid SQLiteQueryExecutor::migrate() const {
int current_user_version = sqlite3_column_int(user_version_stmt, 0); int current_user_version = sqlite3_column_int(user_version_stmt, 0);
sqlite3_finalize(user_version_stmt); sqlite3_finalize(user_version_stmt);
std::stringstream version_msg; std::stringstream version_msg;
version_msg << "db version: " << current_user_version << std::endl; version_msg << "db version: " << current_user_version << std::endl;
Logger::log(version_msg.str()); Logger::log(version_msg.str());
if (current_user_version == 0) {
SQLiteQueryExecutor::getStorage().sync_schema();
Logger::log("Creating new database, syncing structure with ORM storage.");
auto latest_version = migrations.back().first;
std::stringstream update_version;
update_version << "PRAGMA user_version=" << latest_version << ";";
auto update_version_str = update_version.str();
char *error;
sqlite3_exec(db, update_version_str.c_str(), nullptr, nullptr, &error);
if (error) {
std::ostringstream errorStream;
errorStream << "Error saving database version: " << error;
Logger::log(errorStream.str());
marcinUnsubmitted
Not Done
Inline Actions

How is application going to function if this error occurs? In most places we the runtime error to kill the app if database operation fails since application is not going to work correctly. I just want to know whether it is also the case here.

marcin: How is application going to function if this error occurs? In most places we the runtime error…
sqlite3_free(error);
}
return;
}
for (const auto &[idx, migration] : migrations) { for (const auto &[idx, migration] : migrations) {
if (idx <= current_user_version) { if (idx <= current_user_version) {
continue; continue;
} }
const auto &[applyMigration, shouldBeInTransaction] = migration; const auto &[applyMigration, shouldBeInTransaction] = migration;
std::stringstream migration_msg; std::stringstream migration_msg;
Show All 28 Linesvoid SQLiteQueryExecutor::assign_encryption_key() {
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
std::string encryptionKey = comm::crypto::Tools::generateRandomHexString( std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
SQLiteQueryExecutor::sqlcipherEncryptionKeySize); SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
commSecureStore.set( commSecureStore.set(
SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey); SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
SQLiteQueryExecutor::encryptionKey = encryptionKey; SQLiteQueryExecutor::encryptionKey = encryptionKey;
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
void SQLiteQueryExecutor::initialize(std::string &databasePath) { void SQLiteQueryExecutor::initialize(std::string &databasePath) {
std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() { std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
SQLiteQueryExecutor::sqliteFilePath = databasePath; SQLiteQueryExecutor::sqliteFilePath = databasePath;
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
folly::Optional<std::string> maybeEncryptionKey = folly::Optional<std::string> maybeEncryptionKey =
commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID); commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);
if (file_exists(databasePath) && maybeEncryptionKey) { if (file_exists(databasePath) && maybeEncryptionKey) {
▲ Show 20 Lines • Show All 277 Lines • Show Last 20 Lines
View Options

web/chat/thread-menu.react.js

Show First 20 Lines • Show All 487 Lines • ▼ Show 20 Lines attempt_delete_file(
"Failed to delete unencrypted database."); "Failed to delete unencrypted database.");
attempt_rename_file( attempt_rename_file(
temp_encrypted_db_path, temp_encrypted_db_path,
SQLiteQueryExecutor::sqliteFilePath, SQLiteQueryExecutor::sqliteFilePath,
"Failed to move encrypted database to default location."); "Failed to move encrypted database to default location.");
Logger::log("Encryption completed successfully."); Logger::log("Encryption completed successfully.");
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
typedef bool ShouldBeInTransaction; typedef bool ShouldBeInTransaction;
typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction> typedef std::pair<std::function<bool(sqlite3 *)>, ShouldBeInTransaction>
SQLiteMigration; SQLiteMigration;
std::vector<std::pair<uint, SQLiteMigration>> migrations{ std::vector<std::pair<uint, SQLiteMigration>> migrations{
{{1, {create_drafts_table, true}}, {{1, {create_drafts_table, true}},
{2, {rename_threadID_to_key, true}}, {2, {rename_threadID_to_key, true}},
{4, {create_persist_account_table, true}}, {4, {create_persist_account_table, true}},
{5, {create_persist_sessions_table, true}}, {5, {create_persist_sessions_table, true}},
Show All 28 Linesvoid SQLiteQueryExecutor::migrate() const {
int current_user_version = sqlite3_column_int(user_version_stmt, 0); int current_user_version = sqlite3_column_int(user_version_stmt, 0);
sqlite3_finalize(user_version_stmt); sqlite3_finalize(user_version_stmt);
std::stringstream version_msg; std::stringstream version_msg;
version_msg << "db version: " << current_user_version << std::endl; version_msg << "db version: " << current_user_version << std::endl;
Logger::log(version_msg.str()); Logger::log(version_msg.str());
if (current_user_version == 0) {
SQLiteQueryExecutor::getStorage().sync_schema();
Logger::log("Creating new database, syncing structure with ORM storage.");
auto latest_version = migrations.back().first;
std::stringstream update_version;
update_version << "PRAGMA user_version=" << latest_version << ";";
auto update_version_str = update_version.str();
char *error;
sqlite3_exec(db, update_version_str.c_str(), nullptr, nullptr, &error);
if (error) {
std::ostringstream errorStream;
errorStream << "Error saving database version: " << error;
Logger::log(errorStream.str());
marcinUnsubmitted
Not Done
Inline Actions

How is application going to function if this error occurs? In most places we the runtime error to kill the app if database operation fails since application is not going to work correctly. I just want to know whether it is also the case here.

marcin: How is application going to function if this error occurs? In most places we the runtime error…
sqlite3_free(error);
}
return;
}
for (const auto &[idx, migration] : migrations) { for (const auto &[idx, migration] : migrations) {
if (idx <= current_user_version) { if (idx <= current_user_version) {
continue; continue;
} }
const auto &[applyMigration, shouldBeInTransaction] = migration; const auto &[applyMigration, shouldBeInTransaction] = migration;
std::stringstream migration_msg; std::stringstream migration_msg;
Show All 28 Linesvoid SQLiteQueryExecutor::assign_encryption_key() {
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
std::string encryptionKey = comm::crypto::Tools::generateRandomHexString( std::string encryptionKey = comm::crypto::Tools::generateRandomHexString(
SQLiteQueryExecutor::sqlcipherEncryptionKeySize); SQLiteQueryExecutor::sqlcipherEncryptionKeySize);
commSecureStore.set( commSecureStore.set(
SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey); SQLiteQueryExecutor::secureStoreEncryptionKeyID, encryptionKey);
SQLiteQueryExecutor::encryptionKey = encryptionKey; SQLiteQueryExecutor::encryptionKey = encryptionKey;
} }
auto &SQLiteQueryExecutor::getStorage() {
static auto storage = make_storage(
SQLiteQueryExecutor::sqliteFilePath,
make_index("messages_idx_thread_time", &Message::thread, &Message::time),
make_index("media_idx_container", &Media::container),
make_table(
"drafts",
make_column("key", &Draft::key, unique(), primary_key()),
make_column("text", &Draft::text)),
make_table(
"messages",
make_column("id", &Message::id, unique(), primary_key()),
make_column("local_id", &Message::local_id),
make_column("thread", &Message::thread),
make_column("user", &Message::user),
make_column("type", &Message::type),
make_column("future_type", &Message::future_type),
make_column("content", &Message::content),
make_column("time", &Message::time)),
make_table(
"olm_persist_account",
make_column("id", &OlmPersistAccount::id, unique(), primary_key()),
make_column("account_data", &OlmPersistAccount::account_data)),
make_table(
"olm_persist_sessions",
make_column(
"target_user_id",
&OlmPersistSession::target_user_id,
unique(),
primary_key()),
make_column("session_data", &OlmPersistSession::session_data)),
make_table(
"media",
make_column("id", &Media::id, unique(), primary_key()),
make_column("container", &Media::container),
make_column("thread", &Media::thread),
make_column("uri", &Media::uri),
make_column("type", &Media::type),
make_column("extras", &Media::extras)),
make_table(
"threads",
make_column("id", &Thread::id, unique(), primary_key()),
make_column("type", &Thread::type),
make_column("name", &Thread::name),
make_column("description", &Thread::description),
make_column("color", &Thread::color),
make_column("creation_time", &Thread::creation_time),
make_column("parent_thread_id", &Thread::parent_thread_id),
make_column("containing_thread_id", &Thread::containing_thread_id),
make_column("community", &Thread::community),
make_column("members", &Thread::members),
make_column("roles", &Thread::roles),
make_column("current_user", &Thread::current_user),
make_column("source_message_id", &Thread::source_message_id),
make_column("replies_count", &Thread::replies_count)),
make_table(
"metadata",
make_column("name", &Metadata::name, unique(), primary_key()),
make_column("data", &Metadata::data)));
storage.on_open = on_database_open;
return storage;
}
void SQLiteQueryExecutor::initialize(std::string &databasePath) { void SQLiteQueryExecutor::initialize(std::string &databasePath) {
std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() { std::call_once(SQLiteQueryExecutor::initialized, [&databasePath]() {
SQLiteQueryExecutor::sqliteFilePath = databasePath; SQLiteQueryExecutor::sqliteFilePath = databasePath;
CommSecureStore commSecureStore{}; CommSecureStore commSecureStore{};
folly::Optional<std::string> maybeEncryptionKey = folly::Optional<std::string> maybeEncryptionKey =
commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID); commSecureStore.get(SQLiteQueryExecutor::secureStoreEncryptionKeyID);
if (file_exists(databasePath) && maybeEncryptionKey) { if (file_exists(databasePath) && maybeEncryptionKey) {
▲ Show 20 Lines • Show All 277 Lines • Show Last 20 Lines
View Options

web/modals/chat/sidebar-promote-modal.react.js

Loading...
View Options

web/modals/threads/cant-leave-thread-modal.react.js

Loading...
View Options

web/modals/threads/confirm-leave-thread-modal.react.js

Loading...
View Options

web/modals/threads/members/members-list.react.js

Loading...
View Options

web/modals/threads/new-thread-modal.react.js

Loading...
View Options

web/modals/threads/settings/thread-settings-delete-tab.react.js

Loading...
View Options

web/modals/threads/settings/thread-settings-general-tab.react.js

Loading...
View Options

web/modals/threads/settings/thread-settings-modal.react.js

Loading...
View Options

web/modals/threads/settings/thread-settings-privacy-tab.react.js

Loading...
View Options

web/modals/threads/subchannels/subchannels-modal.react.js

Loading...