moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ustream for channels with /channel/foo syntax; ustream wtf are you doing

This commit is contained in:
calzoneman 2013-09-17 13:19:33 -05:00
parent 3f65a69f0e
commit 6aae146f8b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog
View File

@ -1,3 +1,7 @@
Tue Sep 17 13:16 2013 CDT
* lib/get-info.js: Fix ustream for channels that have /channel/ in the
path.
Fri Sep 13 10:10 2013 CDT Fri Sep 13 10:10 2013 CDT
* www/reset.html: Fix data.js dependency * www/reset.html: Fix data.js dependency
* lib/api.js: Fix ActionLog trying to record wrong data. How long has * lib/api.js: Fix ActionLog trying to record wrong data. How long has

7
lib/get-info.js
View File

@ -515,7 +515,12 @@ module.exports = function (Server) {
/* ustream.tv */ /* ustream.tv */
us: function (id, callback) { us: function (id, callback) {
var m = id.match(/([\w-]+)/); // 2013-09-17
// They couldn't fucking decide whether channels should
// be at http://www.ustream.tv/channel/foo or just
// http://www.ustream.tv/foo so they do both.
// [](/cleese)
var m = id.match(/([^\?&#]+)|(channel\/[^\?&#]+)/);
if (m) { if (m) {
id = m[1]; id = m[1];
} else { } else {