3 files changed, 23 insertions, 4 deletions
diff --git a/plugins/MirLua/src/Modules/m_clist.cpp b/plugins/MirLua/src/Modules/m_clist.cpp
index 6de506cfd0..005a21fc1b 100644
--- a/plugins/MirLua/src/Modules/m_clist.cpp
+++ b/plugins/MirLua/src/Modules/m_clist.cpp
@@ -117,6 +117,22 @@ static int clist_AddTrayMenuItem(lua_State *L)
 	return 1;
 }
 
+static int clist_AddGroupMenuItem(lua_State *L)
+{
+	luaL_checktype(L, 1, LUA_TTABLE);
+
+	CMenuItem mi(&g_plugin);
+	MakeMenuItem(L, mi);
+
+	HGENMENU res = Menu_AddGroupMenuItem(&mi);
+	if (res != nullptr)
+		lua_pushlightuserdata(L, res);
+	else
+		lua_pushnil(L);
+
+	return 1;
+}
+
 static luaL_Reg clistApi[] =
 {
 	{ "AddMainMenuRoot", clist_AddMainMenuRoot },
@@ -126,6 +142,7 @@ static luaL_Reg clistApi[] =
 	{ "AddContactMenuItem", clist_AddContactMenuItem },
 
 	{ "AddTrayMenuItem", clist_AddTrayMenuItem },
+	{ "AddGroupMenuItem", clist_AddGroupMenuItem },
 
 	{ nullptr, nullptr }
 };
diff --git a/plugins/MirLua/src/Modules/m_database.cpp b/plugins/MirLua/src/Modules/m_database.cpp
index e3f4922643..030b749bd7 100644
--- a/plugins/MirLua/src/Modules/m_database.cpp
+++ b/plugins/MirLua/src/Modules/m_database.cpp
@@ -294,7 +294,7 @@ void MakeDbEvent(lua_State *L, DBEVENTINFO &dbei)
 	lua_pop(L, 1);
 
 	lua_getfield(L, -1, "Timestamp");
-	dbei.timestamp = lua_tonumber(L, -1);
+	dbei.iTimestamp = lua_tonumber(L, -1);
 	lua_pop(L, 1);
 
 	lua_getfield(L, -1, "Flags");
@@ -692,9 +692,11 @@ LUAMOD_API int luaopen_m_database(lua_State *L)
 
 	MT<DBEVENTINFO>(L, MT_DBEVENTINFO)
 		.Field(&DBEVENTINFO::szModule, "Module", LUA_TSTRINGA)
-		.Field(&DBEVENTINFO::timestamp, "Timestamp", LUA_TINTEGER)
+		.Field(&DBEVENTINFO::iTimestamp, "Timestamp", LUA_TINTEGER)
 		.Field(&DBEVENTINFO::eventType, "Type", LUA_TINTEGER)
-		.Field(&DBEVENTINFO::flags, "Flags", LUA_TINTEGER);
+		.Field(&DBEVENTINFO::flags, "Flags", LUA_TINTEGER)
+		.Field(&DBEVENTINFO::cbBlob, "BlobSize", LUA_TINTEGER)
+		.Field(&DBEVENTINFO::pBlob, "Message", LUA_TSTRING);
 
 	return 1;
 }
diff --git a/plugins/MirLua/src/Modules/m_message.cpp b/plugins/MirLua/src/Modules/m_message.cpp
index 1425771a14..be10f333ab 100644
--- a/plugins/MirLua/src/Modules/m_message.cpp
+++ b/plugins/MirLua/src/Modules/m_message.cpp
@@ -36,7 +36,7 @@ static int message_Send(lua_State *L)
 	else if ((res = ProtoChainSend(hContact, PSS_MESSAGE, 0, (LPARAM)message)) != ACKRESULT_FAILED) {
 		DBEVENTINFO dbei = {};
 		dbei.szModule = MODULENAME;
-		dbei.timestamp = time(0);
+		dbei.iTimestamp = time(0);
 		dbei.eventType = EVENTTYPE_MESSAGE;
 		dbei.cbBlob = (uint32_t)mir_strlen(message);
 		dbei.pBlob = mir_strdup(message);