ip to log, filter ip on global logs

db/db.js

@@ -5,8 +5,6 @@ const { MongoClient, ObjectId, Int32 } = require('mongodb')
 
 module.exports = {
 
-	client,
-
 	connect: async () => {
 		if (module.exports.client) {
 			throw new Error('Mongo already connected');

models/forms/actionhandler.js

@@ -269,9 +269,10 @@ module.exports = async (req, res, next) => {
 					postIds: [],
 					actions: modlogActions,
 					date: logDate,
-					user: logUser,
 					showUser: req.body.show_name || logUser === 'Unregistered User' ? true : false,
 					message: message,
+					user: logUser,
+					ip: res.locals.ip.hash,
 				};
 			}
 			//push each post id

models/pages/globalmanage/logs.js

@@ -2,6 +2,7 @@
 
 const { Modlogs } = require(__dirname+'/../../../db/')
 	, pageQueryConverter = require(__dirname+'/../../../helpers/pagequeryconverter.js')
+	, decodeQueryIP = require(__dirname+'/../../../helpers/decodequeryip.js')
 	, limit = 50;
 
 module.exports = async (req, res, next) => {
@@ -17,6 +18,10 @@ module.exports = async (req, res, next) => {
     if (uri && !Array.isArray(uri)) {
         filter.board = uri;
     }
+	const ipMatch = decodeQueryIP(req.query);
+	if (ipMatch) {
+		filter.ip = ipMatch;
+	}
 
 	let logs, maxPage;
 	try {
@@ -36,6 +41,7 @@ module.exports = async (req, res, next) => {
 		queryString,
 		username,
 		uri,
+		ip: ipMatch ? req.query.ip : null,
 		logs,
 		page,
 		maxPage,

views/pages/globalmanagelogs.pug

@@ -21,6 +21,9 @@ block content
 			.row
 				.label Username
 				input(type='text' name='username' value=username)
+			.row
+				.label IP
+				input(type='text' name='ip' value=ip)
 			input(type='submit', value='Filter')
 		h4.no-m-p Global Logs:
 		if logs && logs.length > 0
@@ -30,6 +33,7 @@ block content
 							th Date
 							th Board
 							th User
+							th IP
 							th Actions
 							th Post IDs
 							th Log Message
@@ -43,11 +47,16 @@ block content
 									a(href=`?uri=${log.board}`) [+]
 								td
 									if log.user !== 'Unregistered User'
-										a(href=`accounts.html?username=${log.user}`) #{log.user}	
-									else 
+										a(href=`accounts.html?username=${log.user}`) #{log.user}
+									else
 										| #{log.user}
 									|   
 									a(href=`?username=${log.user}`) [+]
+								td
+									- const ipSub = log.ip.slice(-10);
+									a(href=`recent.html?ip=${encodeURIComponent(ipSub)}`) #{ipSub}
+									|   
+									a(href=`?ip=${encodeURIComponent(ipSub)}`) [+]
 								td #{log.actions}
 								td #{log.postIds}
 								td #{log.message || '-'}