unescape title, text: tweet text is HTML escaped

2 files changed, 3 insertions, 3 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8ef84e4..a94b0af 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -48,11 +48,11 @@ module ApplicationHelper
   end
 
   def caption
-    "#{@caption}"
+    CGI.unescapeHTML "#{@caption}"
   end
 
   def title
-    "#{@title || @caption} - aclog"
+    CGI.unescapeHTML "#{@title || @caption} - aclog"
   end
 
   # utf8, form
diff --git a/app/views/tweets/_tweets.rss.builder b/app/views/tweets/_tweets.rss.builder
index 5c5afe7..4fea26a 100644
--- a/app/views/tweets/_tweets.rss.builder
+++ b/app/views/tweets/_tweets.rss.builder
@@ -7,7 +7,7 @@ xml.rss version: "2.0", "xmlns:atom" => "http://www.w3.org/2005/Atom" do
     xml.__send__(:"atom:link", rel: "self", href: request.url, type: "application/rss+xml")
     @tweets.each_with_index do |tweet, i|
       xml.item do
-        xml.title "#{tweet.favorites_count}/#{tweet.retweets_count}: #{strip_tags(format_tweet_text(tweet.text))}"
+        xml.title "#{tweet.favorites_count}/#{tweet.retweets_count}: #{CGI.unescapeHTML(strip_tags(format_tweet_text(tweet.text)))}"
         xml.description "Has been favorited by #{tweet.favorites_count} people, retweeted by #{tweet.retweets_count} people"
         xml.pubDate tweet.tweeted_at.rfc2822
         xml.link tweet_url(tweet.id)