diff --git a/json-api/Makefile b/json-api/Makefile index 4c8f1e8..199a3b9 100644 --- a/json-api/Makefile +++ b/json-api/Makefile @@ -7,5 +7,8 @@ dep: run: cargo run --features rtc --release -- -s +test: + cd ../ && bash scripts/run-api-tests.sh + clean: cargo clean diff --git a/json-api/client-tests/config.py b/json-api/client-tests/config.py index 44c965d..73ce845 100644 --- a/json-api/client-tests/config.py +++ b/json-api/client-tests/config.py @@ -37,7 +37,7 @@ class Admin: 'secret': self.secret, 'jwt': self.jwt, } - container = {'user': acc, 'server': str(server)} + container = {'user': acc, 'server': str(self.server)} return str(container) def create_admin() -> Admin : @@ -57,6 +57,6 @@ def create_admin() -> Admin : else: return Admin(user, server) except Exception as e: - print(f'General exception caught in parsing => {e}', file=sys.stderr) + print(f'[create_admin] General exception caught in parsing => {e}', file=sys.stderr) return None diff --git a/json-api/config.json b/json-api/config.json index f200e31..e5e15db 100644 --- a/json-api/config.json +++ b/json-api/config.json @@ -7,8 +7,8 @@ "wss_hmac_path": "wss-hmac.secret", "name": "Freechat Server", "description": "Chatting server", - "public_url": "http://localhost:4536", - "public_ws_url": "ws://localhost:5648", + "url": "http://localhost:4536", + "wsurl": "ws://localhost:5648", "tags": [ "Freechat", diff --git a/roadmap.md b/roadmap.md index 099e594..d21c3fd 100644 --- a/roadmap.md +++ b/roadmap.md @@ -39,7 +39,7 @@ I'd like to be able to support people that make good software and give them a pl * More server meta endpoint support: Some basic server metadata is stored in environment vars but we can probably store these somewhere a bit smarter idk. -Basically this work has to be put in so that we can further decentralize Freechat Ecosystem + * This is now actively being worked with /neighbor/list and /neighbor/add now being added to the supported routes. Further testing is required, as well as relevant documentation. At least this should be done within the next few days as I find time for it among other projects. * RTC Permissions: Unprivileged users shouldn't receive messaegs if they don't have the required permissions