tBKwtWS пре 7 година
родитељ
комит
3779bf2f43
3 измењених фајлова са 13 додато и 7 уклоњено
  1. 3 3
      .eric6project/pyRot.e6t
  2. 1 1
      events/common.py
  3. 9 3
      rotbot.py

+ 3 - 3
.eric6project/pyRot.e6t

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-6.0.dtd">
 <!-- eric6 tasks file for project pyRot -->
-<!-- Saved: 2018-01-28, 22:14:06 -->
+<!-- Saved: 2018-01-29, 02:50:52 -->
 <Tasks version="6.0">
   <ProjectScanFilter></ProjectScanFilter>
-  <Task priority="1" completed="False" type="2" uid="{f922ec46-05e3-43d1-9f41-2fefa8ce09d3}">
+  <Task priority="1" completed="False" type="2" uid="{4cfd7321-6af7-451f-8dd6-5377b0147cd6}">
     <Summary>WARNING: &quot; + str(message))</Summary>
     <Description></Description>
-    <Created>2018-01-28, 22:14:03</Created>
+    <Created>2018-01-29, 02:50:49</Created>
     <Resource>
       <Filename>common/log.py</Filename>
       <Linenumber>8</Linenumber>

+ 1 - 1
events/common.py

@@ -89,7 +89,7 @@ class Lastact():
             fields = fields + ", last_act"
             values = values + ", '" + lastact + "'"
         if auxiliary:
-            fields = fields + ", auxiliary"
+            fields = fields + ", last_act_auxiliary"
             values = values + ", '" + auxiliary + "'"
         self.db.run("UPDATE users SET (" + fields + ") = (" + values + ") WHERE name='" + name + "' AND network='" + self.network + "'")
         

+ 9 - 3
rotbot.py

@@ -52,7 +52,7 @@ class PyRot(irc.bot.SingleServerIRCBot):
         events.on_welcome.process_event(self, connection, event)
     
     def on_error(self, connection, event):
-        log.notice(event)
+        log.notice(str(event))
         connection.privmsg(self.homechannel, "ERROR: " + event)
     
     def on_nick(self, connection, event):
@@ -74,7 +74,10 @@ class PyRot(irc.bot.SingleServerIRCBot):
             del self.protectees[event.source.nick] # Delete from protectees.
         
         # Update last act.
-        Lastact.update(self, event.source.nick, "part", channel=event.target, lastact=event.arguments[0])
+        if event.arguments:
+            Lastact.update(self, event.source.nick, "part", channel=event.target, lastact=event.arguments[0])
+        else:
+            Lastact.update(self, event.source.nick, "part", channel=event.target)
     
     def on_quit(self, connection, event):
         
@@ -83,7 +86,10 @@ class PyRot(irc.bot.SingleServerIRCBot):
             del self.protectees[event.source.nick] # Delete from protectees.
         
         # Update last act.
-        Lastact.update(self, event.source.nick, "quit", lastact=event.arguments[0])
+        if event.arguments:
+            Lastact.update(self, event.source.nick, "quit", lastact=event.arguments[0])
+        else:
+            Lastact.update(self, event.source.nick, "quit")
     
     def on_invite(self, connection, event):
         log.info(event)