highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-27 12:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1358 from frennkie/ip2tor-add-message

Browse Source 
ip2tor: add message on reject
This commit is contained in:
frennkie
2020-07-18 13:27:09 +02:00
committed by GitHub
parent 222d3c24b9 45ad05cd11
commit c27151ac75
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
home.admin/config.scripts/blitz.subscriptions.ip2tor.py
View File

@@ -1,5 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
import ast
import codecs import codecs
import json import json
import math import math
@@ -713,6 +714,9 @@ More information on the service you can find under:
exitcode = 0 exitcode = 0
order = ast.literal_eval(be.errorLong)
message = order['message']
if (be.errorShort == "timeout on waiting for extending bridge" or if (be.errorShort == "timeout on waiting for extending bridge" or
be.errorShort == "fail on subscription storage" or be.errorShort == "fail on subscription storage" or
be.errorShort == "invalid port" or be.errorShort == "invalid port" or
@@ -723,8 +727,10 @@ More information on the service you can find under:
You DID PAY the initial fee. You DID PAY the initial fee.
But the service was not able to provide service. But the service was not able to provide service.
Subscription will be ignored. Subscription will be ignored.
Error: {0} Error: {0}
'''.format(be.errorShort), title="Error on Subscription", extra_button=True, extra_label="Details") Message: {1}
'''.format(be.errorShort, message), title="Error on Subscription", extra_button=True, extra_label="Details")
else: else:
# error happened before payment # error happened before payment
@@ -732,8 +738,10 @@ Error: {0}
You DID NOT PAY the initial fee. You DID NOT PAY the initial fee.
The service was not able to provide service. The service was not able to provide service.
Subscription will be ignored. Subscription will be ignored.
Error: {0} Error: {0}
'''.format(be.errorShort), title="Error on Subscription", extra_button=True, extra_label="Details") Message: {1}
'''.format(be.errorShort, message), title="Error on Subscription", extra_button=True, extra_label="Details")
# show more details (when user used extra button) # show more details (when user used extra button)
if exitcode == Dialog.EXTRA: if exitcode == Dialog.EXTRA: