k4cg · Sep 21, 2017 · Sep 21, 2017 · Nov 2, 2017
Showing with 20 additions and 13 deletions.

+10 −8 language.ini

+9 −4 plugins/open.py

+1 −1 plugins/status.py
diff --git a/language.ini b/language.ini
@@ -39,8 +39,9 @@ nickserv_help = Mich beim freenode NickServ authentifizieren.
 
 # open.py - Open Status Plugin
 open_help = !offen - Aktuelle Geraete in der K4CG anzeigen lassen
-open_str1 = Wahrscheinlich. Momentan sind {d} Geraete in der K4CG
-open_str2 = Sorry, sieht nicht so aus als waere jemand in der K4CG
+open_str1 = Jawoll! Momentan sind {d} Geraete im Wifi und die Tuer ist {door}.
+open_str2 = Vielleicht. Momentan sind {d} Geraete im Wifi und die Tuer ist {door}.
+open_str3 = Nope. {d} Geraete im Wifi und die Tuer ist {door}.
 
 # status.py - Open Status Plugin
 status_help = !status - Zeigt Uebersicht fuer (fast) alle Sensoren
@@ -76,8 +77,8 @@ light_error = Konnte status.json nicht von der Heimat abholen.
 
 # sound.py
 sound_help = !geraeusche - Zeige aktuellen Geraeuschpegel in der K4CG
-sound_str1 = Momentane Geraeuschintensitaet: {sound}/3300
-sound_str2 = Totale stille in der CG. {sound}/3300
+sound_str1 = Momentane Geraeuschintensitaet: {sound}/4095
+sound_str2 = Totale stille in der CG. {sound}/4095
 sound_error = Konnte status.json nicht von der Heimat abholen.
 
 [en]
@@ -121,8 +122,9 @@ nickserv_help = Authenticate to freenode NickServ.
 
 # open.py - Open Status Plugin
 open_help = !open - Current connected devices at K4CG
-open_str1 = Probably. Currently there are {d} devices at K4CG
-open_str2 = Sorry, it doesn't look like there is anyone at K4CG at the moment
+open_str1 = Yep. Currently there are {d} devices in wifi and door is {door}.
+open_str2 = Maybe. Currently there are {d} devices and door is {door}.
+open_str3 = Nope. {d} devices and door is {door}.
 
 # status.py - Open Status Plugin
 status_help = !status - Shows overview for (nearly) all sensors
@@ -159,6 +161,6 @@ licht_help = !licht - Show current UV Light at the hackerspace
 
 # sound.py
 sound_help = !geraeusche - Show current noise in the hackerspace
-sound_str1 = Current noise: {sound}/3300
-sound_str2 = SILENCE in CG. {sound}/3300
+sound_str1 = Current noise: {sound}/4095
+sound_str2 = SILENCE in CG. {sound}/4095
 sound_error = Could not fetch data.
diff --git a/plugins/open.py b/plugins/open.py
@@ -14,9 +14,14 @@ def help_text(self, bot):
   def on_msg(self, bot, user_nick, host, channel, message):
     if message.startswith("!offen") or message.startswith("!open"):
         msg = bot.get_spacestatus_data()
-        f = msg['online']
+        wifi = msg['online']
+        door = str(msg['hservierer']['door'])
 
-        if int(f) > 0:
-          bot.send_message(channel, bot.translate("open_str1").format(d=f), user_nick)
+        if int(wifi) > 0 and door == 'open':
+          bot.send_message(channel, bot.translate("open_str1").format(d=wifi,door=door), user_nick)
+        elif int(wifi) > 0 and door == 'closed':
+          bot.send_message(channel, bot.translate("open_str2").format(d=wifi,door=door), user_nick)
+        elif int(wifi) == 0 and door == 'open':
+          bot.send_message(channel, bot.translate("open_str2").format(d=wifi,door=door), user_nick)
         else:
-          bot.send_message(channel, bot.translate("open_str2").format(d=f), user_nick)
+          bot.send_message(channel, bot.translate("open_str3").format(d=wifi,door=door), user_nick)
diff --git a/plugins/status.py b/plugins/status.py
@@ -23,4 +23,4 @@ def on_msg(self, bot, user_nick, host, channel, message):
           hosts = str(msg['online'])
           door = str(msg['hservierer']['door'])
 
-          bot.send_message(channel, bot.translate("status_str1").format(noise=noise, temp=temp, light=light, hosts=hosts), user_nick)
+          bot.send_message(channel, bot.translate("status_str1").format(noise=noise, temp=temp, light=light, hosts=hosts, door=door), user_nick)