Compare commits

..

5 Commits
dev ... main

Author SHA1 Message Date
b24a3147dd
Merge branch 'dev'
All checks were successful
Build Docker / Build Image (push) Successful in 28s
2024-02-17 12:53:32 +11:00
f8e03aca73
Merge branch 'dev'
All checks were successful
Build Docker / Build Image (push) Successful in 1m11s
2024-02-17 11:57:24 +11:00
38f08c069c
Merge branch 'dev'
All checks were successful
Build Docker / Build Image (push) Successful in 57s
2024-02-13 11:52:04 +11:00
16ac6c7d2b
Merge branch 'dev'
All checks were successful
Build Docker / Build Image (push) Successful in 1m1s
2024-02-13 10:01:21 +11:00
b0c7fcf779
Merge branch 'dev'
All checks were successful
Build Docker / Build Image (push) Successful in 20s
2024-02-12 22:08:02 +11:00
3 changed files with 8 additions and 18 deletions

View File

@ -168,10 +168,4 @@ def emoji_to_punycode(emoji):
try: try:
return emoji.encode("idna").decode("ascii") return emoji.encode("idna").decode("ascii")
except Exception as e: except Exception as e:
return emoji return ""
def punycode_to_emoji(punycode):
try:
return punycode.encode("ascii").decode("idna")
except Exception as e:
return punycode

View File

@ -1047,8 +1047,6 @@ def settings():
branch = info['refs'] branch = info['refs']
if branch != "main": if branch != "main":
branch = f"({branch})" branch = f"({branch})"
else:
branch = ""
last_commit = info['author_date'] last_commit = info['author_date']
# import to time from format "2024-02-13 11:24:03" # import to time from format "2024-02-13 11:24:03"
last_commit = datetime.datetime.strptime(last_commit, "%Y-%m-%d %H:%M:%S") last_commit = datetime.datetime.strptime(last_commit, "%Y-%m-%d %H:%M:%S")

View File

@ -2,11 +2,14 @@ import datetime
import json import json
import urllib.parse import urllib.parse
from flask import render_template from flask import render_template
from domainLookup import punycode_to_emoji
def domains(domains, mobile=False): def domains(domains, mobile=False):
html = '' html = ''
for domain in domains: for domain in domains:
owner = domain['owner']
if 'index' in owner:
if owner['index'] == 0:
continue
expires = domain['stats'] expires = domain['stats']
if 'daysUntilExpire' in expires: if 'daysUntilExpire' in expires:
expires = expires['daysUntilExpire'] expires = expires['daysUntilExpire']
@ -15,16 +18,11 @@ def domains(domains, mobile=False):
paid = domain['value'] paid = domain['value']
paid = paid / 1000000 paid = paid / 1000000
# Handle punycodes
name = domain['name']
emoji = punycode_to_emoji(name)
if emoji != name:
name = f'{emoji} ({name})'
if not mobile: if not mobile:
html += f'<tr><td>{name}</td><td>{expires} days</td><td>{paid} HNS</td><td><a href="/manage/{domain["name"]}">Manage</a></td></tr>' html += f'<tr><td>{domain["name"]}</td><td>{expires} days</td><td>{paid} HNS</td><td><a href="/manage/{domain["name"]}">Manage</a></td></tr>'
else: else:
html += f'<tr><td><a href="/manage/{domain["name"]}">{name}</a></td><td>{expires} days</td></tr>' html += f'<tr><td><a href="/manage/{domain["name"]}">{domain["name"]}</a></td><td>{expires} days</td></tr>'
return html return html