From ab6da62e156ad0a3d266d5d0091246d1120891ec Mon Sep 17 00:00:00 2001 From: Kentai Radiquum Date: Mon, 23 Dec 2024 16:36:51 +0500 Subject: [PATCH] feat: allow uploading sticker pack to default room set fix: cannot open pack if imported by url fix: File Access Error on windows --- stickerbridge/chat_functions.py | 4 ++-- stickerbridge/matrix_reuploader.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/stickerbridge/chat_functions.py b/stickerbridge/chat_functions.py index dda9b22..f53a5ff 100644 --- a/stickerbridge/chat_functions.py +++ b/stickerbridge/chat_functions.py @@ -49,8 +49,8 @@ async def is_stickerpack_existing(client: AsyncClient, room_id: str, pack_name: return not response.content == {} -async def upload_stickerpack(client: AsyncClient, room_id: str, stickerset: MatrixStickerset): - return await client.room_put_state(room_id, 'im.ponies.room_emotes', stickerset.json(), state_key=stickerset.name()) +async def upload_stickerpack(client: AsyncClient, room_id: str, stickerset: MatrixStickerset, name): + return await client.room_put_state(room_id, 'im.ponies.room_emotes', stickerset.json(), state_key=name) async def upload_image(client: AsyncClient, image: str): diff --git a/stickerbridge/matrix_reuploader.py b/stickerbridge/matrix_reuploader.py index 62e35c7..0ef5d6f 100644 --- a/stickerbridge/matrix_reuploader.py +++ b/stickerbridge/matrix_reuploader.py @@ -1,4 +1,5 @@ import tempfile +import os from nio import MatrixRoom, AsyncClient @@ -46,9 +47,13 @@ class MatrixReuploader: converted_stickerset = await self.exporter.get_stickerset(pack_name) yield self.STATUS_UPLOADING for sticker in converted_stickerset: - with tempfile.NamedTemporaryFile('w+b') as file: + with tempfile.NamedTemporaryFile('w+b', delete=False) as file: file.write(sticker.image_data) sticker_mxc = await upload_image(self.client, file.name) + + file.close() + os.unlink(file.name) + stickerset.add_sticker(sticker_mxc, sticker.alt_text) if not stickerset.count(): @@ -56,6 +61,13 @@ class MatrixReuploader: return yield self.STATUS_UPDATING_ROOM_STATE - await upload_stickerpack(self.client, self.room.room_id, stickerset) + + name = stickerset.name() + if import_name.lower() == "default": + name = "" + elif import_name.startswith("http"): + name = import_name.split("/")[-1] + + await upload_stickerpack(self.client, self.room.room_id, stickerset, name) yield self.STATUS_OK