intel-screenbot

commit 53950ad200df8e1e3805c42f30bcec993fc19bad
parent 63afc6a83d195ab3c1d0f417567343b8d797b400
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 15 Nov 2016 08:27:17 +0100

Fix iitc login

Diffstat:
M
__init__.py
 | 
25
++++++++++++++++---------

1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/__init__.py b/__init__.py
@@ -175,7 +175,7 @@ def intel(bot, event, *args):
             html = "<i><b>{}</b> No Intel password has been added to config. Unable to authenticate".format(event.user.full_name)
             yield from bot.coro_send_message(event.conv, html)
     elif bot.config.exists(["intel_screenbot", "email"]):
-        if bot.config.exists(["intel_screenbot", "email"]):
+        if bot.config.exists(["intel_screenbot", "password"]):
             SACSID = bot.config.get_by_path(["intel_screenbot", "email"])
             CSRF = bot.config.get_by_path(["intel_screenbot", "password"])
         else:
@@ -234,16 +234,23 @@ def iitc(bot, event, *args):
         url = bot.conversation_memory_get(event.conv_id, 'IntelURL')
 
     if bot.config.exists(["intel_screenbot", "SACSID"]):
-        SACSID = bot.config.get_by_path(["intel_screenbot", "SACSID"])
-    else:
-        html = "<i><b>{}</b> No Intel SACSID Cookie has been added to config. Unable to authenticate".format(event.user.full_name)
-        yield from bot.coro_send_message(event.conv, html)
-    if bot.config.exists(["intel_screenbot", "CSRF"]):
-        CSRF = bot.config.get_by_path(["intel_screenbot", "CSRF"])
+        if bot.config.exists(["intel_screenbot", "CSRF"]):
+            SACSID = bot.config.get_by_path(["intel_screenbot", "SACSID"])
+            CSRF = bot.config.get_by_path(["intel_screenbot", "CSRF"])
+        else:
+            html = "<i><b>{}</b> No Intel password has been added to config. Unable to authenticate".format(event.user.full_name)
+            yield from bot.coro_send_message(event.conv, html)
+    elif bot.config.exists(["intel_screenbot", "email"]):
+        if bot.config.exists(["intel_screenbot", "password"]):
+            SACSID = bot.config.get_by_path(["intel_screenbot", "email"])
+            CSRF = bot.config.get_by_path(["intel_screenbot", "password"])
+        else:
+            html = "<i><b>{}</b> No Intel password has been added to config. Unable to authenticate".format(event.user.full_name)
+            yield from bot.coro_send_message(event.conv, html)
     else:
-        html = "<i><b>{}</b> No Intel CSRF Cookie has been added to config. Unable to authenticate".format(event.user.full_name)
+        html = "<i><b>{}</b> No Intel SACSID Cookie or Email/password has been added to config. Unable to authenticate".format(event.user.full_name)
         yield from bot.coro_send_message(event.conv, html)
-
+        
     if url is None:
         html = "<i><b>{}</b> No Intel URL has been set for screenshots.".format(event.user.full_name)
         yield from bot.coro_send_message(event.conv, html)