func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface{}) {
events := ps.Sub("presence","door","buttons")
- var present, locked, shut bool
+ var present, locked, shut bool = false, true, true
var who string = "Unknown"
for eventinterface := range(events) {
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}
}
}
}
return
}
defer bot.StopBot()
-
- newlinequeue := make(chan string)
+
+ 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 ReadFromUSocket(presence_socket_path_, newlinequeue)
go EventToWeb(ps)
go EventToXMPP(ps, xmpp_presence_events_chan_)
+ go ReadFromUSocket(presence_socket_path_, newlinequeue)
for {
select {
case e := <-newlinequeue: