From a187f69f5e8fb5e74e529fbe0ebfe0203bc4def7 Mon Sep 17 00:00:00 2001 From: Romedius Weiss Date: Mon, 6 Mar 2017 13:59:59 +0100 Subject: [PATCH] changed urls, added Spaceping plugin for supybot --- ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino | 6 +- supybot/SpacePing/README.txt | 1 + supybot/SpacePing/__init__.py | 66 ++++++++++++++++++++ supybot/SpacePing/config.py | 49 +++++++++++++++ supybot/SpacePing/plugin.py | 68 +++++++++++++++++++++ supybot/SpacePing/test.py | 37 +++++++++++ 6 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 supybot/SpacePing/README.txt create mode 100644 supybot/SpacePing/__init__.py create mode 100644 supybot/SpacePing/config.py create mode 100644 supybot/SpacePing/plugin.py create mode 100644 supybot/SpacePing/test.py diff --git a/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino b/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino index b597141..c09e7be 100644 --- a/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino +++ b/ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino @@ -258,12 +258,12 @@ void setRoom(int statuss){ void RequestState() { - TriggerServerReq("/status-s.php",0); + TriggerServerReq("/api/status-s.php",0); } void RequestPing() { - TriggerServerReq("/ping-get.php?apikey="+pingAPIKey,1); + TriggerServerReq("/api/ping-get.php?apikey="+pingAPIKey,1); } void TriggerServerReq(String s, int mode) { @@ -290,7 +290,7 @@ void TriggerServerUpdate(boolean stat) { if(debug){Serial.println("making HTTP request...");} // make HTTP GET request to server: String s =(stat?"true":"false"); - client.println("GET /update.php?open=" + s + "&apikey="+serverAPIKey+" HTTP/1.1"); + client.println("GET /api/update.php?open=" + s + "&apikey="+serverAPIKey+" HTTP/1.1"); client.println("HOST: it-syndikat.org"); client.println("Connection: close"); client.println(); diff --git a/supybot/SpacePing/README.txt b/supybot/SpacePing/README.txt new file mode 100644 index 0000000..e0912b0 --- /dev/null +++ b/supybot/SpacePing/README.txt @@ -0,0 +1 @@ +this plugin can be used to send a signal to the it-syndikat hackerspace in innsbruck. The implementation of the physical signal is still pending. diff --git a/supybot/SpacePing/__init__.py b/supybot/SpacePing/__init__.py new file mode 100644 index 0000000..59e553e --- /dev/null +++ b/supybot/SpacePing/__init__.py @@ -0,0 +1,66 @@ +### +# Copyright (c) 2013, detlef prskavec +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions, and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions, and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the author of this software nor the name of +# contributors to this software may be used to endorse or promote products +# derived from this software without specific prior written consent. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +### + +""" +Add a description of the plugin (to be presented to the user inside the wizard) +here. This should describe *what* the plugin does. +""" + +import supybot +import supybot.world as world + +# Use this for the version of this plugin. You may wish to put a CVS keyword +# in here if you're keeping the plugin in CVS or some similar system. +__version__ = "" + +# XXX Replace this with an appropriate author or supybot.Author instance. +__author__ = supybot.authors.unknown + +# This is a dictionary mapping supybot.Author instances to lists of +# contributions. +__contributors__ = {} + +# This is a url where the most recent plugin package can be downloaded. +__url__ = '' # 'http://supybot.com/Members/yourname/Spaceping/download' + +import config +import plugin +reload(plugin) # In case we're being reloaded. +# Add more reloads here if you add third-party modules and want them to be +# reloaded when this plugin is reloaded. Don't forget to import them as well! + +if world.testing: + import test + +Class = plugin.Class +configure = config.configure + + +# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: diff --git a/supybot/SpacePing/config.py b/supybot/SpacePing/config.py new file mode 100644 index 0000000..712babd --- /dev/null +++ b/supybot/SpacePing/config.py @@ -0,0 +1,49 @@ +### +# Copyright (c) 2013, detlef prskavec +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions, and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions, and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the author of this software nor the name of +# contributors to this software may be used to endorse or promote products +# derived from this software without specific prior written consent. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +### + +import supybot.conf as conf +import supybot.registry as registry + +def configure(advanced): + # This will be called by supybot to configure this module. advanced is + # a bool that specifies whether the user identified himself as an advanced + # user or not. You should effect your configuration by manipulating the + # registry as appropriate. + from supybot.questions import expect, anything, something, yn + conf.registerPlugin('SpacePing', True) + + +SpacePing = conf.registerPlugin('SpacePing') +# This is where your configuration variables (if any) should go. For example: +# conf.registerGlobalValue(SpacePing, 'someConfigVariableName', +# registry.Boolean(False, """Help for someConfigVariableName.""")) + + +# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: diff --git a/supybot/SpacePing/plugin.py b/supybot/SpacePing/plugin.py new file mode 100644 index 0000000..67058c6 --- /dev/null +++ b/supybot/SpacePing/plugin.py @@ -0,0 +1,68 @@ +## +# Copyright (c) 2013, detlef prskavec +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions, and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions, and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the author of this software nor the name of +# contributors to this software may be used to endorse or promote products +# derived from this software without specific prior written consent. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +### + +import supybot.utils as utils +from supybot.commands import * +import supybot.plugins as plugins +import supybot.ircutils as ircutils +import supybot.callbacks as callbacks +import urllib2 +import simplejson +import datetime + +class SpacePing(callbacks.Plugin): + """Add the help for "@plugin help SpacePing" here + This should describe *how* to use this plugin.""" + threaded = True + + + def _fetchJsonData(self): + """fetches jsondata from url""" + url = 'http://it-syndikat.org/ping.php?apikey=apiKey1' + ua = {'user-agent':'supybot-plugin/SpacePing'} + req = urllib2.Request(url, None, ua) + f = urllib2.urlopen(req) + data = simplejson.load(f) + return data + + + def spaceping(self, irc, msg, args): + """takes no argument + checks if the it-syndikat hackerspace is currently + open. that means someone pushed the button to + announce that fact :)""" + data = self._fetchJsonData() + reply = 'Hello Space!' + irc.reply(reply, prefixNick=True) + +Class = SpacePing + + +# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: diff --git a/supybot/SpacePing/test.py b/supybot/SpacePing/test.py new file mode 100644 index 0000000..b85baeb --- /dev/null +++ b/supybot/SpacePing/test.py @@ -0,0 +1,37 @@ +### +# Copyright (c) 2013, detlef prskavec +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions, and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions, and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the author of this software nor the name of +# contributors to this software may be used to endorse or promote products +# derived from this software without specific prior written consent. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +### + +from supybot.test import * + +class SpacePingTestCase(PluginTestCase): + plugins = ('SpacePing',) + + +# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: