Use lower timeout for media download reqs

mauigpapi/http/base.py

@@ -166,7 +166,7 @@ class BaseAndroidAPI:
         self.http = ClientSession(connector=connector, cookie_jar=cookie_jar)
         return None
 
-    def raw_http_get(self, url: URL | str):
+    def raw_http_get(self, url: URL | str, **kwargs):
         if isinstance(url, str):
             url = URL(url, encoded=True)
         return self.http.get(
@@ -175,6 +175,7 @@ class BaseAndroidAPI:
                 "user-agent": self.state.user_agent,
                 "accept-language": self.state.device.language.replace("_", "-"),
             },
+            **kwargs,
         )
 
     async def std_http_post(

mautrix_instagram/portal.py

@@ -28,6 +28,7 @@ import re
 import sqlite3
 import time
 
+from aiohttp import ClientTimeout
 from yarl import URL
 import asyncpg
 import magic
@@ -869,8 +870,15 @@ class Portal(DBPortal, BasePortal):
     async def _download_instagram_file(
         self, source: u.User, url: str
     ) -> tuple[Optional[bytes], str]:
+        # Use a low timeout for media reqs so we quickly retry them if they get stuck
+        timeout = ClientTimeout(
+            total=30,
+            sock_connect=5,
+            sock_read=10,
+        )
+
         async def download():
-            async with source.client.raw_http_get(url) as resp:
+            async with source.client.raw_http_get(url, timeout=timeout) as resp:
                 try:
                     length = int(resp.headers["Content-Length"])
                 except KeyError: