Remove some more discriminator references

Author: Taaku18

cogs/modmail.py

@@ -729,8 +729,9 @@ def format_log_embeds(self, logs, avatar_url):
  f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{entry['key']}"
  )
 
- username = entry["recipient"]["name"] + "#"
- username += entry["recipient"]["discriminator"]
+ username = entry["recipient"]["name"]
+ if entry["recipient"]["discriminator"] != "0":
+ username += "#" + entry["recipient"]["discriminator"]
 
  embed = discord.Embed(color=self.bot.main_color, timestamp=created_at)
  embed.set_author(name=f"{title} - {username}", icon_url=avatar_url, url=log_url)
@@ -1855,7 +1856,7 @@ async def block(
  )
  return await ctx.send(embed=embed)
 
- reason = f"by {escape_markdown(ctx.author.name)}#{ctx.author.discriminator}"
+ reason = f"by {escape_markdown(str(ctx.author))}"
 
  if after is not None:
  if "%" in reason:
@@ -2054,11 +2055,12 @@ async def repair(self, ctx):
 
  # match username from channel name
  # username-1234, username-1234_1, username-1234_2
- m = re.match(r"^(.+)-(\d{4})(?:_\d+)?$", ctx.channel.name)
+ m = re.match(r"^(.+?)(?:-(\d{4}))?(?:_\d+)?$", ctx.channel.name)
  if m is not None:
  users = set(
  filter(
- lambda member: member.name == m.group(1) and member.discriminator == m.group(2),
+ lambda member: member.name == m.group(1)
+ and (member.discriminator == "0" or member.discriminator == m.group(2)),
  ctx.guild.members,
  )
  )

core/utils.py

@@ -127,7 +127,11 @@ def format_preview(messages: typing.List[typing.Dict[str, typing.Any]]):
  continue
  author = message["author"]
  content = str(message["content"]).replace("\n", " ")
- name = author["name"] + "#" + str(author["discriminator"])
+
+ name = author["name"]
+ discriminator = str(author["discriminator"])
+ if discriminator != "0":
+ name += "#" + discriminator
  prefix = "[M]" if author["mod"] else "[R]"
  out += truncate(f"`{prefix} {name}:` {content}", max=75) + "\n"