Merge pull request #161 from zcyph/qrcode

switch qrencode to qrcode

Author: jagerman

.drone.jsonnet

@@ -16,7 +16,7 @@ local default_deps = [
   'python3-pil',
   'python3-protobuf',
   'python3-openssl',
-  'python3-qrencode',
+  'python3-qrcode',
   'python3-better-profanity',
   'python3-sqlalchemy',
   'python3-sqlalchemy-utils',

install-uwsgi.md

@@ -28,7 +28,7 @@ Python using:
 sudo curl -so /etc/apt/trusted.gpg.d/oxen.gpg https://deb.oxen.io/pub.gpg
 echo "deb https://deb.oxen.io $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/oxen.list
 sudo apt update
-sudo apt install python3-{oxenmq,oxenc,pyonionreq,coloredlogs,uwsgidecorators,flask,cryptography,nacl,pil,protobuf,openssl,qrencode,better-profanity,sqlalchemy,sqlalchemy-utils} uwsgi-plugin-python3
+sudo apt install python3-{oxenmq,oxenc,pyonionreq,coloredlogs,uwsgidecorators,flask,cryptography,nacl,pil,protobuf,openssl,qrcode,better-profanity,sqlalchemy,sqlalchemy-utils} uwsgi-plugin-python3
 ```
 
 If you want to use a postgresql database backend then you will also need the python3-psycopg2

setup.cfg

@@ -16,7 +16,7 @@ install_requires=
     Pillow
     protobuf
     pyOpenSSL
-    qrencode
+    qrcode
     better_profanity
     oxenmq
     oxenc

sogs/routes/views.py

@@ -7,7 +7,7 @@
 
 from io import BytesIO
 
-import qrencode
+import qrcode
 
 import PIL.Image
 
@@ -61,8 +61,8 @@ def serve_invite_qr(room):
     if not room.default_read:
         abort(http.FORBIDDEN)
 
-    img = qrencode.encode(room.url)
+    img = qrcode.make(room.url)
     data = BytesIO()
-    img = img[-1].resize((512, 512), NEAREST)
+    img = img.resize((512, 512), NEAREST)
     img.save(data, "PNG")
     return Response(data.getvalue(), mimetype="image/png")