From 8d91771cb26654c90ee022864c09565f655efc45 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 15 Dec 2010 18:05:09 -0800
Subject: [PATCH] xml escape things

---
 lib/diaspora/ostatus_builder.rb |  2 +-
 lib/diaspora/webhooks.rb        | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
index 4052d5fa0..2bbb417bd 100644
--- a/lib/diaspora/ostatus_builder.rb
+++ b/lib/diaspora/ostatus_builder.rb
@@ -31,7 +31,7 @@ module Diaspora
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
 <generator uri="http://joindiaspora.com/">Diaspora</generator>
 <id>#{@user.public_url}.atom</id>
-<title>#{x@user.name)}'s Public Feed</title>
+<title>#{x(@user.name)}'s Public Feed</title>
 <subtitle>Posts from Diaspora</subtitle>
 <updated>#{Time.now.xmlschema}</updated>
 <author>
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index 4439fecdb..fbf9d3986 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -4,24 +4,17 @@
 
 module Diaspora
   module Webhooks
+    require 'builder/xchar'
 
     def to_diaspora_xml
       xml = "<XML>"
       xml += "<post>#{to_xml.to_s}</post>"
       xml += "</XML>"
     end
-
+  
     def x(input)
-      result.gsub!(/[&<>'"]/) do | match |
-        case match
-        when '&' then return '&amp;'
-        when '<' then return '&lt;'
-        when '>' then return '&gt;'
-        when "'" then return '&apos;'
-        when '"' then return '&quote;'
-        end
-      end
-      return result
+      input.to_s.to_xs
     end
+
   end
 end