rohieb · Oct 6, 2015 · Mar 23, 2016 · Jan 19, 2017 · Jan 19, 2017 · Jan 19, 2017
diff --git a/client/html-js-poll/status.html b/client/html-js-poll/status.html
@@ -21,7 +21,7 @@
 				return sprintf("%s, %d-%02d-%02d, %02d:%02d",
 						days[date.getDay()],
 						date.getFullYear(),
-						date.getMonth(),
+						date.getMonth() + 1, // 0-based
 						date.getDate(),
 						date.getHours(),
 						date.getMinutes()
@@ -42,7 +42,7 @@
 				$("#icon").prop("src", "open.svg");
 			}
 			function fetchStatus() {
-				$.getJSON("http://status.stratum0.org/status.json", function (data) {
+				$.getJSON("https://status.stratum0.org/status.json", function (data) {
 					if(data.state !== undefined &&
 							data.state.lastchange !== undefined &&
 							data.state.open !== undefined &&

diff --git a/server/supybot/plugins/StratumMonitor/plugin.py b/server/supybot/plugins/StratumMonitor/plugin.py
@@ -1,4 +1,5 @@
 ###
+# vim: set fileencoding=utf-8
 # Copyright (c) 2012, Roland Hieber
 # All rights reserved.
 #
@@ -50,10 +51,8 @@ class StratumMonitor(callbacks.Plugin):
   access_log off;
 
   location / {
-    rewrite ^/status.png$ https://$http_host/{{{STATUS}}}.png redirect;
-    rewrite ^/favicon.ico$ https://$http_host/{{{STATUS}}}.ico redirect;
-    #rewrite ^/status.png$ $scheme://$http_host/{{{STATUS}}}.png redirect;
-    #rewrite ^/favicon.ico$ $scheme://$http_host/{{{STATUS}}}.ico redirect;
+    rewrite ^/status.png$ https://stratum0.org/status/{{{STATUS}}}.png redirect;
+    rewrite ^/favicon.ico$ https://stratum0.org/status/{{{STATUS}}}.ico redirect;
     expires +5m;
   }
   location ~* /(open|closed)(_square)?\.(ico|png)$ {
@@ -63,6 +62,9 @@ class StratumMonitor(callbacks.Plugin):
     expires +5m;
     add_header Access-Control-Allow-Origin *;
   }
+  location /update {
+    proxy_pass http://localhost:8766;
+  }
 }
 """
   API_PATH  = "/srv/status.stratum0.org/%s"
@@ -93,22 +95,23 @@ class StratumMonitor(callbacks.Plugin):
     "lat": 52.2785658\r
   },\r
   "contact": {\r
-    "phone": "+49 531 287 69 245",\r
-    "twitter": "@stratum0",\r
     "email": "kontakt@stratum0.org",\r
     "ml": "normalverteiler@stratum0.org",\r
     "issue_mail": "cm9oaWViK3NwYWNlYXBpLWlzc3Vlc0Byb2hpZWIubmFtZQ==",\r
-    "irc": "irc://chat.freenode.net/#stratum0",\r
-    "foursquare": "4f243fd0e4b0b653a35e3ae4"\r
+    "irc": "ircs://irc.libera.net/#stratum0",\r
+    "mastodon": "@stratum0@chaos.social",\r
+    "matrix": "#stratum0:stratum0.org"\r
   },\r
   "issue_report_channels": [\r
     "issue_mail"\r
   ],\r
   "state": {\r
+    "ext_since": {{{SINCE_EPOCH}}},\r
+    "lastchange": {{{LASTCHANGE_EPOCH}}},\r
     "open": {{{ISOPEN}}},\r
     "icon": {\r
-      "open": "http://status.stratum0.org/open_square.png",\r
-      "closed": "http://status.stratum0.org/closed_square.png"\r
+      "open": "https://status.stratum0.org/open_square.png",\r
+      "closed": "https://status.stratum0.org/closed_square.png"\r
     },\r
     "trigger_person": "{{{OPENER}}}",
     "lastchange": {{{SINCE_EPOCH}}}\r
@@ -124,7 +127,7 @@ class StratumMonitor(callbacks.Plugin):
     },\r
     "calendar": {\r
       "type": "ical",\r
-      "url": "https://stratum0.org/calendar/events.ics"\r
+      "url": "https://stratum0.org/kalender/events.ics"\r
     }\r
   }\r
 }\r
@@ -171,6 +174,7 @@ def __init__(self, irc):
     self.openedBy = ""
     self.since = datetime.now()
     self.presentEntities = None
+    self.lastchange = datetime.now()
     self.lastCalled = int(time.time())
     self.lastBroadcast = 0
 
@@ -279,6 +283,8 @@ def replaceVariables(self, text):
     text = text.replace("{{{SINCE}}}", self.since.isoformat())
     text = text.replace("{{{SINCE_EPOCH}}}",
       str(int(time.mktime(self.since.timetuple()))))
+    text = text.replace("{{{LASTCHANGE_EPOCH}}}",
+      str(int(time.mktime(self.lastchange.timetuple()))))
     text = text.replace("{{{ISOPEN}}}", "true" if self.isOpen else "false")
     text = text.replace("{{{STATUS}}}", "open" if self.isOpen else "closed")
     text = text.replace("{{{ACTION}}}", "Opened" if self.isOpen else "Closed")
@@ -323,6 +329,8 @@ def spaceopen(self, irc, msg, args, nick):
     empty, the nick of the caller is used instead.
     """
     self.since = datetime.now()
+    if not self.isOpen:
+      self.lastchange = datetime.now()
     self.isOpen = True;
     self.openedBy = nick if nick else msg.nick
     self.writeFiles()
@@ -344,6 +352,8 @@ def spaceclosed(self, irc, msg, args):
     the channel topic.
     """
     self.since = datetime.now()
+    if self.isOpen:
+      self.lastchange = datetime.now()
     self.isOpen = False;
     self.openedBy = ""
     self.writeFiles()

diff --git a/server/supybot/supybot.conf.example b/server/supybot/supybot.conf.example
@@ -56,14 +56,14 @@ supybot.networks.freenode.password:
 #
 # Default value: 
 ###
-supybot.networks.freenode.servers: irc.freenode.net:6667
+supybot.networks.freenode.servers: chat.freenode.net:6667 kornbluth.freenode.net:6667 hitchcock.freenode.net:6667 verne.freenode.net:6667
 
 ###
 # Determines what channels the bot will join only on freenode.
 #
 # Default value:  
 ###
-supybot.networks.freenode.channels: #stratum0 #stratum0v
+supybot.networks.freenode.channels: #stratum0
 
 ###
 # Determines what key (if any) will be used to join the channel.
@@ -286,7 +286,7 @@ supybot.reply.whenAddressedBy.chars: @
 #
 # Default value:  
 ###
-supybot.reply.whenAddressedBy.strings: sudo mach
+supybot.reply.whenAddressedBy.strings: sudo mach Sudo Mach
 
 ###
 # Determines whether the bot will reply when people address it by its
@@ -696,6 +696,8 @@ supybot.plugins.Alias.aliases.auf: offen $*
 supybot.plugins.Alias.aliases.auf.locked: True
 supybot.plugins.Alias.aliases.make: echo $nick: Here, have a sandwich: https://www.google.com/images?q=sandwich
 supybot.plugins.Alias.aliases.make.locked: True
+supybot.plugins.Alias.aliases.space: offen $*
+supybot.plugins.Alias.aliases.space.locked: False
 supybot.plugins.Alias.aliases.neuhier: echo Neu hier? https://stratum0.org/wiki/Neu_hier
 supybot.plugins.Alias.aliases.neuhier.locked: False
 supybot.plugins.Alias.aliases.kekse: action hat kein mehl

diff --git a/server/www/closed-badge.svg b/server/www/closed-badge.svg
diff --git a/server/www/closed.png b/server/www/closed.png
diff --git a/server/www/closed_square.png b/server/www/closed_square.png