Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Added Image logging by Minus-hates-school · Pull Request #114 · practical-python-org/Eos · GitHub
Skip to content
Merged
Changes from all commits
Commits
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
78 changes: 69 additions & 9 deletions src/bot/cogs/logging/logging_message_delete.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
import datetime
import logging
import os
from io import BytesIO

import discord
from discord.ext import commands
Expand All@@ -19,8 +20,8 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
embed = discord.Embed(
title="<:red_circle:1043616578744357085> Deleted Message",
description=f"{some_moderator.mention if some_moderator is not None else some_member.mention} deleted a message"
f"\nIn {some_message.channel}\nMessage "
f"author: {some_member.mention}",
f"\nIn {some_message.channel}\n"
f"Message author: {some_member.mention}",
color=discord.Color.red(),
timestamp=datetime.datetime.now(datetime.timezone.utc),
)
Expand All@@ -33,8 +34,20 @@ def embed_message_delete(some_member, some_message, some_moderator=None):
the_message = some_message.content[0:1020] + "..."
else:
the_message = some_message.content

if not the_message:
the_message = "*No text content*"
embed.add_field(name="Message: ", value=the_message, inline=True)

if some_message.attachments:
embed.add_field(
name="Attachments: ",
value="\n".join(
attachment.filename for attachment in some_message.attachments
)[0:1020],
inline=False,
)

return embed


Expand All@@ -46,18 +59,61 @@ class LoggingMessageDelete(commands.Cog):

def __init__(self, bot):
self.bot = bot
self.staff_channel = self.bot.api.get_one_setting("3")["setting"][
"value"
] # Staff Channel ID
setting = self.bot.api.get_one_setting("3") # Staff Channel ID
if setting["status"] != "ok":
raise RuntimeError("Failed to fetch staff channel setting from API.")
self.staff_channel = setting["setting"]["value"]

self.chat_log = self.bot.api.get_one_log_setting("3") # chat_log
if self.chat_log["status"] != "ok":
raise RuntimeError("Failed to fetch chat log setting from API.")

async def build_image_file(self, attachment: discord.Attachment) -> discord.File:
"""
Return a File for the attachment, so it can be re-uploaded with the log embed.
"""
data = await attachment.read()
return discord.File(BytesIO(data), filename=attachment.filename)

async def collect_image_files(self, message) -> list[discord.File]:
"""
Re-download every image attachment on the deleted message.

Discord purges the CDN copy shortly after a delete, so anything we
fail to fetch is simply left out of the log rather than raising.
"""
size_limit = message.guild.filesize_limit
files = []
for attachment in message.attachments:
if not (
attachment.content_type and attachment.content_type.startswith("image/")
):
continue
if attachment.size > size_limit:
logger.debug(
f"Image attachment {attachment.filename} is too large to re-upload "
f"({attachment.size} > {size_limit}). Skipping."
)
continue
logger.debug(
f"Image attachment detected in deleted message, "
f"{attachment.filename}:{attachment.url}"
)
try:
files.append(await self.build_image_file(attachment))
except discord.HTTPException as err:
logger.warning(
f"Could not fetch deleted attachment {attachment.filename} -> {err}"
)
return files

@commands.Cog.listener()
async def on_message_delete(self, message):
async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD"))
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
logger.warning(
Expand All@@ -80,15 +136,19 @@ async def on_message_delete(self, message):
self.chat_log["log_setting"]["value"]
)

image_files = await self.collect_image_files(message)

if str(audit_log.action) == "AuditLogAction.message_delete":
# Then a moderator deleted a message.
embed = embed_message_delete(audit_log.target, message, audit_log.user)
await logs_channel.send(embed=embed)
await logs_channel.send(embed=embed, files=image_files)

else:
# Otherwise, the author deleted it.
username = message.author
await logs_channel.send(embed=embed_message_delete(username, message))
await logs_channel.send(
embed=embed_message_delete(username, message), files=image_files
)
else:
logger.critical(f"API error. API response not ok. -> {self.chat_log}")

Expand Down
Loading