Add getnickbynumeric

diff --git a/lua/lua.h b/lua/lua.h
index 6ec5144c66a2c503daa049b511cca43120c28eec..1b4d78d24074bc15866f18621db9a7da0acd9d69 100644 (file)
--- a/lua/lua.h
+++ b/lua/lua.h
@@ -12,7 +12,7 @@
 
 #include "../lib/sstring.h"
 
-#define LUA_BOTVERSION "1.34"
+#define LUA_BOTVERSION "1.35"
 #define LUA_CHANFIXBOT "Z"
 #define LUA_OPERCHAN "#twilightzone"
 #define LUA_PUKECHAN "#qnet.keepout"

diff --git a/lua/luacommands.c b/lua/luacommands.c
index 52b2241d71c6d977324c8920e116d25aa360f415..c86d8160ee3f9c8780515d3c6c6fc326c03f2534 100644 (file)
--- a/lua/luacommands.c
+++ b/lua/luacommands.c
@@ -633,6 +633,20 @@ static int lua_getnickbynick(lua_State *l) {
   return 1;
 }
 
+static int lua_getnickbynumeric(lua_State *l) {
+  nick *np;
+
+  if(!lua_islong(l, 1))
+    return 0;
+
+  np = getnickbynumeric(lua_tolong(l, 1));
+  if(!np)
+    return 0;
+
+  LUA_PUSHNICK(l, np);
+  return 1;
+}
+
 void lua_registercommands(lua_State *l) {
   lua_register(l, "irc_smsg", lua_smsg);
   lua_register(l, "irc_skill", lua_skill);
@@ -661,6 +675,7 @@ void lua_registercommands(lua_State *l) {
   lua_register(l, "irc_topic", lua_topic);
 
   lua_register(l, "irc_getnickbynick", lua_getnickbynick);
+  lua_register(l, "irc_getnickbynumeric", lua_getnickbynumeric);
   lua_register(l, "irc_getfirstnick", lua_getfirstnick);
   lua_register(l, "irc_getnextnick", lua_getnextnick);
 

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index 1aab978049f6f08382e842f795bb3dc5d7a84ce3..e9f5e978ae5b64b130a9c06d60f99f3e7e3e52df 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -1817,7 +1817,7 @@ void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args)
                   matchbuf[0] = 0;
               
               trojanscan_mainchanmsg("m: t: %c u: %s!%s@%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, sender->host->name->content, mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
-              trojanscan_peonchanmsg("m: t: %c u: %s!%s@%s%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, (IsHideHost(sender)&&IsAccount(sender))?sender->authname:sender->host->name->content, (IsHideHost(sender)&&IsAccount(sender))?"."HIS_HIDDENHOST:"", mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
+/*              trojanscan_peonchanmsg("m: t: %c u: %s!%s@%s%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, (IsHideHost(sender)&&IsAccount(sender))?sender->authname:sender->host->name->content, (IsHideHost(sender)&&IsAccount(sender))?"."HIS_HIDDENHOST:"", mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:""); */
             } else {
               int glinetime = TROJANSCAN_FIRST_OFFENSE * frequency * (worm->epidemic?TROJANSCAN_EPIDEMIC_MULTIPLIER:1);
               if(glinetime > 7 * 24)