Skip to content

Remove additional embed message #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbaruh merged 1 commit into from
Jan 19, 2021
Merged

Remove additional embed message #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions bot/exts/filters/filtering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class Stats(NamedTuple):

message_content: str
additional_embeds: Optional[List[discord.Embed]]
additional_embeds_msg: Optional[str]


class Filtering(Cog):
Expand Down Expand Up @@ -358,7 +357,6 @@ async def _send_log(
channel_id=Channels.mod_alerts,
ping_everyone=ping_everyone,
additional_embeds=stats.additional_embeds,
additional_embeds_msg=stats.additional_embeds_msg
)

def _add_stats(self, name: str, match: FilterMatch, content: str) -> Stats:
Expand All @@ -375,7 +373,6 @@ def _add_stats(self, name: str, match: FilterMatch, content: str) -> Stats:
message_content = content

additional_embeds = None
additional_embeds_msg = None

self.bot.stats.incr(f"filters.{name}")

Expand All @@ -392,13 +389,11 @@ def _add_stats(self, name: str, match: FilterMatch, content: str) -> Stats:
embed.set_thumbnail(url=data["icon"])
embed.set_footer(text=f"Guild ID: {data['id']}")
additional_embeds.append(embed)
additional_embeds_msg = "For the following guild(s):"

elif name == "watch_rich_embeds":
additional_embeds = match
additional_embeds_msg = "With the following embed(s):"

return Stats(message_content, additional_embeds, additional_embeds_msg)
return Stats(message_content, additional_embeds)

@staticmethod
def _check_filter(msg: Message) -> bool:
Expand Down
3 changes: 0 additions & 3 deletions bot/exts/moderation/modlog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ async def send_log_message(
files: t.Optional[t.List[discord.File]] = None,
content: t.Optional[str] = None,
additional_embeds: t.Optional[t.List[discord.Embed]] = None,
additional_embeds_msg: t.Optional[str] = None,
timestamp_override: t.Optional[datetime] = None,
footer: t.Optional[str] = None,
) -> Context:
Expand Down Expand Up @@ -133,8 +132,6 @@ async def send_log_message(
)

if additional_embeds:
if additional_embeds_msg:
await channel.send(additional_embeds_msg)
for additional_embed in additional_embeds:
await channel.send(embed=additional_embed)

Expand Down