Page MenuHomePhabricator
Differential D4520

[keyserver] Make mediaFromRow return a Promise
ClosedPublic
Actions

Authored by ashoat on Jul 13 2022, 9:24 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 10:35 PM
Unknown Object (File)
Sun, Mar 16, 10:04 AM
Unknown Object (File)
Sun, Mar 16, 5:13 AM
Unknown Object (File)
Fri, Mar 14, 11:35 PM
Unknown Object (File)
Thu, Mar 13, 4:10 AM
Unknown Object (File)
Wed, Mar 12, 3:30 PM
Unknown Object (File)
Tue, Mar 11, 2:08 PM
Unknown Object (File)
Mon, Mar 10, 7:54 AM
View All Files
Subscribers
• abosh
• adrian

Details

Reviewers
atul
tomek
• jon
Commits
rCOMMc9c5ad27ff0b: [keyserver] Make mediaFromRow return a Promise
Summary

In D4521 we end up needing to await getDBType() in the message-fetchers.js code because we need to parse the query results differently depending on whether it came from MySQL 5.7 or MariaDB 10.8.

Depends on D4519

Test Plan

Flow; tested in combination with next diffs

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Jul 13 2022, 9:24 AM
Herald added subscribers: • abosh, • adrian. · View Herald TranscriptJul 13 2022, 9:24 AM
Harbormaster completed remote builds in B10492: Diff 14439.Jul 13 2022, 9:34 AM
ashoat requested review of this revision.Jul 13 2022, 9:34 AM
ashoat added a child revision: D4521: [keyserver] Parse JSON columns returned from MariaDB.Jul 13 2022, 10:36 AM
• jon resigned from this revision.Jul 15 2022, 11:09 AM

Not super qualified to review js

atul accepted this revision.Jul 15 2022, 12:46 PM

Same as D4519:

The change makes sense, but explaining the higher level motivation in the Summary section could be helpful

This revision is now accepted and ready to land.Jul 15 2022, 12:46 PM
ashoat edited the summary of this revision. (Show Details)Jul 17 2022, 7:44 AM
Closed by commit rCOMMc9c5ad27ff0b: [keyserver] Make mediaFromRow return a Promise (authored by ashoat). · Explain WhyJul 17 2022, 8:13 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMMc9c5ad27ff0b: [keyserver] Make mediaFromRow return a Promise.
ashoat added a reverting change: D4834: [keyserver] Move mediaFromRow and rawMessageInfoFromRows back to not return a Promise.Aug 15 2022, 12:38 PM
ashoat added a reverting change: rCOMM47dfd97cde84: [keyserver] Move mediaFromRow and rawMessageInfoFromRows back to not return a….Aug 16 2022, 6:14 AM

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
4 lines
4 lines

Diff 14552

View Options

keyserver/src/fetchers/message-fetchers.js

