From 26a634999fef1055c806f84c0dfceb2c04ed622f Mon Sep 17 00:00:00 2001
From: Elliu <elliu@hashi.re>
Date: Mon, 15 Aug 2022 19:27:45 +0200
Subject: [PATCH] Fix content-type in image upload
---
stpkg | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/stpkg b/stpkg
index 6d96025..a0c2f13 100755
--- a/stpkg
+++ b/stpkg
@@ -1,9 +1,12 @@
#!/bin/bash
# TODO:
-# Scale up, not only down
+# Scale up, not only down??
# Fail on remove empty sticker pack dir
# Test trusted source
+# Preview
+# Thumbnails: https://github.com/matrix-org/synapse/issues/13039 (manually upload small version of the sticker (32x32?) and uses this as thumbnail_url)
+# Store hash of source sticker in .stickerpack-hash.json to prevent pack to reupload unchanged stickers (default, can be overriden with flag)
shopt -s nocasematch # Case insensitive
@@ -277,8 +280,8 @@ STPKG_NO_MSG='no'
STPKG_MAX_HEIGHT=128
STPKG_MAX_WIDTH=256
STPKG_GENERATE_PREVIEW="no"
-STPKG_IMAGE_TARGET_FILETYPE="png"
-STPKG_ANIMATED_TARGET_FILETYPE="gif"
+STPKG_IMAGE_TARGET_FILETYPE="image/png"
+STPKG_ANIMATED_TARGET_FILETYPE="image/gif"
__do_mount() { :; }
@@ -664,7 +667,7 @@ process_sticker_file() {
fi
- # TODO: check for gifs here
+ # TODO: correctly get max width/height for animated
DEST_WIDTH=$(file_get_width "$TEMP")
DEST_HEIGHT=$(file_get_height "$TEMP")
@@ -910,8 +913,8 @@ __do_command() {
STPKG_MAX_HEIGHT=${STPKG_MAX_HEIGHT:="128"}
STPKG_TRUST_SOURCE=${STPKG_TRUST_SOURCE:="no"}
STPKG_GENERATE_PREVIEW=${STPKG_GENERATE_PREVIEW:="no"}
- STPKG_IMAGE_TARGET_FILETYPE=${STPKG_IMAGE_TARGET_FILETYPE:="png"}
- STPKG_ANIMATED_TARGET_FILETYPE=${STPKG_ANIMATED_TARGET_FILETYPE:="gif"}
+ STPKG_IMAGE_TARGET_FILETYPE=${STPKG_IMAGE_TARGET_FILETYPE:="image/png"}
+ STPKG_ANIMATED_TARGET_FILETYPE=${STPKG_ANIMATED_TARGET_FILETYPE:="image/gif"}
;;&
--
GitLab