mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Stickers in storage service

Browse source
This commit is contained in:
Fedor Indutny 2022-08-03 10:10:49 -07:00 • committed by GitHub
parent d8a7e99c81
commit b47a906211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 1216 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

41
ts/state/ducks/stickers.ts
View file

@ -14,13 +14,13 @@ import {
downloadStickerPack as externalDownloadStickerPack,
maybeDeletePack,
} from '../../types/Stickers';
import { storageServiceUploadJob } from '../../services/storage';
import { sendStickerPackSync } from '../../shims/textsecure';
import { trigger } from '../../shims/events';
import type { NoopActionType } from './noop';
const { getRecentStickers, updateStickerLastUsed, updateStickerPackStatus } =
dataInterface;
const { getRecentStickers, updateStickerLastUsed } = dataInterface;
// State
@ -204,7 +204,7 @@ function downloadStickerPack(
function installStickerPack(
packId: string,
packKey: string,
options: { fromSync: boolean } | null = null
options: { fromSync?: boolean; fromStorageService?: boolean } = {}
): InstallStickerPackAction {
return {
type: 'stickers/INSTALL_STICKER_PACK',
@ -214,25 +214,28 @@ function installStickerPack(
async function doInstallStickerPack(
packId: string,
packKey: string,
options: { fromSync: boolean } | null
options: { fromSync?: boolean; fromStorageService?: boolean } = {}
): Promise<InstallStickerPackPayloadType> {
const { fromSync } = options || { fromSync: false };
const { fromSync = false, fromStorageService = false } = options;
const status = 'installed';
const timestamp = Date.now();
await updateStickerPackStatus(packId, status, { timestamp });
await dataInterface.installStickerPack(packId, timestamp);
if (!fromSync) {
if (!fromSync && !fromStorageService) {
// Kick this off, but don't wait for it
sendStickerPackSync(packId, packKey, true);
}
if (!fromStorageService) {
storageServiceUploadJob();
}
const recentStickers = await getRecentStickers();
return {
packId,
fromSync,
status,
status: 'installed',
installedAt: timestamp,
recentStickers: recentStickers.map(item => ({
packId: item.packId,
@ -243,7 +246,7 @@ async function doInstallStickerPack(
function uninstallStickerPack(
packId: string,
packKey: string,
options: { fromSync: boolean } | null = null
options: { fromSync?: boolean; fromStorageService?: boolean } = {}
): UninstallStickerPackAction {
return {
type: 'stickers/UNINSTALL_STICKER_PACK',
@ -253,27 +256,31 @@ function uninstallStickerPack(
async function doUninstallStickerPack(
packId: string,
packKey: string,
options: { fromSync: boolean } | null
options: { fromSync?: boolean; fromStorageService?: boolean } = {}
): Promise<UninstallStickerPackPayloadType> {
const { fromSync } = options || { fromSync: false };
const { fromSync = false, fromStorageService = false } = options;
const status = 'downloaded';
await updateStickerPackStatus(packId, status);
const timestamp = Date.now();
await dataInterface.uninstallStickerPack(packId, timestamp);
// If there are no more references, it should be removed
await maybeDeletePack(packId);
if (!fromSync) {
if (!fromSync && !fromStorageService) {
// Kick this off, but don't wait for it
sendStickerPackSync(packId, packKey, false);
}
if (!fromStorageService) {
storageServiceUploadJob();
}
const recentStickers = await getRecentStickers();
return {
packId,
fromSync,
status,
status: 'downloaded',
installedAt: undefined,
recentStickers: recentStickers.map(item => ({
packId: item.packId,
@ -313,7 +320,7 @@ function stickerPackUpdated(
function useSticker(
packId: string,
stickerId: number,
time = Date.now()
time?: number
): UseStickerAction {
return {
type: 'stickers/USE_STICKER',