Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-01-18 21:47:05 (GMT)
committerRemko Tronçon <git@el-tramo.be>2014-01-18 21:54:25 (GMT)
commit4083d6da47ac0e3b77da9c7c222a9439b3e1c04c (patch)
tree36737e1bc0cdf55e2737c3eadb878bca66d2dcca
parentd7b86d83de8b9b452243eac841af80cfa4327c03 (diff)
downloadswift-4083d6da47ac0e3b77da9c7c222a9439b3e1c04c.zip
swift-4083d6da47ac0e3b77da9c7c222a9439b3e1c04c.tar.bz2
Sluift: Support for common presence payloads
Change-Id: Idb7cd431f20ea69690a105240a5e2aeec1643cec
Diffstat
-rw-r--r--Sluift/ElementConvertors/DelayConvertor.cpp47
-rw-r--r--Sluift/ElementConvertors/DelayConvertor.h23
-rw-r--r--Sluift/ElementConvertors/StatusConvertor.cpp36
-rw-r--r--Sluift/ElementConvertors/StatusConvertor.h23
-rw-r--r--Sluift/ElementConvertors/StatusShowConvertor.cpp59
-rw-r--r--Sluift/ElementConvertors/StatusShowConvertor.h23
-rw-r--r--Sluift/LuaElementConvertors.cpp8
-rw-r--r--Sluift/SConscript3
8 files changed, 221 insertions, 1 deletions
diff --git a/Sluift/ElementConvertors/DelayConvertor.cpp b/Sluift/ElementConvertors/DelayConvertor.cpp
new file mode 100644
index 0000000..09789e9
--- /dev/null
+++ b/Sluift/ElementConvertors/DelayConvertor.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Sluift/ElementConvertors/DelayConvertor.h>
+
+#include <lua.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <Sluift/Lua/Check.h>
+#include <Swiften/Base/DateTime.h>
+
+using namespace Swift;
+
+DelayConvertor::DelayConvertor() : GenericLuaElementConvertor<Delay>("delay") {
+}
+
+DelayConvertor::~DelayConvertor() {
+}
+
+boost::shared_ptr<Delay> DelayConvertor::doConvertFromLua(lua_State* L) {
+ boost::shared_ptr<Delay> result = boost::make_shared<Delay>();
+ lua_getfield(L, -1, "stamp");
+ if (lua_isstring(L, -1)) {
+ result->setStamp(stringToDateTime(lua_tostring(L, -1)));
+ }
+ lua_pop(L, 1);
+
+ lua_getfield(L, -1, "from");
+ if (lua_isstring(L, -1)) {
+ result->setFrom(lua_tostring(L, -1));
+ }
+ lua_pop(L, 1);
+ return result;
+}
+
+void DelayConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<Delay> payload) {
+ lua_createtable(L, 0, 0);
+ if (payload->getFrom()) {
+ lua_pushstring(L, (*payload->getFrom()).toString().c_str());
+ lua_setfield(L, -2, "from");
+ }
+ lua_pushstring(L, dateTimeToString(payload->getStamp()).c_str());
+ lua_setfield(L, -2, "stamp");
+}
diff --git a/Sluift/ElementConvertors/DelayConvertor.h b/Sluift/ElementConvertors/DelayConvertor.h
new file mode 100644
index 0000000..0e6640c
--- /dev/null
+++ b/Sluift/ElementConvertors/DelayConvertor.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/Override.h>
+
+#include <Sluift/GenericLuaElementConvertor.h>
+#include <Swiften/Elements/Delay.h>
+
+namespace Swift {
+ class DelayConvertor : public GenericLuaElementConvertor<Delay> {
+ public:
+ DelayConvertor();
+ virtual ~DelayConvertor();
+
+ virtual boost::shared_ptr<Delay> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
+ virtual void doConvertToLua(lua_State*, boost::shared_ptr<Delay>) SWIFTEN_OVERRIDE;
+ };
+}
diff --git a/Sluift/ElementConvertors/StatusConvertor.cpp b/Sluift/ElementConvertors/StatusConvertor.cpp
new file mode 100644
index 0000000..092e9b7
--- /dev/null
+++ b/Sluift/ElementConvertors/StatusConvertor.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Sluift/ElementConvertors/StatusConvertor.h>
+
+#include <lua.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <Sluift/Lua/Check.h>
+
+using namespace Swift;
+
+StatusConvertor::StatusConvertor() : GenericLuaElementConvertor<Status>("status") {
+}
+
+StatusConvertor::~StatusConvertor() {
+}
+
+boost::shared_ptr<Status> StatusConvertor::doConvertFromLua(lua_State* L) {
+ boost::shared_ptr<Status> result = boost::make_shared<Status>();
+ lua_getfield(L, -1, "text");
+ if (lua_isstring(L, -1)) {
+ result->setText(lua_tostring(L, -1));
+ }
+ lua_pop(L, 1);
+ return result;
+}
+
+void StatusConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<Status> payload) {
+ lua_createtable(L, 0, 0);
+ lua_pushstring(L, payload->getText().c_str());
+ lua_setfield(L, -2, "text");
+}
diff --git a/Sluift/ElementConvertors/StatusConvertor.h b/Sluift/ElementConvertors/StatusConvertor.h
new file mode 100644
index 0000000..ac494c4
--- /dev/null
+++ b/Sluift/ElementConvertors/StatusConvertor.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/Override.h>
+
+#include <Sluift/GenericLuaElementConvertor.h>
+#include <Swiften/Elements/Status.h>
+
+namespace Swift {
+ class StatusConvertor : public GenericLuaElementConvertor<Status> {
+ public:
+ StatusConvertor();
+ virtual ~StatusConvertor();
+
+ virtual boost::shared_ptr<Status> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
+ virtual void doConvertToLua(lua_State*, boost::shared_ptr<Status>) SWIFTEN_OVERRIDE;
+ };
+}
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.cpp b/Sluift/ElementConvertors/StatusShowConvertor.cpp
new file mode 100644
index 0000000..c8a5bd6
--- /dev/null
+++ b/Sluift/ElementConvertors/StatusShowConvertor.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#include <Sluift/ElementConvertors/StatusShowConvertor.h>
+
+#include <lua.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <Sluift/Lua/Check.h>
+
+using namespace Swift;
+
+StatusShowConvertor::StatusShowConvertor() : GenericLuaElementConvertor<StatusShow>("show") {
+}
+
+StatusShowConvertor::~StatusShowConvertor() {
+}
+
+boost::shared_ptr<StatusShow> StatusShowConvertor::doConvertFromLua(lua_State* L) {
+ boost::shared_ptr<StatusShow> result = boost::make_shared<StatusShow>();
+ lua_getfield(L, -1, "type");
+ if (lua_isstring(L, -1)) {
+ if (std::string(lua_tostring(L, -1)) == "online") {
+ result->setType(StatusShow::Online);
+ }
+ if (std::string(lua_tostring(L, -1)) == "ffc") {
+ result->setType(StatusShow::FFC);
+ }
+ if (std::string(lua_tostring(L, -1)) == "away") {
+ result->setType(StatusShow::Away);
+ }
+ if (std::string(lua_tostring(L, -1)) == "xa") {
+ result->setType(StatusShow::XA);
+ }
+ if (std::string(lua_tostring(L, -1)) == "dnd") {
+ result->setType(StatusShow::DND);
+ }
+ }
+ lua_pop(L, 1);
+ return result;
+}
+
+void StatusShowConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<StatusShow> payload) {
+ lua_createtable(L, 0, 0);
+ if (payload->getType() != StatusShow::None) {
+ switch (payload->getType()) {
+ case StatusShow::Online: lua_pushstring(L, "online"); break;
+ case StatusShow::FFC: lua_pushstring(L, "ffc"); break;
+ case StatusShow::Away: lua_pushstring(L, "away"); break;
+ case StatusShow::XA: lua_pushstring(L, "xa"); break;
+ case StatusShow::DND: lua_pushstring(L, "dnd"); break;
+ case StatusShow::None: assert(false); break;
+ }
+ lua_setfield(L, -2, "type");
+ }
+}
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.h b/Sluift/ElementConvertors/StatusShowConvertor.h
new file mode 100644
index 0000000..32253ec
--- /dev/null
+++ b/Sluift/ElementConvertors/StatusShowConvertor.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/Override.h>
+
+#include <Sluift/GenericLuaElementConvertor.h>
+#include <Swiften/Elements/StatusShow.h>
+
+namespace Swift {
+ class StatusShowConvertor : public GenericLuaElementConvertor<StatusShow> {
+ public:
+ StatusShowConvertor();
+ virtual ~StatusShowConvertor();
+
+ virtual boost::shared_ptr<StatusShow> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
+ virtual void doConvertToLua(lua_State*, boost::shared_ptr<StatusShow>) SWIFTEN_OVERRIDE;
+ };
+}
diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp
index 71957c1..ba86c06 100644
--- a/Sluift/LuaElementConvertors.cpp
+++ b/Sluift/LuaElementConvertors.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Remko Tronçon
+ * Copyright (c) 2013-2014 Remko Tronçon
* Licensed under the GNU General Public License.
* See the COPYING file for more information.
*/
@@ -22,6 +22,9 @@
#include <Sluift/ElementConvertors/VCardConvertor.h>
#include <Sluift/ElementConvertors/BodyConvertor.h>
#include <Sluift/ElementConvertors/CommandConvertor.h>
+#include <Sluift/ElementConvertors/StatusShowConvertor.h>
+#include <Sluift/ElementConvertors/StatusConvertor.h>
+#include <Sluift/ElementConvertors/DelayConvertor.h>
#include <Sluift/Lua/LuaUtils.h>
#include <Sluift/Lua/Exception.h>
@@ -29,6 +32,9 @@ using namespace Swift;
LuaElementConvertors::LuaElementConvertors() {
registerConvertors();
+ convertors.push_back(boost::make_shared<StatusConvertor>());
+ convertors.push_back(boost::make_shared<StatusShowConvertor>());
+ convertors.push_back(boost::make_shared<DelayConvertor>());
convertors.push_back(boost::make_shared<CommandConvertor>(this));
convertors.push_back(boost::make_shared<PubSubEventConvertor>(this));
convertors.push_back(boost::make_shared<BodyConvertor>());
diff --git a/Sluift/SConscript b/Sluift/SConscript
index 38baef1..c2bbff5 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -30,6 +30,9 @@ elif env["SCONS_STAGE"] == "build" :
"ElementConvertors/SoftwareVersionConvertor.cpp",
"ElementConvertors/VCardConvertor.cpp",
"ElementConvertors/CommandConvertor.cpp",
+ "ElementConvertors/StatusConvertor.cpp",
+ "ElementConvertors/StatusShowConvertor.cpp",
+ "ElementConvertors/DelayConvertor.cpp",
"ClientHelpers.cpp",
"SluiftClient.cpp",
"Watchdog.cpp",