From 2f07b2d00e6a5585aabdd2b66e0ada40371f2e76 Mon Sep 17 00:00:00 2001 From: KF Date: Tue, 2 Jul 2019 17:34:26 -0500 Subject: [PATCH] * fixed some mail elements for bulma redesign * added dll, exe to .gitignore * fixed some miscpublicapi endpoints httpapi calls --- .gitignore | 3 +++ onionr/api.py | 2 +- onionr/httpapi/miscpublicapi/endpoints.py | 6 +++--- onionr/static-data/www/board/index.html | 2 +- onionr/static-data/www/friends/index.html | 2 +- onionr/static-data/www/mail/index.html | 8 ++------ onionr/static-data/www/mail/mail.js | 10 +++++----- onionr/static-data/www/shared/misc.js | 10 ++++++---- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 637243fe..7573da9c 100755 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,9 @@ core venv/* onionr/fs* +*.dll +*.exe + # log files output.log *.log diff --git a/onionr/api.py b/onionr/api.py index 3bd6214d..f13203fc 100755 --- a/onionr/api.py +++ b/onionr/api.py @@ -227,4 +227,4 @@ class API: pass def getBlockData(self, bHash, decrypt=False, raw=False, headerOnly=False): - return self.get_block_data.get_block_data(self, bHash, decrypt, raw, headerOnly) + return self.get_block_data.get_block_data(bHash, decrypt=decrypt, raw=raw, headerOnly=headerOnly) diff --git a/onionr/httpapi/miscpublicapi/endpoints.py b/onionr/httpapi/miscpublicapi/endpoints.py index 269e63c9..247ec01c 100644 --- a/onionr/httpapi/miscpublicapi/endpoints.py +++ b/onionr/httpapi/miscpublicapi/endpoints.py @@ -38,12 +38,12 @@ class PublicEndpoints: @public_endpoints_bp.route('/getblocklist') def get_block_list(): - return getblocks.public_block_list(client_API, public_api, request) + return getblocks.get_public_block_list(client_API, public_api, request) @public_endpoints_bp.route('/getdata/') def get_block_data(name): # Share data for a block if we have it - return getblocks.public_get_block_data(client_API, public_api, name) + return getblocks.get_block_data(client_API, public_api, name) @public_endpoints_bp.route('/www/') def www_public(path): @@ -66,7 +66,7 @@ class PublicEndpoints: @public_endpoints_bp.route('/announce', methods=['post']) def accept_announce(): - resp = httpapi.miscpublicapi.announce(client_API, request) + resp = announce.handle_announce(client_API, request) return resp @public_endpoints_bp.route('/upload', methods=['post']) diff --git a/onionr/static-data/www/board/index.html b/onionr/static-data/www/board/index.html index e4fc7db2..69483429 100755 --- a/onionr/static-data/www/board/index.html +++ b/onionr/static-data/www/board/index.html @@ -17,7 +17,7 @@