diff options
| -rw-r--r-- | lib/rbot/core/utils/extends.rb | 3 | ||||
| -rw-r--r-- | lib/rbot/core/utils/utils.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/rbot/core/utils/extends.rb b/lib/rbot/core/utils/extends.rb index 95569b71..5fa24dcb 100644 --- a/lib/rbot/core/utils/extends.rb +++ b/lib/rbot/core/utils/extends.rb @@ -55,6 +55,7 @@ class ::String if self.respond_to?(:http_headers) and headers = self.http_headers if headers['content-type'].first.match(/charset="?(\S+?)"?\s*;?/i) + debug "charset #{charset} set from header" charset = $1 end end @@ -66,10 +67,10 @@ class ::String when /<meta\s+http-equiv\s*=\s*"Content-Type".*charset\s*=\s*"?(\S+?)"?\s*;?/i charset = $1 end + debug "charset #{charset} set from string" end if charset - debug "charset: #{charset}" return Iconv.iconv('utf-8', charset, self).join rescue self else debug "Couldn't find charset for #{self.inspect}" diff --git a/lib/rbot/core/utils/utils.rb b/lib/rbot/core/utils/utils.rb index 63cd58da..57f6a934 100644 --- a/lib/rbot/core/utils/utils.rb +++ b/lib/rbot/core/utils/utils.rb @@ -433,7 +433,7 @@ module ::Irc # * :min_spaces => Minimum number of spaces a paragraph should have # def Utils.ircify_first_html_par(xml_org, opts={}) - xml = xml_org.gsub(/<!--.*?-->/, '').utfy_xml + xml = xml_org.gsub(/<!--.*?-->/m, '').gsub(/<script(?:\s+[^>]*)?>.*?<\/script>/im, "").gsub(/<style(?:\s+[^>]*)?>.*?<\/style>/im, "").utfy_xml strip = opts[:strip] strip = Regexp.new(/^#{Regexp.escape(strip)}/) if strip.kind_of?(String) |