projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a1d5c2
)
++Using
author
Bernhard Tittelbach
<xro@realraum.at>
Fri, 6 Sep 2013 21:33:25 +0000
(21:33 +0000)
committer
Bernhard Tittelbach
<xro@realraum.at>
Fri, 6 Sep 2013 21:33:25 +0000
(21:33 +0000)
r3-netstatus/main.go
patch
|
blob
|
history
diff --git
a/r3-netstatus/main.go
b/r3-netstatus/main.go
index
8e6610d
..
cd0f601
100644
(file)
--- a/
r3-netstatus/main.go
+++ b/
r3-netstatus/main.go
@@
-46,7
+46,7
@@
func composeMessage(present, locked, shut bool, who string, ts int64) string {
IfThenElseStr(present, "Somebody is present!" , "Everybody left."),
IfThenElseStr(locked, "locked","unlocked"),
IfThenElseStr(shut, "shut","ajar"),
IfThenElseStr(present, "Somebody is present!" , "Everybody left."),
IfThenElseStr(locked, "locked","unlocked"),
IfThenElseStr(shut, "shut","ajar"),
- IfThenElseStr(who == "","", " by " + who),
+ IfThenElseStr(len(who) == 0,"", " by " + who),
time.Unix(ts,0).String())
}
time.Unix(ts,0).String())
}
@@
-62,7
+62,11
@@
func EventToXMPP(ps *pubsub.PubSub, xmpp_presence_events_chan_ chan <- interface
present = event.Present
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true}
case DoorCommandEvent:
present = event.Present
xmpp_presence_events_chan_ <- r3xmppbot.XMPPMsgEvent{Msg: composeMessage(present, locked, shut, who, event.Ts), DistributeLevel: r3xmppbot.R3OnlineOnlyInfo, RememberAsStatus: true}
case DoorCommandEvent:
- who = event.Who
+ if len(event.Who) > 0 && len(event.Using) > 0 {
+ who = fmt.Sprintf("%s (%s)",event.Who, event.Using)
+ } else {
+ who = event.Who
+ }
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
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