aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Pipfile1
-rw-r--r--Pipfile.lock44
-rw-r--r--bot/cogs/antispam.py3
-rw-r--r--bot/cogs/bot.py6
-rw-r--r--bot/cogs/modlog.py36
-rw-r--r--bot/constants.py1
-rw-r--r--config-default.yml1
7 files changed, 21 insertions, 71 deletions
diff --git a/Pipfile b/Pipfile
index b81976583..494a8a6ff 100644
--- a/Pipfile
+++ b/Pipfile
@@ -5,7 +5,6 @@ name = "pypi"
[packages]
discord-py = {git = "https://github.com/Rapptz/discord.py.git",extras = ["voice"],ref = "860d6a9ace8248dfeec18b8b159e7b757d9f56bb",editable = true}
-dulwich = "*"
aiodns = "*"
logmatic-python = "*"
aiohttp = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 94af49045..735d7cd96 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "d731c41fe6352ae0bd5a2de66e1436c8ac63088e591367ed1634a22f69d039bb"
+ "sha256": "ab3b63b74dbf35fb960913a91e10282121a2776e935d98f0b4c3d780715f7a6b"
},
"pipfile-spec": 6,
"requires": {
@@ -18,11 +18,11 @@
"default": {
"aio-pika": {
"hashes": [
- "sha256:eb6daaae400ee1345f971b335cdf5bb941c4b4afaed5cbd6e609f18a1545e3f2",
- "sha256:f609f9a26ac5cfad4c4d99507b93f4c8648aea3a005f81acbb6c5156aa1f152c"
+ "sha256:300474d8b0e9ccde17b2d1e71c3b4f7ba86559cc0842b9355b9eccb12be4a02a",
+ "sha256:3bc547600344beba8f36edfd1b1ec1c8b30f803ea7c11eaf249683099d07c98b"
],
"index": "pypi",
- "version": "==5.5.1"
+ "version": "==5.5.2"
},
"aiodns": {
"hashes": [
@@ -62,10 +62,10 @@
},
"aiormq": {
"hashes": [
- "sha256:19489efae3fedbef68b44ed39103455823e1d3caa098e80595155d25a0f244c1",
- "sha256:d2eac8f81e56e1e8e7bc2e38b720dd7825318cd299d2155fd03b456241c68789"
+ "sha256:79b41e51481fb7617279414e4428a644a944beb4dea8ea0febd67a8902976250",
+ "sha256:f134cc91ac111b0135c97539272579b1d15b69f25c75a935f6ee39e5194df231"
],
- "version": "==2.5.0"
+ "version": "==2.5.2"
},
"alabaster": {
"hashes": [
@@ -174,13 +174,6 @@
],
"version": "==0.14"
},
- "dulwich": {
- "hashes": [
- "sha256:afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725"
- ],
- "index": "pypi",
- "version": "==0.19.11"
- },
"fuzzywuzzy": {
"hashes": [
"sha256:5ac7c0b3f4658d2743aa17da53a55598144edbc5bee3c6863840636e6926f254",
@@ -332,10 +325,9 @@
},
"ordered-set": {
"hashes": [
- "sha256:41c7ba85e7619cd4c71e38d4cd434f84de8473b826919eb79274b3a11b940b4d",
- "sha256:f9b703ea9aa9c1db44412c5ba1c16cf8b7ad7ef37a685e4da2fd3754b40f8f6a"
+ "sha256:a7bfa858748c73b096e43db14eb23e2bc714a503f990c89fac8fab9b0ee79724"
],
- "version": "==3.1"
+ "version": "==3.1.1"
},
"packaging": {
"hashes": [
@@ -706,10 +698,10 @@
},
"identify": {
"hashes": [
- "sha256:244e7864ef59f0c7c50c6db73f58564151d91345cd9b76ed793458953578cadd",
- "sha256:8ff062f90ad4b09cfe79b5dfb7a12e40f19d2e68a5c9598a49be45f16aba7171"
+ "sha256:443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9",
+ "sha256:bd7f15fe07112b713fb68fbdde3a34dd774d9062128f2c398104889f783f989d"
],
- "version": "==1.4.1"
+ "version": "==1.4.2"
},
"idna": {
"hashes": [
@@ -831,17 +823,17 @@
},
"virtualenv": {
"hashes": [
- "sha256:6aebaf4dd2568a0094225ebbca987859e369e3e5c22dc7d52e5406d504890417",
- "sha256:984d7e607b0a5d1329425dd8845bd971b957424b5ba664729fab51ab8c11bc39"
+ "sha256:15ee248d13e4001a691d9583948ad3947bcb8a289775102e4c4aa98a8b7a6d73",
+ "sha256:bfc98bb9b42a3029ee41b96dc00a34c2f254cbf7716bec824477b2c82741a5c4"
],
- "version": "==16.4.3"
+ "version": "==16.5.0"
},
"zipp": {
"hashes": [
- "sha256:55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478",
- "sha256:682b3e1c62b7026afe24eadf6be579fb45fec54c07ea218bded8092af07a68c4"
+ "sha256:139391b239594fd8b91d856bc530fbd2df0892b17dd8d98a91f018715954185f",
+ "sha256:8047e4575ce8d700370a3301bbfc972896a5845eb62dd535da395b86be95dfad"
],
- "version": "==0.3.3"
+ "version": "==0.4.0"
}
}
}
diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py
index f65dbe8ab..a86a6f3d4 100644
--- a/bot/cogs/antispam.py
+++ b/bot/cogs/antispam.py
@@ -32,8 +32,7 @@ RULE_FUNCTION_MAPPING = {
}
WHITELISTED_CHANNELS = (
Channels.admins, Channels.announcements, Channels.big_brother_logs,
- Channels.devalerts, Channels.devlog, Channels.devtest,
- Channels.helpers, Channels.message_log,
+ Channels.devlog, Channels.devtest, Channels.helpers, Channels.message_log,
Channels.mod_alerts, Channels.modlog, Channels.staff_lounge
)
diff --git a/bot/cogs/bot.py b/bot/cogs/bot.py
index 61bad422d..828e2514c 100644
--- a/bot/cogs/bot.py
+++ b/bot/cogs/bot.py
@@ -5,7 +5,6 @@ import time
from discord import Embed, Message, RawMessageUpdateEvent
from discord.ext.commands import Bot, Context, command, group
-from dulwich.repo import Repo
from bot.constants import (
Channels, Guild, MODERATION_ROLES,
@@ -66,12 +65,7 @@ class Bot:
url="https://gitlab.com/discord-python/projects/bot"
)
- repo = Repo(".")
- sha = repo[repo.head()].sha().hexdigest()
-
embed.add_field(name="Total Users", value=str(len(self.bot.get_guild(Guild.id).members)))
- embed.add_field(name="Git SHA", value=str(sha)[:7])
-
embed.set_author(
name="Python Bot",
url="https://gitlab.com/discord-python/projects/bot",
diff --git a/bot/cogs/modlog.py b/bot/cogs/modlog.py
index 65efda5ed..b3094321e 100644
--- a/bot/cogs/modlog.py
+++ b/bot/cogs/modlog.py
@@ -8,9 +8,8 @@ from dateutil.relativedelta import relativedelta
from deepdiff import DeepDiff
from discord import (
CategoryChannel, Colour, Embed, File, Guild,
- Member, Message, NotFound, RawBulkMessageDeleteEvent,
- RawMessageDeleteEvent, RawMessageUpdateEvent, Role,
- TextChannel, User, VoiceChannel
+ Member, Message, NotFound, RawMessageDeleteEvent,
+ RawMessageUpdateEvent, Role, TextChannel, User, VoiceChannel
)
from discord.abc import GuildChannel
from discord.ext.commands import Bot
@@ -526,37 +525,6 @@ class ModLog:
channel_id=Channels.userlog
)
- async def on_raw_bulk_message_delete(self, event: RawBulkMessageDeleteEvent):
- if event.guild_id != GuildConstant.id or event.channel_id in GuildConstant.ignored:
- return
-
- # Could upload the log to the site - maybe we should store all the messages somewhere?
- # Currently if messages aren't in the cache, we ain't gonna have 'em.
-
- ignored_messages = 0
-
- for message_id in event.message_ids:
- if message_id in self._ignored[Event.message_delete]:
- self._ignored[Event.message_delete].remove(message_id)
- ignored_messages += 1
-
- if ignored_messages >= len(event.message_ids):
- return
-
- channel = self.bot.get_channel(event.channel_id)
-
- if channel.category:
- message = f"{len(event.message_ids)} deleted in {channel.category}/#{channel.name} (`{channel.id}`)"
- else:
- message = f"{len(event.message_ids)} deleted in #{channel.name} (`{channel.id}`)"
-
- await self.send_log_message(
- Icons.message_bulk_delete, Colour.orange(),
- "Bulk message delete",
- message, channel_id=Channels.devalerts,
- ping_everyone=True
- )
-
async def on_message_delete(self, message: Message):
channel = message.channel
author = message.author
diff --git a/bot/constants.py b/bot/constants.py
index 93f8a231b..d2c953276 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -333,7 +333,6 @@ class Channels(metaclass=YAMLGetter):
bot: int
checkpoint_test: int
defcon: int
- devalerts: int
devlog: int
devtest: int
help_0: int
diff --git a/config-default.yml b/config-default.yml
index e5681dc3d..d8016875b 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -95,7 +95,6 @@ guild:
bot: 267659945086812160
checkpoint_test: 422077681434099723
defcon: 464469101889454091
- devalerts: 460181980097675264
devlog: &DEVLOG 409308876241108992
devtest: &DEVTEST 414574275865870337
help_0: 303906576991780866
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-29 23:33:41 +0000