From b41527aed70f34c18b9e2c722933377b9e1091a6 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Fri, 7 Oct 2016 13:09:38 -0500
Subject: [PATCH] NodeBB Update

Highlights
----------

- (WTDWTF only) Disabled "dismiss flag" feature as all it did was delete
  the flag permanently.
- Switched to anotherusername's details shim
  <https://what.thedailywtf.com/post/1014136>
- Removed hack to prevent admins/mods from accessing other users' chats
  as this is now in core.
- Flag management UI has English translations instead of placeholders.
  In all languages. :wtf:
- Fixed: Crash when forking from large topic
  <https://github.com/NodeBB/NodeBB/issues/5077>
- Post cache size is now configurable
  <https://github.com/NodeBB/NodeBB/issues/5081>
- Updated jQuery textcomplete plugin from 1.3.4 to 1.7.3.

Change Lists
------------

- https://github.com/NodeBB/NodeBB/compare/3a50c4657295bfff702039191106972d1cfcdbff...804c7927a4e291c653c5e978056f6f97eaf9cb50
- https://github.com/NodeBB/nodebb-theme-persona/compare/aec8f2d14d7f92be7a82ff569afefc87fe00e9ed...ecebebe97df2237c4b8f021061a4127693112f10
- https://github.com/yuku-t/jquery-textcomplete/compare/7846dc5b258009bfc3a468d2b2e257c2101b7176...adda11608d4aa33250dd31471ac33fdfee17363e
---
 NodeBB                                          |  2 +-
 .../nodebb-plugin-tdwtf-customizations/index.js | 17 -----------------
 .../plugin.json                                 |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/NodeBB b/NodeBB
index 3a50c46..804c792 160000
--- a/NodeBB
+++ b/NodeBB
@@ -1 +1 @@
-Subproject commit 3a50c4657295bfff702039191106972d1cfcdbff
+Subproject commit 804c7927a4e291c653c5e978056f6f97eaf9cb50
diff --git a/plugins/nodebb-plugin-tdwtf-customizations/index.js b/plugins/nodebb-plugin-tdwtf-customizations/index.js
index 00fa106..0b6ae0f 100644
--- a/plugins/nodebb-plugin-tdwtf-customizations/index.js
+++ b/plugins/nodebb-plugin-tdwtf-customizations/index.js
@@ -25,23 +25,6 @@ module.exports = {
 		}).unref();
 		callback();
 	},
-	"protectChats": function(req, res, next) {
-		if (req.route.path === '/user/:userslug/chats/:roomid?' || req.route.path === '/api/user/:userslug/chats/:roomid?') {
-			return User.getUidByUserslug(req.params.userslug, function(err, uid) {
-				if (err) {
-					return next(err);
-				}
-
-				if (req.uid === uid) {
-					return next();
-				}
-
-				controllerHelpers.notAllowed(req, res);
-			});
-		}
-
-		next();
-	},
 	"meta": function(tags, callback) {
 		tags = tags.concat([{
 			name: 'google-site-verification',
diff --git a/plugins/nodebb-plugin-tdwtf-customizations/plugin.json b/plugins/nodebb-plugin-tdwtf-customizations/plugin.json
index 156e4f2..22dfdeb 100644
--- a/plugins/nodebb-plugin-tdwtf-customizations/plugin.json
+++ b/plugins/nodebb-plugin-tdwtf-customizations/plugin.json
@@ -4,7 +4,6 @@
 	"library": "index.js",
 	"hooks": [
 		{"hook": "static:app.load", "method": "init"},
-		{"hook": "filter:router.page", "method": "protectChats"},
 		{"hook": "filter:meta.getMetaTags", "method": "meta"},
 		{"hook": "filter:middleware.renderHeader", "method": "header"},
 		{"hook": "filter:post.edit", "method": "postEdit"},