Add in permissions for reactions

controllers/class.reactcontroller.php

@@ -44,13 +44,17 @@ class ReactController extends Gdn_Controller {
    * tell you!
    */
   public function Discussion($DiscussionID, $ActionID) {
-    // check to see if allowed to react
-    $this->Permission('Plugins.Reactions.Add');
+    $Action = $this->ActionModel->GetAction($ActionID);
     
-    if(!$this->ActionModel->ActionExists($ActionID)) {
+    // Make sure the action exists and the user is allowed to react    
+    if(!$Action) {
       throw new Gdn_UserException('Invalid Action');
     }
     
+    if(!Gdn::Session()->CheckPermission($Action->Permission)) {
+      throw PermissionException();
+    }
+    
     $DiscussionModel = new DiscussionModel();
     $Discussion = $DiscussionModel->GetID($DiscussionID);
     
@@ -85,13 +89,17 @@ class ReactController extends Gdn_Controller {
    * tell you!
    */
   public function Comment($CommentID, $ActionID) {
-    // check to see if allowed to react
-    $this->Permission('Plugins.Reactions.Add');
+    $Action = $this->ActionModel->GetAction($ActionID);
     
-    if(!$this->ActionModel->ActionExists($ActionID)) {
+    // Make sure the action exists and the user is allowed to react    
+    if(!$Action) {
       throw new Gdn_UserException('Invalid Action');
     }
     
+    if(!Gdn::Session()->CheckPermission($Action->Permission)) {
+      throw PermissionException();
+    }
+    
     $CommentModel = new CommentModel();
     $Comment = $CommentModel->GetID($CommentID);
     
@@ -126,17 +134,20 @@ class ReactController extends Gdn_Controller {
    * tell you!
    */
   public function Activity($ActivityID, $ActionID) {
-    // check to see if allowed to react
-    $this->Permission('Plugins.Reactions.Add');
+    $Action = $this->ActionModel->GetAction($ActionID);
     
-    if(!$this->ActionModel->ActionExists($ActionID)) {
+    // Make sure the action exists and the user is allowed to react    
+    if(!$Action) {
       throw new Gdn_UserException('Invalid Action');
     }
     
+    if(!Gdn::Session()->CheckPermission($Action->Permission)) {
+      throw PermissionException();
+    }
+    
     $ActivityModel = new ActivityModel();
     $Activity = $ActivityModel->GetID($ActivityID);
-//    decho($Activity);
-//    die();
+
     if($Activity) {
       $Anchor = '#Activity_' . $ActivityID . ' .ReactMenu';
     }

models/class.reactionmodel.php

@@ -151,7 +151,6 @@ class ReactionModel extends Gdn_Model {
    * 
    * Events: AfterReactionSave
    * 
-   * @todo Add points to the parent score column on discussions and comments
    * @param int $ID
    * @param enum $Type activity, comment, discussion
    * @param int $AuthorID

settings/structure.php

@@ -32,6 +32,7 @@ $Construct->Table('Action')
         ->Column('Tooltip', 'varchar(255)')
         ->Column('CssClass', 'varchar(255)')
         ->Column('AwardValue', 'int', 1)
+        ->Column('Permission', 'varchar(255)', 'Yaga.Reactions.Add')
         ->Column('Sort', 'int', TRUE)
         ->Set($Explicit, $Drop);