Merge remote-tracking branch 'celogeek/fixes-ios-and-more'

This commit is contained in:
Tulir Asokan 2021-10-03 11:50:27 +03:00
commit 591137ccb3
3 changed files with 4 additions and 1 deletions

View File

@ -42,6 +42,7 @@ if TYPE_CHECKING:
url: str url: str
info: MediaInfo info: MediaInfo
id: str id: str
msgtype: str
else: else:
MediaInfo = None MediaInfo = None
StickerInfo = None StickerInfo = None

View File

@ -76,4 +76,5 @@ def make_sticker(mxc: str, width: int, height: int, size: int,
"mimetype": "image/png", "mimetype": "image/png",
}, },
}, },
"msgtype": "m.sticker",
} }

View File

@ -138,11 +138,12 @@ async def main(args: argparse.Namespace) -> None:
if args.list: if args.list:
stickers: AllStickers = await client(GetAllStickersRequest(hash=0)) stickers: AllStickers = await client(GetAllStickersRequest(hash=0))
index = 1 index = 1
width = len(str(stickers.sets)) width = len(str(len(stickers.sets)))
print("Your saved sticker packs:") print("Your saved sticker packs:")
for saved_pack in stickers.sets: for saved_pack in stickers.sets:
print(f"{index:>{width}}. {saved_pack.title} " print(f"{index:>{width}}. {saved_pack.title} "
f"(t.me/addstickers/{saved_pack.short_name})") f"(t.me/addstickers/{saved_pack.short_name})")
index += 1
elif args.pack[0]: elif args.pack[0]:
input_packs = [] input_packs = []
for pack_url in args.pack[0]: for pack_url in args.pack[0]: