Merge branch 'main' into intents

rocketbot/bot.py

@@ -24,7 +24,7 @@ class Rocketbot(commands.Bot):
 		self.__first_ready = True
 
 	async def on_command_error(self, context: commands.Context, exception: BaseException) -> None:
-		bot_log(None, None, 'Command error')
+		bot_log(None, None, '\u0007Command error')
 		dump_stacktrace(exception)
 		if context.guild is None or \
 				context.message.channel is None or \
@@ -42,7 +42,7 @@ class Rocketbot(commands.Bot):
 		# Stack trace everything else
 
 	async def on_error(self, event_method, args=None, kwargs=None):
-		bot_log(None, None, 'Event caused error\n' + \
+		bot_log(None, None, '\u0007Event caused error\n' + \
 			f'	event method: {event_method}' + \
 			f'	event args: {args}' + \
 			f'	event kwargs: {kwargs}' + \

rocketbot/cogs/videopreviewcog.py

@@ -154,11 +154,11 @@ class VideoPreviewCog(BaseCog, name='Video Link Previews'):
 		delay: timedelta = self.get_guild_setting(message.guild, Self.SETTING_DELAY)
 		await asyncio.sleep(delay.total_seconds())
 		# Look for embeds already showing the video
-		self.log(message.guild, "Checking message for embeds")
+		# self.log(message.guild, "Checking message for embeds")
 		for embed in message.embeds:
 			if embed.video.url:
 				# If there's any video, skip downloading any previews
-				self.log(message.guild, "Message already has a video. Skipping this message.")
+				# self.log(message.guild, "Message already has a video. Skipping this message.")
 				return
 		await self._fetch_previews(message, links)
 
@@ -181,25 +181,25 @@ class VideoPreviewCog(BaseCog, name='Video Link Previews'):
 			universal_newlines=True
 		)
 		if result.returncode != 0:
-			self.log(message.guild, "Fetching link info JSON failed. Skipping preview.")
-			self.log(message.guild, result.stderr)
+			# self.log(message.guild, "Fetching link info JSON failed. Skipping preview.")
+			# self.log(message.guild, result.stderr)
 			return
 		try:
 			info: dict = json.loads(result.stdout)
 		except Exception as e:
-			self.log(message.guild, f"Error parsing info.json. Skipping preview. {e}")
+			# self.log(message.guild, f"Error parsing info.json. Skipping preview. {e}")
 			return
 		description = info.get('description') or ''
 		formats: list[dict] = info.get('formats') or []
-		self.log(message.guild, f"Found {len(formats)} formats")
+		# self.log(message.guild, f"Found {len(formats)} formats")
 		formats = list(filter(filter_video_format, formats))
-		self.log(message.guild, f"Filtered to {len(formats)} formats")
+		# self.log(message.guild, f"Filtered to {len(formats)} formats")
 		sorted_formats: list[dict] = sorted(formats, key=rank_video_format, reverse=True)
 		if len(sorted_formats) == 0:
-			self.log(message.guild, f"No eligible formats for URL {link.url}")
+			# self.log(message.guild, f"No eligible formats for URL {link.url}")
 			return
 		best_format: dict = sorted_formats[0]
-		self.log(message.guild, f"Best format is id {best_format.get('format_id')}")
+		# self.log(message.guild, f"Best format is id {best_format.get('format_id')}")
 		video_url: str = best_format.get('url')
 		link_description: str = "video"
 		if (best_format.get('width') or 0) > 0 and (best_format.get('height') or 0) > 0:
@@ -208,7 +208,7 @@ class VideoPreviewCog(BaseCog, name='Video Link Previews'):
 			link_description += f", {format_bytes(best_format.get('filesize'))}"
 		elif (best_format.get('filesize_approx') or 0) > 0:
 			link_description += f", {format_bytes(best_format.get('filesize_approx'))}"
-		content = "Hmm, video preview didn't load. Let's try this."
+		content = "Here's a preview of that video link."
 		if len(description) > 0:
 			content += "\n\n" + blockquote_markdown(suppress_markdown_url_previews(description)) + "\n"
 		if link.spoiler: