Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #107 from FluffyJenkins/feature/communityModules

Browse source 
Fixed url parsing breaking with text formatting! <3
This commit is contained in:
kasenvr 2020-01-21 22:53:52 -05:00 committed by GitHub
commit 31ea9e33c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
scripts/communityModules/chat/FloofChat.html
View file

@ -52,6 +52,21 @@
var $ChatLog; // The scrolling chat log.
var $ChatInputText; // The text field for entering text.
var userName;
var urlRegEx = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;,:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+,~%\/\.\w\-]*)?\??(?:[\-\+=&;,:%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g;
function reverseMatches(msg) {
var result = [];
var matches = msg.match(urlRegEx);
if (matches === null) {
matches = [];
}
for (var i = 0; i <= matches.length; i++) {
var split = msg.split(matches[i], 2);
result.push(split[0]);
msg = split[1];
}
return result;
}
//Start George Function
//Function provided by George Deac
@ -62,11 +77,30 @@
$.fn.linky = function (options) {
return this.each(function () {
var $el = $(this),
linkifiedContent = _linkify($el, options);
var formattedContent = replaceFormatting(linkifiedContent);
var $el = $(this);
var content = $el.html();
$el.html(formattedContent);
var match = content.match(urlRegEx);
var matchLength = match === null ? 0 : match.length;
var messageParts = reverseMatches(content);
var messageFormatted = [];
var urlLinkified = [];
var completeMessage = [];
for (var i = 0; i < matchLength; i++) {
urlLinkified.push(_linkify(match[i], options));
}
for (var i = 0; i < messageParts.length; i++) {
messageFormatted.push(replaceFormatting(messageParts[i]));
}
for (var i = 0; i < messageFormatted.length; i++) {
completeMessage.push(messageFormatted[i], urlLinkified[i]);
}
$el.html(completeMessage.join(""));
});
};
@ -92,9 +126,8 @@
linkTo: "twitter" // Let's default to Twitter
},
extendedOptions = $.extend(defaultOptions, options),
elContent = $el.html(),
elContent = $el,
// Regular expression courtesy of Matthew O'Riordan, see: http://goo.gl/3syEKK
urlRegEx = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;,:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+,~%\/\.\w\-]*)?\??(?:[\-\+=&;,:%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g,
matches;
// Linkifying URLs
@ -121,7 +154,7 @@
// For any URLs present, unless they are already identified within
// an `a` element, linkify them.
function _linkifyUrls(matches, $el) {
var elContent = $el.html();
var elContent = $el;
$.each(matches, function () {

20
scripts/communityModules/chat/FloofChat.js
View file

@ -112,10 +112,15 @@ function connectWebSocket(timeout) {
console.log('disconnected');
timeout = timeout | 0;
if (!shutdownBool && timeout < (30 * 1000)) {
if (!shutdownBool) {
if (timeout > (30 * 1000)) {
timeout = 30 * 1000;
} else if (timeout < (30 * 1000)) {
timeout += 1000;
}
Script.setTimeout(function () {
connectWebSocket(timeout);
}, timeout + 1000);
}, timeout);
} else {
wsReady = -1;
}
@ -128,13 +133,18 @@ function sendWS(msg, timeout) {
ws.send(JSON.stringify(msg));
} else {
timeout = timeout | 0;
if (!shutdownBool && timeout < (30 * 1000)) {
if (!shutdownBool) {
if (timeout > (30 * 1000)) {
timeout = 30 * 1000;
} else if (timeout < (30 * 1000)) {
timeout += 1000;
}
Script.setTimeout(function () {
if (wsReady === -1) {
connectWebSocket();
}
sendWS(msg, timeout);
}, timeout + 1000);
}, timeout);
}
}
}
@ -181,7 +191,7 @@ function go2(msg) {
var dest = false;
var domainsList = [];
try {
domainsList = Script.require("http://metaverse.darlingvr.club:8081/goto.json");
domainsList = Script.require(gotoJSONUrl + "?" + Date.now());
} catch (e) {
//
}