Merge branch 'master' of git.incorporeal.org:bss/hitomi

bot/management/commands/starthitomi.py

@@ -44,7 +44,7 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         loop = asyncio.get_event_loop()
         handler = hitomi_api.make_handler()
-        api_server = loop.create_server(handler, '0.0.0.0', 8080)
+        api_server = loop.create_server(handler, '0.0.0.0', settings.API_PORT)
         futures = asyncio.gather(run_bot(), api_server)
         try:
             loop.run_until_complete(futures)

hitomi/settings.py

@@ -138,6 +138,8 @@ WEATHER_WEATHER_UNDERGROUND_API_KEY = 'key'
 
 BOT_PLUGINS = []
 
+API_PORT = 7777
+
 
 # get local settings