X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjs%2Fblerg.js;h=b882dd9944425567d01f6844138216e8955978d0;hb=e5ddf802919d8f9d123d02b14602a98168c7bf6f;hp=9f92594ba51b22777d5855bf0390d4854d0bb3b9;hpb=f4bf2d2efc566e9f165b97bda72cd5a27e0d2b19;p=blerg.git diff --git a/www/js/blerg.js b/www/js/blerg.js index 9f92594..b882dd9 100644 --- a/www/js/blerg.js +++ b/www/js/blerg.js @@ -5,13 +5,13 @@ // Config var baseURL = ''; var recordTemplate = new Template( - '
'); if (pi != -1) { @@ -299,6 +336,25 @@ function mangleRecord(record, template) { l = l.replace(/^>\s*/, ''); } } + + // Sanitize HTML input + l = l.replace(/&/g, '&').replace(//g, '>'); + + // Turn HTTP URLs into links + l = l.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1$2'); + + // Turn markdown links into links + l = l.replace(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)\)/g, '$1$2'); + + // Turn *foo* into italics and **foo** into bold + l = l.replace(/([^\w\\]|^)\*\*(\w[^*]*)\*\*(\W|$)/g, '$1$2$3'); + l = l.replace(/([^\w\\]|^)\*(\w[^*]*)\*(\W|$)/g, '$1$2$3'); + + // Turn refs and tags into links + l = l.replace(/(\s|^)#([A-Za-z0-9_-]+)/g, '$1#$2'); + l = l.replace(/(\s|^)@([A-Za-z0-9_-]+)(\/\d+)?/g, '$1@$2'); + + // Create lists when lines begin with * if (l[0] == '*') { if (!listMode) { var pi = out.lastIndexOf('
'); @@ -309,32 +365,20 @@ function mangleRecord(record, template) { out.push('
') out.pop(); + if (listMode) + out.push(''); record.data = out.join(''); record.date = (new Date(record.timestamp * 1000)).toString(); @@ -368,9 +414,11 @@ function Tag(type, tag) { case 'tag': //url += '%23'; url += 'H'; // apache is eating the hash, even encoded. Probably a security feature. + this.baseFrag = '/tag/' + tag; break; case 'ref': url += '%40'; + this.baseFrag = '/ref/' + tag; break; default: alert('Invalid tag type: ' + type); @@ -390,6 +438,7 @@ function Tag(type, tag) { }); this.addItems(j); this.pageStart = j.length - 1; + this.itemCount = j.length; } this.displayItems(); }.bind(this), @@ -417,14 +466,64 @@ Tag.prototype.show = function() { $('usercontrols').hide(); } -function postPopup() { - if (loginStatus.loggedIn) { + +// Pager for browsing subscription feeds +function Feed() { + this.initPager(); + this.username = loginStatus.username; + this.baseFrag = '/feed'; + + new Ajax.Request(baseURL + '/feed', { + method: 'post', + parameters: { + username: loginStatus.username + }, + onSuccess: function(r) { + var response = r.responseText.evalJSON(); + if (response) { + var maxid = response.length - 1; + response.each(function(v, i) { + v.id = maxid - i; + mangleRecord(v, tagRecordTemplate) + }); + this.addItems(response); + this.pageStart = response.length - 1; + this.itemCount = response.length; + } + this.displayItems(); + }.bind(this), + onFailure: function(r) { + this.displayItems(); + }.bind(this) + }); +} +Feed.prototype = new Pager(); +Feed.prototype.constructor = Feed; + +Feed.prototype.show = function() { + $$('[name=section]').each(function(v) { + v.update(' ' + loginStatus.username + "'s spycam"); + }.bind(this)); + $('welcome').hide(); + $('post').hide(); + $('older_link').hide(); + $('newer_link').hide(); + $('rss').hide(); + items.show(); + $('usercontrols').hide(); +} + + +function postPopup(initial) { + if (loginStatus.loggedIn || initial) { var post = $('post'); if (post.visible()) { post.hide(); } else { post.show(); - if (currentPager.username && currentPager.username != loginStatus.username && !$('post.content').value) { + if (initial) { + $('post.content').value = initial; + } else if (!$('post.content').value && currentPager.username && currentPager.username != loginStatus.username) { $('post.content').value = '@' + currentPager.username + ': '; } $('post.content').focus(); @@ -443,8 +542,7 @@ function signup() { }, onSuccess: function(r) { $('signup').hide(); - location.href = '/#' + username; - hashSwitch(); + qlink(username); loginStatus.login(username, password); }, @@ -459,17 +557,7 @@ function signup_cancel() { hashSwitch(); } -function newer_page() { - if (currentPager) - currentPager.newerPage(); -} - -function older_page() { - if (currentPager) - currentPager.olderPage(); -} - -function obsess() { +function subscribe() { new Ajax.Request(baseURL + '/subscribe/' + currentPager.username, { method: 'post', parameters: { @@ -479,19 +567,19 @@ function obsess() { var response = r.responseText.evalJSON(); if (response.status == 'success') { alert("You call " + currentPager.username + " and begin breathing heavily into the handset."); - $$('[name=user.obsesslink]').each(Element.hide); - $$('[name=user.unobsesslink]').each(Element.show); + $$('[name=user.subscribelink]').each(Element.hide); + $$('[name=user.unsubscribelink]').each(Element.show); } else { - alert('Failed to obsess. This is probably for the best'); + alert('Failed to subscribe. This is probably for the best'); } }, onFailure: function(r) { - alert('Failed to obsess. This is probably for the best'); + alert('Failed to subscribe. This is probably for the best'); } }); } -function unobsess() { +function unsubscribe() { new Ajax.Request(baseURL + '/unsubscribe/' + currentPager.username, { method: 'post', parameters: { @@ -501,8 +589,8 @@ function unobsess() { var response = r.responseText.evalJSON(); if (response.status == 'success') { alert("You come to your senses."); - $$('[name=user.obsesslink]').each(Element.show); - $$('[name=user.unobsesslink]').each(Element.hide); + $$('[name=user.subscribelink]').each(Element.show); + $$('[name=user.unsubscribelink]').each(Element.hide); } else { alert('You are unable to tear yourself away (because something failed on the server)'); } @@ -587,8 +675,9 @@ function loadLatest() { $('latest-tags').update(); j.tags.each(function(v) { - var a = new Element('a', {href: '/#tag/' + v}); + var a = new Element('a', {href: '/#/tag/' + v}); a.insert('#' + v); + a.onclick = "return qlink()"; a.className = 'ref'; $('latest-tags').insert(a); $('latest-tags').appendChild(document.createTextNode(' ')); @@ -606,32 +695,65 @@ function loadLatest() { }); } +function qlink(loc) { + if (loc) { + location.hash = loc; + } else if (event && event.target) { + location.href = event.target.href; + } else { + // Bogus qlink + return; + } + hashSwitch(); + return false; +} + function hashSwitch() { var m; stopTicker(); if (m = location.search.match(/^\?post\/([^/]+)\/(.+)/)) { $('post').show(); $('post.content').value = '[' + decodeURIComponent(m[1]).replace(']','').replace('[','') + '](' + decodeURIComponent(m[2]) + ')'; - } else if (m = location.hash.match(/^#(ref|tag)\/([A-Za-z0-9_-]+)$/)) { - currentPager = new Tag(m[1], m[2]); + } else if (m = location.hash.match(/^#\/(ref|tag)\/([A-Za-z0-9_-]+)(?:\/p(\d+))?$/)) { + if (!currentPager || !(currentPager instanceof Tag) || currentPager.type != m[1] || currentPager.tag != m[2]) + currentPager = new Tag(m[1], m[2]); currentPager.show(); - } else if (m = location.hash.match(/^#([A-Za-z0-9_-]+)(:(\d+))?$/)) { - if (!currentPager || currentPager.username != m[1]) + + if (m[3]) { + var r = parseInt(m[3]); + currentPager.showPageAt(r); + } else { + currentPager.showPageAt(currentPager.itemCount - 1); + } + } else if (m = location.hash.match(/^#\/feed(?:\/p(\d+))?$/)) { + if (loginStatus.loggedIn) { + if (!currentPager || !(currentPager instanceof Feed) || currentPager.username != loginStatus.username) + currentPager = new Feed(); + currentPager.show(); + if (m[3]) { + var r = parseInt(m[3]); + currentPager.showPageAt(r); + } else { + currentPager.showPageAt(currentPager.itemCount - 1); + } + } else { + location.href = baseURL; + } + } else if (m = location.hash.match(/^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/)) { + if (!currentPager || !(currentPager instanceof User) || currentPager.username != m[1]) currentPager = new User(m[1]); currentPager.show(); loginStatus.update(); if (m[3]) { var r = parseInt(m[3]); - currentPager.showRecord = r; - if (currentPager.itemCache[r]) { - currentPager.displayItems(); + if (m[2] == 'p') { + currentPager.showPageAt(r); } else { - currentPager.loadItems((r >= 49 ? r - 49 : 0), r); + currentPager.showRecord(r); } } else { - currentPager.pageStart = currentPager.itemCount - 1; - currentPager.loadItems(); + currentPager.reload(); } } else { $$('[name=section]').each(function(v) { v.update('Welcome') }); @@ -665,7 +787,7 @@ function init() { setInterval(hashCheck, 250); document.body.observe('keyup', function(event) { - if (event.shiftKey && event.keyCode == '32') { + if (event.shiftKey && event.keyCode == 32) { postPopup(); event.stop(); }