Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:29:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clickable links.

Browse source 
Messages are now rich text.
Fix clear_message command flow over.

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
This commit is contained in:
Armored Dragon 2024-05-22 02:50:29 -05:00
parent 391a33d149
commit c48e9d3a69
No known key found for this signature in database
GPG key ID: C7207ACC3382AD8B
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/communityScripts/armored-chat/armored_chat.qml
View file

@ -369,6 +369,11 @@ Rectangle {
width: parent.width * 0.8 width: parent.width * 0.8
height: contentHeight // Adjust height to fit content height: contentHeight // Adjust height to fit content
wrapMode: Text.Wrap wrapMode: Text.Wrap
textFormat: TextEdit.RichText
onLinkActivated: {
Window.openWebBrowser(link)
}
} }
} }
} }
@ -455,6 +460,14 @@ Rectangle {
function addMessage(username, message, date, channel, type){ function addMessage(username, message, date, channel, type){
channel = getChannel(channel) channel = getChannel(channel)
// Linkify
var regex = /(https?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+(?:\/[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]*)?(?=\s|$)/g;
message = message.replace(regex, (match) => {
return "<a onclick='Window.openUrl("+match+")' href='" + match + "'>" + match + "</a>";
});
message = sanatizeContent(message); // Make sure we don't have any nasties
if (type === "notification"){ if (type === "notification"){
channel.append({ text: message, date: date, type: "notification" }); channel.append({ text: message, date: date, type: "notification" });
last_message_user = ""; last_message_user = "";
@ -471,6 +484,7 @@ Rectangle {
var last_item = channel.get(last_item_index); var last_item = channel.get(last_item_index);
if (last_message_user === username && elapsed_minutes < 1 && last_item){ if (last_message_user === username && elapsed_minutes < 1 && last_item){
message = "<br>" + message
last_item.text = last_item.text += "\n" + message; last_item.text = last_item.text += "\n" + message;
scrollToBottom() scrollToBottom()
last_message_time = new Date(); last_message_time = new Date();
@ -487,10 +501,15 @@ Rectangle {
return channels[id]; return channels[id];
} }
function sanatizeContent(mess) {
var script_tag = /<script\b[^>]*>/gi;
return mess.replace(script_tag, "script");
}
// Messages from script // Messages from script
function fromScript(message) { function fromScript(message) {
let time = new Date().toLocaleTimeString(undefined, { hour12: false }); let time = new Date().toLocaleTimeString(undefined, { hour12: false });
let date = new Date().toLocaleDateString(undefined, { month: "long", day: "numeric", }); let date = new Date().toLocaleDateString(undefined, { year: "numeric", month: "long", day: "numeric", });
switch (message.type){ switch (message.type){
case "show_message": case "show_message":
@ -502,6 +521,7 @@ Rectangle {
case "clear_messages": case "clear_messages":
local.clear() local.clear()
domain.clear() domain.clear()
break;
case "initial_settings": case "initial_settings":
if (message.settings.external_window) s_external_window.checked = true if (message.settings.external_window) s_external_window.checked = true
if (message.settings.maximum_messages) s_maximum_messages.value = message.settings.maximum_messages if (message.settings.maximum_messages) s_maximum_messages.value = message.settings.maximum_messages