From fade3c20fc92ef303d43abb84989ae984ca8fb3a Mon Sep 17 00:00:00 2001 From: dotnet Date: Fri, 13 Oct 2023 14:36:59 -0400 Subject: [PATCH] Allow specification of several messages to choose from --- README.md | 2 +- gelbooru_poster.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dc53b91..fc33d18 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Usage: python3 gelbooru-bot.py [--gen-config] [--help] "hololive_images": { "gelbooru_tags": "hololive", "gelbooru_tags_exclude": "-sky", - "bot_message": "Hololive Image", + "bot_message": ["Hololive Image", "Uooooh"], "bot_hashtags": "#hololive", "misskey_token": "uuuu0hOhrrrlrlrP8888uquqaaaaAUAU", "max_page_number": 200, diff --git a/gelbooru_poster.py b/gelbooru_poster.py index fe4aa98..2216c57 100644 --- a/gelbooru_poster.py +++ b/gelbooru_poster.py @@ -158,7 +158,10 @@ class BotInstance: post_json = post_request.json() if 'id' in post_json: # Submit a /notes/create request to Misskey - msg = self.bot_message + if isinstance(self.bot_message, list): + msg = random.choice(self.bot_message) + else: + msg = self.bot_message if random.randint(0, 100) < 5: msg += " " + self.bot_hashtags create_note_request = requests.post(self.misskey_url + "notes/create", json = {"renoteId": post_json['id'], "text": "%s\n[Source](%s)\n" % (msg, image_src), "i": self.misskey_token}) @@ -168,7 +171,10 @@ class BotInstance: return True # Submit a /notes/create request to Misskey - msg = self.bot_message + if isinstance(self.bot_message, list): + msg = random.choice(self.bot_message) + else: + msg = self.bot_message if random.randint(0, 100) < 5: msg += " " + self.bot_hashtags create_note_request = requests.post(self.misskey_url + "notes/create", json = {"fileIds": [file_id], "text": "%s\n[Source](%s)\n" % (msg, image_src), "i": self.misskey_token}) @@ -218,7 +224,7 @@ def generate_defaults(): config['gelbooru_tags'] = 'rating:safe' config['gelbooru_tags_exclude'] = '' - config['bot_message'] = 'Random image from Gelbooru' + config['bot_message'] = ['Random image from Gelbooru'] config['bot_hashtags'] = '#gelbooru #random' config['misskey_url'] = 'https://misskey.example.com/' config['misskey_token'] = ''