Skip to content

Commit

Permalink
Merge branch 'main' into ErrorEmptyMessage
Browse files Browse the repository at this point in the history
  • Loading branch information
ajax146 authored Jul 5, 2024
2 parents 3dfe6c2 + ddaf8ce commit 2899307
Show file tree
Hide file tree
Showing 12 changed files with 995 additions and 740 deletions.
14 changes: 7 additions & 7 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ aiocron = "==1.8"
bidict = "==0.22.1"
black = "==24.4.2"
dateparser = "1.2.0"
"discord.py" = "==2.3.2"
"discord.py" = "==2.4.0"
emoji = "==2.11.1"
expiringdict = "==1.2.2"
flake8 = "==7.0.0"
flake8-annotations = "==3.0.1"
flake8-bugbear = "==24.2.6"
flake8 = "==7.1.0"
flake8-annotations = "==3.1.1"
flake8-bugbear = "==24.4.26"
flake8-docstrings-complete = "==1.3.0"
flake8-modern-annotations = "==1.6.0"
flake8-variables-names = "==0.0.6"
gino = "==1.0.1"
gitpython = "==3.1.43"
hypothesis = "==6.103.1"
hypothesis = "==6.105.0"
ib3 = "==0.2.0"
inflect = "==7.2.1"
inflect = "==7.3.1"
irc = "==20.1.0"
isort = "==5.13.2"
munch = "==4.0.0"
typing_extensions = "==4.8.0"
pip = "==24.0"
pip = "==24.1.1"
pipenv = "==2024.0.1"
pydantic = "==2.7.0"
pydoclint = "==0.4.1"
Expand Down
92 changes: 46 additions & 46 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions techsupport_bot/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import gino
import ircrelay
import munch
import ui
import yaml
from botlogging import LogContext, LogLevel
from core import auxiliary, custom_errors, databases, extensionconfig, http
Expand Down Expand Up @@ -182,6 +183,9 @@ async def setup_hook(self: Self) -> None:
json.loads(config.config)
)

# Adds persistent views to the bot
self.add_view(ui.VotingButtonPersistent())

# The very last step should be loading extensions
# Some extensions will require the database or config when loading
await self.logger.send_log(
Expand Down
3 changes: 2 additions & 1 deletion techsupport_bot/commands/grab.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ async def random_grab(
).where(self.bot.models.Grab.guild == str(ctx.guild.id))

if not ctx.channel.is_nsfw():
query = query.where(self.bot.models.Grab.nsfw is False)
# pylint: disable=C0121
query = query.where(self.bot.models.Grab.nsfw == False)

grabs = await query.gino.all()

Expand Down
Loading

0 comments on commit 2899307

Please sign in to comment.