Browse Source

Update dependencies

master
Andrew Ferrazzutti 1 month ago
parent
commit
6f62eb0054
4 changed files with 10 additions and 9 deletions
  1. +3
    -1
      SETUP.md
  2. +2
    -3
      matrix_puppeteer_line/portal.py
  3. +1
    -1
      optional-requirements.txt
  4. +4
    -4
      requirements.txt

+ 3
- 1
SETUP.md View File

@ -10,7 +10,9 @@
5. Copy `puppet/example-config.json` to `puppet/config.json`, and update it with the UUID found in the previous step
6. Launch the Puppeteer module with `yarn start` or `node src/main.js`
7. `cd` to the main directory and create a Python virtual environment with `virtualenv -p /usr/bin/python3 .venv`, and enter it with `source .venv/bin/activate`
8. Install Python requirements with `pip install -r requirements.txt`
8. Install Python requirements:
* `pip install -r requirements.txt` for base functionality
* `pip install -r optional_requirements.txt` for [end-to-bridge](https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html) encryption and metrics
9. Copy `matrix_puppeteer_line/example-config.yaml` to `config.yaml`, and update it with the proper settings to connect to your homeserver
10. Run `python -m matrix_puppeteer_line -g` to generate an appservice registration file, and update your homeserver configuration to accept it
11. Run the bridge with `python -m matrix_puppeteer_line`


+ 2
- 3
matrix_puppeteer_line/portal.py View File

@ -31,7 +31,6 @@ from mautrix.types import (EventID, MessageEventContent, RoomID, EventType, Mess
RelatesTo, RelationType)
from mautrix.errors import MatrixError
from mautrix.util.simple_lock import SimpleLock
from mautrix.util.network_retry import call_with_net_retry
from .db import Portal as DBPortal, Message as DBMessage, ReceiptReaction as DBReceiptReaction, Media as DBMedia
from .config import Config
@ -344,8 +343,8 @@ class Portal(DBPortal, BasePortal):
upload_mime_type = "application/octet-stream"
upload_file_name = None
mxc = await call_with_net_retry(intent.upload_media, data, mime_type=upload_mime_type,
filename=upload_file_name, _action="upload media")
mxc = await intent.upload_media(data, mime_type=upload_mime_type,
filename=upload_file_name)
if decryption_info:
decryption_info.url = mxc


+ 1
- 1
optional-requirements.txt View File

@ -7,4 +7,4 @@ pycryptodome>=3,<4
unpaddedbase64>=1,<2
#/metrics
prometheus_client>=0.6,<0.9
prometheus_client>=0.6,<0.11

+ 4
- 4
requirements.txt View File

@ -1,10 +1,10 @@
ruamel.yaml>=0.15.35,<0.17
ruamel.yaml>=0.15.35,<0.18
python-magic>=0.4,<0.5
commonmark>=0.8,<0.10
aiohttp>=3,<4
yarl>=1,<2
attrs>=19.1
mautrix>=0.8.2,<0.9
asyncpg>=0.20,<0.22
pillow>=4,<8
mautrix>=0.9.2,<0.10
asyncpg>=0.20,<0.23
pillow>=4,<9
qrcode>=6,<7

Loading…
Cancel
Save