From a527e0dd0f33603629f5778ae64727ada13576c1 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <tykling@bornhack.org>
Date: Mon, 3 Jul 2017 19:46:49 +0200
Subject: [PATCH] a few more changes to irc worker stuff

---
 src/bornhack/environment_settings.py.dist  | 10 +++++---
 src/ircbot/management/__init__.py          |  0
 src/ircbot/management/commands/__init__.py |  0
 src/ircbot/management/commands/ircbot.py   | 30 ----------------------
 4 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 src/ircbot/management/__init__.py
 delete mode 100644 src/ircbot/management/commands/__init__.py
 delete mode 100644 src/ircbot/management/commands/ircbot.py

diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist
index eadd3b51..5b1abb5a 100644
--- a/src/bornhack/environment_settings.py.dist
+++ b/src/bornhack/environment_settings.py.dist
@@ -73,9 +73,13 @@ SCHEDULE_EVENT_NOTIFICATION_MINUTES=10
 
 # irc bot settings
 IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS=60
-IRCBOT_NICK='mybot'
-IRCBOT_SCHEDULE_ANNOUNCE_CHANNEL='#something'
-IRCBOT_SERVER_HOSTNAME='irc.example.com'
+IRCBOT_NICK='{{ django_ircbot_nickname }}'
+IRCBOT_SERVER_HOSTNAME='{{ django_ircbot_server }}'
 IRCBOT_SERVER_PORT=6697
 IRCBOT_SERVER_USETLS=True
+IRCBOT_CHANNELS={
+    'default': '{{ django_ircbot_default_channel }}',
+    'orga': '{{ django_ircbot_orga_channel }}',
+    'public': '{{ django_ircbot_public_channel }}'
+}
 
diff --git a/src/ircbot/management/__init__.py b/src/ircbot/management/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ircbot/management/commands/__init__.py b/src/ircbot/management/commands/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ircbot/management/commands/ircbot.py b/src/ircbot/management/commands/ircbot.py
deleted file mode 100644
index 52ce7e69..00000000
--- a/src/ircbot/management/commands/ircbot.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.conf import settings
-from django.utils import timezone
-from time import sleep
-import irc3, sys, asyncio
-
-
-class Command(BaseCommand):
-    args = 'none'
-    help = 'Runs the BornHack IRC bot to announce talks and manage team channel permissions'
-
-    def output(self, message):
-        self.stdout.write('%s: %s' % (timezone.now().strftime("%Y-%m-%d %H:%M:%S"), message))
-
-    def handle(self, *args, **options):
-        self.output('IRC bot worker running...')
-        # connect to IRC
-        config = {
-            'nick': settings.IRCBOT_NICK,
-            'autojoins': [settings.IRCBOT_SCHEDULE_ANNOUNCE_CHANNEL],
-            'host': settings.IRCBOT_SERVER_HOSTNAME,
-            'port': settings.IRCBOT_SERVER_PORT,
-            'ssl': settings.IRCBOT_SERVER_USETLS,
-            'timeout': 30,
-            'includes': [
-                'ircbot.irc3module',
-            ],
-        }
-        irc3.IrcBot(**config).run(forever=True)
-