Merge branch 'mautrix:master' into master

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.3.1 (2023-09-19)
+
+* **Security:** Updated Pillow to 10.0.1.
+* Added support for double puppeting with arbitrary `as_token`s.
+  See [docs](https://docs.mau.fi/bridges/general/double-puppeting.html#appservice-method-new) for more info.
+* Updated attachment upload API as the old one was slow.
+* Changed error for expired media to look more like what Instagram shows and
+  less like the bridge is broken.
+
 # v0.3.0 (2023-05-31)
 
 * Improved handling of some message types.

Dockerfile

@@ -2,7 +2,7 @@ FROM docker.io/alpine:3.18
 
 RUN apk add --no-cache \
       python3 py3-pip py3-setuptools py3-wheel \
-      py3-pillow \
+      #py3-pillow \
       py3-aiohttp \
       py3-magic \
       py3-ruamel.yaml \
@@ -10,7 +10,7 @@ RUN apk add --no-cache \
       #py3-prometheus-client \
       py3-paho-mqtt \
       # proxy support
-      py3-aiohttp-socks \
+      #py3-aiohttp-socks \
       py3-pysocks \
       # Other dependencies
       ca-certificates \
@@ -25,7 +25,9 @@ RUN apk add --no-cache \
       bash \
       curl \
       jq \
-      yq
+      yq \
+  # Temporarily install pillow from edge repo to get up-to-date version
+  && apk add --no-cache py3-pillow --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community
 
 COPY requirements.txt /opt/mautrix-instagram/requirements.txt
 COPY optional-requirements.txt /opt/mautrix-instagram/optional-requirements.txt

mautrix_instagram/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __author__ = "Tulir Asokan <tulir@maunium.net>"

optional-requirements.txt

@@ -13,7 +13,7 @@ pysocks
 aiohttp-socks
 
 #/imageconvert
-pillow>=4,<10
+pillow>=10.0.1,<11
 
 #/sqlite
 aiosqlite>=0.16,<0.20

requirements.txt

@@ -4,7 +4,7 @@ commonmark>=0.8,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
 attrs>=20.1
-mautrix>=0.20.0,<0.21
-asyncpg>=0.20,<0.28
+mautrix>=0.20.2,<0.21
+asyncpg>=0.20,<0.29
 pycryptodome>=3,<4
 paho-mqtt>=1.5,<2