I need to get back into using git. The hell is wrong with me!?

2019-12-20 05:50:50 +00:00
parent 7b77bd37f3
commit 6fe39406b7
135 changed files with 53273 additions and 699 deletions
--- a/server/ecosystem.config.js
+++ b/server/ecosystem.config.js
@@ -0,0 +1,31 @@
+module.exports = {
+  apps : [{
+    name: 'NoteServer',
+    script: 'index.js',
+
+    // Options reference: https://pm2.io/doc/en/runtime/reference/ecosystem-file/
+    // args: 'one two',
+    instances: 1,
+    autorestart: true,
+    watch: true,
+    ignore_watch : ["node_modules", "staticFiles"],
+    max_memory_restart: '1G',
+    env: {
+      NODE_ENV: 'development'
+    },
+    env_production: {
+      NODE_ENV: 'production'
+    }
+  }],
+
+  deploy : {
+    production : {
+      user : 'node',
+      host : '212.83.163.1',
+      ref  : 'origin/master',
+      repo : 'git@github.com:repo.git',
+      path : '/var/www/production',
+      'post-deploy' : 'npm install && pm2 reload ecosystem.config.js --env production'
+    }
+  }
+};
--- a/server/helpers/ProcessText.js
+++ b/server/helpers/ProcessText.js
@@ -0,0 +1,9 @@
+
+let ProcessText = module.exports = {}
+
+ProcessText.removeHtml = (string) => {
+	return string
+		.replace(/&[#A-Za-z0-9]+;/g,' ') //Rip out all HTML entities
+		.replace(/<[^>]+>/g, ' ') //Rip out all HTML tags
+		.replace(/\s+/g, ' ') //Remove all whitespace
+}
--- a/server/index.js
+++ b/server/index.js
@@ -8,19 +8,19 @@ const app = express()
 const port = 3000

 //Enable json body parsing in requests. Allows me to post data in ajax calls
-app.use(express.json())
+app.use(express.json({limit: '2mb'}))
+

 //Prefix defied by route in nginx config
 const prefix = '/api'

 //App Auth, all requests will come in with a token, decode the token and set global var
 app.use(function(req, res, next){
-
-	let token = req.headers.authorization
+	//auth token set by axios in headers
+	let token = req.headers.authorizationtoken
 	if(token && token != null && typeof token === 'string'){
 		Auth.decodeToken(token)
 		.then(userData => {
-
 			req.headers.userId = userData.id //Update headers for the rest of the application
 			next()
 		}).catch(error => {
@@ -36,17 +36,32 @@ app.use(function(req, res, next){
 //Test 
 app.get(prefix, (req, res) => res.send('The api is running'))

-//Init user endpoint
+//Serve up uploaded files
+app.use(prefix+'/static', express.static( __dirname+'/../staticFiles' ))
+
+//Public routes
+var public = require('@routes/publicController')
+app.use(prefix+'/public', public)
+
+//user endpoint
 var user = require('@routes/userController')
 app.use(prefix+'/user', user)

-//Init notes endpoint
+//notes endpoint
 var notes = require('@routes/noteController')
 app.use(prefix+'/note', notes)

-//Init tags endpoint
+//tags endpoint
 var tags = require('@routes/tagController')
 app.use(prefix+'/tag', tags)

+//notes endpoint
+var attachment = require('@routes/attachmentController')
+app.use(prefix+'/attachment', attachment)
+
+//quick notes endpoint
+var quickNote = require('@routes/quicknoteController')
+app.use(prefix+'/quick-note', quickNote)
+
 //Output running status
 app.listen(port, () => console.log(`Listening on port ${port}!`))
--- a/server/models/Attachment.js
+++ b/server/models/Attachment.js
@@ -2,21 +2,73 @@ let db = require('@config/database')

 let Attachment = module.exports = {}

-const cheerio = require('cheerio');
-const rp = require('request-promise');
+const cheerio = require('cheerio')
+const rp = require('request-promise')
+const request = require('request')
+const fs = require('fs')

+Attachment.search = (userId, noteId) => {
+	return new Promise((resolve, reject) => {
+
+		// Attachment.downloadFileFromUrl('https://i.imgur.com/5PVufWa.jpg')
+
+		let params = [userId]
+		let query = 'SELECT * FROM attachment WHERE user_id = ? '
+
+		if(noteId && noteId > 0){
+			query += 'AND note_id = ? '
+			params.push(noteId)
+		}
+
+		query += 'ORDER BY last_indexed DESC '
+
+		db.promise()
+			.query(query, params)
+			.then((rows, fields) => {
+				resolve(rows[0]) //Return all attachments found by query
+			})
+		.catch(console.log)
+	})
+}
+
+//Returns all attachments
 Attachment.forNote = (userId, noteId) => {
 	return new Promise((resolve, reject) => {
 		db.promise()
-			.query(`SELECT * FROM attachment WHERE user_id = ? AND note_id = ? AND attachment_type = 1;`, [userId, noteId])
+			.query(`SELECT * FROM attachment WHERE user_id = ? AND note_id = ? ORDER BY last_indexed DESC;`, [userId, noteId])
 			.then((rows, fields) => {
-				resolve(rows[0]) //Return all tags found by query
+				resolve(rows[0]) //Return all attachments found by query
+			})
+		.catch(console.log)
+	})
+}
+
+Attachment.urlForNote = (userId, noteId) => {
+	return new Promise((resolve, reject) => {
+		db.promise()
+			.query(`SELECT * FROM attachment WHERE user_id = ? AND note_id = ? AND attachment_type = 1 ORDER BY last_indexed DESC;`, [userId, noteId])
+			.then((rows, fields) => {
+				resolve(rows[0]) //Return all attachments found by query
+			})
+		.catch(console.log)
+	})
+}
+
+//Update attachment in database
+Attachment.update = (userId, attachmentId, updatedText, noteId) => {
+	return new Promise((resolve, reject) => {
+		db.promise()
+			.query(`UPDATE attachment SET text = ? WHERE id = ? AND user_id = ?`, 
+				[updatedText, attachmentId, userId])
+			.then((rows, fields) => {
+				resolve(true)
 			})
 		.catch(console.log)
 	})
 }

 Attachment.delete = (attachmentId) => {
+	console.log('Delete Attachment', attachmentId)
 	return new Promise((resolve, reject) => {
 		db.promise()
 			.query(`DELETE FROM attachment WHERE id = ?`, [attachmentId])
@@ -27,6 +79,34 @@ Attachment.delete = (attachmentId) => {
 	})
 }

+Attachment.processUploadedFile = (userId, noteId, fileObject) => {
+	return new Promise((resolve, reject) => {
+
+		const created = Math.round((+new Date)/1000)
+		const fileLocation = fileObject.filename
+		const fileName = fileObject.originalname
+
+		// console.log('Adding file')
+		// console.log( [noteId, userId, 2, fileName, created, fileLocation] )
+
+		//Create attachment in DB with scrape text and provided data
+		
+		db.promise()
+		.query(`
+			INSERT INTO attachment 
+				(note_id, user_id, attachment_type, \`text\`, last_indexed, file_location) 
+			VALUES 
+				(?, ?, ?, ?, ?, ?)
+		`, [noteId, userId, 2, fileName, created, fileLocation])
+		.then((rows, fields) => {
+			console.log('Created attachment for ',fileName)
+			resolve({ fileName, fileLocation }) //Return found text
+		})
+		.catch(console.log)
+	})
+}
+
+//Scans text for websites, returns all attachments
 Attachment.scanTextForWebsites = (userId, noteId, noteText) => {
 	return new Promise((resolve, reject) => {

@@ -34,7 +114,7 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => {

 		if(noteText.length == 0){ resolve(solrAttachmentText) }

-		Attachment.forNote(userId, noteId).then(attachments => {
+		Attachment.urlForNote(userId, noteId).then(attachments => {

 			//Find all URLs in text
 			const urlPattern = /(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[A-Z0-9+&@#/%=~_|$])/igm
@@ -52,6 +132,7 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => {
 					solrAttachmentText += attachment.text
 					foundUrls.splice(urlIndex, 1) //Remove existing from set of found
 				} else {
+					//If existing attachment is not found in note, remove it
 					Attachment.delete(attachment.id)
 				}
 			})
@@ -75,11 +156,13 @@ Attachment.scanTextForWebsites = (userId, noteId, noteText) => {
 Attachment.scrapeUrlsCreateAttachments = (userId, noteId, foundUrls) => {
 	return new Promise((resolve, reject) => {

+		if(foundUrls == null || foundUrls.length == 0){ 
+			return resolve('')
+		}
+
 		console.log('About to scrape')
 		console.log(foundUrls)

-		if(foundUrls == null || foundUrls.length == 0){resolve('')}
-
 		let processedCount = 0
 		let scrapedText = ''

@@ -100,7 +183,42 @@ Attachment.scrapeUrlsCreateAttachments = (userId, noteId, foundUrls) => {
 }


+Attachment.downloadFileFromUrl = (url) => {
+
+	//File Path
+	
+
+	return new Promise((resolve, reject) => {
+
+
+			const random = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
+			const filePath = '../staticFiles/'
+			let fileName = filePath + random + '_img'
+
+			console.log('Getting ready to scrape ', url)
+
+			request(url)
+				.on('error', error => {
+					console.log(error)
+					resolve(null)
+				})
+				.on('response', res => {
+					console.log(res.statusCode)
+					console.log(res.headers['content-type'])
+				})
+				.pipe(fs.createWriteStream(fileName))
+				.on('close', () => {
+					console.log('Saved Image')
+					resolve(random + '_img')
+				})
+	})
+}
+
+
 Attachment.processUrl = (userId, noteId, url) => {
+
+	const scrapeTime = 20*1000; 
+
 	return new Promise((resolve, reject) => {

 		const excludeWords = ['share','facebook','twitter','reddit','be','have','do','say','get','make','go','know','take','see','come','think','look','want',
@@ -117,7 +235,7 @@ Attachment.processUrl = (userId, noteId, url) => {
 		const options = {
 			uri: url,
 			simple: true,
-			timeout: 1000 * 10, // 10 seconds
+			timeout: scrapeTime,
 			headers: {
 				'User-Agent':'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)' //Simulate google headers
 			},
@@ -127,6 +245,7 @@ Attachment.processUrl = (userId, noteId, url) => {
 		}

 		let requestTimeout = null
+		let thumbnail = null

 		let request = rp(options)
 		.then($ => {
@@ -141,6 +260,17 @@ Attachment.processUrl = (userId, noteId, url) => {
 			let header = $('h1').text().replace(removeWhitespace, " ")
 			desiredSearchText += header + "\n"

+			let metadata = $('meta[property="og:image"]')
+			//'meta[property="og:image"]' .conten()
+			console.log('Scrape metadata')
+			// console.log(metadata)
+			if(metadata && metadata[0] && metadata[0].attribs){
+				console.log('Found metadata image')
+				console.log(metadata[0].attribs.content)
+				thumbnail = metadata[0].attribs.content
+			}
+
+
 			let majorContent = ''
 			majorContent += $('[class*=content]').text()
 				.replace(removeWhitespace, " ") //Remove all whitespace
@@ -191,15 +321,21 @@ Attachment.processUrl = (userId, noteId, url) => {

 			const created = Math.round((+new Date)/1000)

-			//Create attachment in DB with scrape text and provided data
-			db.promise()
-			.query(`INSERT INTO attachment 
-				(note_id, user_id, attachment_type, text, url, last_indexed) 
-				VALUES (?, ?, ?, ?, ?, ?)`, [noteId, userId, 1, desiredSearchText, url, created])
-			.then((rows, fields) => {
-				resolve(desiredSearchText) //Return found text
+			//Scrape URL for thumbnail - take filename and save in attachment
+			Attachment.downloadFileFromUrl(thumbnail)
+			.then(thumbnailFilename => {
+
+				//Create attachment in DB with scrape text and provided data
+				db.promise()
+				.query(`INSERT INTO attachment 
+					(note_id, user_id, attachment_type, text, url, last_indexed, file_location) 
+					VALUES (?, ?, ?, ?, ?, ?, ?)`, [noteId, userId, 1, desiredSearchText, url, created, thumbnailFilename])
+				.then((rows, fields) => {
+
+					resolve(desiredSearchText) //Return found text
+				})
+				.catch(console.log)
 			})
-			.catch(console.log)

 		})
 		.catch(error => {
@@ -212,7 +348,7 @@ Attachment.processUrl = (userId, noteId, url) => {
 			console.log('Cancel the request, its taking to long.')
 			request.cancel()

-			desiredSearchText = 'Unable to Scrape URL at this time'
+			desiredSearchText = url
 			const created = Math.round((+new Date)/1000)

 			//Create attachment in DB with scrape text and provided data
@@ -225,6 +361,6 @@ Attachment.processUrl = (userId, noteId, url) => {
 			})
 			.catch(console.log)

-		}, (5000))
+		}, (scrapeTime))
 	})
 }
--- a/server/models/Note.js
+++ b/server/models/Note.js
@@ -3,20 +3,36 @@ let db = require('@config/database')
 let Tags = require('@models/Tag')
 let Attachment = require('@models/Attachment')

+let ProcessText = require('@helpers/ProcessText')
+
 var rp = require('request-promise');
-var SolrNode = require('solr-node');

 let Note = module.exports = {}
- 
-// Create client
-var client = new SolrNode({
-    host: '127.0.0.1',
-    port: '8983',
-    core: 'note',
-    protocol: 'http'
-});

-Note.create = (userId, noteText) => {
+
+Note.stressTest = () => {
+	return new Promise((resolve, reject) => {
+		db.promise()
+		.query(`
+		
+			SELECT text FROM note;
+
+		`)
+		.then((rows, fields) => {
+			console.log()
+
+			rows[0].forEach(item => {
+				
+				Note.create(68, item['text'])
+			})
+
+			resolve(true)
+		})
+		.catch(console.log)	
+	})
+}
+
+Note.create = (userId, noteText, quickNote = 0) => {
 	return new Promise((resolve, reject) => {

 		if(userId == null || userId < 10){ reject('User Id required to create note') }
@@ -24,48 +40,95 @@ Note.create = (userId, noteText) => {
 		const created = Math.round((+new Date)/1000)

 		db.promise()
-		.query('INSERT INTO note (user_id, text, created) VALUES (?,?,?)', [userId, noteText, created])
+		.query('INSERT INTO note (user_id, text, updated, created, quick_note) VALUES (?,?,?,?,?)', 
+			[userId, noteText, created, created, quickNote])
 		.then((rows, fields) => {
+			// New notes are empty, don't add to solr index
+			// Note.reindex(userId, rows[0].insertId)
 			resolve(rows[0].insertId) //Only return the new note ID when creating a new note
 		})
 		.catch(console.log)
 	})
 }

-Note.update = (userId, noteId, noteText, fancyInput, color, pinned, archived) => {
+Note.reindexAll = () => {
 	return new Promise((resolve, reject) => {

-		const now = Math.round((+new Date)/1000)
-
 		db.promise()
-		.query('UPDATE note SET text = ?, raw_input = ?, pinned = ?, archived = ?, updated = ?, color = ? WHERE id = ? AND user_id = ? LIMIT 1', 
-			[noteText, fancyInput, pinned, archived, now, color, noteId, userId])
+		.query(`
+		
+			SELECT id, user_id FROM note;
+
+		`)
 		.then((rows, fields) => {
+			console.log()
+
+			rows[0].forEach(item => {
+				Note.reindex(item.user_id, item.id)
+			})
+
+			resolve(true)
+		})
+		.catch(console.log)
+	})
+}
+
+Note.reindex = (userId, noteId) => {
+	return new Promise((resolve, reject) => {
+
+		Note.get(userId, noteId)
+		.then(note => {
+			const noteText = note.text

 			//Process note text and attachment data
-			Attachment.scanTextForWebsites(userId, noteId, noteText).then( attachmentText => {
+			Attachment.scanTextForWebsites(userId, noteId, noteText)
+			.then( allNoteAttachmentText => {
 				//
 				// Update Solr index
 				//
-				Tags.string(userId, noteId).then(tagString => {
-					// JSON Data
-					var data = {
-						'id': noteId,//string - ID of note
-						'user_id': userId,//int
-					    'note_text': noteText,
-					    'note_tag': tagString,
-					    'attachment_text': attachmentText,
-					};
-					// Update document to Solr server
-					client.update(data, function(err, result) {
-					   if (err) { console.log(err); return; }
-					   console.log('Note Solr Update, node/solrid ('+noteId+'):');
-					   console.log(result.responseHeader)
-					});
+				Tags.string(userId, noteId)
+				.then(tagString => {
+
+					const fullText = ProcessText.removeHtml(noteText) +' '+ tagString +' '+ ProcessText.removeHtml(allNoteAttachmentText)
+
+					db.promise()
+					.query(`
+					
+						INSERT INTO note_text_index (note_id, user_id, text) 
+						VALUES (?,?,?)
+						ON DUPLICATE KEY UPDATE text = ?
+
+					`, [noteId, userId, fullText, fullText])
+					.then((rows, fields) => {
+						resolve(true)
+					})
+					.catch(console.log)
 					
 				})
 			})

+		})
+	})
+}
+
+Note.update = (userId, noteId, noteText, color, pinned, archived) => {
+	return new Promise((resolve, reject) => {
+
+		//Prevent note loss if it saves with empty text
+		if(ProcessText.removeHtml(noteText) == ''){
+			console.log('Not saving empty note')
+			resolve(false)
+		}
+
+		const now = Math.round((+new Date)/1000)
+
+		db.promise()
+		.query('UPDATE note SET text = ?, pinned = ?, archived = ?, updated = ?, color = ? WHERE id = ? AND user_id = ? LIMIT 1', 
+			[noteText, pinned, archived, now, color, noteId, userId])
+		.then((rows, fields) => {
+
+			//Async solr note reindex
+			Note.reindex(userId, noteId)
 			
 			//Send back updated response
 			resolve(rows[0])
@@ -92,7 +155,25 @@ Note.delete = (userId, noteId) => {
 Note.get = (userId, noteId) => {
 	return new Promise((resolve, reject) => {
 		db.promise()
-		.query('SELECT text, updated, raw_input, pinned, archived, color FROM note WHERE user_id = ? AND id = ? LIMIT 1', [userId,noteId])
+		.query(`
+			SELECT note.text, note.updated, note.pinned, note.archived, note.color, count(distinct attachment.id) as attachment_count
+			FROM note 
+			LEFT JOIN attachment ON (note.id = attachment.note_id)
+			WHERE note.user_id = ? AND note.id = ? LIMIT 1`, [userId,noteId])
+		.then((rows, fields) => {
+
+			//Return note data
+			resolve(rows[0][0])
+
+		})
+		.catch(console.log)
+	})
+}
+
+Note.getShared = (noteId) => {
+	return new Promise((resolve, reject) => {
+		db.promise()
+		.query('SELECT text, updated, color FROM note WHERE id = ? AND shared = 1 LIMIT 1', [noteId])
 		.then((rows, fields) => {

 			//Return note data
@@ -106,56 +187,79 @@ Note.get = (userId, noteId) => {
 Note.solrQuery = (userId, searchQuery, searchTags) => {
 	return new Promise((resolve, reject) => {

-		if(searchQuery != '' && searchQuery != null){
-			let urlQuery = `/solr/note/select?hl.fl=note_text&hl=on&q=user_id:${userId} AND note_text:${searchQuery}&wt=json`
-			urlQuery = `/solr/note/select?
-				hl.fl=note_text,attachment_text,note_tag&
-				hl=on&
-				q=user_id:${userId} AND (note_text:${searchQuery} OR attachment_text:${searchQuery} OR note_tag:${searchQuery})&
-				wt=json&
-				fl=id&
-				hl.fl=note_text,attachment_text,note_tag&
-				hl.snippets=20&
-				hl.maxAnalyzedChars=100000`
-
-			rp('http://127.0.0.1:8983'+urlQuery)
-			.then(function (htmlString) {
-				let solrResult = JSON.parse(htmlString)
-				resolve(solrResult)
-			})
+		if(searchQuery.length == 0){
+			resolve(null)
 		} else {
-			resolve([])
+
+			//Number of characters before and after search word
+			const front = 5
+			const tail = 150
+
+			db.promise()
+			.query(`
+			
+				SELECT 
+					note_id,
+					substring(
+							text,
+					        IF(LOCATE(?, text) > ${tail}, LOCATE(?, text) - ${front}, 1),
+					        ${tail} + LENGTH(?) + ${front}
+						) as snippet
+				FROM note_text_index 
+				WHERE user_id = ?
+				AND MATCH(text)
+				AGAINST(? IN NATURAL LANGUAGE MODE)
+				LIMIT 1000
+				;
+
+			`, [searchQuery, searchQuery, searchQuery, userId, searchQuery])
+			.then((rows, fields) => {
+
+				let results = []
+				let snippets = {}
+				rows[0].forEach(item => {
+					let noteId = parseInt(item['note_id'])
+					//Setup array of ids to use for query
+					results.push( noteId )
+					//Get text snippet and highlight the key word
+					snippets[noteId] = item['snippet'].replace(new RegExp(searchQuery,"ig"), '<em>'+searchQuery+'</em>');
+					//.replace(searchQuery,'<em>'+searchQuery+'</em>')
+				})
+
+				resolve({ 'ids':results, 'snippets':snippets })
+			})
 		}
+
 	})
 }

 Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 	return new Promise((resolve, reject) => {
-
 		//Define return data objects
 		let returnData = {
 			'notes':[],
 			'tags':[]
 		}

-		Note.solrQuery(userId, searchQuery, searchTags).then( solrResult => {
+		Note.solrQuery(userId, searchQuery, searchTags).then( (textSearchResults) => {

-		    let highlights = solrResult.highlighting
+			let textSearchIds = []
+			let highlights = {}

-		    //Parse Note ID's from solr search
-		    let solrNoteIds = []
-		    if(solrResult.response){
-			    solrResult.response.docs.forEach(item => {
-			    	solrNoteIds.push(parseInt(item.id))
-			    })
-		    }
+			if(textSearchResults != null){
+				textSearchIds = textSearchResults['ids']
+				highlights = textSearchResults['snippets']
+			}
+
+			

 		    //No results, return empty data
-			if(solrNoteIds.length == 0 && searchQuery.length > 0){
-				resolve(returnData)
+			if(textSearchIds.length == 0 && searchQuery.length > 0){
+				return resolve(returnData)
 			}

 			//Default note lookup gets all notes
+			// Add to query for character counts -> CHAR_LENGTH(note.text) as chars
 			let noteSearchQuery = `
 				SELECT note.id, 
 					SUBSTRING(note.text, 1, 400) as text, 
@@ -166,20 +270,15 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 					note.archived
 				FROM note 
 				LEFT JOIN note_tag ON (note.id = note_tag.note_id)
-				LEFT JOIN attachment ON (note.id = attachment.note_id AND attachment.attachment_type = 1)
+				LEFT JOIN attachment ON (note.id = attachment.note_id)
 				WHERE note.user_id = ?`
 			let searchParams = [userId]

-			if(solrNoteIds.length > 0){
-				searchParams.push(solrNoteIds)
+			if(textSearchIds.length > 0){
+				searchParams.push(textSearchIds)
 				noteSearchQuery += ' AND note.id IN (?)'
 			}

-			// if(searchQuery != ''){
-			// 	//If a search query is defined, search notes for that word
-			// 	searchParams.push('%'+searchQuery+'%')
-			// 	noteSearchQuery += ' AND text LIKE ?'
-			// }
 			if(searchTags.length > 0){
 				//If tags are passed, use those tags in search
 				searchParams.push(searchTags)
@@ -211,6 +310,9 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 				noteSearchQuery += ' HAVING note.archived = 1'
 			}

+			//
+			// Always prioritize pinned notes in searches.
+
 			//Default Sort, order by last updated
 			let defaultOrderBy = ' ORDER BY note.pinned DESC, updated DESC, created DESC, opened DESC, id DESC'

@@ -226,6 +328,19 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 			//Append Order by to query
 			noteSearchQuery += defaultOrderBy

+			
+			//Manage limit params if set
+			if(fastFilters.limitSize  > 0 || fastFilters.limitOffset > 0){
+
+				const limitSize = parseInt(fastFilters.limitSize, 10) || 10 //Use int or default to 10
+				const limitOffset = parseInt(fastFilters.limitOffset, 10) || 0 //Either parse int, or use zero
+
+
+				console.log(` LIMIT ${limitOffset}, ${limitSize}`)
+				noteSearchQuery += ` LIMIT ${limitOffset}, ${limitSize}`
+			}
+			
+
 			db.promise()
 			.query(noteSearchQuery, searchParams)
 			.then((noteRows, noteFields) => {
@@ -239,6 +354,8 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {

 					//Grab note ID for finding tags
 					noteIds.push(note.id)
+
+					if(note.text == null){ note.text = '' }
 					
 					//Attempt to pull string out of first tag in note
 					let reg = note.text.match(/<([\w]+)[^>]*>(.*?)<\/\1>/g)
@@ -251,18 +368,13 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 					}

 					//Clean up html title 
-					note.title = note.title
-						.replace(/&[#A-Za-z0-9]+;/g,'') //Rip out all HTML entities
-						.replace(/<[^>]+>/g, '') //Rip out all HTML tags
+					note.title = ProcessText.removeHtml(note.title)

 					//Generate Subtext
 					note.subtext = ''
 					if(note.text != '' && note.title != ''){
-						note.subtext = note.text
-							.replace(/&[#A-Za-z0-9]+;/g,' ') //Rip out all HTML entities
-							.replace(/<[^>]+>/g, ' ') //Rip out all HTML tags
-							.replace(/\s+/g, ' ') //Remove all whitespace
-							.substring(note.title.length + 2)
+						note.subtext = ProcessText.removeHtml(note.text)
+							.substring(note.title.length)
 					}
 					

@@ -271,14 +383,8 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {
 					note.tag_highlights = []

 					//Push in solr highlights
-					if(highlights && highlights[note.id] && highlights[note.id].note_text){
-						note['note_highlights'] = highlights[note.id].note_text
-					}
-					if(highlights && highlights[note.id] && highlights[note.id].attachment_text){
-						note['attachment_highlights'] = highlights[note.id].attachment_text
-					}
-					if(highlights && highlights[note.id] && highlights[note.id].note_tag){
-						note['tag_highlights'] = highlights[note.id].note_tag
+					if(highlights && highlights[note.id]){
+						note['note_highlights'] = [highlights[note.id]]
 					}

 					//Clear out note.text before sending it to front end
@@ -287,7 +393,7 @@ Note.search = (userId, searchQuery, searchTags, fastFilters) => {

 				//If no notes are returned, there are no tags, return empty
 				if(noteIds.length == 0){
-					resolve(returnData)
+					return resolve(returnData)
 				}

 				//Only show tags of selected notes
--- a/server/models/QuickNote.js
+++ b/server/models/QuickNote.js
@@ -0,0 +1,113 @@
+let db = require('@config/database')
+
+let Note = require('@models/Note')
+
+let QuickNote = module.exports = {}
+
+
+QuickNote.get = (userId) => {
+	return new Promise((resolve, reject) => {
+
+		db.promise()
+		.query(`
+			SELECT id, text FROM note WHERE quick_note = 1 AND user_id = ? LIMIT 1
+			`, [userId])
+		.then((rows, fields) => {
+
+			//Quick Note is set, return note text
+			if(rows[0].length == 1){
+				resolve({
+					id: rows[0][0].id,
+					text: rows[0][0].text
+				})
+			}
+
+			resolve({
+				id: null,
+				text: 'Enter something to create a quick note.'
+			})
+		})
+		.catch(console.log)
+	})
+}
+
+QuickNote.update = (userId, pushText) => {
+	return new Promise((resolve, reject) => {
+
+		//Process pushText, split at \n (new lines), put <p> tags around each new line
+		let broken = '<blockquote>' +
+			pushText.split(/\r?\n/).map( (line, index) => {
+
+			let clean = line
+				.replace(/&[#A-Za-z0-9]+;/g,'') //Rip out all HTML entities
+				.replace(/<[^>]+>/g, '') //Rip out all HTML tags
+
+			if(clean == ''){ clean = '&nbsp;' }
+			let newLine = ''
+			if(index > 0){ newLine = '<br>' }
+
+			//Return line wrapped in p tags
+			return `${newLine}<span>${clean}</span>`
+
+		}).join('') + '</blockquote>'
+
+		db.promise()
+		.query(`
+			SELECT id, text, color, pinned, archived
+			FROM note WHERE quick_note = 1 AND user_id = ? LIMIT 1
+			`, [userId])
+		.then((rows, fields) => {
+
+			//Quick Note is set, push it the front of existing note
+			if(rows[0].length == 1){
+
+				let d = rows[0][0] //Get row data
+
+				//Push old text behind fresh new text
+				let newText = broken +''+ d.text
+
+				//Save that, then return the new text
+				Note.update(userId, d.id, newText, d.color, d.pinned, d.archived)
+				.then( saveResults => {
+					resolve({
+						id:d.id,
+						text:newText
+					})
+				})
+
+			} else {
+
+				//Create a new note with the quick text submitted.
+				Note.create(userId, broken, 1)
+				.then( insertId => {
+					resolve({
+						id:insertId,
+						text:broken
+					})
+				})
+			}
+		})
+		.catch(console.log)
+	})
+
+	//Lookup quick note, 
+
+	//Note.create(userId, 'Quick Note', 1)
+
+}
+
+QuickNote.create = (userId, noteText) => {
+	return new Promise((resolve, reject) => {
+
+		if(userId == null || userId < 10){ reject('User Id required to create note') }
+
+		const created = Math.round((+new Date)/1000)
+
+		db.promise()
+		.query('INSERT INTO note (user_id, text, created) VALUES (?,?,?)', [userId, noteText, created])
+		.then((rows, fields) => {
+			resolve(rows[0].insertId) //Only return the new note ID when creating a new note
+		})
+		.catch(console.log)
+	})
+}
--- a/server/routes/attachmentController.js
+++ b/server/routes/attachmentController.js
@@ -0,0 +1,53 @@
+let express = require('express')
+
+var multer  = require('multer')
+var upload = multer({ dest: '../staticFiles/' })
+let router = express.Router()
+
+let Attachment = require('@models/Attachment');
+let Note = require('@models/Note')
+let userId = null
+
+// middleware that is specific to this router
+router.use(function setUserId (req, res, next) {
+	if(userId = req.headers.userId){
+		userId = req.headers.userId
+	}
+	
+	next()
+})
+
+router.post('/search', function (req, res) {
+	Attachment.search(userId, req.body.noteId)
+	.then( data => res.send(data) )
+})
+
+router.post('/get', function (req, res) {
+	Attachment.forNote(userId, req.body.noteId)
+	.then( data => res.send(data) )
+})
+
+router.post('/update', function (req, res) {
+	Attachment.update(userId, req.body.attachmentId, req.body.updatedText, req.body.noteId)
+	.then( result => {
+		Note.reindex(userId, req.body.noteId)
+		.then( data => res.send(data) )
+	})
+})
+
+router.post('/upload', upload.single('file'), function (req, res, next) {
+
+	//Create attachment with file information and node id
+	const noteId = parseInt(req.body.noteId)
+
+	Attachment.processUploadedFile(userId, noteId, req.file)
+	.then( uploadResults => {
+		//Reindex note, attachment may have had text
+		Note.reindex(userId, noteId)
+		.then( data => res.send(uploadResults) )
+	})
+
+})
+
+
+module.exports = router
--- a/server/routes/noteController.js
+++ b/server/routes/noteController.js
@@ -29,7 +29,7 @@ router.post('/create', function (req, res) {
 })

 router.post('/update', function (req, res) {
-	Notes.update(userId, req.body.noteId, req.body.text, req.body.fancyInput, req.body.color, req.body.pinned, req.body.archived)
+	Notes.update(userId, req.body.noteId, req.body.text, req.body.color, req.body.pinned, req.body.archived)
 	.then( id => res.send({id}) )
 })

@@ -38,6 +38,13 @@ router.post('/search', function (req, res) {
 	.then( notesAndTags => res.send(notesAndTags))
 })

+//Reindex all notes. Not a very good function, not public
+router.get('/reindex5yu43prchuj903mrc', function (req, res) {
+
+	// Notes.stressTest().then( i => {
+	// 	// Notes.reindexAll().then( result => res.send('Welcome to reindex...oh god'))
+	// })
+})



--- a/server/routes/publicController.js
+++ b/server/routes/publicController.js
@@ -0,0 +1,15 @@
+var express = require('express')
+var router = express.Router()
+
+let Notes = require('@models/Note')
+
+router.post('/note', function (req, res) {
+
+	Notes.getShared(req.body.noteId)
+	.then( data => res.send(data) )
+})
+
+
+
+
+module.exports = router
--- a/server/routes/quicknoteController.js
+++ b/server/routes/quicknoteController.js
@@ -0,0 +1,35 @@
+var express = require('express')
+var router = express.Router()
+
+let QuickNote = require('@models/QuickNote');
+let userId = null
+
+// middleware that is specific to this router
+router.use(function setUserId (req, res, next) {
+	if(userId = req.headers.userId){
+		userId = req.headers.userId
+	}
+	
+	next()
+})
+
+//Get quick note text
+router.post('/get', function (req, res) {
+	QuickNote.get(userId)
+	.then( data => res.send(data) )
+})
+
+//Push text to quick note
+router.post('/update', function (req, res) {
+	QuickNote.update(userId, req.body.pushText)
+	.then( data => res.send(data) )
+})
+
+//Change quick note to a new note
+router.post('/change', function (req, res) {
+	QuickNote.change(userId, req.body.noteId)
+	.then( data => res.send(data) )
+})
+
+
+module.exports = router