Max/SolidScribe
1
0
Fork 0
Code Issues 24 Pull Requests Releases Wiki Activity

Added rate limiting and server security

Browse Source 
Ton of little visual style tweaks and little up improvements for mobile
This commit is contained in:
Max G
2020-03-26 04:45:23 +00:00
parent 749d2cea94
commit ecbf6a9cde
17 changed files with 283 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/helpers/ProcessText.js
View File

@@ -26,6 +26,17 @@ ProcessText.stripBlankHtmlLines = (string) => {
return string.replace(/\<p\>\<br\>\<\/p\>/g,'')
}
//Remove Double Empty HTML lines from a string
ProcessText.stripDoubleBlankLines = (string) => {
if(string == undefined || string == null || string.length == 0){
return ''
}
//Blank lines look like this -> <p><br></p>
return string.replace(/\<p\>\<br\>\<\/p\>\<p\>\<br\>\<\/p\>/g,'')
}
ProcessText.getUrlsFromString = (string) => {
const urlPattern = /(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[A-Z0-9+&@#/%=~_|$])/igm
return string.match(urlPattern)
@@ -41,11 +52,16 @@ ProcessText.getUrlsFromString = (string) => {
+ If note starts as a list, skip the title
*/
ProcessText.deduceNoteTitle = (inString) => {
ProcessText.deduceNoteTitle = (inTitle, inString) => {
let title = '' //Title of note
let title = inTitle //Title of note
let sub = '' //sub text below note
//Always return a title as a String
if(title == null){
title = ''
}
if(!inString || inString == null || inString.length == 0){
return {title, sub}
}
@@ -55,16 +71,17 @@ ProcessText.deduceNoteTitle = (inString) => {
const tagFreeLength = ProcessText.removeHtml(inString).length
if(tagFreeLength < 100){
sub = ProcessText.stripBlankHtmlLines(inString)
return {title, sub}
//
// Simplified attempt!
// Remove tags, push caret if greater than 200 chars...thats it
// Still needs, links to open in a new window.
sub = ProcessText.stripDoubleBlankLines(inString)
if(tagFreeLength > 200){
sub += '... <i class="green caret down icon"></i>'
}
//Primare Case - Short notes
if(tagFreeLength < 300){
sub = ProcessText.stripBlankHtmlLines(inString)
return {title, sub}
}
return {title, sub}
//Emergency ending tag if truncated. This will help regex find all the lines
inString += '</end>'
@@ -87,6 +104,7 @@ ProcessText.deduceNoteTitle = (inString) => {
let charLimit = 400
let listStart = false
let noTitleJustList = false
let appendCaret = false
for(let i=0; i < totalLines; i++){
@@ -167,8 +185,8 @@ ProcessText.deduceNoteTitle = (inString) => {
if(cleanCutString.length == 0){
cleanCutString = cutString
}
finalLines.push(cleanCutString + '... <i class="green caret down icon"></i>')
appendCaret = true
break;
}
@@ -176,9 +194,13 @@ ProcessText.deduceNoteTitle = (inString) => {
}
if(tagFreeLength.length >= 300 || appendCaret){
finalLines.push('... <i class="green caret down icon"></i>')
}
//Pull out title if its not an empty string
if(ProcessText.removeHtml(finalLines[0]).trim().replace('&nbsp','').length > 0 && !noTitleJustList){
// title = finalLines.shift()
if(!noTitleJustList && title == ''){
title = ProcessText.removeHtml( finalLines.shift() ).replace('&nbsp','')
}
sub = finalLines.join('')