Add HTML entity decoding.

evl · Jan 20, 2012 · 7b3fe16 · 7b3fe16
1 parent b6fd319
commit 7b3fe16
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/lib/plugins/spotify.js b/lib/plugins/spotify.js
@@ -11,7 +11,7 @@ exports.configure = function(client) {
                 var matches;
 
                 if ((matches = titlePattern.exec(body))) {
-                    meta.title = matches[1];
+                    meta.title = matches[1].decodeEntities();
 
                     client.say(to, 'Spotify'.bold + ': ' + meta.title);
                 }

diff --git a/lib/plugins/wimp.js b/lib/plugins/wimp.js
@@ -9,7 +9,7 @@ exports.configure = function(client) {
                 var titleMatches = body.match(/<title>(.+)\s\-\s/);
 
                 if (titleMatches) {
-                    meta.title = titleMatches[0];
+                    meta.title = titleMatches[0].decodeEntities();
 
                     client.say(to, 'WiMP'.bold + ': ' + meta.title);
                 }

diff --git a/lib/utils.js b/lib/utils.js
@@ -2,6 +2,22 @@ String.prototype.repeat = function(count) {
 	return new Array(count + 1).join(this);
 };
 
+var entities = {
+    'amp': '&',
+    'lt': '<',
+    'gt': '>',
+    'quot':
+    '"'
+};
+
+String.prototype.decodeEntities = function() {
+    return this.replace(/&#(\d+);/g, function(value, charCode) {
+        return String.fromCharCode(parseInt(charCode, 10));
+    }).replace(/&([a-z]+);/g, function(value, entity) {
+        return entities[entity] || '';
+    });
+};
+
 String.prototype.__defineGetter__('bold', function() {
     return String.fromCharCode(2) + this + String.fromCharCode(15);
 });