Database reading changes should work, gotta implement same for writing and finish up testing then merge back into master

src/data.js

@@ -14,7 +14,7 @@ export function increment_hitcount(postID = -1) { // -1 Means it will increment
 		writedata('hitcount', hitcount);
 	}
 	else {
-		let post = getdata('posts','id', postID);
+		let post = getdata('posts','id', postID)[0];
 		if (post == 1) // Does not exist
 		{
 			return 1
@@ -86,7 +86,7 @@ export function getdata(table_name, key=-1, value=-1) {
 						{ // id is the index
  							if (value < result.length && value >= 0)
 							{
-								return result[value]
+								return [result[value]]
 							}
 							else 
 							{
@@ -94,11 +94,10 @@ export function getdata(table_name, key=-1, value=-1) {
 								return 1
 							}
 						}
-						return result[func.find_key_value_pair(result, key, value)]
+						let return_list = func.find_key_value_pair(result,key,value)
-						return -1 // This index doesn't exist
+						return return_list
 					}
-					return result.slice(- config['data_request_limit'])
+					return result
-					break;
 				case 'hitcount':
 					result = func.require_module('../data/data.json') // This file is actually called data.json
 					return result["hitcount"]
@@ -109,37 +108,9 @@ export function getdata(table_name, key=-1, value=-1) {
 					break;
 			}
 			break;
-	// NOT YET WORKING!
+		default:
-		case 'mysql':
+			console.log("Error, invalid database management system")
-			const mysql = require('mysql');
+			return 1
-			let con = mysql.createConnection({
-				host: config.database.host,
-				user: config.database.user,
-				password: config.database.password,
-				database: config.database.database,
-			});
-
-			con.connect(function(err) {
-				if (err) throw err;
-
-				if (data == "posts" || data == 'users' || data == 'comments') {
-					con.query(`SELECT * FROM ${data}`, function (err, result, fields) {
-						if (err) throw err;
-						result = Object.values(JSON.parse(JSON.stringify(result)))
-						console.log(result)
-						return result;
-					});
-				}
-				else if (data == 'hitcount') {
-					con.query(`SELECT paramValue FROM params WHERE paramName = '${data}'`, function (err, result, fields) {
-						if (err) throw err;
-						result = Object.values(JSON.parse(JSON.stringify(result)))
-						console.log(result)
-						return result;
-					});
-
-				}
-			});
 	}
 }
 

src/functions.js

@@ -57,8 +57,9 @@ export function unix_time_to_atom_date(unix_time)
 // eg "<a href="/tag/string1">string1</a>, <a href="/tag/string2">string2</a>, <a href="/tag/string3">string3</a>"
 // this is so you can have a list of tags that each point to their individual tag page
 // returns: string
-export function render_tags(tags)
+export function render_tags(tags_string)
 {
+	let tags = tags_string.split(',')
 	tags = tags.filter((item, index) => tags.indexOf(item) === index) // Remove duplicate tags
 	let string = "" // Initialises the string
     if (tags.length == 1 && tags[0] == "")
@@ -74,24 +75,6 @@ export function render_tags(tags)
     }
 	return string
 }
-// The users are stored as a list of objects [ user_object, user_object, user_object ]
-// So you cannot easily find the userID (position in list) from the username
-// This function returns the username for a given userID by looping over every user
-// if the user is present, it returns the index of the user (integer)
-// if the user is not present it returns -1
-export function get_userID(username)
-{
-    const users = require_module("../data/users.json")
-	for (let i = 0; i < users.length; i++)
-    { // Loop over every user
-		if (users[i]['username'] == username)
-        {
-			return i // If the username matches then return the index of that user
-		}
-	}
-	return -1 // If user is not present, return -1
-}
-
 // This escapes some potentially dangerous HTML characters with their HTML entities
 // https://www.freeformatter.com/html-entities.html
 // accepts a string
@@ -140,11 +123,14 @@ export function render_md(content)
     return md.render(content)
 };
 
