aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2021-10-03 11:50:27 +0300
committerTulir Asokan <tulir@maunium.net>2021-10-03 11:50:27 +0300
commit591137ccb39bad45a245017c72c180031fe41470 (patch)
tree3ebd591434b28ab8ba03aa760e73a5cf984e7b4f
parentf29c165357ed116ba0af2f8589ae0a10d959e7e2 (diff)
parent9443e79e97f45d0ed6c974fc23ec2ee510a4737b (diff)
Merge remote-tracking branch 'celogeek/fixes-ios-and-more'
-rw-r--r--sticker/lib/matrix.py1
-rw-r--r--sticker/lib/util.py1
-rw-r--r--sticker/stickerimport.py3
3 files changed, 4 insertions, 1 deletions
diff --git a/sticker/lib/matrix.py b/sticker/lib/matrix.py
index cf405d8..e506e83 100644
--- a/sticker/lib/matrix.py
+++ b/sticker/lib/matrix.py
@@ -42,6 +42,7 @@ if TYPE_CHECKING:
url: str
info: MediaInfo
id: str
+ msgtype: str
else:
MediaInfo = None
StickerInfo = None
diff --git a/sticker/lib/util.py b/sticker/lib/util.py
index 2d58c82..2b3fe2a 100644
--- a/sticker/lib/util.py
+++ b/sticker/lib/util.py
@@ -76,4 +76,5 @@ def make_sticker(mxc: str, width: int, height: int, size: int,
"mimetype": "image/png",
},
},
+ "msgtype": "m.sticker",
}
diff --git a/sticker/stickerimport.py b/sticker/stickerimport.py
index c852e78..f153e98 100644
--- a/sticker/stickerimport.py
+++ b/sticker/stickerimport.py
@@ -138,11 +138,12 @@ async def main(args: argparse.Namespace) -> None:
if args.list:
stickers: AllStickers = await client(GetAllStickersRequest(hash=0))
index = 1
- width = len(str(stickers.sets))
+ width = len(str(len(stickers.sets)))
print("Your saved sticker packs:")
for saved_pack in stickers.sets:
print(f"{index:>{width}}. {saved_pack.title} "
f"(t.me/addstickers/{saved_pack.short_name})")
+ index += 1
elif args.pack[0]:
input_packs = []
for pack_url in args.pack[0]:
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage