From 904f3f037ce57043a6037a37736c6f62a913c2e5 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 22 Jul 2017 11:41:20 +0930
Subject: [PATCH] Define the default moderator group ID

This allows extensions to add default permissions for moderators,
without having to hardcode in the default moderator group ID.
---
 framework/core/src/Core/Group.php                    |  5 +++++
 .../core/src/Install/Console/InstallCommand.php      | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/framework/core/src/Core/Group.php b/framework/core/src/Core/Group.php
index c45039f70..ad265e6f0 100755
--- a/framework/core/src/Core/Group.php
+++ b/framework/core/src/Core/Group.php
@@ -52,6 +52,11 @@ class Group extends AbstractModel
      */
     const MEMBER_ID = 3;
 
+    /**
+     * The ID of the mod group.
+     */
+    const MODERATOR_ID = 4;
+
     /**
      * Boot the model.
      *
diff --git a/framework/core/src/Install/Console/InstallCommand.php b/framework/core/src/Install/Console/InstallCommand.php
index 2c89fec85..6dacaeb6f 100644
--- a/framework/core/src/Install/Console/InstallCommand.php
+++ b/framework/core/src/Install/Console/InstallCommand.php
@@ -25,8 +25,6 @@ use Symfony\Component\Console\Input\InputOption;
 
 class InstallCommand extends AbstractCommand
 {
-    const MOD_GROUP_ID = 4;
-
     /**
      * @var DataProviderInterface
      */
@@ -271,7 +269,7 @@ class InstallCommand extends AbstractCommand
             [Group::ADMINISTRATOR_ID, 'Admin', 'Admins', '#B72A2A', 'wrench'],
             [Group::GUEST_ID, 'Guest', 'Guests', null, null],
             [Group::MEMBER_ID, 'Member', 'Members', null, null],
-            [static::MOD_GROUP_ID, 'Mod', 'Mods', '#80349E', 'bolt']
+            [Group::MODERATOR_ID, 'Mod', 'Mods', '#80349E', 'bolt']
         ];
 
         foreach ($groups as $group) {
@@ -297,10 +295,10 @@ class InstallCommand extends AbstractCommand
             [Group::MEMBER_ID, 'viewUserList'],
 
             // Moderators can edit + delete stuff
-            [static::MOD_GROUP_ID, 'discussion.delete'],
-            [static::MOD_GROUP_ID, 'discussion.deletePosts'],
-            [static::MOD_GROUP_ID, 'discussion.editPosts'],
-            [static::MOD_GROUP_ID, 'discussion.rename'],
+            [Group::MODERATOR_ID, 'discussion.hide'],
+            [Group::MODERATOR_ID, 'discussion.editPosts'],
+            [Group::MODERATOR_ID, 'discussion.rename'],
+            [Group::MODERATOR_ID, 'discussion.viewIpsPosts'],
         ];
 
         foreach ($permissions as &$permission) {