diff --git a/dr_botzo/ircbot/admin.py b/dr_botzo/ircbot/admin.py index 886c6f4..5e19f47 100644 --- a/dr_botzo/ircbot/admin.py +++ b/dr_botzo/ircbot/admin.py @@ -10,14 +10,14 @@ from django.contrib import admin from django.shortcuts import render from ircbot.forms import PrivmsgForm -from ircbot.models import Alias, BotAdmin, IrcChannel, IrcPlugin +from ircbot.models import Alias, BotUser, IrcChannel, IrcPlugin log = logging.getLogger('ircbot.admin') admin.site.register(Alias) -admin.site.register(BotAdmin) +admin.site.register(BotUser) admin.site.register(IrcChannel) admin.site.register(IrcPlugin) diff --git a/dr_botzo/ircbot/lib.py b/dr_botzo/ircbot/lib.py index c2457fd..b0bf32d 100644 --- a/dr_botzo/ircbot/lib.py +++ b/dr_botzo/ircbot/lib.py @@ -6,7 +6,7 @@ import logging import irc.client -from ircbot.models import BotAdmin +from ircbot.models import BotUser log = logging.getLogger('ircbot.lib') @@ -48,9 +48,9 @@ def is_admin(source): """Check if the provided event source is a bot admin.""" try: - bot_user = BotAdmin.objects.get(nickmask=source) + bot_user = BotUser.objects.get(nickmask=source) log.debug("found bot user {0:s}".format(bot_user)) - except BotAdmin.DoesNotExist: + except BotUser.DoesNotExist: log.debug("could not find bot user for {0:s}".format(source)) return False diff --git a/dr_botzo/ircbot/migrations/0010_auto_20150620_0930.py b/dr_botzo/ircbot/migrations/0010_auto_20150620_0930.py new file mode 100644 index 0000000..9f36462 --- /dev/null +++ b/dr_botzo/ircbot/migrations/0010_auto_20150620_0930.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ircbot', '0009_botadmin_user'), + ] + + operations = [ + migrations.RenameModel( + old_name='BotAdmin', + new_name='BotUser', + ), + ] diff --git a/dr_botzo/ircbot/models.py b/dr_botzo/ircbot/models.py index 73a873f..5b58aab 100644 --- a/dr_botzo/ircbot/models.py +++ b/dr_botzo/ircbot/models.py @@ -36,9 +36,9 @@ class Alias(models.Model): return command -class BotAdmin(models.Model): +class BotUser(models.Model): - """Configure admins, which can do things through the bot that others can't.""" + """Configure bot users, which can do things through the bot and standard Django auth.""" nickmask = models.CharField(max_length=200, unique=True) user = models.ForeignKey(settings.AUTH_USER_MODEL)