Fix some deepsource code quality issues

cogs/events.py

@@ -317,8 +317,8 @@ async def get_autoembed_options(
  print(options_data)
  if options_data:
  return options_data
- else:
-  return None, None
+
+ return None, None
 
  async def parse_media_auto_embed(self, message: discord.Message, media_settings: dict):
  if media_settings["instagram"]:

cogs/lastfm.py

@@ -1955,7 +1955,7 @@ def check(message):
  except ValueError:
  return False
  else:
- return num <= len(results) and num > 0
+ return len(results) <= num > 0
  else:
  return False
 
@@ -2050,7 +2050,6 @@ async def get_userinfo_embed(self, username):
  async def listening_report(self, ctx: commands.Context, timeframe):
  current_day_floor = arrow.utcnow().floor("day")
  week = []
- # for i in range(7, 0, -1):
  for i in range(1, 8):
  dt = current_day_floor.shift(days=-i)
  week.append(
@@ -2107,7 +2106,6 @@ async def listening_report(self, ctx: commands.Context, timeframe):
  value=f"{scrobbles_average} Scrobbles",
  inline=False,
  )
- # content.add_field(name="Listening time", value=listening_time)
  await ctx.send(embed=content)
 
  async def get_artist_image(self, artist):
@@ -2233,7 +2231,7 @@ async def custom_period(self, user, group_by, shift_hours=24, limit=None):
  }
  }
 
- elif group_by in ["track", "user.gettoptracks"]:
+ if group_by in ["track", "user.gettoptracks"]:
  for track in data["recenttracks"]["track"]:
  track_name = track["name"]
  artist_name = track["artist"]["#text"]
@@ -2260,7 +2258,7 @@ async def custom_period(self, user, group_by, shift_hours=24, limit=None):
  }
  }
 
- elif group_by in ["artist", "user.gettopartists"]:
+ if group_by in ["artist", "user.gettopartists"]:
  for track in data["recenttracks"]["track"]:
  artist_name = track["artist"]["#text"]
  if artist_name in formatted_data:

cogs/media.py

@@ -367,12 +367,6 @@ async def confirm(self, interaction: discord.Interaction, _button: discord.ui.Bu
  await interaction.response.defer()
  await self.remove_ui()
 
- # @discord.ui.button(
- # label="Powered by GIPHY", style=discord.ButtonStyle.secondary, disabled=True
- # )
- # async def giphy_label(self, _, __):
- # pass
-
  async def remove_ui(self):
  for item in self.children:
  item.disabled = True # type: ignore

cogs/mod.py

@@ -8,9 +8,9 @@
 import discord
 from discord.ext import commands, tasks
 from loguru import logger
+from modules.misobot import MisoBot
 
 from modules import exceptions, util
-from modules.misobot import MisoBot
 
 
 class Mod(commands.Cog):
@@ -178,21 +178,22 @@ async def timeout(self, ctx: commands.Context, member: discord.Member, *, durati
  if duration and duration.strip().lower() == "remove":
  await member.timeout(None)
  return await util.send_success(ctx, f"Removed timeout from {member.mention}")
+
  seconds = member.timeout.timestamp() - arrow.now().int_timestamp
  raise exceptions.CommandInfo(
  f"{member.mention} is already timed out "
  f"(**{util.stringfromtime(seconds)}** remaining)",
  )
- else:
- seconds = util.timefromstring(duration)
- if seconds is None:
- raise exceptions.CommandWarning(f"Invalid duration `{duration}`")
- until = arrow.now().shift(seconds=+seconds).datetime
 
- await member.timeout(until)
- await util.send_success(
- ctx, f"Timed out {member.mention} for **{util.stringfromtime(seconds)}**"
- )
+ seconds = util.timefromstring(duration)
+ if seconds is None:
+ raise exceptions.CommandWarning(f"Invalid duration `{duration}`")
+ until = arrow.now().shift(seconds=+seconds).datetime
+
+ await member.timeout(until)
+ await util.send_success(
+ ctx, f"Timed out {member.mention} for **{util.stringfromtime(seconds)}**"
+ )
 
  @commands.command()
  @commands.guild_only()

cogs/notifications.py

@@ -9,9 +9,9 @@
 import regex
 from discord.ext import commands
 from loguru import logger
+from modules.misobot import MisoBot
 
 from modules import emojis, exceptions, queries, util
-from modules.misobot import MisoBot
 
 
 class Notifications(commands.Cog):
@@ -271,8 +271,8 @@ async def notification_list(self, ctx: commands.Context):
  """List your current notifications"""
  words = await self.bot.db.fetch(
  """
- SELECT guild_id, keyword, times_triggered 
- FROM notification WHERE user_id = %s 
+ SELECT guild_id, keyword, times_triggered
+ FROM notification WHERE user_id = %s
  ORDER BY keyword
  """,
  ctx.author.id,

cogs/owner.py

@@ -8,9 +8,9 @@
 import discord
 from discord.ext import commands
 from loguru import logger
+from modules.misobot import MisoBot
 
 from modules import util
-from modules.misobot import MisoBot
 
 
 class Owner(commands.Cog):
@@ -137,7 +137,7 @@ async def donator_add(
 
  await self.bot.db.execute(
  """
- INSERT INTO donator (user_id, platform, external_username, 
+ INSERT INTO donator (user_id, platform, external_username,
  donation_tier, donating_since, amount)
  VALUES (%s, %s, %s, %s, %s, %s)
  """,

cogs/utility.py

@@ -406,7 +406,6 @@ async def weather_now(self, ctx: commands.Context, *, location: Optional[str] =
  daily_data = next(filter(lambda t: t["timestep"] == "1d", data["data"]["timelines"]))
  values_current = current_data["intervals"][0]["values"]
  values_today = daily_data["intervals"][0]["values"]
- # values_tomorrow = daily_data["intervals"][1]["values"]
  temperature = values_current["temperature"]
  temperature_apparent = values_current["temperatureApparent"]
  sunrise = arrow.get(values_current["sunriseTime"]).to(local_time.tzinfo).format("HH:mm")

modules/instagram.py

@@ -106,7 +106,7 @@ def get_url_expiry(media_url: str):
 
  @staticmethod
  def calculate_post_lifetime(media: list) -> int:
- return min([m.expires for m in media]) - arrow.utcnow().int_timestamp
+ return min(m.expires for m in media) - arrow.utcnow().int_timestamp
 
  async def api_request_with_cache(self, endpoint: str, params: dict) -> tuple[dict, bool, str]:
  cache_key = self.make_cache_key(endpoint, params)

modules/media_embedders.py

@@ -341,13 +341,12 @@ def remove_tco(text: str) -> str:
 
  try:
  pre_text, tco = text.rsplit(maxsplit=1)
+ if tco.startswith("https://t.co"):
+ return pre_text
  except ValueError:
- return text
+ pass
 
- if tco.startswith("https://t.co"):
- return pre_text
- else:
- return pre_text + " " + tco
+ return text
 
  @staticmethod
  def extract_links(text: str, include_id_only=True):