From 183eff1da73a2708bbdfd896e04ad56040284382 Mon Sep 17 00:00:00 2001 From: EverOddish Date: Wed, 13 Jul 2022 21:57:27 -0400 Subject: [PATCH] Bumped version to 2.1.2 (Crystal Kaizo+) --- DrFujiBot_Django/dashboard/admin_commands.py | 2 +- DrFujiBot_Django/dashboard/lookup_helpers.py | 3 ++- DrFujiBot_Django/scheduled_tasks/backup_task.py | 2 +- DrFujiBot_Installer/install_python.cfg | 2 +- DrFujiBot_Twitch/DrFujiBot_Twitch/TwitchService.cs | 2 +- release_checklist.txt | 3 +++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/DrFujiBot_Django/dashboard/admin_commands.py b/DrFujiBot_Django/dashboard/admin_commands.py index cf0a5b8..59dd886 100644 --- a/DrFujiBot_Django/dashboard/admin_commands.py +++ b/DrFujiBot_Django/dashboard/admin_commands.py @@ -562,7 +562,7 @@ def handle_shoutout(args): def handle_debug(args): # Not sure what else would be useful to put here. - output = 'DrFujiBot 2.1.1' + output = 'DrFujiBot 2.1.2' return output def handle_afflict(args): diff --git a/DrFujiBot_Django/dashboard/lookup_helpers.py b/DrFujiBot_Django/dashboard/lookup_helpers.py index fab0a4d..4361ed3 100644 --- a/DrFujiBot_Django/dashboard/lookup_helpers.py +++ b/DrFujiBot_Django/dashboard/lookup_helpers.py @@ -312,7 +312,8 @@ def get_generation(game): return 1 elif 'Pokemon Gold' == game or \ 'Pokemon Silver' == game or \ - 'Pokemon Crystal' == game: + 'Pokemon Crystal' == game or \ + 'Pokemon Crystal Kaizo+' == game: return 2 elif 'Pokemon Ruby' == game or \ 'Pokemon Sapphire' == game or \ diff --git a/DrFujiBot_Django/scheduled_tasks/backup_task.py b/DrFujiBot_Django/scheduled_tasks/backup_task.py index 3a57065..b4f982a 100644 --- a/DrFujiBot_Django/scheduled_tasks/backup_task.py +++ b/DrFujiBot_Django/scheduled_tasks/backup_task.py @@ -7,7 +7,7 @@ def backup_database(): original_path = settings.DATABASES['default']['NAME'] now = datetime.now() - filename = 'db_2.1.1_' + now.strftime('%Y-%m-%d_%H-%M-%S') + '.sqlite3' + filename = 'db_2.1.2_' + now.strftime('%Y-%m-%d_%H-%M-%S') + '.sqlite3' backup_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', 'DrFujiBot_Backup', filename) print('Backing up database from ' + original_path + ' to ' + backup_path) shutil.copyfile(original_path, backup_path) diff --git a/DrFujiBot_Installer/install_python.cfg b/DrFujiBot_Installer/install_python.cfg index 626945e..d0b2c86 100644 --- a/DrFujiBot_Installer/install_python.cfg +++ b/DrFujiBot_Installer/install_python.cfg @@ -1,6 +1,6 @@ [Application] name=DrFujiBot -version=2.1.1 +version=2.1.2 entry_point=launcher:start icon=drfuji.ico diff --git a/DrFujiBot_Twitch/DrFujiBot_Twitch/TwitchService.cs b/DrFujiBot_Twitch/DrFujiBot_Twitch/TwitchService.cs index c8c1c40..cc29c2f 100644 --- a/DrFujiBot_Twitch/DrFujiBot_Twitch/TwitchService.cs +++ b/DrFujiBot_Twitch/DrFujiBot_Twitch/TwitchService.cs @@ -244,7 +244,7 @@ private void Client_OnMessageReceived(object sender, OnMessageReceivedArgs e) url += "is_moderator=" + (e.ChatMessage.IsModerator ? "True" : "False") + "&"; url += "is_subscriber=" + (e.ChatMessage.IsSubscriber ? "True" : "False") + "&"; url += "username=" + e.ChatMessage.Username + "&"; - url += "line=" + e.ChatMessage.Message; + url += "line=" + Uri.EscapeDataString(e.ChatMessage.Message); requestAndDisplay(url); } diff --git a/release_checklist.txt b/release_checklist.txt index 65f701e..c4364c4 100644 --- a/release_checklist.txt +++ b/release_checklist.txt @@ -11,6 +11,9 @@ Release Checklist: python manage.py migrate --database=westwood python manage.py import_westwood_data + * If adding a new game from Westwood, update: + * DrFujiBot_Django/dashboard/lookup_commands.py handle_tm() + * DrFujiBot_Django/dashboard/lookup_helpers.py get_generation() * Build DrFujiBot_Twitch in Visual Studio in Release * Build and test the installer * Create a release on GitHub with this format: