X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=r3-netstatus%2Fmain.go;h=da2101643eb550e0ee58be893e7f7a6c3c1ee8d1;hb=caa5ad7abedd69e82acd4c0fb29ffddddc32e460;hp=f7828b92db8ec80b8e231252cd3fdc0460c14c60;hpb=63eb752b0e125d962bcd5a4d56afb2616ab2af67;p=svn42.git

diff --git a/r3-netstatus/main.go b/r3-netstatus/main.go
index f7828b9..da21016 100644
--- 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_)