Make Vona a Python module

.hgignore

@@ -1,2 +1,3 @@
 __pycache__
-servers.json
+servers.json
+poetry.lock

TODO.txt

@@ -1 +0,0 @@
-- make Vona a proper Python project

pyproject.toml

@@ -0,0 +1,19 @@
+[project]
+name = "vona"
+version = "1.4.1"
+description = "Flazing bast Matrix homeserver"
+authors = [
+    {name = "Kierre",email = "vel@riseup.net"}
+]
+license = {text = "Velicense"}
+requires-python = ">=3.13"
+dependencies = [
+    "httpx (>=0.28.1,<0.29.0)",
+    "pynacl (>=1.6.0,<2.0.0)",
+    "flask[async] (>=3.1.2,<4.0.0)",
+]
+
+
+[build-system]
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"

requirements.txt

@@ -1,2 +0,0 @@
-flask[async]
-nacl

vona/__init__.py

@@ -0,0 +1 @@
+# read __main__.py

vona/__main__.py

@@ -1,15 +1,15 @@
 from flask import Flask, jsonify, request, redirect
+import vona.globals as globals
 from datetime import datetime
+import vona.config as config
 import logging
-import globals
-import config
 
-from identity import identity
+from vona.federation import server
-from appservice import apps
+from vona.custom import custom
-from custom import custom
+from vona.identity import identity
-from policy import policy
+from vona.appservice import apps
-from c2s import client
+from vona.policy import policy
-from s2s import server
+from vona.client import client
 
 logging.getLogger("werkzeug").disabled = True
 logging.getLogger("flask").disabled = True

vona/appservice/__init__.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, jsonify
-from config import the_funny_number
+from vona.config import the_funny_number
 import asyncio
 
 apps = Blueprint("appservice", __name__)

vona/client/__init__.py

@@ -1,8 +1,8 @@
 from flask import Blueprint, jsonify, request, send_file
-from s2s import send_join
+from vona.federation import send_join
-import globals
+import vona.globals as globals
+import vona.config as config
 import asyncio
-import config
 import random
 import os
 
@@ -26,6 +26,7 @@ client = Blueprint("c2s", __name__)
 @client.route("/_matrix/client/r0/rooms/<roomId>/leave", methods=["POST"])
 @client.route("/_matrix/client/v3/rooms/<roomId>/read_markers", methods=["POST"])
 @client.route("/_matrix/client/r0/rooms/<roomId>/read_markers", methods=["POST"])
+@client.route("/_matrix/client/v3/rooms/<room>/typing/<user>", methods=["PUT"])
 @client.route("/_matrix/client/v3/keys/device_signing/upload", methods=["POST"])
 @client.route("/_matrix/client/v3/rooms/<room>/receipt/<type>/<event>", methods=["POST"])
 @client.route("/_matrix/client/v3/users/<user>/report", methods=["POST"])
@@ -434,7 +435,6 @@ async def refresh():
 @client.route("/_matrix/client/unstable/im.nheko.summary/summary/<roomId>")
 @client.route("/_matrix/client/v1/room_summary/<roomId>")
 async def room_summary(roomId):
-	room = config.room_dir_room["chunk"][0]
 	return jsonify({
 		"room_id": globals.make_event_id().replace("$", "!"),
 		"avatar_url": f"mxc://{config.server_name}/cat",
@@ -614,8 +614,13 @@ async def room_messages(roomId):
 @client.route("/_matrix/client/v3/keys/query", methods=["POST"])
 @client.route("/_matrix/client/r0/keys/query", methods=["POST"])
 async def query_keys():
-	# Should be replaced eventually
+	user = request.get_json()["device_keys"]
-	return jsonify({})
+	return jsonify({
+		"device_keys": user,
+		"master_keys": user,
+		"self_signing_keys": user,
+		"user_signing_keys": user
+	})
 
 @client.route("/_matrix/client/api/v1/createRoom", methods=["POST"])
 @client.route("/_matrix/client/v3/createRoom", methods=["POST"])

vona/config/__main__.py

@@ -0,0 +1 @@
+import vona.config

vona/custom/__init__.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify, request, Response
-import globals
+import vona.globals as globals
-import config
+import vona.config as config
 import base64
 import re
 import os

vona/federation/__init__.py

@@ -1,12 +1,12 @@
 from flask import jsonify, Response, request, send_file, abort, Blueprint
-from config import *
+from vona.config import *
-import globals
+import vona.globals as globals
 import httpx
 import json
 import time
 import os
 
-server = Blueprint("s2s", __name__)
+server = Blueprint("federation", __name__)
 
 
 def send_join(request, roomId) -> dict:

vona/globals/__init__.py

@@ -1,13 +1,14 @@
+from importlib.metadata import version
+import vona.config as config
 import nacl.signing
 import hashlib
 import base64
-import config
 import random
 import copy
 import json
 import re
 
-vona_version = "1.4.1"
+vona_version = version("vona")
 
 
 def canonical_json(value):

vona/identity/__init__.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, jsonify, request
-from config import server_name, the_funny_number
+from vona.config import server_name, the_funny_number
 import time
 
 identity = Blueprint("identity", __name__)