+// Returns a list of matches
 export function find_key_value_pair(data_array, key, value) {
+	let return_list = []
 	for (let i = 0; i < data_array.length; i++) {
-		if (data_array[i][key] == value) {
+		let element = data_array[i][key]
-			return i
+		if (element == value || (key == 'tags' && element.includes(value))) {
+			return_list.push(data_array[i])
 		}
 	}
-	return -1
+	return return_list
 };

src/routes/standard_pages.js

@@ -10,46 +10,45 @@ const router = express.Router();
 
 // Timeline
 router.get("/", (req,res) => {
+	let posts = data.getdata('posts')
     // Increment the hitcount
     if (config.enable_hitcount) {
         data.increment_hitcount()
     }
 
-    res.render("pages/timeline",
+	res.render("pages/timeline",
-               {
+	{
-                   config,
+		config,
-                   locale,
+		locale,
-                   posts: data.getdata("posts"),
+		posts,
-                   users: data.getdata("users"),
+		users: data.getdata("users"),
-                   comments: data.getdata("comments"),
+		comments: data.getdata("comments"),
-                   hitcount: data.getdata("hitcount"),
+		hitcount: data.getdata("hitcount"),
-                   fromUnixTime,
+		fromUnixTime,
-                   format,
+		format,
-                   getUnixTime,
+		getUnixTime,
-                   func,
+		func,
-               })
+	})
 }); // /
 
 // Users
 router.get("/user/:username", (req, res) => {
-    const userID = func.get_userID(req.params.username)
+    let user = data.getdata('users', 'username', req.params.username)
-    let user = data.getdata('users', 'id', userID)
+    if (user.length > 0) {
-    if (userID != -1) {
         res.render("pages/user",
-                   {
+		{
-                       config,
+			config,
-                       locale,
+			locale,
-                       posts: data.getdata('posts'),
+			posts: data.getdata('posts','userID',user[0].id),
-                       user,
+			user: user[0],
-                       userID: userID,
+			comments: data.getdata('comments'),
-                       comments: data.getdata('comments'),
+			fromUnixTime,
-                       fromUnixTime,
+			format,
-                       format,
+			getUnixTime,
-                       getUnixTime,
+			func,
-                       func,
+		})
-                   })
     }
-    else if (userID == -1) {
+    else {
         res.render("partials/message",
                    {
                        message: locale.user_doesnt_exist,
@@ -61,34 +60,30 @@ router.get("/user/:username", (req, res) => {
 // Posts
 router.get("/post/:post_index", (req, res) => {
     const postID = parseInt(req.params.post_index)
-    let post = data.getdata('posts','id', postID)
+    let post = data.getdata('posts','id', postID)[0]
-    if (post == 1) { // data.getdata returns error code 1 if nothing is available
+    if (post.length == 0) { // data.getdata returns error code 1 if nothing is available
         res.render("partials/message", {
             message: locale.post_doesnt_exist,
             config,
         })
     }
-    else if (typeof post["deleted"] == "undefined" || post["deleted"] == false) {
+    else {
 		if (config.enable_hitcount) {
 			data.increment_hitcount(postID)
 		}
         res.render("pages/post",
-                   {
+		{
-                       config,
+			config,
-                       locale,
+			locale,
-                       post,
+			post,
-                       postID,
+			postID,
-                       user: data.getdata('users','id', post.userID),
+			user: data.getdata('users','id', post.userID)[0],
-                       comments: data.getdata('comments','id', postID)["comments"],
+			comments: data.getdata('comments','id', postID)[0]["comments"],
-                       fromUnixTime,
+			fromUnixTime,
-                       format,
+			format,
-                        getUnixTime,
+			getUnixTime,
-                        func,
+			func,
-                   })
+		})
-    }
-    else {
-        console.log("Error loading page")
-        res.redirect(301,"/")
     }
 }); // /post/:post_index
 
@@ -96,19 +91,23 @@ router.get("/post/:post_index", (req, res) => {
 // Tags
 router.get("/tag/:tag", (req,res) => {
     const tag = req.params.tag
+	const posts = data.getdata('posts','tags',tag);
+	console.log(posts)
+	const users = data.getdata('users')
+	const comments = data.getdata('comments')
     res.render("pages/tag",
-               {
+	{
-                   config,
+		config,
-                   locale,
+		locale,
-                   tag,
+		tag,
-                   posts: data.getdata('posts'),
+		posts,
-                   users: data.getdata('users'),
+		users,
-                   comments: data.getdata('comments'),
+		comments,
-                   fromUnixTime,
+		fromUnixTime,
-                   format,
+		format,
-                    getUnixTime,
+		getUnixTime,
-                    func,
+		func,
-               })
+	})
 }); // /tag/:tag
 
 

src/routes/syndication.js

@@ -18,9 +18,10 @@ router.get("/rss", (req,res) => {
     }
     else {
         res.setHeader('content-type', 'application/rss+xml');
-        res.render("syndication/global_rss", {
+        res.render("syndication/rss", {
             config,
             posts: data.getdata('posts'),
+			users: data.getdata('users'),
             func,
         })
     };
@@ -28,7 +29,7 @@ router.get("/rss", (req,res) => {
 // user RSS protocol gets
 router.get("/user/:username/rss", (req,res) => {
     const username = req.params.username;
-    const userID = func.get_userID(username);
+	const user = data.getdata('users', 'username', username);
     if (config.rss == false) {
         res.render("partials/message", {
             message: locale.rss_disabled,
@@ -37,11 +38,11 @@ router.get("/user/:username/rss", (req,res) => {
     }
     else {
         res.setHeader('content-type', 'application/rss+xml');
-        res.render("syndication/user_rss", {
+        res.render("syndication/rss", {
             config,
             posts: data.getdata('posts'),
+			users: user,
             func,
-            userID,
         })
     };
 });
@@ -58,6 +59,7 @@ router.get("/atom", (req,res) => {
         res.render("syndication/global_atom", {
             config,
             posts: data.getdata('posts'),
+			users: data.getdata('users'),
             func,
             getUnixTime,
         })
@@ -78,6 +80,7 @@ router.get("/user/:username/atom", (req,res) => {
         res.render("syndication/user_atom", {
             config,
             posts: data.getdata('posts'),
+			users: data.getdata('users'),
             func,
             userID,
             getUnixTime,

views/headers/user.ejs

@@ -4,7 +4,7 @@
 	</h1>
 </div>
 <p><%- func.render_md(user.description) %></p>
-<a if='edit-account-link' href="<%= config.edit_account_base_url %>/<%= userID %>">
+<a if='edit-account-link' href="<%= config.edit_account_base_url %>/<%= user.id %>">
             <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'>
 </a>
 |

views/pages/tag.ejs

@@ -12,13 +12,7 @@
         </header>
         <div id="posts">
             <% for (let index = posts.length - 1; index >= 0; index--) { %>
-                <% if ( posts[index].deleted != true) { %>
+                  <%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
-                    <% posts[index].tags.forEach((current_tag, tag_index) => { %> 
-                        <% if (current_tag.toLowerCase() == tag.toLowerCase()) { %>
-                            <%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
-                        <% } %>
-                    <% }) %>
-                <% } %>
             <% } %>
         </div>
         <footer id='footer'>

views/pages/timeline.ejs

@@ -13,6 +13,7 @@
         <div id="posts">
             <% for (let index = posts.length - 1; index >= 0; index--) { %>
             <% if (posts[index]["deleted"] != true) { %>
+					<%- console.log(posts[index]) %>
                     <%- include('../posts/timeline', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
                 <% } %>
             <% } %>

views/pages/user.ejs

@@ -12,9 +12,7 @@
         </header>
         <div id="posts">
             <% for (let index = posts.length - 1; index >= 0; index--) { %>
-                <% if (posts[index].userID == userID) { %>
+                <%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %>
-                    <%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %>
-                    <% } %>
             <% } %>
         </div>
         <footer id='footer'>

views/syndication/atom.ejs

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="<%= config.charset %>" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+	<title><%= config.site_name %></title>
+	<link><%= config.site_url %></title>
+	<description><%= config.site_description %></description>
+	<updated><%= func.unix_time_to_date_format(getUnixTime(new Date()),"yyyy-MM-dd'T'HH:mm:ss'Z'") %></updated>
+	<id><%= config.site_url %></id>
+	<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
+		<% if (posts[postID]["deleted"] != true) { %>
+			<entry>
+				<title><%= posts[postID]["title"] %></title>
+				<link><%= config.site_url %>/post/<%= postID %></link>
+				<summary><![CDATA[<%- (posts[postID]["content"]) %>]]></summary>
+				<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
+				<pubDate><%- func.unix_time_to_date_format(posts[postID]['pubdate'],"yyyy-MM-dd'T'HH:mm:ss'Z'") %></pubDate>
+				<% tags = posts[postID]['tags'].split(',') %>
+				<% for (let tag_index = 0; tag_index < tags.length; tag_index++) { %>
+					<category><![CDATA[<%= tags[tag_index] %>]]></category>
+				<% } %>
+			</entry>
+		<% } %>
+	<% } %>
+</feed>

views/syndication/global_atom.ejs

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <title><%= config.site_name %></title>
-    <link><%= config.site_url %></title>
-    <description><%= config.site_description %></description>
-    <updated><%= func.unix_time_to_atom_date(getUnixTime(new Date())) %></updated>
-    <id><%= config.site_url %></id>
-    <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-    <% if (posts[postID]["deleted"] != true) { %>
-    <entry>
-        <title><%= posts[postID]["title"] %></title>
-        <link><%= config.site_url %>/post/<%= postID %></link>
-        <summary><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></summary>
-        <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-        <pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
-        <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-        <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-        <% } %>
-    </entry>
-    <% } %>
-    <% } %>
-</feed>

views/syndication/global_rss.ejs

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<rss version="2.0">
-    <channel>
-        <title><%= config.site_name %></title>
-        <link><%= config.site_url %></title>
-        <description><%= config.site_description %></description>
-        <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <item>
-            <title><%= posts[postID]["title"] %></title>
-            <link><%= config.site_url %>/post/<%= postID %></link>
-            <description><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></description>
-            <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-            <pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
-            <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-            <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-            <% } %>
-        </item>
-        <% } %>
-        <% } %>
-    </channel>
-</rss>

views/syndication/rss.ejs

@@ -0,0 +1,23 @@
+<rss version="2.0">
+	<channel>
+		<title><%= config.site_name %></title>
+		<link><%= config.site_url %></link>
+		<description><%= config.site_description %></description>
+		<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
+		<% if (posts[postID]["deleted"] != true) { %>
+		<item>
+			<title><%= posts[postID]["title"] %></title>
+			<link><%= config.site_url %>/post/<%= postID %></link>
+			<description><![CDATA[<%- (posts[postID]["content"]) %>]]></description>
+			<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
+			<pubDate><%= func.unix_time_to_date_format(posts[postID]['pubdate'],'EEE, dd MMM yyyy HH:mm:ss') %></pubDate>
+			<author><%= users[posts[postID]['userID']]['prettyname'] %></author>
+			<% tags = posts[postID]['tags'].split(',') %>
+			<% for (let tag_index = 0; tag_index < tags.length; tag_index++) { %>
+				<category><![CDATA[<%= tags[tag_index] %>]]></category>
+			<% } %>
+		</item>
+		<% } %>
+		<% } %>
+	</channel>
+</rss>

views/syndication/user_atom.ejs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <title><%= config.site_name %></title>
-    <link><%= config.site_url %></title>
-    <description><%= config.site_description %></description>
-    <updated><%= func.unix_time_to_atom_date(getUnixTime(new Date())) %></updated>
-    <id><%= config.site_url %></id>
-    <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-    <% if (posts[postID]["userID"] == userID) { %>
-    <% if (posts[postID]["deleted"] != true) { %>
-    <entry>
-        <title><%= posts[postID]["title"] %></title>
-        <link><%= config.site_url %>/post/<%= postID %></link>
-        <summary><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></summary>
-        <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-        <pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
-        <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-        <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-        <% } %>
-    </entry>
-    <% } %>
-    <% } %>
-    <% } %>
-</feed>

views/syndication/user_rss.ejs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<rss version="2.0">
-    <channel>
-        <title><%= config.site_name %></title>
-        <link><%= config.site_url %></title>
-        <description><%= config.site_description %></description>
-        <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-        <% if (posts[postID]["userID"] == userID) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <item>
-            <title><%= posts[postID]["title"] %></title>
-            <link><%= config.site_url %>/post/<%= postID %></link>
-	    <description><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></description>
-            <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-            <pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
-            <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-            <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-            <% } %>
-        </item>
-        <% } %>
-        <% } %>
-        <% } %>
-    </channel>
-</rss>