Merge pull request #203 from jgibbon/feature/functions-js-optimizations

Optimize functions.js
This commit is contained in:
Sebastian Wolf 2020-12-05 15:19:10 +01:00 committed by GitHub
commit bc0f30bbe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 325 additions and 162 deletions

View file

@ -74,6 +74,7 @@ DISTFILES += qml/harbour-fernschreiber.qml \
qml/pages/ChatPage.qml \ qml/pages/ChatPage.qml \
qml/pages/ChatSelectionPage.qml \ qml/pages/ChatSelectionPage.qml \
qml/pages/CoverPage.qml \ qml/pages/CoverPage.qml \
qml/pages/DebugPage.qml \
qml/pages/InitializationPage.qml \ qml/pages/InitializationPage.qml \
qml/pages/NewChatPage.qml \ qml/pages/NewChatPage.qml \
qml/pages/OverviewPage.qml \ qml/pages/OverviewPage.qml \

View file

@ -27,7 +27,11 @@ var timeEnd = enabled ? console.timeEnd : function(){};
var trace = enabled ? console.trace : function(){}; var trace = enabled ? console.trace : function(){};
var count = enabled ? console.count : function(){}; var count = enabled ? console.count : function(){};
var profile = enabled ? console.profile : function(){}; var profile = enabled ? console.profile : function(){};
var profileEnd = enabled ? console.profileEnd : function(){};
var exception = enabled ? console.exception : function(){}; var exception = enabled ? console.exception : function(){};
var warn = enabled ? console.warn: function(){};
// Debug.error is always enabled.
var error = console.error;
Fernschreiber.DebugLog.enabledChanged.connect(function() { Fernschreiber.DebugLog.enabledChanged.connect(function() {
enabled = Fernschreiber.DebugLog.enabled; enabled = Fernschreiber.DebugLog.enabled;
@ -39,9 +43,88 @@ Fernschreiber.DebugLog.enabledChanged.connect(function() {
trace = console.trace; trace = console.trace;
count = console.count; count = console.count;
profile = console.profile; profile = console.profile;
profileEnd = console.profileEnd;
exception = console.exception; exception = console.exception;
} else { } else {
log = assert = time = timeEnd = trace = count = profile = exception = function(){}; log = assert = time = timeEnd = trace = count = profile = profileEnd = exception = warn = function(){};
} }
}); });
/**
* @function compareAndRepeat
* This function compares results of two functions for multiple sets of arguments and then repeats those calls to compare them with profiling.
* Testing showed that results are slightly skewed in favor of the secondaryProfileFunction, which (together with external factors)
* is almost compensated by running the calls often.
*
* @param {string} title - used for Debug output
* @param {function} profileFunction - function to compare
* @param {function} [secondaryProfileFunction] - secondary function to compare. Use falsy value to skip comparison.
* @param {Array.<Array.<*>>} [functionArgumentsArray = []] - argument sets to run both functions with
* @param {number} [testCount = 10000] - times to run each function in addition to result comparison
* @param {Object} [testContext = null] - If the functions use `this` or otherwise depend on a Closure/Execution context, it can be set here. If they, for example, use properties of a QML `Item`, you can use that `Item` as `testContext`.
*
* @example
* // to compare the results of Debug.log("first", "second", "third")
* // and Debug.log("some value")
* // with the same calls of console.log and run 100 times each:
* Debug.compareAndRepeat("Debuglog",
* Debug.log, console.log,
* [["first", "second", "third"], ["some value"]],
* 100
* );
*
*/
function compareAndRepeat(title, profileFunction, secondaryProfileFunction, functionArgumentsArray, testCount, testContext) {
if(!enabled) {
log("Debugging disabled, compareAndRepeat ran uselessly:", title);
return;
}
var numberOfTests = testCount || 10000,
context = testContext || null,
args = functionArgumentsArray || [],
argumentIterator = args.length || 1,
results,
resultsComparison,
functionIterator = numberOfTests;
if(secondaryProfileFunction) {
while(argumentIterator--) {
results = JSON.stringify(profileFunction.apply(context, args[argumentIterator] || null));
resultsComparison = JSON.stringify(secondaryProfileFunction.apply(context, args[argumentIterator] || null));
if(resultsComparison !== results) {
warn("\x1b[1m✘ Different return values!\x1b[0m", title)
warn("profileFunction result:", results);
warn("secondaryProfileFunction result:", resultsComparison);
return;
}
}
log("\x1b[1m✔ Comparison of", title, "return values successful!\x1b[0m")
}
log("Running", title, "with", args.length, "different argument sets", numberOfTests, "times each")
if(secondaryProfileFunction) {
// "secondaryProfileFunction"
functionIterator = numberOfTests;
while(functionIterator--) {
argumentIterator = args.length || 1;
while(argumentIterator--) {
secondaryProfileFunction.apply(context, args[argumentIterator] || null);
}
}
}
// "profileFunction"
functionIterator = numberOfTests;
while(functionIterator--) {
argumentIterator = args.length || 1;
while(argumentIterator--) {
profileFunction.apply(context, args[argumentIterator] || null);
}
}
log("Ran", title, args.length * numberOfTests, "times", secondaryProfileFunction ? "and compared results successfully" : "");
}

