+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
diff --git a/onionr/static-data/www/ui/src/js/main.js b/onionr/static-data/www/ui/src/js/main.js
index 50738052..ca2c5214 100644
--- a/onionr/static-data/www/ui/src/js/main.js
+++ b/onionr/static-data/www/ui/src/js/main.js
@@ -44,16 +44,17 @@ function deserializeUser(id) {
return user;
}
-function serializeUser(user) {
- if(user !== null && user !== undefined) {
- var serialized = {'name' : user.getName(), 'id' : user.getID(), 'icon' : user.getIcon()};
+function getCurrentUser() {
+ var user = get('currentUser', null);
- usermap[user.getID()] = serialized;
+ if(user === null)
+ return null;
- set('usermap', JSON.stringify(getUserMap()));
+ return User.getUser(user, function() {});
+}
- return serialized;
- }
+function setCurrentUser(user) {
+ set('currentUser', user.getID());
}
/* returns a relative date format, e.g. "5 minutes" */
@@ -131,6 +132,11 @@ class Sanitize {
static url(url) {
return encodeURIComponent(url);
}
+
+ /* usernames */
+ static username(username) {
+ return String(username).replace(/[\W_]+/g, " ").substring(0, 25);
+ }
}
/* config stuff */
@@ -182,18 +188,75 @@ class User {
return this.image;
}
+ setDescription(description) {
+ this.description = description;
+ }
+
+ getDescription() {
+ return this.description;
+ }
+
serialize() {
return {
'name' : this.getName(),
'id' : this.getID(),
- 'icon' : this.getIcon()
+ 'icon' : this.getIcon(),
+ 'description' : this.getDescription()
};
}
+ /* save in usermap */
remember() {
usermap[this.getID()] = this.serialize();
set('usermap', JSON.stringify(usermap));
}
+
+ /* save as a block */
+ save(callback) {
+ var block = new Block();
+
+ block.setType('onionr-user');
+ block.setContent(JSON.stringify(this.serialize()));
+
+ return block.save(true, callback);
+ }
+
+ static getUser(id, callback) {
+ var user = deserializeUser(id);
+ if(user === null) {
+ Block.getBlocks({'type' : 'onionr-user-info', 'signed' : true, 'reverse' : true}, function(data) {
+ if(data.length !== 0) {
+ try {
+ user = new User();
+
+ var userInfo = JSON.parse(data[0].getContent());
+
+ if(userInfo['id'] === id) {
+ user.setName(userInfo['name']);
+ user.setIcon(userInfo['icon']);
+ user.setID(id);
+
+ user.remember();
+
+ callback(user);
+ return user;
+ }
+ } catch(e) {
+ console.log(e);
+
+ callback(null);
+ return null;
+ }
+ } else {
+ callback(null);
+ return null;
+ }
+ });
+ } else {
+ callback(user);
+ return user;
+ }
+ }
}
/* post class */
@@ -246,6 +309,35 @@ class Post {
getPostDate() {
return this.date;
}
+
+ save(callback) {
+ var args = {'type' : 'onionr-post', 'sign' : true, 'content' : JSON.stringify({'content' : this.getContent()})};
+
+ var url = '/client/?action=insertBlock&data=' + Sanitize.url(JSON.stringify(args)) + '&token=' + Sanitize.url(getWebPassword()) + '&timingToken=' + Sanitize.url(getTimingToken());
+
+ console.log(url);
+
+ var http = new XMLHttpRequest();
+
+ if(callback !== undefined) {
+ // async
+
+ http.addEventListener('load', function() {
+ callback(Block.parseBlockArray(JSON.parse(http.responseText)['hash']));
+ }, false);
+
+ http.open('GET', url, true);
+ http.timeout = 5000;
+ http.send(null);
+ } else {
+ // sync
+
+ http.open('GET', url, false);
+ http.send(null);
+
+ return Block.parseBlockArray(JSON.parse(http.responseText)['hash']);
+ }
+ }
}
/* block class */
@@ -348,6 +440,52 @@ class Block {
return !(this.hash === null || this.hash === undefined);
}
+ // saves the block, returns the hash
+ save(sign, callback) {
+ var type = this.getType();
+ var content = this.getContent();
+ var parent = this.getParent();
+
+ if(content !== undefined && content !== null && type !== '') {
+ var args = {'content' : content};
+
+ if(type !== undefined && type !== null && type !== '')
+ args['type'] = type;
+ if(parent !== undefined && parent !== null && parent.getHash() !== undefined && parent.getHash() !== null && parent.getHash() !== '')
+ args['parent'] = parent.getHash();
+ if(sign !== undefined && sign !== null)
+ args['sign'] = String(sign) !== 'false'
+
+
+ var url = '/client/?action=insertBlock&data=' + Sanitize.url(JSON.stringify(args)) + '&token=' + Sanitize.url(getWebPassword()) + '&timingToken=' + Sanitize.url(getTimingToken());
+
+ console.log(url);
+
+ var http = new XMLHttpRequest();
+
+ if(callback !== undefined) {
+ // async
+
+ http.addEventListener('load', function() {
+ callback(Block.parseBlockArray(JSON.parse(http.responseText)['hash']));
+ }, false);
+
+ http.open('GET', url, true);
+ http.timeout = 5000;
+ http.send(null);
+ } else {
+ // sync
+
+ http.open('GET', url, false);
+ http.send(null);
+
+ return Block.parseBlockArray(JSON.parse(http.responseText)['hash']);
+ }
+ }
+
+ return false;
+ }
+
/* static functions */
// recreates a block by hash
@@ -431,19 +569,55 @@ class Block {
/* temporary code */
+var tt = getParameter("timingToken");
+if(tt !== null && tt !== undefined) {
+ setTimingToken(tt);
+}
+
if(getWebPassword() === null) {
var password = "";
while(password.length != 64) {
password = prompt("Please enter the web password (run `./RUN-LINUX.sh --get-password`)");
}
- setTimingToken(prompt("Please enter the timing token (optional)"));
-
setWebPassword(password);
- window.location.reload(true);
}
-var tt = getParameter("timingToken");
-if(tt !== null && tt !== undefined) {
- setTimingToken(tt);
+if(getCurrentUser() === null) {
+ var url = '/client/?action=info&token=' + Sanitize.url(getWebPassword()) + '&timingToken=' + Sanitize.url(getTimingToken());
+
+ console.log(url);
+
+ var http = new XMLHttpRequest();
+
+ // sync
+
+ http.open('GET', url, false);
+ http.send(null);
+
+ var id = JSON.parse(http.responseText)['pubkey'];
+
+ User.getUser(id, function(data) {
+ if(data === null || data === undefined) {
+ jQuery('#modal').modal('show');
+
+ var user = new User();
+
+ user.setName('New User');
+ user.setID(id);
+ user.setIcon('<$= Template.jsTemplate("default-icon") $>');
+ user.setDescription('A new OnionrUI user');
+
+ user.remember();
+ user.save();
+
+ setCurrentUser(user);
+
+ window.location.reload();
+ } else {
+ setCurrentUser(data);
+ }
+ });
}
+
+currentUser = getCurrentUser();
diff --git a/onionr/static-data/www/ui/src/js/timeline.js b/onionr/static-data/www/ui/src/js/timeline.js
index e7a3c472..c411f41c 100644
--- a/onionr/static-data/www/ui/src/js/timeline.js
+++ b/onionr/static-data/www/ui/src/js/timeline.js
@@ -1,35 +1,3 @@
-function getUserInfo(id, callback) {
- var user = deserializeUser(id);
- if(user === null) {
- Block.getBlocks({'type' : 'onionr-user-info', 'signed' : true, 'reverse' : true}, function(data) {
- if(data.length !== 0) {
- try {
- user = new User();
-
- var userInfo = JSON.parse(data[0].getContent());
-
- if(userInfo['id'] === id) {
- user.setName(userInfo['name']);
- user.setIcon(userInfo['icon']);
- user.setID(id);
-
- serializeUser(user);
-
- return callback(user);
- }
- } catch(e) {
- console.log(e);
- return callback(null);
- }
- } else {
- return callback(null);
- }
- });
- } else {
- return callback(user);
- }
-}
-
/* just for testing rn */
Block.getBlocks({'type' : 'onionr-post', 'signed' : true, 'reverse' : true}, function(data) {
for(var i = 0; i < data.length; i++) {
@@ -37,7 +5,7 @@ Block.getBlocks({'type' : 'onionr-post', 'signed' : true, 'reverse' : true}, fun
var block = data[i];
var finished = false;
- getUserInfo(new String(block.getHeader('signer', 'unknown')), function(user) {
+ User.getUser(new String(block.getHeader('signer', 'unknown')), function(user) {
var post = new Post();
var blockContent = JSON.parse(block.getContent());
@@ -53,6 +21,7 @@ Block.getBlocks({'type' : 'onionr-post', 'signed' : true, 'reverse' : true}, fun
while(!finished);
} catch(e) {
+ console.log('Troublemaker block: ' + data[i].getHash());
console.log(e);
}
}
@@ -62,11 +31,101 @@ function viewProfile(id, name) {
id = decodeURIComponent(id);
document.getElementById("onionr-profile-username").innerHTML = Sanitize.html(decodeURIComponent(name));
- getUserInfo(id, function(data) {
+ User.getUser(id, function(data) {
if(data !== null) {
document.getElementById("onionr-profile-username").innerHTML = Sanitize.html(data.getName());
document.getElementById("onionr-profile-username").title = Sanitize.html(data.getID());
document.getElementById("onionr-profile-user-icon").src = "data:image/jpeg;base64," + Sanitize.html(data.getIcon());
+ document.getElementById("onionr-profile-user-icon").b64 = Sanitize.html(data.getIcon());
}
});
}
+
+function updateUser() {
+ toggleSaveButton(false);
+
+ jQuery('#modal').modal('show');
+
+ var name = jQuery('#onionr-profile-username').text();
+ var id = document.getElementById("onionr-profile-username").title;
+ var icon = document.getElementById("onionr-profile-user-icon").b64;
+ var description = 'todo';
+
+ var user = new User();
+
+ user.setName(name);
+ user.setID(id);
+ user.setIcon(icon);
+ user.setDescription(description);
+
+ user.remember();
+ user.save();
+
+ window.location.reload();
+}
+
+function cancelUpdate() {
+ toggleSaveButton(false);
+
+ var name = jQuery('#onionr-profile-username').text();
+ var id = document.getElementById("onionr-profile-username").title;
+
+ viewProfile(id, name);
+}
+
+function toggleSaveButton(show) {
+ document.getElementById("onionr-profile-save").style.display = (show ? 'block' : 'none');
+ document.getElementById("onionr-profile-cancel").style.display = (show ? 'block' : 'none');
+}
+
+function makePost() {
+ var content = document.getElementById("onionr-post-creator-content").value;
+
+ if(content.trim() !== '') {
+ var post = new Post();
+
+ post.setUser(getCurrentUser());
+ post.setContent(content);
+ post.setPostDate(new Date());
+
+ post.save(function(data) {}); // async, but no function
+
+ document.getElementById('onionr-timeline-posts').innerHTML = post.getHTML() + document.getElementById('onionr-timeline-posts').innerHTML;
+
+ document.getElementById("onionr-post-creator-content").value = "";
+ } else {
+ console.log('Not making empty post.');
+ }
+}
+
+$('body').on('click', '[data-editable]', function() {
+ var el = jQuery(this);
+ var txt = el.text();
+
+ var input = jQuery('
').val(txt);
+ el.replaceWith(input);
+
+ var save = function() {
+ var newTxt = input.val();
+ var p = el.text(Sanitize.username(newTxt));
+ input.replaceWith(p);
+
+ if(newTxt !== txt)
+ toggleSaveButton(true);
+ };
+
+ input.one('blur', save).focus();
+});
+
+document.getElementById("onionr-post-creator-user-name").innerHTML = Sanitize.html(currentUser.getName());
+document.getElementById("onionr-post-creator-user-id").innerHTML = "<$= LANG.POST_CREATOR_YOU $>";
+document.getElementById("onionr-post-creator-user-icon").src = "data:image/jpeg;base64," + Sanitize.html(currentUser.getIcon());
+document.getElementById("onionr-post-creator-user-id").title = currentUser.getID();
+document.getElementById("onionr-post-creator-content").placeholder = "<$= LANG.POST_CREATOR_PLACEHOLDER $>";
+
+viewCurrentProfile = function() {
+ viewProfile(encodeURIComponent(currentUser.getID()), encodeURIComponent(currentUser.getName()));
+}
+
+document.getElementById("onionr-post-creator-user-id").onclick = viewCurrentProfile;
+document.getElementById("onionr-post-creator-user-name").onclick = viewCurrentProfile;
+