Skip to content

Commit

Permalink
Refactored to store JSON instead of an HTML message
Browse files Browse the repository at this point in the history 
This will allow the messages to be rendered differently. New CSS or HTML can
be applied.
  • Loading branch information
@wsams
wsams committed Jul 29, 2018
1 parent 650f4ee commit c0b083c
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 11 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ networks:

Persistent chat rooms are not enabled by default and are never required when entering a room. If you click the checkbox on the login page to **Create or join a persistent room** all of your messages will be logged. If you do not check the box your messages will not be logged. You can tell if a user is logging there messages when an exclamation mark is appended to their username. e.g. `@foobar!`

Note: There is no URL syntax for logging into a room with encrypting messages enabled. If you are logged into a room with encryption enabled and you refresh the browser, your encryption password will be lost. You will need to logout and back in manually with the same encryption password. Your encryption password is only valid until you close the browser window or tab, or refresh.

## Encrypted messages

Encryption is handled by the Stanford Javascript Crypto Library and happens entirely within your browser.
Expand Down
58 changes: 47 additions & 11 deletions html/js/talk2me.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,22 @@
return;
}

msg = "<span class=\"room-user-message\">@" + username + "</span> " + htmlspecialchars(msg)
+ " <span class=\"timestamp\">" + getTimestamp() + "</span>";
// strip_tags(msg, "<strong><em><table><thead><tbody><tr><th><td><img><br><br/><a><p><div><ul><li><ol><span><hr><hr/><dd><dl><dt>");
var orgMsg = msg;
var timestamp = getTimestamp();
var jsonMessageString = JSON.stringify({ "username": username, "msg": msg, "tst": timestamp });
// TODO: create a function to generate htmlMessage - this is duplicated 3 times in this code
var htmlMessage = "<span class=\"room-user-message\">@" + username + "</span> " + htmlspecialchars(msg)
+ " <span class=\"timestamp\">" + timestamp + "</span>";

if (usekey) {
msg = encryptMessage(msg);
jsonMessageString = encryptMessage(jsonMessageString);
}

if (!msg) {
$.jGrowl("Message not sent - could not encrypt!", { life: 8000, group: "error-encryption" });
} else {
var request = {"a": "message", "msg": msg, "persistent": persistent, "encrypted": usekey};
var request = {"a": "message", "msg": jsonMessageString, "persistent": persistent, "encrypted": usekey};
conn.send(JSON.stringify(request));
appendMessage(orgMsg, usekey);
appendMessage(htmlMessage, usekey);
}

scrollToTop();
Expand Down Expand Up @@ -278,14 +279,32 @@
$(".messages").before("<div class=\"more-messages-alert container\">"
+ "Persistent messages enabled</div>");
// Display all messages from room when first logging into room.
console.log(jsonObj.messages);
$.each(jsonObj.messages, function(k, v) {
// TODO: start: create function for this (#duplicateParsedMessage)
var jsonMessage = null;
if (v.item.encrypted) {
v.item.message = getMessageLockHTML() + " " + decryptMessage(v.item.message);
jsonMessage = JSON.parse(decryptMessage(v.item.message));
} else {
jsonMessage = JSON.parse(v.item.message);
}

var message = null;
if (v.item.encrypted) {
message = getMessageLockHTML() + " " + htmlspecialchars(jsonMessage.msg);
} else {
message = htmlspecialchars(jsonMessage.msg);
}
var username = jsonMessage.username;
var timestamp = jsonMessage.tst;

var htmlMessage = "<span class=\"room-user-message\">@" + username + "</span> "
+ message + " <span class=\"timestamp\">" + timestamp + "</span>";
// TODO: end: create function for this (#duplicateParsedMessage)

if (v.item.message) {
$(".messages").append("<div class=\"well well-sm message\">"
+ Wwiki.render(linker.link(v.item.message)) + "</div>");
+ Wwiki.render(linker.link(htmlMessage)) + "</div>");
}
});
var s = $(jsonObj.messages).size();
Expand Down Expand Up @@ -696,12 +715,29 @@
"use strict";
if (persistent) {
$.each(jsonObj.messages, function(k, v) {
// TODO: start: create function for this (#duplicateParsedMessage)
var jsonMessage = null;
if (v.item.encrypted) {
jsonMessage = JSON.parse(decryptMessage(v.item.message));
} else {
jsonMessage = JSON.parse(v.item.message);
}

var message = null;
if (v.item.encrypted) {
v.item.message = getMessageLockHTML() + " " + decryptMessage(v.item.message);
message = getMessageLockHTML() + " " + htmlspecialchars(jsonMessage.msg);
} else {
message = htmlspecialchars(jsonMessage.msg);
}
var username = jsonMessage.username;
var timestamp = jsonMessage.tst;

var htmlMessage = "<span class=\"room-user-message\">@" + username + "</span> "
+ message + " <span class=\"timestamp\">" + timestamp + "</span>";
// TODO: end: create function for this (#duplicateParsedMessage)

$(".messages").append("<div class=\"well well-sm message\">"
+ Wwiki.render(linker.link(v.item.message)) + "</div>");
+ Wwiki.render(linker.link(htmlMessage)) + "</div>");
});
var s = $(jsonObj.messages).size();
messagesShown += s;
Expand Down

0 comments on commit c0b083c

Please sign in to comment.