Fix db connection not closing due to unhandled exception

Also: fix version numbering.

README.md

@@ -1,5 +1,5 @@
 # LaunchBot – a rocket launch information and notifications bot for Telegram 🚀
-LaunchBot keeps you up to date with what's going up, around the clock, since 2019. Over 350,000 notifications delivered to thousands of chats and groups!
+LaunchBot keeps you up to date with what's going up, around the clock, since 2019. Over 450,000 notifications delivered to thousands of chats and groups!
 
 Reachable as [@rocketrybot](https://t.me/rocketrybot) on Telegram.
 
@@ -105,7 +105,7 @@ Please note, that the above only applies on a per-bot basis. The creator of the
 	- ✅ allow users to set their own timezone
 
 
-	## 1.6 / major back-end changes (October 2020)
+	## 2.0 / major back-end changes (October 2020)
 
 	- ✅ upgrade to the LL2 API (LL1 closes at the end of October)
 
@@ -137,14 +137,10 @@ Please note, that the above only applies on a per-bot basis. The creator of the
 
 	- ✅ re-add statistics to all needed places
 
-	- add "show changelog" button under /statistics or /help
-
-		- load from a changelog.txt file?
-
 	- ✅ open-source LaunchBot ✨
 
 
-	## 1.7 / performance optimizations
+	## 2.1 / performance optimizations
 
 	- send notifications for launches entering into the middle of notification windows
 
@@ -173,4 +169,8 @@ Please note, that the above only applies on a per-bot basis. The creator of the
 	- enable the disabling of postpone notifications
 
 		- globally or on a per-launch basis
+
+	- add "show changelog" button under /statistics or /help
+
+		- load from a changelog.txt file?
 </details>

tg-launchbot/db.py

@@ -446,7 +446,14 @@ def update_stats_db(stats_update: dict, db_path: str):
 			rd.hset('stats', stat, val)
 		else:
 			stats_cursor.execute(f"UPDATE stats SET {stat} = {stat} + {val}")
-			rd.hset('stats', stat, int(rd.hget('stats', stat)) + int(val))
+			try:
+				rd.hset('stats', stat, int(rd.hget('stats', stat)) + int(val))
+			except TypeError:
+				logging.exception(f'⚠️ Error updating stat for {stat} with ++{val}! stats_update: {stats_update}')
+				logging.warning('⚠️ Not commiting database change: closing connection and exiting...')
+
+				stats_conn.close()
+				return
 
 	# commit changes
 	stats_conn.commit()

tg-launchbot/launchbot.py

@@ -1484,7 +1484,7 @@ def timer_handle(update, context, command, chat, user):
 						context.bot.send_message(
 							chat,
 							'⚠️ *Please do not spam the bot.* Your user ID has been blocked and all commands by you will be ignored for an indefinite amount of time.',
-							parse_mode='Markdown')
+							parse_mode='Markdown', reply_to_message_id=update.message.message_id)
 					else:
 						run_time_ = int(time.time()) - STARTUP_TIME
 						logging.info(f'''
@@ -1652,16 +1652,16 @@ def notify(update, context):
 				[InlineKeyboardButton(text='✅ Save and exit', callback_data='notify/done')]])
 
 	try:
-		context.bot.send_message(
-			chat, inspect.cleandoc(message_text), parse_mode='Markdown', reply_markup=keyboard)
+		context.bot.send_message(chat, inspect.cleandoc(message_text),
+			parse_mode='Markdown', reply_markup=keyboard)
 	except telegram.error.RetryAfter as error:
 		logging.exception(f'🚧 Got a telegram.error.retryAfter: sleeping for {error.retry_after} sec.')
 		retry_after(error.retry_after)
-		context.bot.send_message(
-			chat, inspect.cleandoc(message_text), parse_mode='Markdown', reply_markup=keyboard)
+		context.bot.send_message(chat, inspect.cleandoc(message_text),
+			parse_mode='Markdown', reply_markup=keyboard)
 
 	# update stats
-	update_stats_db(stats_update={'commands':1}, db_path=DATA_DIR)
+	update_stats_db(stats_update={'commands': 1}, db_path=DATA_DIR)
 
 
 def feedback(update, context):
@@ -1719,17 +1719,13 @@ def feedback(update, context):
 
 def generate_changelog():
 	changelog = f'''
-	🚀 *LaunchBot* v{VERSION} | Changelog
+	🚀 *LaunchBot* {VERSION} | Changelog
+
+	- Handle scenario where database connection failed to close due to redis error
 
-	- added Blue Origin
-	- tuned postpone notifications
-	- support local bot API servers
-	- show hold/launched status in /next
-	- implemented caching with redis
-	- tiny improvements everywhere
-	- massive amounts of bug-fixes
+	- Added changelogs to statistics
 
-	*More information on Github*
+	More information on Github
 	https://github.com/499602D2/tg-launchbot
 	'''
 
@@ -2870,7 +2866,7 @@ def apscheduler_event_listener(event):
 
 if __name__ == '__main__':
 	# current version, set DATA_DIR
-	VERSION = '1.7.13'
+	VERSION = '2.1.15'
 	DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 	OLD_DATA_DIR = os.path.join(os.path.dirname(__file__), 'launchbot')