diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a5df4c8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +bridge.db +bridge.log diff --git a/modules/ircclient/ircclient.rb b/modules/ircclient/ircclient.rb index 2573a4d..5902110 100644 --- a/modules/ircclient/ircclient.rb +++ b/modules/ircclient/ircclient.rb @@ -560,7 +560,7 @@ def handle_user_input(msg) else unless @channel == nil @sock.write("PRIVMSG #{@channel.name} :#{msg}\n") - reply_user(@jid, "sent to: #{@channel.name}", "std") + # reply_user(@jid, "sent to: #{@channel.name}", "std") else reply_user(@jid, "not active on a channel: use .c or .j", "std") end @@ -926,10 +926,12 @@ def send_to_user mode = $5 target = $6 user = get_user_from_nick(target) - if mode == "+o" - user.op = true - elsif mode == "-o" - user.op = false + if !user.nil? + if mode == "+o" + user.op = true + elsif mode == "-o" + user.op = false + end end mode_msg = "*** [#{channel_name}] MODE #{mode} #{target} by #{nick}" reply_user(@jid, mode_msg.chomp, "std") diff --git a/modules/main/main.rb b/modules/main/main.rb index e5557c0..bb98980 100755 --- a/modules/main/main.rb +++ b/modules/main/main.rb @@ -248,7 +248,7 @@ def presence_updates_handler(contact,presence) seen = Time.now.strftime('%Y-%m-%d %H:%M:%S') $db.execute("UPDATE roster SET lastseen='#{seen}' WHERE rjid='" + sql_sanitize(ujid) + "'") #quit_bridged_app(ujid) - leave_lobby(ujid, "unavailable") + #leave_lobby(ujid, "unavailable") end end diff --git a/xmppbridge.rb b/xmppbridge.rb index 94ba4bd..5ecb378 100755 --- a/xmppbridge.rb +++ b/xmppbridge.rb @@ -61,7 +61,7 @@ $bridged_app_timeout = config['timeout'].to_i # Debuging: true = extensive xmpp output to stderr -debug_mode = true +debug_mode = false # Initial setting for botmasters to see source code for botcmds when # they are executed (very noisy when enabled) @@ -219,7 +219,7 @@ def sql_sanitize(str) $db.execute("CREATE INDEX banidx ON bans (jid)") # populate roster table with default bot masters - $db.execute("INSERT INTO roster (rjid,rlvl,rnick,rpasswd,in_lobby) VALUES ('#{$default_master}','owner','Steve','foobar99', '1')") + $db.execute("INSERT INTO roster (rjid,rlvl,rnick,rpasswd,in_lobby) VALUES ('#{$default_master}','owner','#{$botnick}','foobar99', '1')") $masters << $default_master logit("done inserting default master user")