Compare commits

..

2 Commits

6 changed files with 11 additions and 2 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ tags/
*.egg-info/ *.egg-info/
.tox/ .tox/
.coverage .coverage
staticfiles/
dr.botzo.data dr.botzo.data
dr.botzo.cfg dr.botzo.cfg
localsettings.py localsettings.py

View File

@ -54,6 +54,7 @@ INSTALLED_APPS = [
MIDDLEWARE = [ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'whitenoise.middleware.WhiteNoiseMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
@ -165,6 +166,9 @@ BOOTSTRAP3 = {
'javascript_in_head': True, 'javascript_in_head': True,
} }
# whitenoise
STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
############### ###############
# web options # # web options #
############### ###############

View File

@ -158,7 +158,7 @@ class DrReactor(irc.client.Reactor):
# ignore the first word, a nick, if the speaker is the bridge # ignore the first word, a nick, if the speaker is the bridge
try: try:
channel = IrcChannel.objects.get(name=sent_location) channel = IrcChannel.objects.get(server=connection.server_config, name=sent_location)
if sender_nick == channel.discord_bridge: if sender_nick == channel.discord_bridge:
short_what = ' '.join(what.split(' ')[1:]) short_what = ' '.join(what.split(' ')[1:])
real_source = re.sub(r'^<(\S+)> .*', r'\1!user@discord-bridge', what) real_source = re.sub(r'^<(\S+)> .*', r'\1!user@discord-bridge', what)

View File

@ -12,7 +12,7 @@ authors = [
] ]
requires-python = ">=3.10,<3.12" requires-python = ">=3.10,<3.12"
dependencies = ["Django<5.1", "django-bootstrap3", "django-extensions", "djangorestframework", "irc<20.5.0", "numexpr", dependencies = ["Django<5.1", "django-bootstrap3", "django-extensions", "djangorestframework", "irc<20.5.0", "numexpr",
"parsedatetime", "ply", "python-dateutil", "python-mpd2", "pytz", "requests", "zalgo-text"] "parsedatetime", "ply", "python-dateutil", "python-mpd2", "pytz", "requests", "whitenoise", "zalgo-text"]
dynamic = ["version"] dynamic = ["version"]
classifiers = [ classifiers = [
"Framework :: Django", "Framework :: Django",

View File

@ -283,6 +283,8 @@ virtualenv==20.27.1
# via tox # via tox
wheel==0.44.0 wheel==0.44.0
# via pip-tools # via pip-tools
whitenoise==6.11.0
# via dr.botzo (pyproject.toml)
zalgo-text==0.6 zalgo-text==0.6
# via dr.botzo (pyproject.toml) # via dr.botzo (pyproject.toml)

View File

@ -83,5 +83,7 @@ tempora==5.7.0
# jaraco-logging # jaraco-logging
urllib3==2.2.3 urllib3==2.2.3
# via requests # via requests
whitenoise==6.11.0
# via dr.botzo (pyproject.toml)
zalgo-text==0.6 zalgo-text==0.6
# via dr.botzo (pyproject.toml) # via dr.botzo (pyproject.toml)