Show All 37 Linesimport {
updateWindowDimensionsActionType, updateWindowDimensionsActionType,
updateCalendarCommunityFilter, updateCalendarCommunityFilter,
clearCalendarCommunityFilter, clearCalendarCommunityFilter,
} from './action-types.js'; } from './action-types.js';
import { reduceDeviceID } from './device-id-reducer.js'; import { reduceDeviceID } from './device-id-reducer.js';
import reduceNavInfo from './nav-reducer.js'; import reduceNavInfo from './nav-reducer.js';
import { import {
reducePrimaryIdentityPublicKey, reducePrimaryIdentityPublicKey,
setPrimaryIdentityPublicKey, setPrimaryIdentityKeys,
} from './primary-identity-public-key-reducer.js'; } from './primary-identity-public-key-reducer.js';
import { getVisibility } from './visibility.js'; import { getVisibility } from './visibility.js';
import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js'; import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js';
import { activeThreadSelector } from '../selectors/nav-selectors.js'; import { activeThreadSelector } from '../selectors/nav-selectors.js';
import { type NavInfo } from '../types/nav-types.js'; import { type NavInfo } from '../types/nav-types.js';
export type WindowDimensions = { width: number, height: number }; export type WindowDimensions = { width: number, height: number };
Show All 39 Linesexport type Action =
| { | {
type: 'UPDATE_WINDOW_ACTIVE', type: 'UPDATE_WINDOW_ACTIVE',
payload: boolean, payload: boolean,
} }
| { | {
type: 'SET_DEVICE_ID', type: 'SET_DEVICE_ID',
payload: string, payload: string,
} }
| { +type: 'SET_PRIMARY_IDENTITY_PUBLIC_KEY', payload: ?string } | { +type: 'SET_PRIMARY_IDENTITY_KEYS', payload: ?string }
| { | {
+type: 'UPDATE_CALENDAR_COMMUNITY_FILTER', +type: 'UPDATE_CALENDAR_COMMUNITY_FILTER',
+payload: string, +payload: string,
} }
| { | {
+type: 'CLEAR_CALENDAR_COMMUNITY_FILTER', +type: 'CLEAR_CALENDAR_COMMUNITY_FILTER',
+payload: void, +payload: void,
}; };
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines (action.type === deleteAccountActionTypes.success &&
)) ))
) { ) {
return oldState; return oldState;
} }
if ( if (
action.type !== updateNavInfoActionType && action.type !== updateNavInfoActionType &&
action.type !== setDeviceIDActionType && action.type !== setDeviceIDActionType &&
action.type !== setPrimaryIdentityPublicKey action.type !== setPrimaryIdentityKeys
) { ) {
state = baseReducer(state, action).state; state = baseReducer(state, action).state;
} }
state = { state = {
...state, ...state,
navInfo: reduceNavInfo( navInfo: reduceNavInfo(
state.navInfo, state.navInfo,
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines
View Options

keyserver/src/fetchers/upload-fetchers.js

Show All 37 Linesimport {
updateWindowDimensionsActionType, updateWindowDimensionsActionType,
updateCalendarCommunityFilter, updateCalendarCommunityFilter,
clearCalendarCommunityFilter, clearCalendarCommunityFilter,
} from './action-types.js'; } from './action-types.js';
import { reduceDeviceID } from './device-id-reducer.js'; import { reduceDeviceID } from './device-id-reducer.js';
import reduceNavInfo from './nav-reducer.js'; import reduceNavInfo from './nav-reducer.js';
import { import {
reducePrimaryIdentityPublicKey, reducePrimaryIdentityPublicKey,
setPrimaryIdentityPublicKey, setPrimaryIdentityKeys,
} from './primary-identity-public-key-reducer.js'; } from './primary-identity-public-key-reducer.js';
import { getVisibility } from './visibility.js'; import { getVisibility } from './visibility.js';
import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js'; import { filterThreadIDsBelongingToCommunity } from '../selectors/calendar-selectors.js';
import { activeThreadSelector } from '../selectors/nav-selectors.js'; import { activeThreadSelector } from '../selectors/nav-selectors.js';
import { type NavInfo } from '../types/nav-types.js'; import { type NavInfo } from '../types/nav-types.js';
export type WindowDimensions = { width: number, height: number }; export type WindowDimensions = { width: number, height: number };
Show All 39 Linesexport type Action =
| { | {
type: 'UPDATE_WINDOW_ACTIVE', type: 'UPDATE_WINDOW_ACTIVE',
payload: boolean, payload: boolean,
} }
| { | {
type: 'SET_DEVICE_ID', type: 'SET_DEVICE_ID',
payload: string, payload: string,
} }
| { +type: 'SET_PRIMARY_IDENTITY_PUBLIC_KEY', payload: ?string } | { +type: 'SET_PRIMARY_IDENTITY_KEYS', payload: ?string }
| { | {
+type: 'UPDATE_CALENDAR_COMMUNITY_FILTER', +type: 'UPDATE_CALENDAR_COMMUNITY_FILTER',
+payload: string, +payload: string,
} }
| { | {
+type: 'CLEAR_CALENDAR_COMMUNITY_FILTER', +type: 'CLEAR_CALENDAR_COMMUNITY_FILTER',
+payload: void, +payload: void,
}; };
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines (action.type === deleteAccountActionTypes.success &&
)) ))
) { ) {
return oldState; return oldState;
} }
if ( if (
action.type !== updateNavInfoActionType && action.type !== updateNavInfoActionType &&
action.type !== setDeviceIDActionType && action.type !== setDeviceIDActionType &&
action.type !== setPrimaryIdentityPublicKey action.type !== setPrimaryIdentityKeys
) { ) {
state = baseReducer(state, action).state; state = baseReducer(state, action).state;
} }
state = { state = {
...state, ...state,
navInfo: reduceNavInfo( navInfo: reduceNavInfo(
state.navInfo, state.navInfo,
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines