feat: App.HostName is now optional
Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
This commit is contained in:
parent
496ea38b5c
commit
a41417ee84
3 changed files with 6 additions and 4 deletions
|
@ -11,6 +11,7 @@ SourceUrl =
|
||||||
Name = Danbooru
|
Name = Danbooru
|
||||||
; Host (without http://) used to access the application API.
|
; Host (without http://) used to access the application API.
|
||||||
Host = danbooru.donmai.us
|
Host = danbooru.donmai.us
|
||||||
; Public host name (without http://) for the “Open in [App.Name]” button.
|
; (Optional) Public host name (without http://) for the “Open in [App.Name]” button.
|
||||||
; Useful if the bot is hosted on the same server as the application.
|
; Useful if the bot is hosted on the same server as the application.
|
||||||
HostName = danbooru.donmai.us
|
; If not set, [App.Host] will be used instead.
|
||||||
|
HostName =
|
|
@ -38,10 +38,12 @@ async def answer_query(update: Update, query: str,
|
||||||
copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright")
|
copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright")
|
||||||
artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist")
|
artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist")
|
||||||
rating = format_rating(data['rating'])
|
rating = format_rating(data['rating'])
|
||||||
|
hostname = config.get('App', 'HostName')
|
||||||
|
hostname = hostname if hostname != "" else config.get('App', 'Host')
|
||||||
keyboard = [
|
keyboard = [
|
||||||
[
|
[
|
||||||
InlineKeyboardButton(f"Open in {config.get('App', 'Name')}",
|
InlineKeyboardButton(f"Open in {config.get('App', 'Name')}",
|
||||||
url=f"https://{config.get('App', 'HostName')}/posts/{query}"),
|
url=f"https://{hostname}/posts/{query}"),
|
||||||
InlineKeyboardButton("View original", url=data['file_url'])
|
InlineKeyboardButton("View original", url=data['file_url'])
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
|
|
1
main.py
1
main.py
|
@ -34,7 +34,6 @@ def main() -> None:
|
||||||
|
|
||||||
|
|
||||||
def validate_config() -> None:
|
def validate_config() -> None:
|
||||||
# TODO: do some HostName checks or something
|
|
||||||
# noinspection PyBroadException
|
# noinspection PyBroadException
|
||||||
try:
|
try:
|
||||||
response = requests.get(f"http://{config.get('App', 'Host')}/status.json")
|
response = requests.get(f"http://{config.get('App', 'Host')}/status.json")
|
||||||
|
|
Loading…
Add table
Reference in a new issue