Update Instagram IDs.

2 files changed, 3 insertions, 3 deletions

diff --git a/filters/expand.py b/filters/expand.py
index 39a5b2a..a345ad7 100644
--- a/filters/expand.py
+++ b/filters/expand.py
@@ -1,4 +1,4 @@
-#  gLifestream Copyright (C) 2009, 2010, 2011 Wojciech Polak
+#  gLifestream Copyright (C) 2009, 2010, 2011, 2013 Wojciech Polak
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by the
@@ -97,7 +97,7 @@ def shortpics(s):
     """Expand short picture-URLs."""
     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://(instagr\.am)/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 3452076..c6ed501 100644
--- a/static/js/glifestream.js
+++ b/static/js/glifestream.js
@@ -1234,7 +1234,7 @@
 	href = 'http://api.plixi.com/api/tpapi.svc/imagefromurl?size=big&url=http://lockerz.com/s/' + RegExp.$1;
 	type = 'image';
       }
-      else if (href.match (/instagr\.am\/p\/(\w+)\/?/)) {
+      else if (href.match (/instagr\.am\/p\/([\w\-]+)\/?/)) {
 	href = 'http://instagr.am/p/'+ RegExp.$1 +'/media/?size=l';
 	type = 'image';
       }