autojoin.lua: fix chankey argument

diff --git a/lua/autojoin.lua b/lua/autojoin.lua
index b04fb4b..74c483c 100644 (file)
--- a/lua/autojoin.lua
+++ b/lua/autojoin.lua
@@ -5,6 +5,6 @@ if not autojoin then
 end
 hook_add("newuser", "autojoin", function(hook, cl1, cl2, chan, txt)
        for k in pairs(autojoin) do
-               channel_join(cl1, k, false)
+               channel_join(cl1, k)
        end
 end)

diff --git a/src/admin.cpp b/src/admin.cpp
index d9db90e..8afd0aa 100644 (file)
--- a/src/admin.cpp
+++ b/src/admin.cpp
@@ -245,7 +245,7 @@ static int fn_channel_join(lua_State *L)
        } else {
                channel = luaL_checkstring(L, 2);
        }
-       const char *chankey = lua_isboolean(L, 3) && lua_toboolean(L, 3) ? (chan ? chan->chankey : 0) : luaL_optstring(L, 3, 0);
+       const char *chankey = lua_isboolean(L, 3) ? (lua_toboolean(L, 3) && chan ? chan->chankey : 0) : luaL_optstring(L, 3, 0);
        channel_join(cl, channel, chankey);
        return 0;
 }