View file

@ -29,89 +29,72 @@ function setGlobals(globals) {
} }
function getUserName(userInformation) { function getUserName(userInformation) {
var firstName = typeof userInformation.first_name !== "undefined" ? userInformation.first_name : ""; return ((userInformation.first_name || "") + " " + (userInformation.last_name || "")).trim();
var lastName = typeof userInformation.last_name !== "undefined" ? userInformation.last_name : "";
return (firstName + " " + lastName).trim();
} }
function getMessageText(message, simple, myself, ignoreEntities) { function getMessageText(message, simple, myself, ignoreEntities) {
if (message.content['@type'] === 'messageText') { switch(message.content['@type']) {
case 'messageText':
if (simple) { if (simple) {
return message.content.text.text; return message.content.text.text;
} else { } else {
return enhanceMessageText(message.content.text, ignoreEntities); return enhanceMessageText(message.content.text, ignoreEntities);
} }
} case 'messageSticker':
if (message.content['@type'] === 'messageSticker') {
return simple ? qsTr("Sticker: %1").arg(message.content.sticker.emoji) : ""; return simple ? qsTr("Sticker: %1").arg(message.content.sticker.emoji) : "";
} case 'messagePhoto':
if (message.content['@type'] === 'messagePhoto') {
if (message.content.caption.text !== "") { if (message.content.caption.text !== "") {
return simple ? qsTr("Picture: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities) return simple ? qsTr("Picture: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities)
} else { } else {
return simple ? (myself ? qsTr("sent a picture", "myself") : qsTr("sent a picture")) : ""; return simple ? (myself ? qsTr("sent a picture", "myself") : qsTr("sent a picture")) : "";
} }
} case 'messageVideo':
if (message.content['@type'] === 'messageVideo') {
if (message.content.caption.text !== "") { if (message.content.caption.text !== "") {
return simple ? qsTr("Video: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities) return simple ? qsTr("Video: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities)
} else { } else {
return simple ? (myself ? qsTr("sent a video", "myself") : qsTr("sent a video")) : ""; return simple ? (myself ? qsTr("sent a video", "myself") : qsTr("sent a video")) : "";
} }
} case 'messageVideoNote':
if (message.content['@type'] === 'messageVideoNote') {
return simple ? (myself ? qsTr("sent a video note", "myself") : qsTr("sent a video note")) : ""; return simple ? (myself ? qsTr("sent a video note", "myself") : qsTr("sent a video note")) : "";
} case 'messageAnimation':
if (message.content['@type'] === 'messageAnimation') {
if (message.content.caption.text !== "") { if (message.content.caption.text !== "") {
return simple ? qsTr("Animation: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities) return simple ? qsTr("Animation: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities)
} else { } else {
return simple ? (myself ? qsTr("sent an animation", "myself") : qsTr("sent an animation")) : ""; return simple ? (myself ? qsTr("sent an animation", "myself") : qsTr("sent an animation")) : "";
} }
} case 'messageAudio':
if (message.content['@type'] === 'messageAudio') {
if (message.content.caption.text !== "") { if (message.content.caption.text !== "") {
return simple ? qsTr("Audio: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities) return simple ? qsTr("Audio: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities)
} else { } else {
return simple ? (myself ? qsTr("sent an audio", "myself") : qsTr("sent an audio")) : ""; return simple ? (myself ? qsTr("sent an audio", "myself") : qsTr("sent an audio")) : "";
} }
} case 'messageVoiceNote':
if (message.content['@type'] === 'messageVoiceNote') {
if (message.content.caption.text !== "") { if (message.content.caption.text !== "") {
return simple ? qsTr("Voice Note: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities) return simple ? qsTr("Voice Note: %1").arg(message.content.caption.text) : enhanceMessageText(message.content.caption, ignoreEntities)
} else { } else {
return simple ? (myself ? qsTr("sent a voice note", "myself") : qsTr("sent a voice note")) : ""; return simple ? (myself ? qsTr("sent a voice note", "myself") : qsTr("sent a voice note")) : "";
} }
} case 'messageDocument':
if (message.content['@type'] === 'messageDocument') {
if (message.content.document.file_name !== "") { if (message.content.document.file_name !== "") {
return simple ? qsTr("Document: %1").arg(message.content.document.file_name) : (message.content.document.file_name + ( message.content.caption.text !== "" ? ("<br />" + enhanceMessageText(message.content.caption, ignoreEntities) ) : "")).trim(); return simple ? qsTr("Document: %1").arg(message.content.document.file_name) : (message.content.document.file_name + ( message.content.caption.text !== "" ? ("<br />" + enhanceMessageText(message.content.caption, ignoreEntities) ) : "")).trim();
} else { } else {
return simple ? (myself ? qsTr("sent a document", "myself") : qsTr("sent a document")) : ""; return simple ? (myself ? qsTr("sent a document", "myself") : qsTr("sent a document")) : "";
} }
} case 'messageLocation':
if (message.content['@type'] === 'messageLocation') {
return simple ? (myself ? qsTr("sent a location", "myself") : qsTr("sent a location")) : ""; return simple ? (myself ? qsTr("sent a location", "myself") : qsTr("sent a location")) : "";
} case 'messageVenue':
if (message.content['@type'] === 'messageVenue') {
return simple ? (myself ? qsTr("sent a venue", "myself") : qsTr("sent a venue")) : ( "<b>" + message.content.venue.title + "</b>, " + message.content.venue.address ); return simple ? (myself ? qsTr("sent a venue", "myself") : qsTr("sent a venue")) : ( "<b>" + message.content.venue.title + "</b>, " + message.content.venue.address );
} case 'messageContactRegistered':
if (message.content['@type'] === 'messageContactRegistered') {
return myself ? qsTr("have registered with Telegram") : qsTr("has registered with Telegram"); return myself ? qsTr("have registered with Telegram") : qsTr("has registered with Telegram");
} case 'messageChatJoinByLink':
if (message.content['@type'] === 'messageChatJoinByLink') {
return myself ? qsTr("joined this chat", "myself") : qsTr("joined this chat"); return myself ? qsTr("joined this chat", "myself") : qsTr("joined this chat");
} case 'messageChatAddMembers':
if (message.content['@type'] === 'messageChatAddMembers') {
return myself ? qsTr("were added to this chat", "myself") : qsTr("was added to this chat"); return myself ? qsTr("were added to this chat", "myself") : qsTr("was added to this chat");
} case 'messageChatDeleteMember':
if (message.content['@type'] === 'messageChatDeleteMember') {
return myself ? qsTr("left this chat", "myself") : qsTr("left this chat"); return myself ? qsTr("left this chat", "myself") : qsTr("left this chat");
} case 'messageChatChangeTitle':
if (message.content['@type'] === 'messageChatChangeTitle') {
return myself ? qsTr("changed the chat title to %1", "myself").arg(message.content.title) : qsTr("changed the chat title to %1").arg(message.content.title); return myself ? qsTr("changed the chat title to %1", "myself").arg(message.content.title) : qsTr("changed the chat title to %1").arg(message.content.title);
} case 'messagePoll':
if (message.content['@type'] === 'messagePoll') {
if (message.content.poll.type['@type'] === "pollTypeQuiz") { if (message.content.poll.type['@type'] === "pollTypeQuiz") {
if (message.content.poll.is_anonymous) { if (message.content.poll.is_anonymous) {
return simple ? (myself ? qsTr("sent an anonymous quiz", "myself") : qsTr("sent an anonymous quiz")) : ("<b>" + qsTr("Anonymous Quiz") + "</b>"); return simple ? (myself ? qsTr("sent an anonymous quiz", "myself") : qsTr("sent an anonymous quiz")) : ("<b>" + qsTr("Anonymous Quiz") + "</b>");
@ -122,43 +105,33 @@ function getMessageText(message, simple, myself, ignoreEntities) {
return simple ? (myself ? qsTr("sent an anonymous poll", "myself") : qsTr("sent an anonymous poll")) : ("<b>" + qsTr("Anonymous Poll") + "</b>"); return simple ? (myself ? qsTr("sent an anonymous poll", "myself") : qsTr("sent an anonymous poll")) : ("<b>" + qsTr("Anonymous Poll") + "</b>");
} }
return simple ? (myself ? qsTr("sent a poll", "myself") : qsTr("sent a poll")) : ("<b>" + qsTr("Poll") + "</b>"); return simple ? (myself ? qsTr("sent a poll", "myself") : qsTr("sent a poll")) : ("<b>" + qsTr("Poll") + "</b>");
} case 'messageBasicGroupChatCreate':
if (message.content['@type'] === 'messageBasicGroupChatCreate' || message.content['@type'] === 'messageSupergroupChatCreate') { case 'messageSupergroupChatCreate':
return myself ? qsTr("created this group", "myself") : qsTr("created this group"); return myself ? qsTr("created this group", "myself") : qsTr("created this group");
} case 'messageChatChangePhoto':
if (message.content['@type'] === 'messageChatChangePhoto') {
return myself ? qsTr("changed the chat photo", "myself") : qsTr("changed the chat photo"); return myself ? qsTr("changed the chat photo", "myself") : qsTr("changed the chat photo");
} case 'messageChatDeletePhoto':
if (message.content['@type'] === 'messageChatDeletePhoto') {
return myself ? qsTr("deleted the chat photo", "myself") : qsTr("deleted the chat photo"); return myself ? qsTr("deleted the chat photo", "myself") : qsTr("deleted the chat photo");
} case 'messageChatSetTtl':
if (message.content['@type'] === 'messageChatSetTtl') {
return myself ? qsTr("changed the secret chat TTL setting", "myself; TTL = Time To Live") : qsTr("changed the secret chat TTL setting", "TTL = Time To Live"); return myself ? qsTr("changed the secret chat TTL setting", "myself; TTL = Time To Live") : qsTr("changed the secret chat TTL setting", "TTL = Time To Live");
} case 'messageChatUpgradeFrom':
case 'messageChatUpgradeTo':
if (message.content['@type'] === 'messageChatUpgradeFrom' || message.content['@type'] === 'messageChatUpgradeTo' ) {
return myself ? qsTr("upgraded this group to a supergroup", "myself") : qsTr("upgraded this group to a supergroup"); return myself ? qsTr("upgraded this group to a supergroup", "myself") : qsTr("upgraded this group to a supergroup");
} case 'messageCustomServiceAction':
if (message.content['@type'] === 'messageCustomServiceAction') {
return message.content.text; return message.content.text;
} case 'messagePinMessage':
if (message.content['@type'] === 'messagePinMessage') {
return myself ? qsTr("changed the pinned message", "myself") : qsTr("changed the pinned message"); return myself ? qsTr("changed the pinned message", "myself") : qsTr("changed the pinned message");
} case 'messageExpiredPhoto':
if (message.content['@type'] === 'messageExpiredPhoto') {
return myself ? qsTr("sent a self-destructing photo that is expired", "myself") : qsTr("sent a self-destructing photo that is expired"); return myself ? qsTr("sent a self-destructing photo that is expired", "myself") : qsTr("sent a self-destructing photo that is expired");
} case 'messageExpiredVideo':
if (message.content['@type'] === 'messageExpiredVideo') {
return myself ? qsTr("sent a self-destructing video that is expired", "myself") : qsTr("sent a self-destructing video that is expired"); return myself ? qsTr("sent a self-destructing video that is expired", "myself") : qsTr("sent a self-destructing video that is expired");
} case 'messageScreenshotTaken':
if (message.content['@type'] === 'messageScreenshotTaken') {
return myself ? qsTr("created a screenshot in this chat", "myself") : qsTr("created a screenshot in this chat"); return myself ? qsTr("created a screenshot in this chat", "myself") : qsTr("created a screenshot in this chat");
} case 'messageUnsupported':
if (message.content['@type'] === 'messageUnsupported') {
return myself ? qsTr("sent an unsupported message", "myself") : qsTr("sent an unsupported message"); return myself ? qsTr("sent an unsupported message", "myself") : qsTr("sent an unsupported message");
default:
return myself ? qsTr("sent an unsupported message: %1", "myself; %1 is message type").arg(message.content['@type'].substring(7)) : qsTr("sent an unsupported message: %1", "%1 is message type").arg(message.content['@type'].substring(7));
} }
return myself ? qsTr("sent an unsupported message: %1", "myself; %1 is message type").arg(message.content['@type'].substring(7)) : qsTr("sent an unsupported message: %1", "%1 is message type").arg(message.content['@type'].substring(7));
} }
function getChatPartnerStatusText(statusType, was_online) { function getChatPartnerStatusText(statusType, was_online) {
@ -190,7 +163,6 @@ function getSecretChatStatus(secretChatDetails) {
} }
function getChatMemberStatusText(statusType) { function getChatMemberStatusText(statusType) {
// chatMemberStatusAdministrator, chatMemberStatusBanned, chatMemberStatusCreator, chatMemberStatusLeft, chatMemberStatusMember, and chatMemberStatusRestricted.
switch(statusType) { switch(statusType) {
case "chatMemberStatusAdministrator": case "chatMemberStatusAdministrator":
return qsTr("Admin", "channel user role"); return qsTr("Admin", "channel user role");
@ -225,128 +197,135 @@ function getDateTimeTranslated(timestamp) {
return new Date(timestamp * 1000).toLocaleString(); return new Date(timestamp * 1000).toLocaleString();
} }
function MessageInsertion(offset, insertionString, removeLength) {
this.offset = offset;
this.insertionString = insertionString;
this.removeLength = removeLength;
}
MessageInsertion.prototype.toString = function insertionToString() {
return "Offset: " + this.offset + ", Insertion String: " + this.insertionString + ", Remove Length: " + this.removeLength;
}
function handleHtmlEntity(messageText, messageInsertions, originalString, replacementString) { function handleHtmlEntity(messageText, messageInsertions, originalString, replacementString) {
var continueSearch = true; var nextIndex = -1;
var fromIndex = 0; while ((nextIndex = messageText.indexOf(originalString, nextIndex + 1)) > -1) {
var nextIndex = 0; messageInsertions.push({ offset: nextIndex, insertionString: replacementString, removeLength: originalString.length });
while (continueSearch) {
nextIndex = messageText.indexOf(originalString, fromIndex);
if (nextIndex < 0) {
continueSearch = false;
} else {
messageInsertions.push(new MessageInsertion(nextIndex, replacementString, originalString.length));
fromIndex = nextIndex + 1;
}
} }
} }
var rawNewLineRegExp = /\r?\n/g;
var ampRegExp = /&/g;
var ltRegExp = /</g;
var gtRegExp = />/g;
function enhanceHtmlEntities(simpleText) { function enhanceHtmlEntities(simpleText) {
return simpleText.replace(ampRegExp, "&amp;").replace(ltRegExp, "&lt;").replace(gtRegExp, "&gt;");//.replace(rawNewLineRegExp, "<br>");
var messageInsertions = [];
var messageText = simpleText;
handleHtmlEntity(messageText, messageInsertions, "&", "&amp;");
handleHtmlEntity(messageText, messageInsertions, "<", "&lt;");
handleHtmlEntity(messageText, messageInsertions, ">", "&gt;");
messageInsertions.sort( function(a, b) { return (b.offset+b.removeLength) - (a.offset+a.removeLength) } );
for (var z = 0; z < messageInsertions.length; z++) {
messageText = messageText.substring(0, messageInsertions[z].offset) + messageInsertions[z].insertionString + messageText.substring(messageInsertions[z].offset + messageInsertions[z].removeLength);
}
return messageText;
} }
function messageInsertionSorter(a, b) { return (b.offset+b.removeLength) - (a.offset+a.removeLength) }
function enhanceMessageText(formattedText, ignoreEntities) { function enhanceMessageText(formattedText, ignoreEntities) {
var messageInsertions = []; var messageInsertions = [];
var messageText = formattedText.text; var messageText = formattedText.text;
var entity;
if (ignoreEntities) { if (ignoreEntities) {
return messageText; return messageText;
} }
if(formattedText.entities.length === 0) {
return messageText.replace(ampRegExp, "&amp;").replace(ltRegExp, "&lt;").replace(gtRegExp, "&gt;").replace(rawNewLineRegExp, "<br>");
}
for (var i = 0; i < formattedText.entities.length; i++) {
entity = formattedText.entities[i];
if (entity['@type'] !== "textEntity") {
continue;
}
switch(entity.type['@type']) {
case "textEntityTypeBold":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<b>", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</b>", removeLength: 0 }
);
break;
case "textEntityTypeUrl":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<a href=\"" + messageText.substring(entity.offset, ( entity.offset + entity.length )) + "\">", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</a>", removeLength: 0 }
);
break;
case "textEntityTypeCode":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<pre>", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</pre>", removeLength: 0 }
);
break;
case "textEntityTypeEmailAddress":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<a href=\"mailto:" + messageText.substring(entity.offset, ( entity.offset + entity.length )) + "\">", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</a>", removeLength: 0 }
);
break;
case "textEntityTypeItalic":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<i>", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</i>", removeLength: 0 }
);
break;
case "textEntityTypeMention":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<a href=\"user://" + messageText.substring(entity.offset, ( entity.offset + entity.length )) + "\">", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</a>", removeLength: 0 }
);
break;
case "textEntityTypeMentionName":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<a href=\"userId://" + entity.type.user_id + "\">", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</a>", removeLength: 0 }
);
break;
case "textEntityTypePhoneNumber":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<a href=\"tel:" + messageText.substring(entity.offset, ( entity.offset + entity.length )) + "\">", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</a>", removeLength: 0 }
);
break;
case "textEntityTypePre":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<pre>", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</pre>", removeLength: 0 }
);
break;
case "textEntityTypePreCode":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<pre>", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</pre>", removeLength: 0 }
);
break;
case "textEntityTypeTextUrl":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<a href=\"" + entity.type.url + "\">", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</a>", removeLength: 0 }
);
break;
case "textEntityTypeUnderline":
messageInsertions.push(
{ offset: entity.offset, insertionString: "<u>", removeLength: 0 },
{ offset: (entity.offset + entity.length), insertionString: "</u>", removeLength: 0 }
);
break;
}
}
if(messageInsertions.length === 0) {
return messageText.replace(ampRegExp, "&amp;").replace(ltRegExp, "&lt;").replace(gtRegExp, "&gt;").replace(rawNewLineRegExp, "<br>");
}
handleHtmlEntity(messageText, messageInsertions, "&", "&amp;"); handleHtmlEntity(messageText, messageInsertions, "&", "&amp;");
handleHtmlEntity(messageText, messageInsertions, "<", "&lt;"); handleHtmlEntity(messageText, messageInsertions, "<", "&lt;");
handleHtmlEntity(messageText, messageInsertions, ">", "&gt;"); handleHtmlEntity(messageText, messageInsertions, ">", "&gt;");
messageInsertions.sort(messageInsertionSorter);
for (var i = 0; i < formattedText.entities.length; i++) {
if (formattedText.entities[i]['@type'] !== "textEntity") {
continue;
}
var entityType = formattedText.entities[i].type['@type'];
if (entityType === "textEntityTypeBold") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<b>", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</b>", 0 ));
}
if (entityType === "textEntityTypeUrl") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<a href=\"" + messageText.substring(formattedText.entities[i].offset, ( formattedText.entities[i].offset + formattedText.entities[i].length )) + "\">", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</a>", 0 ));
}
if (entityType === "textEntityTypeCode") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<pre>", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</pre>", 0 ));
}
if (entityType === "textEntityTypeEmailAddress") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<a href=\"mailto:" + messageText.substring(formattedText.entities[i].offset, ( formattedText.entities[i].offset + formattedText.entities[i].length )) + "\">", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</a>", 0 ));
}
if (entityType === "textEntityTypeItalic") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<i>", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</i>", 0 ));
}
if (entityType === "textEntityTypeMention") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<a href=\"user://" + messageText.substring(formattedText.entities[i].offset, ( formattedText.entities[i].offset + formattedText.entities[i].length )) + "\">", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</a>", 0 ));
}
if (entityType === "textEntityTypeMentionName") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<a href=\"userId://" + formattedText.entities[i].type.user_id + "\">", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</a>", 0 ));
}
if (entityType === "textEntityTypePhoneNumber") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<a href=\"tel:" + messageText.substring(formattedText.entities[i].offset, ( formattedText.entities[i].offset + formattedText.entities[i].length )) + "\">", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</a>", 0 ));
}
if (entityType === "textEntityTypePre") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<pre>", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</pre>", 0 ));
}
if (entityType === "textEntityTypePreCode") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<pre>", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</pre>", 0 ));
}
if (entityType === "textEntityTypeTextUrl") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<a href=\"" + formattedText.entities[i].type.url + "\">", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</a>", 0 ));
}
if (entityType === "textEntityTypeUnderline") {
messageInsertions.push(new MessageInsertion(formattedText.entities[i].offset, "<u>", 0 ));
messageInsertions.push(new MessageInsertion((formattedText.entities[i].offset + formattedText.entities[i].length), "</u>", 0 ));
}
}
messageInsertions.sort( function(a, b) { return (b.offset+b.removeLength) - (a.offset+a.removeLength) } );
for (var z = 0; z < messageInsertions.length; z++) { for (var z = 0; z < messageInsertions.length; z++) {
messageText = messageText.substring(0, messageInsertions[z].offset) + messageInsertions[z].insertionString + messageText.substring(messageInsertions[z].offset + messageInsertions[z].removeLength); messageText = messageText.substring(0, messageInsertions[z].offset)
+ messageInsertions[z].insertionString
+ messageText.substring(messageInsertions[z].offset + messageInsertions[z].removeLength);
} }
messageText = messageText.replace(new RegExp("\r?\n", "g"), "<br>"); messageText = messageText.replace(rawNewLineRegExp, "<br>");
return messageText; return messageText;
} }
function handleLink(link) { function handleLink(link) {
@ -401,6 +380,7 @@ function getVideoHeight(videoWidth, videoData) {
return 1; return 1;
} }
} }
function replaceUrlsWithLinks(string) { function replaceUrlsWithLinks(string) {
return string.replace(/((\w+):\/\/[\w?=&.\/-;#~%-]+(?![\w\s?&.\/;#~%"=-]*>))/g, "<a href=\"$1\">$1</a>"); return string.replace(/((\w+):\/\/[\w?=&.\/-;#~%-]+(?![\w\s?&.\/;#~%"=-]*>))/g, "<a href=\"$1\">$1</a>");
} }

View file

@ -20,7 +20,6 @@ import QtQuick 2.6
import Sailfish.Silica 1.0 import Sailfish.Silica 1.0
import "../components" import "../components"
import "../js/twemoji.js" as Emoji import "../js/twemoji.js" as Emoji
import "../js/functions.js" as Functions
Page { Page {
id: aboutPage id: aboutPage

95
qml/pages/DebugPage.qml Normal file
View file

@ -0,0 +1,95 @@
/*
Copyright (C) 2020 Sebastian J. Wolf and other contributors
This file is part of Fernschreiber.
Fernschreiber is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Fernschreiber is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import Sailfish.Silica 1.0
import "../components"
import "../js/twemoji.js" as Emoji
import "../js/functions.js" as Functions
import "../js/debug.js" as Debug
Page {
id: debugPage
allowedOrientations: Orientation.All
SilicaFlickable {
id: aboutContainer
contentHeight: column.height
anchors.fill: parent
Column {
id: column
width: parent.width
spacing: Theme.paddingLarge
PageHeader {
title: "Debug Page"
description: "here be dragons"
}
}
VerticalScrollDecorator {}
}
Timer {
id: profileTimer
interval: 1000
property bool hasRun
property var cases: []
onTriggered: {
if(cases.length === 0) {
return;
}
if(!hasRun) {
hasRun = true;
Debug.profile();
}
cases.pop()();
if(cases.length > 0) {
restart();
} else {
Debug.profileEnd();
}
}
}
onStatusChanged: {
if (status === PageStatus.Active) {
// example runner for comparing function calls
// profileTimer.cases.push(function(){
// Debug.compareAndRepeat(
// "getUserName",
// Functions.getUserName,
// Functions.getUserName,
// [
// [{first_name: "Test", last_name: "User"}],
// [{first_name: "Test", last_name: ""}],
// [{first_name: "Test"}],
// [{first_name: "", last_name: "User"}],
// [{last_name: "User"}]
// ],
// 800
// )
// });
// profileTimer.start();
}
}
}

View file

@ -190,6 +190,11 @@ Page {
visible: !overviewPage.loading visible: !overviewPage.loading
PullDownMenu { PullDownMenu {
MenuItem {
text: "Debug"
visible: Debug.enabled
onClicked: pageStack.push(Qt.resolvedUrl("../pages/DebugPage.qml"))
}
MenuItem { MenuItem {
text: qsTr("About Fernschreiber") text: qsTr("About Fernschreiber")
onClicked: pageStack.push(Qt.resolvedUrl("../pages/AboutPage.qml")) onClicked: pageStack.push(Qt.resolvedUrl("../pages/AboutPage.qml"))