cosmetic improvements

[svn42.git] / r3-netstatus / main.go

diff --git a/r3-netstatus/main.go b/r3-netstatus/main.go
index f7828b9..da21016 100644 (file)
--- a/r3-netstatus/main.go
+++ b/r3-netstatus/main.go
@@ -46,16 +46,16 @@ func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
         switch event := eventinterface.(type) {
             case PresenceUpdate:
                 present = event.Present
-                xmpp_presence_events_chan_ <- r3xmppbot.XMPPPresenceEvent{Present: present, Who: who, DoorLock: locked, DoorShut: shut, Button: false}
+                xmpp_presence_events_chan_ <- r3xmppbot.XMPPPresenceEvent{Present: present, Who: who, DoorLock: locked, DoorShut: shut, Ts: event.Ts}
             case DoorCommandEvent:
                 who = event.Who
-                xmpp_presence_events_chan_ <- fmt.Sprintln("DoorCommand: ",event.Command, "using", event.Using, "by", event.Who, event.Ts)
+                xmpp_presence_events_chan_ <- fmt.Sprintln("DoorCommand:",event.Command, "using", event.Using, "by", event.Who, time.Unix(event.Ts,0))
             case DoorStatusUpdate:
                 locked = event.Locked
                 shut = event.Shut
-                xmpp_presence_events_chan_ <- fmt.Sprintln("DoorStatus locked:",event.Locked, "shut:", event.Shut, event.Ts)
+                xmpp_presence_events_chan_ <- fmt.Sprintln("DoorStatus:",r3xmppbot.IfThenElseStr(event.Locked, "locked","unlocked"), r3xmppbot.IfThenElseStr(event.Shut, "shut","ajar"), time.Unix(event.Ts,0))
             case ButtonPressUpdate:
-                xmpp_presence_events_chan_ <- r3xmppbot.XMPPPresenceEvent{Present: present, Who: who, DoorLock: locked, DoorShut: shut, Button: true}
+                xmpp_presence_events_chan_ <- r3xmppbot.XMPPPresenceEvent{Present: present, Who: who, DoorLock: locked, DoorShut: shut, Button: true, Ts: event.Ts}
         }
        }
 }
@@ -69,14 +69,14 @@ func main() {
         return
     }
     defer bot.StopBot()
-    
+
     newlinequeue := make(chan string, 1)
     ps := pubsub.New(1)
     //~ brn := brain.New()
     defer close(newlinequeue)
     defer ps.Shutdown()
     //~ defer brn.Shutdown()
-    
+
        ticker := time.NewTicker(time.Duration(7) * time.Minute)
     go EventToWeb(ps)
     go EventToXMPP(ps, xmpp_presence_events_chan_)