mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
fix(sticker): send using the pack's image info instead of downloading the sticker (#1332)
### Description Tapping a sticker did nothing. The send path downloaded and decoded the sticker purely to compute `info`, with no error handling, so any media failure meant `sendEvent` was never reached. It now uses the `info` the pack already declares, only measures the file when a pack omits it, and sends either way. Fixes #1323 #### Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation - [x] My changes generate no new warnings ### AI disclosure: - [ ] Partially AI assisted (clarify which code was AI assisted and briefly explain what it does). - [ ] Fully AI generated (explain what all the generated code does in moderate detail). <!-- Write any explanation required here, but do not generate the explanation using AI!! You must prove you understand what the code in this PR does. -->
This commit is contained in:
3 files changed
+50
-6
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Fix tapping a sticker silently not sending it.
|
||||
@@ -191,6 +191,7 @@ import {
|
||||
getImagePackReferencesForMxcWrappedInMap,
|
||||
} from '$utils/msc4459helper';
|
||||
import { ImageUsage } from '$plugins/custom-emoji';
|
||||
import { getPackImageInfo } from '$plugins/custom-emoji/utils';
|
||||
import { SerializableMap } from '$types/wrapper/SerializableMap';
|
||||
import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUrl';
|
||||
import { AttachmentSheet } from '$components/attachment-sheet/AttachmentSheet';
|
||||
@@ -1746,16 +1747,26 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
};
|
||||
|
||||
const handleStickerSelect = async (mxc: string, shortcode: string, label: string) => {
|
||||
const stickerUrl = mxcUrlToHttp(mx, mxc, useAuthentication);
|
||||
if (!stickerUrl) return;
|
||||
// Packs declare their own info, so sending does not need the file. Measuring it instead made
|
||||
// the send fail outright whenever the media fetch did.
|
||||
let info = getPackImageInfo(mx, room, ImageUsage.Sticker, mxc);
|
||||
|
||||
const { blob, image } = await loadImageElementFromMediaUrl(stickerUrl);
|
||||
const info = getImageInfo(image, blob);
|
||||
if (!info) {
|
||||
const stickerUrl = mxcUrlToHttp(mx, mxc, useAuthentication);
|
||||
if (stickerUrl) {
|
||||
try {
|
||||
const { blob, image } = await loadImageElementFromMediaUrl(stickerUrl);
|
||||
info = getImageInfo(image, blob);
|
||||
} catch (error) {
|
||||
log.error('failed to measure sticker, sending without info', { mxc }, error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const content: StickerEventContent & ReplyEventContent & IContent & IGenericMSC4459 = {
|
||||
body: label,
|
||||
url: mxc,
|
||||
info,
|
||||
info: info ?? {},
|
||||
};
|
||||
|
||||
// add the image pack reference
|
||||
@@ -1784,7 +1795,11 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
content['m.mentions'] = { ['user_ids']: [replyDraft.userId] };
|
||||
setReplyDraft(replyDraftBase);
|
||||
}
|
||||
mx.sendEvent(roomId, EventType.Sticker, content);
|
||||
try {
|
||||
await mx.sendEvent(roomId, EventType.Sticker, content);
|
||||
} catch (error) {
|
||||
log.error('failed to send sticker', { roomId }, error);
|
||||
}
|
||||
};
|
||||
|
||||
const handleGifSelect = async (gif: GifData, spoiler?: boolean) => {
|
||||
|
||||
@@ -2,6 +2,7 @@ import type { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
|
||||
|
||||
import { getAccountData, getStateEvent, getStateEvents } from '$utils/room';
|
||||
|
||||
import type { IImageInfo } from '$types/matrix/common';
|
||||
import type { ImageUsage } from './types';
|
||||
import { ImagePack } from './ImagePack';
|
||||
import type { PackMetaReader } from './PackMetaReader';
|
||||
@@ -127,3 +128,26 @@ export function getUserImagePack(mx: MatrixClient): ImagePack | undefined {
|
||||
const userImagePack = ImagePack.fromMatrixEvent(userId, packEvent);
|
||||
return userImagePack;
|
||||
}
|
||||
|
||||
/**
|
||||
* The info a pack declares for one of its images: dimensions, mimetype and size, so sending a pack
|
||||
* image never requires downloading it first.
|
||||
*/
|
||||
export function getPackImageInfo(
|
||||
mx: MatrixClient,
|
||||
room: Room,
|
||||
usage: ImageUsage,
|
||||
mxcUrl: string
|
||||
): IImageInfo | undefined {
|
||||
const userPack = getUserImagePack(mx);
|
||||
const packs = [
|
||||
...getRoomImagePacks(room),
|
||||
...(userPack ? [userPack] : []),
|
||||
...getGlobalImagePacks(mx),
|
||||
];
|
||||
for (const pack of packs) {
|
||||
const info = pack.getImages(usage).find((image) => image.url === mxcUrl)?.info;
|
||||
if (info) return info;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
Reference in new issue
Block a user