Add instagram.com support.

2 files changed, 5 insertions, 0 deletions

diff --git a/filters/expand.py b/filters/expand.py
index a345ad7..90f6963 100644
--- a/filters/expand.py
+++ b/filters/expand.py
@@ -98,6 +98,7 @@ def shortpics(s):
     s = re.sub(r'http://(www\.)?(twitpic\.com)/(\w+)', __sp_twitpic, s)
     s = re.sub(r'http://lockerz\.com/s/(\d+)', __sp_lockerz, s)
     s = re.sub(r'http://(instagr\.am)/p/([\w\-]+)/?', __sp_instagram, s)
+    s = re.sub(r'http://(instagram\.com)/p/([\w\-]+)/?', __sp_instagram, s)
     s = re.sub(r'http://(yfrog\.com)/(\w+)', __sp_yfrog, s)
     s = re.sub(r'http://(www\.)?brizzly\.com/pic/(\w+)', __sp_brizzly, s)
     s = re.sub(r'http://(www\.)?flickr\.com/([\w\.\-/]+)', __sp_flickr, s)
diff --git a/static/js/glifestream.js b/static/js/glifestream.js
index c6ed501..6e2d2ae 100644
--- a/static/js/glifestream.js
+++ b/static/js/glifestream.js
@@ -1234,6 +1234,10 @@
 	href = 'http://api.plixi.com/api/tpapi.svc/imagefromurl?size=big&url=http://lockerz.com/s/' + RegExp.$1;
 	type = 'image';
       }
+      else if (href.match (/instagram\.com\/p\/([\w\-]+)\/?/)) {
+	href = 'http://instagram.com/p/'+ RegExp.$1 +'/media/?size=l';
+	type = 'image';
+      }
       else if (href.match (/instagr\.am\/p\/([\w\-]+)\/?/)) {
 	href = 'http://instagr.am/p/'+ RegExp.$1 +'/media/?size=l';
 	type = 'image';