From 6b903407ed8ab8d53129821307c760e4d68ad259 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Sat, 12 Jan 2013 09:49:41 +0000
Subject: [PATCH] Used access parameter on all elevated access commadns I can
 think of [#124]

---
 modules/js/js.js         | 10 ++---
 modules/quotes/quotes.js | 33 ++++++++--------
 modules/users/users.js   | 83 ++++++++++++++++++++--------------------
 3 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/modules/js/js.js b/modules/js/js.js
index 76d5f91..917e0a5 100644
--- a/modules/js/js.js
+++ b/modules/js/js.js
@@ -22,17 +22,17 @@ var js = function(dbot) {
 
         // Run JS code un-sandboxed, with access to DBot memory (admin-only).
         '~ajs': function(event) {
-            if(dbot.config.admins.include(event.user) ) {
-                var ret = eval(event.input[1]);
-                if(ret !== undefined) {
-                    event.reply(ret);
-                }
+            var ret = eval(event.input[1]);
+            if(ret !== undefined) {
+                event.reply(ret);
             }
         }
     };
     commands['~js'].regex = [/^~js (.*)/, 2];
     commands['~ajs'].regex = [/^~ajs (.*)/, 2];
 
+    commands['~ajs'].access = 'admin';
+
     return {
         'name': 'js',
         'ignorable': true,
diff --git a/modules/quotes/quotes.js b/modules/quotes/quotes.js
index c93307e..9d605f1 100644
--- a/modules/quotes/quotes.js
+++ b/modules/quotes/quotes.js
@@ -93,28 +93,24 @@ var quotes = function(dbot) {
         },
 
         '~rmconfirm': function(event) {
-            if(dbot.config.admins.include(event.user)) {
-                var rmCacheCount = rmCache.length;
-                rmCache.length = 0;
-                event.reply(dbot.t('quote_cache_cleared', 
-                    { 'count': rmCacheCount }));
-            }
+            var rmCacheCount = rmCache.length;
+            rmCache.length = 0;
+            event.reply(dbot.t('quote_cache_cleared', 
+                { 'count': rmCacheCount }));
         },
 
         '~rmdeny': function(event) {
-            if(dbot.config.admins.include(event.user)) {
-                var rmCacheCount = rmCache.length;
-                for(var i=0;i<rmCacheCount;i++) {
-                    if(!quotes.hasOwnProperty(rmCache[i].key)) {
-                        quotes[rmCache[i].key] = [];
-                    }
-                    quotes[rmCache[i].key].push(rmCache[i].quote);
+            var rmCacheCount = rmCache.length;
+            for(var i=0;i<rmCacheCount;i++) {
+                if(!quotes.hasOwnProperty(rmCache[i].key)) {
+                    quotes[rmCache[i].key] = [];
                 }
-                rmCache.length = 0;
-
-                event.reply(dbot.t('quote_cache_reinstated', 
-                    { 'count': rmCacheCount }));
+                quotes[rmCache[i].key].push(rmCache[i].quote);
             }
+            rmCache.length = 0;
+
+            event.reply(dbot.t('quote_cache_reinstated', 
+                { 'count': rmCacheCount }));
         },
 
 
@@ -271,6 +267,9 @@ var quotes = function(dbot) {
     commands['~rmlast'].regex = [/^~rmlast ([\d\w\s-]*)/, 2];
     commands['~qadd'].regex = [/^~qadd ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
 
+    commands['~rmconfirm'].access = 'moderator';
+    commands['~rmdeny'].access = 'moderator';
+
     var pages = {
         // Lists quotes in a category
         '/quotes/:key': function(req, res) {
diff --git a/modules/users/users.js b/modules/users/users.js
index 0948719..b96f9c8 100644
--- a/modules/users/users.js
+++ b/modules/users/users.js
@@ -95,63 +95,62 @@ var users = function(dbot) {
         },
 
         '~setaliasparent': function(event) {
-            if(dbot.config.admins.include(event.user)) {
-                var knownUsers = getServerUsers(event.server);
-                var newParent = event.params[1];
+            var knownUsers = getServerUsers(event.server);
+            var newParent = event.params[1];
 
-                if(knownUsers.aliases.hasOwnProperty(newParent)) {
-                    var newAlias = knownUsers.aliases[newParent]; 
+            if(knownUsers.aliases.hasOwnProperty(newParent)) {
+                var newAlias = knownUsers.aliases[newParent]; 
 
-                    // Replace users entry with new primary user
-                    var usersIndex = knownUsers.users.indexOf(newAlias);
-                    knownUsers.users.splice(usersIndex, 1);
-                    knownUsers.users.push(newParent);
+                // Replace users entry with new primary user
+                var usersIndex = knownUsers.users.indexOf(newAlias);
+                knownUsers.users.splice(usersIndex, 1);
+                knownUsers.users.push(newParent);
 
-                    // Replace channels entries with new primary user
-                    updateChannels(event, newAlias, newParent);
+                // Replace channels entries with new primary user
+                updateChannels(event, newAlias, newParent);
 
-                    // Remove alias for new parent & add alias for new alias
-                    delete knownUsers.aliases[newParent];
-                    knownUsers.aliases[newAlias] = newParent;
+                // Remove alias for new parent & add alias for new alias
+                delete knownUsers.aliases[newParent];
+                knownUsers.aliases[newAlias] = newParent;
 
-                    // Update aliases to point to new primary user
-                    updateAliases(event, newAlias, newParent);
+                // Update aliases to point to new primary user
+                updateAliases(event, newAlias, newParent);
 
-                    event.reply(dbot.t('aliasparentset', { 'newParent': newParent, 
-                        'newAlias': newAlias }));
+                event.reply(dbot.t('aliasparentset', { 'newParent': newParent, 
+                    'newAlias': newAlias }));
 
-                    dbot.api.stats.fixStats(event.server, newAlias);
-                } else {
-                    event.reply(dbot.t('unknown_alias', { 'alias': newParent}));
-                }
+                dbot.api.stats.fixStats(event.server, newAlias);
+            } else {
+                event.reply(dbot.t('unknown_alias', { 'alias': newParent}));
             }
         },
 
         '~mergeusers': function(event) {
-            if(dbot.config.admins.include(event.user)) {
-                var knownUsers = getServerUsers(event.server);
-                var primaryUser = event.params[1];
-                var secondaryUser = event.params[2];
+            var knownUsers = getServerUsers(event.server);
+            var primaryUser = event.params[1];
+            var secondaryUser = event.params[2];
 
-                if(knownUsers.users.include(primaryUser) && knownUsers.users.include(secondaryUser)) {
-                    knownUsers.users.splice(knownUsers.users.indexOf(secondaryUser), 1);  
-                    knownUsers.aliases[secondaryUser] = primaryUser;
-                    updateAliases(event, secondaryUser, primaryUser);
-                    updateChannels(event, secondaryUser, primaryUser);
+            if(knownUsers.users.include(primaryUser) && knownUsers.users.include(secondaryUser)) {
+                knownUsers.users.splice(knownUsers.users.indexOf(secondaryUser), 1);  
+                knownUsers.aliases[secondaryUser] = primaryUser;
+                updateAliases(event, secondaryUser, primaryUser);
+                updateChannels(event, secondaryUser, primaryUser);
 
-                    event.reply(dbot.t('merged_users', { 
-                        'old_user': secondaryUser,
-                        'new_user': primaryUser
-                    }));
-                    
-                    dbot.api.stats.fixStats(event.server, secondaryUser);
-                } else {
-                    event.reply(dbot.t('unprimary_error'));
-                }
-           } 
-        }
+                event.reply(dbot.t('merged_users', { 
+                    'old_user': secondaryUser,
+                    'new_user': primaryUser
+                }));
+                
+                dbot.api.stats.fixStats(event.server, secondaryUser);
+            } else {
+                event.reply(dbot.t('unprimary_error'));
+            }
+        } 
     };
 
+    commands['~setaliasparent'].access = 'moderator';
+    commands['~mergeusers'].access = 'moderator';
+
     return {
         'name': 'users',
         'ignorable': false,