quote linking and previewing works
This commit is contained in:
parent
37b1aca048
commit
617f0b7a6d
|
@ -3,6 +3,7 @@
|
||||||
Individual functions for handling WebSocket events. Gets called by the
|
Individual functions for handling WebSocket events. Gets called by the
|
||||||
QuestConsumer object in consumers.py.
|
QuestConsumer object in consumers.py.
|
||||||
"""
|
"""
|
||||||
|
import re
|
||||||
import time
|
import time
|
||||||
import types
|
import types
|
||||||
|
|
||||||
|
@ -23,6 +24,23 @@ def message(socket, data):
|
||||||
return
|
return
|
||||||
tags = ["b", "code", "i", "s"]
|
tags = ["b", "code", "i", "s"]
|
||||||
message = bleach.clean(message, tags=tags)
|
message = bleach.clean(message, tags=tags)
|
||||||
|
|
||||||
|
lines = []
|
||||||
|
for line in message.splitlines():
|
||||||
|
if line.startswith(">") and not line.startswith(">>"):
|
||||||
|
line = '<span class="greenText">' + line + '</span>'
|
||||||
|
lines.append(line)
|
||||||
|
message = "<br>".join(lines)
|
||||||
|
|
||||||
|
quotes = re.findall(r">>\d+", message)
|
||||||
|
for quote in quotes:
|
||||||
|
msg_id = quote.replace(">>", "")
|
||||||
|
msg = '<a class="quotelink" '
|
||||||
|
msg += 'href="javascript:scrollToMsg(\'' + msg_id + '\')" '
|
||||||
|
msg += 'onmousemove="showPreview(event, \'' + msg_id + '\')" '
|
||||||
|
msg += 'onmouseout="clearPreview()">' + quote + '</a>'
|
||||||
|
message = message.replace(quote, msg)
|
||||||
|
|
||||||
user = socket.scope['user']
|
user = socket.scope['user']
|
||||||
|
|
||||||
m = Message(
|
m = Message(
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
<div class="messageHeader">
|
<div class="messageHeader">
|
||||||
<span class="messageName">{{ message.user.username or 'Anonymous' }}</span>
|
<span class="messageName">{{ message.user.username or 'Anonymous' }}</span>
|
||||||
<span class="messageDate">{{ localtime(message.timestamp).strftime('%Y-%m-%d %H:%M:%S') }}</span>
|
<span class="messageDate">{{ localtime(message.timestamp).strftime('%Y-%m-%d %H:%M:%S') }}</span>
|
||||||
<span class="messageID">No.<a href="javascript:quote('{{ message }}')">{{ message.id }}</a></span>
|
<span class="messageID">No.<a href="javascript:quote('{{ message.id }}')">{{ message.id }}</a></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="messageContent">{{ message.message }}</div>
|
<div class="messageContent">{{ message.message }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* House keeping */
|
||||||
var socket = new WebSocket('wss://' + document.domain + SCRIPT_NAME + '/ws/quest/' + quest_id + '/');
|
var socket = new WebSocket('wss://' + document.domain + SCRIPT_NAME + '/ws/quest/' + quest_id + '/');
|
||||||
socket.oldSend = socket.send;
|
socket.oldSend = socket.send;
|
||||||
socket.send = function(event_title, data) {
|
socket.send = function(event_title, data) {
|
||||||
|
@ -12,7 +13,21 @@ socket.onmessage = function(e) {
|
||||||
if (socket.events[event] === undefined) { return; }
|
if (socket.events[event] === undefined) { return; }
|
||||||
socket.events[event](data);
|
socket.events[event](data);
|
||||||
}
|
}
|
||||||
|
function load() {
|
||||||
|
document.getElementById('chatWindow').scrollTop = document.getElementById('chatWindow').scrollHeight;
|
||||||
|
let mtarea = document.getElementById('messageTextArea');
|
||||||
|
mtarea.addEventListener('keypress', function(event) {
|
||||||
|
if (event.key == 'Enter' && !event.shiftKey) {
|
||||||
|
let text = mtarea.value.trim();
|
||||||
|
mtarea.value = '';
|
||||||
|
if (text == '') { return; }
|
||||||
|
document.getElementById('chatWindow').scrollTop = document.getElementById('chatWindow').scrollHeight;
|
||||||
|
socket.send('message', {message: text, quest_id: quest_id});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Websocket events */
|
||||||
socket.events['message'] = function(data) {
|
socket.events['message'] = function(data) {
|
||||||
let msg_str = '<div id="message-' + data.message_id + '" class="message">';
|
let msg_str = '<div id="message-' + data.message_id + '" class="message">';
|
||||||
msg_str = '<div class="messageHeader"><span class="messageName">' + data.name + '</span> ';
|
msg_str = '<div class="messageHeader"><span class="messageName">' + data.name + '</span> ';
|
||||||
|
@ -27,6 +42,7 @@ socket.events['message'] = function(data) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Helpers */
|
||||||
function padToTwo(number) {
|
function padToTwo(number) {
|
||||||
if (number<=99) { number = ("0"+number).slice(-2); }
|
if (number<=99) { number = ("0"+number).slice(-2); }
|
||||||
return number;
|
return number;
|
||||||
|
@ -38,16 +54,31 @@ function strftime(date) {
|
||||||
return date_str;
|
return date_str;
|
||||||
}
|
}
|
||||||
|
|
||||||
function load() {
|
/* User-facing */
|
||||||
document.getElementById('chatWindow').scrollTop = document.getElementById('chatWindow').scrollHeight;
|
function quote(message_id) {
|
||||||
let mtarea = document.getElementById('messageTextArea');
|
let textbox = document.getElementById('messageTextArea');
|
||||||
mtarea.addEventListener('keypress', function(event) {
|
textbox.value += '>>' + message_id + '\n';
|
||||||
if (event.key == 'Enter' && !event.shiftKey) {
|
textbox.focus();
|
||||||
let text = mtarea.value.trim();
|
}
|
||||||
mtarea.value = '';
|
function showPreview(event, message_id) {
|
||||||
if (text == '') { return; }
|
let elem = document.getElementById('msg-' + message_id);
|
||||||
document.getElementById('chatWindow').scrollTop = document.getElementById('chatWindow').scrollHeight;
|
if (!elem) { return; }
|
||||||
socket.send('message', {message: text, quest_id: quest_id});
|
let preview = document.getElementById('preview');
|
||||||
}
|
preview.innerHTML = elem.innerHTML;
|
||||||
});
|
preview.style.display = '';
|
||||||
|
let x = event.clientX + 20 + 'px';
|
||||||
|
let y = event.clientY + 20 + 'px';
|
||||||
|
let maxWidth = window.innerWidth - event.clientX - 80 + 'px';
|
||||||
|
preview.style.top = y;
|
||||||
|
preview.style.left = x;
|
||||||
|
preview.style.maxWidth = maxWidth;
|
||||||
|
}
|
||||||
|
function clearPreview() {
|
||||||
|
document.getElementById('preview').innerHTML = '';
|
||||||
|
document.getElementById('preview').style.display = 'none';
|
||||||
|
}
|
||||||
|
function scrollToMsg(message_id) {
|
||||||
|
let elem = document.getElementById('msg-' + message_id);
|
||||||
|
if (!elem) { return; }
|
||||||
|
elem.scrollIntoView();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user