Page MenuHomePhabricator
Differential D4834

[keyserver] Move mediaFromRow and rawMessageInfoFromRows back to not return a Promise
ClosedPublic
Actions

Authored by ashoat on Aug 15 2022, 12:38 PM.
Tags
None
Referenced Files
F5105418: D4834.id15622.diff
Tue, Apr 1, 7:15 AM
Unknown Object (File)
Sun, Mar 30, 9:12 PM
Unknown Object (File)
Sun, Mar 16, 10:04 AM
Unknown Object (File)
Thu, Mar 6, 4:21 AM
Unknown Object (File)
Thu, Mar 6, 4:21 AM
Unknown Object (File)
Thu, Mar 6, 4:21 AM
Unknown Object (File)
Thu, Mar 6, 4:21 AM
Unknown Object (File)
Wed, Mar 5, 7:48 AM
View All Files
Subscribers
• abosh
• adrian

Details

Reviewers
tomek
atul
Commits
rCOMM47dfd97cde84: [keyserver] Move mediaFromRow and rawMessageInfoFromRows back to not return a…
Summary

This diff does three things:

  1. Reverts D4519
  2. Reverts D4520
  3. Reverts changes to message-fetchers.js in D4521

I separated this out into its own diff because it has some interlocking parts and I wanted to make sure I did it right / it was reviewed right.

Depends on D4833

Test Plan
  1. Flow
  2. I ran keyserver locally and made sure things generally still worked

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
55 lines
9 lines

Diff 15654

View Options

keyserver/src/fetchers/message-fetchers.js

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines SQL`
CREATE TABLE sessions ( CREATE TABLE sessions (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
user bigint(20) NOT NULL, user bigint(20) NOT NULL,
cookie bigint(20) NOT NULL, cookie bigint(20) NOT NULL,
query json NOT NULL, query json NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
last_update bigint(20) NOT NULL, last_update bigint(20) NOT NULL,
last_validated bigint(20) NOT NULL last_validated bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE threads ( CREATE TABLE threads (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
type tinyint(3) NOT NULL, type tinyint(3) NOT NULL,
name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
description mediumtext COLLATE utf8mb4_bin, description mediumtext COLLATE utf8mb4_bin,
parent_thread_id bigint(20) DEFAULT NULL, parent_thread_id bigint(20) DEFAULT NULL,
Show All 30 Lines SQL`
secret varchar(255) NOT NULL, secret varchar(255) NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
extra json DEFAULT NULL extra json DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE users ( CREATE TABLE users (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL, username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,
hash char(60) COLLATE utf8mb4_bin DEFAULT NULL, hash char(60) COLLATE utf8mb4_bin NOT NULL,
avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
creation_time bigint(20) NOT NULL creation_time bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE relationships_undirected ( CREATE TABLE relationships_undirected (
user1 bigint(20) NOT NULL, user1 bigint(20) NOT NULL,
user2 bigint(20) NOT NULL, user2 bigint(20) NOT NULL,
status tinyint(1) UNSIGNED NOT NULL status tinyint(1) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines SQL`
ADD KEY entry (entry); ADD KEY entry (entry);
ALTER TABLE roles ALTER TABLE roles
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY thread (thread); ADD KEY thread (thread);
ALTER TABLE sessions ALTER TABLE sessions
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY user (user); ADD KEY user (user),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE threads ALTER TABLE threads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX parent_thread_id (parent_thread_id), ADD INDEX parent_thread_id (parent_thread_id),
ADD INDEX containing_thread_id (containing_thread_id), ADD INDEX containing_thread_id (containing_thread_id),
ADD INDEX community (community); ADD INDEX community (community);
ALTER TABLE updates ALTER TABLE updates
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX user_time (user,time), ADD INDEX user_time (user,time),
ADD INDEX target_time (target, time), ADD INDEX target_time (target, time),
ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time), ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),
ADD INDEX user_key_type_time (user, \`key\`, type, time), ADD INDEX user_key_type_time (user, \`key\`, type, time),
ADD INDEX user_key_time (user, \`key\`, time); ADD INDEX user_key_time (user, \`key\`, time);
ALTER TABLE uploads ALTER TABLE uploads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX container (container); ADD INDEX container (container);
ALTER TABLE users ALTER TABLE users
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY username (username); ADD UNIQUE KEY username (username),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE relationships_undirected ALTER TABLE relationships_undirected
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
ALTER TABLE relationships_directed ALTER TABLE relationships_directed
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines
View Options

keyserver/src/fetchers/upload-fetchers.js

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines SQL`
CREATE TABLE sessions ( CREATE TABLE sessions (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
user bigint(20) NOT NULL, user bigint(20) NOT NULL,
cookie bigint(20) NOT NULL, cookie bigint(20) NOT NULL,
query json NOT NULL, query json NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
last_update bigint(20) NOT NULL, last_update bigint(20) NOT NULL,
last_validated bigint(20) NOT NULL last_validated bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE threads ( CREATE TABLE threads (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
type tinyint(3) NOT NULL, type tinyint(3) NOT NULL,
name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
description mediumtext COLLATE utf8mb4_bin, description mediumtext COLLATE utf8mb4_bin,
parent_thread_id bigint(20) DEFAULT NULL, parent_thread_id bigint(20) DEFAULT NULL,
Show All 30 Lines SQL`
secret varchar(255) NOT NULL, secret varchar(255) NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
extra json DEFAULT NULL extra json DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE users ( CREATE TABLE users (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL, username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,
hash char(60) COLLATE utf8mb4_bin DEFAULT NULL, hash char(60) COLLATE utf8mb4_bin NOT NULL,
avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
creation_time bigint(20) NOT NULL creation_time bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE relationships_undirected ( CREATE TABLE relationships_undirected (
user1 bigint(20) NOT NULL, user1 bigint(20) NOT NULL,
user2 bigint(20) NOT NULL, user2 bigint(20) NOT NULL,
status tinyint(1) UNSIGNED NOT NULL status tinyint(1) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines SQL`
ADD KEY entry (entry); ADD KEY entry (entry);
ALTER TABLE roles ALTER TABLE roles
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY thread (thread); ADD KEY thread (thread);
ALTER TABLE sessions ALTER TABLE sessions
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY user (user); ADD KEY user (user),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE threads ALTER TABLE threads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX parent_thread_id (parent_thread_id), ADD INDEX parent_thread_id (parent_thread_id),
ADD INDEX containing_thread_id (containing_thread_id), ADD INDEX containing_thread_id (containing_thread_id),
ADD INDEX community (community); ADD INDEX community (community);
ALTER TABLE updates ALTER TABLE updates
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX user_time (user,time), ADD INDEX user_time (user,time),
ADD INDEX target_time (target, time), ADD INDEX target_time (target, time),
ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time), ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),
ADD INDEX user_key_type_time (user, \`key\`, type, time), ADD INDEX user_key_type_time (user, \`key\`, type, time),
ADD INDEX user_key_time (user, \`key\`, time); ADD INDEX user_key_time (user, \`key\`, time);
ALTER TABLE uploads ALTER TABLE uploads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX container (container); ADD INDEX container (container);
ALTER TABLE users ALTER TABLE users
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY username (username); ADD UNIQUE KEY username (username),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE relationships_undirected ALTER TABLE relationships_undirected
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
ALTER TABLE relationships_directed ALTER TABLE relationships_directed
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines