mctaylors/danbooru-bot
mctaylors/danbooru-bot
1
0
Fork 0
Code Issues Pull requests Activity

feat: add token in config.ini

Browse source 
Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
This commit is contained in:
Macintxsh 2025-03-02 14:09:49 +03:00
parent 6ec797a387
commit 1178c80831
Signed by: mctaylors
GPG key ID: 4EEF4F949A266EE2
4 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands.py
View file

@ -26,7 +26,7 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
from main import config from main import config
reply_markup = None reply_markup = None
source_url = config.get('Source', 'Url') source_url = config.get('General', 'SourceUrl')
if source_url.startswith('http://') or source_url.startswith('https://'): if source_url.startswith('http://') or source_url.startswith('https://'):
keyboard = [ keyboard = [
[ [

9
config.ini
View file

@ -1,6 +1,7 @@
[General] [General]
Name = Danbooru Token =
Domain = danbooru.donmai.us SourceUrl =
[Source] [Service]
Url = Name = Danbooru
Domain = danbooru.donmai.us

6
inline_query.py
View file

@ -20,7 +20,7 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
return return
from main import config from main import config
response = requests.get(f"https://{config.get('General', 'Domain')}/posts/{query}.json") response = requests.get(f"https://{config.get('Service', 'Domain')}/posts/{query}.json")
if response.status_code != 200: if response.status_code != 200:
await invalid_query(update, query) await invalid_query(update, query)
@ -37,8 +37,8 @@ async def answer_query(update, query, config, data):
artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist") artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist")
keyboard = [ keyboard = [
[ [
InlineKeyboardButton(f"Open in {config.get('General', 'Name')}", InlineKeyboardButton(f"Open in {config.get('Service', 'Name')}",
url=f"https://{config.get('General', 'Domain')}/posts/{query}"), url=f"https://{config.get('Service', 'Domain')}/posts/{query}"),
InlineKeyboardButton("View original", url=data['file_url']) InlineKeyboardButton("View original", url=data['file_url'])
] ]
] ]

19
main.py
View file

@ -17,12 +17,12 @@ logging.getLogger("httpx").setLevel(logging.WARNING)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read('config.ini') config.read("config.ini")
def main() -> None: def main() -> None:
validate_config() validate_config()
application = Application.builder().token(os.getenv("BOT_TOKEN")).build() application = Application.builder().token(get_token()).build()
application.add_handler(CommandHandler("start", start_command)) application.add_handler(CommandHandler("start", start_command))
application.add_handler(CommandHandler("help", help_command)) application.add_handler(CommandHandler("help", help_command))
@ -36,13 +36,24 @@ def main() -> None:
def validate_config(): def validate_config():
# noinspection PyBroadException # noinspection PyBroadException
try: try:
response = requests.get(f"https://{config.get('General', 'Domain')}/profile.json") response = requests.get(f"https://{config.get('Service', 'Domain')}/profile.json")
if response.status_code != 200: if response.status_code != 200:
raise raise
except: except:
print('Unable validate Domain in config.ini.') print("Unable validate Domain in config.ini.")
exit(1) exit(1)
def get_token():
if os.getenv("BOT_TOKEN") is not None:
return os.getenv("BOT_TOKEN")
if config.get('General', 'Token') != "":
return config.get('General', 'Token')
print("Set BOT_TOKEN environment variable or use config.ini to set bot token.")
exit(1)
if __name__ == "__main__": if __name__ == "__main__":
main() main()