mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-04-25 19:08:04 +01:00
Use @signalapp/sqlcipher
This commit is contained in:
@@ -11,7 +11,6 @@ import {
|
||||
groupSendMemberEndorsementSchema,
|
||||
groupSendEndorsementsDataSchema,
|
||||
} from '../../types/GroupSendEndorsements';
|
||||
import { prepare } from '../Server';
|
||||
import type { ReadableDB, WritableDB } from '../Interface';
|
||||
import { sql } from '../util';
|
||||
import type { AciString } from '../../types/ServiceId';
|
||||
@@ -43,8 +42,8 @@ function _deleteAllEndorsementsForGroup(db: WritableDB, groupId: string): void {
|
||||
DELETE FROM groupSendMemberEndorsement
|
||||
WHERE groupId IS ${groupId};
|
||||
`;
|
||||
prepare<Array<unknown>>(db, deleteCombined).run(deleteCombinedParams);
|
||||
prepare<Array<unknown>>(db, deleteMembers).run(deleteMembersParams);
|
||||
db.prepare(deleteCombined).run(deleteCombinedParams);
|
||||
db.prepare(deleteMembers).run(deleteMembersParams);
|
||||
}
|
||||
|
||||
function _replaceCombinedEndorsement(
|
||||
@@ -57,9 +56,7 @@ function _replaceCombinedEndorsement(
|
||||
(groupId, expiration, endorsement)
|
||||
VALUES (${groupId}, ${expiration}, ${endorsement});
|
||||
`;
|
||||
const result = prepare<Array<unknown>>(db, insertCombined).run(
|
||||
insertCombinedParams
|
||||
);
|
||||
const result = db.prepare(insertCombined).run(insertCombinedParams);
|
||||
strictAssert(
|
||||
result.changes === 1,
|
||||
'Must update groupSendCombinedEndorsement'
|
||||
@@ -77,9 +74,7 @@ function _replaceMemberEndorsements(
|
||||
(groupId, memberAci, expiration, endorsement)
|
||||
VALUES (${groupId}, ${memberAci}, ${expiration}, ${endorsement});
|
||||
`;
|
||||
const result = prepare<Array<unknown>>(db, replaceMember).run(
|
||||
replaceMemberParams
|
||||
);
|
||||
const result = db.prepare(replaceMember).run(replaceMemberParams);
|
||||
strictAssert(
|
||||
result.changes === 1,
|
||||
'Must update groupSendMemberEndorsement'
|
||||
@@ -104,8 +99,10 @@ export function getGroupSendCombinedEndorsementExpiration(
|
||||
SELECT expiration FROM groupSendCombinedEndorsement
|
||||
WHERE groupId IS ${groupId};
|
||||
`;
|
||||
const value = prepare<Array<unknown>>(db, selectGroup)
|
||||
.pluck()
|
||||
const value = db
|
||||
.prepare(selectGroup, {
|
||||
pluck: true,
|
||||
})
|
||||
.get(selectGroupParams);
|
||||
if (value == null) {
|
||||
return null;
|
||||
@@ -128,19 +125,17 @@ export function getGroupSendEndorsementsData(
|
||||
WHERE groupId IS ${groupId}
|
||||
`;
|
||||
|
||||
const combinedEndorsement: unknown = prepare<Array<unknown>>(
|
||||
db,
|
||||
selectCombinedEndorsement
|
||||
).get(selectCombinedEndorsementParams);
|
||||
const combinedEndorsement: unknown = db
|
||||
.prepare(selectCombinedEndorsement)
|
||||
.get(selectCombinedEndorsementParams);
|
||||
|
||||
if (combinedEndorsement == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const memberEndorsements: Array<unknown> = prepare<Array<unknown>>(
|
||||
db,
|
||||
selectMemberEndorsements
|
||||
).all(selectMemberEndorsementsParams);
|
||||
const memberEndorsements: Array<unknown> = db
|
||||
.prepare(selectMemberEndorsements)
|
||||
.all(selectMemberEndorsementsParams);
|
||||
|
||||
return parseLoose(groupSendEndorsementsDataSchema, {
|
||||
combinedEndorsement,
|
||||
@@ -159,9 +154,9 @@ export function getGroupSendMemberEndorsement(
|
||||
WHERE groupId IS ${groupId}
|
||||
AND memberAci IS ${memberAci}
|
||||
`;
|
||||
const row = prepare<Array<unknown>>(db, selectMemberEndorsements).get(
|
||||
selectMemberEndorsementsParams
|
||||
);
|
||||
const row = db
|
||||
.prepare(selectMemberEndorsements)
|
||||
.get(selectMemberEndorsementsParams);
|
||||
if (row == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user