mautrix-facebook-git-changes_2021-03-09.patch

diff --git a/PKGBUILD b/PKGBUILD
index afbd80b..7873b47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@

 _pkgbase=mautrix-facebook
 pkgname=${_pkgbase}-git
-pkgver=r447.19e9e20
+pkgver=r462.2fb76cb
 pkgrel=1
 pkgdesc="A double puppeting Facebook bridge with multi-user support for Hangouts"
 arch=(any)
@@ -11,38 +11,34 @@ license=(AGPLv3)
 url="https://github.com/tulir/mautrix-facebook"
 depends=(python
         python-aiohttp
-        python-alembic
-        python-sqlalchemy
-        python-commonmark
+        python-yarl
+        python-asyncpg
         python-ruamel-yaml
-        python-mautrix
+        python-commonmark
         python-magic-git
-        python-fbchat-asyncio
-        python-beautifulsoup4
+        python-mautrix
+        python-pycryptodome
+        python-paho-mqtt
+
         python-pillow
-        python-yaml
-        python-idna
-        python-future
-        python-pycrypto
-        python-asyncpg
-        sudo
+        python-olm
+        python-unpaddedbase64
+        python-setuptools
        )
 makedepends=(git)
 optdepends=()
 source=("${_pkgbase}::git+https://github.com/tulir/${_pkgbase}"
        "usr-share.patch"
        "README"
-       "mautrix-facebook-db-upgrade"
        "sysusers-mautrix-facebook.conf"
        "tmpfiles-mautrix-facebook.conf"
        "${_pkgbase}.service")
 sha256sums=('SKIP'
-            '637a4d95fb551394133562b3be27cc7c2d1d5893096e33c9df86f22697fb087d'
+            'd513b67b7ed70a7d4b19aece23d820e309629bc25131caf136101bb2508fc075'
             '4e7cad7b07af957fb85cc45faeee12b6ff78c7a731306984449699c300b94054'
-            '793016de273d6dc0a2fdfd1090942aa2ec3cc75c0cad333ed231bb8561fddfd0'
             'd981fb6fef944b83a4089683075ab2ae1cf095a6814e4d3bdce500d3309cb617'
             '9e7d00ea24067447fde0f3c4c08ea70760db85975d93496ed82f597cd8c863d6'
-            '76da1de365d5df8f85c90050fc8485b64c4275caa6762326ed3deebb045396a3')
+            'a405ddaff8d16e09caae4346b4721727c1d3e86ca3d8325c54e0180b771bc12f')

 pkgver() {
   cd "$srcdir/${_pkgbase}"
@@ -65,7 +61,6 @@ package() {

   cd "$srcdir/"
   install -Dm644 "$srcdir"/README -t "$pkgdir"/etc/synapse/mautrix-facebook/
-  install -Dm755 "$srcdir"/mautrix-facebook-db-upgrade -t "$pkgdir"/usr/bin/
   install -Dm644 ${_pkgbase}.service -t  "${pkgdir}"/usr/lib/systemd/system/
   install -Dm644 "$srcdir"/sysusers-mautrix-facebook.conf "$pkgdir"/usr/lib/sysusers.d/mautrix-facebook.conf
   install -Dm644 "$srcdir"/tmpfiles-mautrix-facebook.conf "$pkgdir"/usr/lib/tmpfiles.d/mautrix-facebook.conf
diff --git a/README b/README
index c1d1f91..4ec4dae 100644
--- a/README
+++ b/README
@@ -23,8 +23,5 @@ Quick Setup:
 5. Restart synapse
  sudo systemctl restart synapse

-6. Create/update the database:
- sudo mautrix-facebook-db-upgrade
-
-7. Start the bridge:
+6. Start the bridge:
  sudo systemctl start mautrix-facebook
diff --git a/mautrix-facebook-db-upgrade b/mautrix-facebook-db-upgrade
deleted file mode 100644
index 9735084..0000000
--- a/mautrix-facebook-db-upgrade
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root"
-   exit 1
-fi
-
-cd /var/lib/mautrix-facebook
-
-if [[ ! -e /var/lib/mautrix-facebook/alembic ]]; then
-  ln -s /usr/share/mautrix-facebook/alembic ./
-fi
-if [[ ! -e /var/lib/mautrix-facebook/alembic.ini ]]; then
-  ln -s /usr/share/mautrix-facebook/alembic.ini ./
-fi
-sudo -u mautrix-facebook alembic -x config=/etc/synapse/mautrix-facebook/config.yaml upgrade head
diff --git a/mautrix-facebook.service b/mautrix-facebook.service
index 85cd908..45dea9a 100644
--- a/mautrix-facebook.service
+++ b/mautrix-facebook.service
@@ -6,7 +6,7 @@ Type=simple
 User=mautrix-facebook
 Group=mautrix-facebook
 WorkingDirectory=/var/lib/mautrix-facebook/
-ExecStart=/usr/bin/python -m mautrix-facebook -c /etc/synapse/mautrix-facebook/config.yaml \
+ExecStart=/usr/bin/python -m mautrix_facebook -c /etc/synapse/mautrix-facebook/config.yaml \
           -r /etc/synapse/mautrix-facebook/registration.yaml
 Restart=always
 RestartSec=3
diff --git a/usr-share.patch b/usr-share.patch
index 8ab37d4..34a573f 100644
--- a/usr-share.patch
+++ b/usr-share.patch
@@ -2,16 +2,9 @@ diff --git a/setup.py b/setup.py
 index 794e0f9..4f2bf38 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,9 @@ setuptools.setup(
-         "example-config.yaml",
-     ]},
+@@ -70,6 +70,6 @@ setuptools.setup(
      data_files=[
--        (".", ["alembic.ini", "mautrix_facebook/example-config.yaml"]),
--        ("alembic", ["alembic/env.py"]),
--        ("alembic/versions", glob.glob("alembic/versions/*.py"))
-+        ("./share/mautrix-facebook", ["alembic.ini", "mautrix_facebook/example-config.yaml"]),
-+        ("./share/mautrix-facebook/alembic", ["alembic/env.py"]),
-+        ("./share/mautrix-facebook/alembic/versions", glob.glob("alembic/versions/*.py"))
-+
+-        (".", ["mautrix_facebook/example-config.yaml"]),
++        ("./share/mautrix-facebook", ["mautrix_facebook/example-config.yaml"]),
      ],
  )