Sticker Creator: Use findIndex to determine cover sticker index
This commit is contained in:
parent
d3e27157ef
commit
9fe1dba796
|
@ -34,6 +34,9 @@ export const UploadStage: React.ComponentType = () => {
|
||||||
setComplete(i => i + 1);
|
setComplete(i => i + 1);
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
|
if (!cover) {
|
||||||
|
throw new Error('UploadStage: Cover was missing on upload!');
|
||||||
|
}
|
||||||
const packMeta = await encryptAndUpload(
|
const packMeta = await encryptAndUpload(
|
||||||
{ title, author },
|
{ title, author },
|
||||||
orderedData,
|
orderedData,
|
||||||
|
|
|
@ -29,7 +29,7 @@ export type PackMetaData = { packId: string; key: string };
|
||||||
export type EncryptAndUploadFn = (
|
export type EncryptAndUploadFn = (
|
||||||
manifest: { title: string; author: string },
|
manifest: { title: string; author: string },
|
||||||
stickers: Array<StickerData>,
|
stickers: Array<StickerData>,
|
||||||
cover: StickerImageData | undefined,
|
cover: StickerImageData,
|
||||||
onProgress?: () => unknown
|
onProgress?: () => unknown
|
||||||
) => Promise<PackMetaData>;
|
) => Promise<PackMetaData>;
|
||||||
|
|
||||||
|
|
|
@ -167,11 +167,6 @@ window.encryptAndUpload = async (
|
||||||
useWebSocket: false,
|
useWebSocket: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
const uniqueStickers = uniqBy(
|
|
||||||
[...stickers, { imageData: cover }],
|
|
||||||
'imageData'
|
|
||||||
);
|
|
||||||
|
|
||||||
const manifestProto = new Proto.StickerPack();
|
const manifestProto = new Proto.StickerPack();
|
||||||
manifestProto.title = manifest.title;
|
manifestProto.title = manifest.title;
|
||||||
manifestProto.author = manifest.author;
|
manifestProto.author = manifest.author;
|
||||||
|
@ -185,7 +180,14 @@ window.encryptAndUpload = async (
|
||||||
return s;
|
return s;
|
||||||
});
|
});
|
||||||
|
|
||||||
const coverStickerId = 0;
|
const uniqueStickers = uniqBy(
|
||||||
|
[...stickers, { imageData: cover }],
|
||||||
|
'imageData'
|
||||||
|
);
|
||||||
|
const coverStickerIndex = uniqueStickers.findIndex(
|
||||||
|
item => item.imageData?.src === cover.src
|
||||||
|
);
|
||||||
|
const coverStickerId = coverStickerIndex >= 0 ? coverStickerIndex : 0;
|
||||||
const coverStickerData = stickers[coverStickerId];
|
const coverStickerData = stickers[coverStickerId];
|
||||||
|
|
||||||
if (!coverStickerData) {
|
if (!coverStickerData) {
|
||||||
|
|
Loading…
Reference in New Issue