From 8a607004bf91b499856df36becac2df4a7415198 Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Thu, 27 Jan 2011 13:16:57 -0500 Subject: [PATCH 1/7] ignore bridge.{db,log} --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore 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 From aeb840c182a661d910271e3702f9916f3bc13fe6 Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Thu, 27 Jan 2011 13:17:41 -0500 Subject: [PATCH 2/7] use $botnick as default nick in DB --- xmppbridge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmppbridge.rb b/xmppbridge.rb index 94ba4bd..22b0164 100755 --- a/xmppbridge.rb +++ b/xmppbridge.rb @@ -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") From 9534b325fd4b795ea9a97e86aa4ea686cd640aa0 Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Thu, 27 Jan 2011 13:26:21 -0500 Subject: [PATCH 3/7] de-verbosify IRC PING --- modules/ircclient/ircclient.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ircclient/ircclient.rb b/modules/ircclient/ircclient.rb index 66dc535..e23935b 100644 --- a/modules/ircclient/ircclient.rb +++ b/modules/ircclient/ircclient.rb @@ -294,7 +294,7 @@ def send_to_user if msg.match(/^PING :(.+)/) @sock.write("PONG #{$1}\n") - reply_user(@jid, ">>> answered PING from #{$1}", "std") + # reply_user(@jid, ">>> answered PING from #{$1}", "std") elsif msg.match(/^:(.+?)!(.+?) NOTICE (.+?) :(.+)$/) notice_msg = "." From d6ef12a81dacc57ebfa4b19234620e0468188c54 Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Thu, 27 Jan 2011 13:52:21 -0500 Subject: [PATCH 4/7] Silently send messages to channel, remove verbose "sent to:" message. --- modules/ircclient/ircclient.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ircclient/ircclient.rb b/modules/ircclient/ircclient.rb index e23935b..a0fbd74 100644 --- a/modules/ircclient/ircclient.rb +++ b/modules/ircclient/ircclient.rb @@ -216,7 +216,7 @@ def send(msg) else unless @channel == nil @sock.write("PRIVMSG #{@channel} :#{msg}\n") - reply_user(@jid, "sent to: #{@channel}", "std") + # reply_user(@jid, "sent to: #{@channel}", "std") else reply_user(@jid, "not active on a channel: use .c or .j", "std") end From 08c94621b8ec7cd16952d962d9cd01135c98abcc Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Thu, 27 Jan 2011 15:19:45 -0500 Subject: [PATCH 5/7] debug_mode = false --- xmppbridge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmppbridge.rb b/xmppbridge.rb index 22b0164..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) From 2af48bde9f8c43bfa12306050c8cffb4c3b40fac Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Fri, 4 Mar 2011 16:10:37 -0500 Subject: [PATCH 6/7] don't leave the lobby just because chat status changes --- modules/main/main.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9ee1f3a9ea789bc19bf415c2f76c8985431b9adc Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Fri, 24 Jun 2011 14:58:40 -0400 Subject: [PATCH 7/7] some mode lines don't have _users_ as targets - don't try to add an op flag on nil. --- modules/ircclient/ircclient.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/ircclient/ircclient.rb b/modules/ircclient/ircclient.rb index fa0fd97..5902110 100644 --- a/modules/ircclient/ircclient.rb +++ b/modules/ircclient/ircclient.rb @@ -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")