1 files changed, 32 insertions, 6 deletions
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index 75f675d..24ece85 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -1,18 +1,16 @@
 /*
- * Copyright (c) 2013-2017 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <boost/assign/list_of.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Disco/ClientDiscoManager.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Elements/RawXMLPayload.h>
 #include <Swiften/Elements/RosterItemPayload.h>
 #include <Swiften/Elements/RosterPayload.h>
@@ -36,19 +34,18 @@
 #include <Sluift/Lua/Check.h>
 #include <Sluift/Lua/Exception.h>
 #include <Sluift/Lua/FunctionRegistration.h>
 #include <Sluift/Lua/LuaUtils.h>
 #include <Sluift/Lua/Value.h>
 #include <Sluift/SluiftClient.h>
 #include <Sluift/globals.h>
 
 using namespace Swift;
-namespace lambda = boost::lambda;
 
 static inline SluiftClient* getClient(lua_State* L) {
     return *Lua::checkUserData<SluiftClient>(L, 1);
 }
 
 static inline int getGlobalTimeout(lua_State* L) {
     lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.moduleLibIndex);
     lua_getfield(L, -1, "timeout");
     int result = boost::numeric_cast<int>(lua_tointeger(L, -1));
@@ -596,18 +593,45 @@ static void pushEvent(lua_State* L, const SluiftClient::Event& event) {
         }
         case SluiftClient::Event::UnblockEventType: {
             Lua::Table result = boost::assign::map_list_of
                 ("type", std::make_shared<Lua::Value>(std::string("unblock")))
                 ("jid",  std::make_shared<Lua::Value>(event.item.toString()));
             Lua::pushValue(L, result);
             Lua::registerTableToString(L, -1);
             break;
         }
+        case SluiftClient::Event::RosterAddType: {
+            Lua::Table result = boost::assign::map_list_of
+                ("type", std::make_shared<Lua::Value>(std::string("rosterpush")))
+                ("jid",  std::make_shared<Lua::Value>(event.item.toString()))
+                ("action", std::make_shared<Lua::Value>(std::string("added")));
+            Lua::pushValue(L, result);
+            Lua::registerTableToString(L, -1);
+            break;
+        }
+        case SluiftClient::Event::RosterRemoveType: {
+            Lua::Table result = boost::assign::map_list_of
+                ("type", std::make_shared<Lua::Value>(std::string("rosterpush")))
+                ("jid",  std::make_shared<Lua::Value>(event.item.toString()))
+                ("action", std::make_shared<Lua::Value>(std::string("removed")));
+            Lua::pushValue(L, result);
+            Lua::registerTableToString(L, -1);
+            break;
+        }
+        case SluiftClient::Event::RosterUpdateType: {
+            Lua::Table result = boost::assign::map_list_of
+                ("type", std::make_shared<Lua::Value>(std::string("rosterpush")))
+                ("jid",  std::make_shared<Lua::Value>(event.item.toString()))
+                ("action", std::make_shared<Lua::Value>(std::string("updated")));
+            Lua::pushValue(L, result);
+            Lua::registerTableToString(L, -1);
+            break;
+        }
     }
 }
 
 struct CallUnaryLuaPredicateOnEvent {
     CallUnaryLuaPredicateOnEvent(lua_State* L, int index) : L(L), index(index) {
     }
 
     bool operator()(const SluiftClient::Event& event) {
         lua_pushvalue(L, index);
@@ -653,19 +677,21 @@ SLUIFT_LUA_FUNCTION(Client, get_next_event) {
         }
     }
 
     boost::optional<SluiftClient::Event> event;
     if (condition) {
         event = client->getNextEvent(timeout, CallUnaryLuaPredicateOnEvent(L, condition));
     }
     else if (type) {
         event = client->getNextEvent(
-                timeout, lambda::bind(&SluiftClient::Event::type, lambda::_1) == *type);
+                timeout, [&](const SluiftClient::Event& event) {
+                    return event.type == *type;
+                });
     }
     else {
         event = client->getNextEvent(timeout);
     }
 
     if (event) {
         pushEvent(L, *event);
     }
     else {
@@ -695,19 +721,19 @@ SLUIFT_LUA_FUNCTION_WITH_HELP(
         }
         lua_getfield(L, 2, "name");
         const char* rawName = lua_tostring(L, -1);
         if (rawName) {
             item.setName(rawName);
         }
         lua_getfield(L, 2, "groups");
         if (!lua_isnil(L, -1)) {
             if (lua_type(L, -1) == LUA_TTABLE) {
-                for (size_t i = 1; i <= lua_objlen(L, -1); ++i) {
+                for (size_t i = 1; i <= lua_rawlen(L, -1); ++i) {
                     lua_rawgeti(L, -1, boost::numeric_cast<int>(i));
                     const char* rawGroup = lua_tostring(L, -1);
                     if (rawGroup) {
                         item.addGroup(rawGroup);
                     }
                     lua_pop(L, 1);
                 }
             }
             else {