Make automation conditions optional for rules to be triggered.

tastyigniter · Aug 30, 2023 · 95f2f30 · 95f2f30
1 parent e43b242
commit 95f2f30
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 40 deletions.
diff --git a/classes/BaseEvent.php b/classes/BaseEvent.php
@@ -161,45 +161,8 @@ public static function findEventObjects()
         return $results;
     }
 
-    public static function findEventGroups()
-    {
-        return self::findRulesValues('groups');
-    }
-
-    public static function findEventsByGroup($group)
-    {
-        $results = [];
-        foreach (self::findEvents() as $eventClass => [$eventCode, $eventObj]) {
-            if ($eventObj->getEventGroup() == $group)
-                $results[$eventClass] = $eventObj;
-        }
-
-        return $results;
-    }
-
-    public static function findEventByIdentifier($identifier)
-    {
-        foreach (self::findEvents() as [$eventCode, $eventObj]) {
-            if ($eventObj->getEventIdentifier() == $identifier)
-                return $eventObj;
-        }
-    }
-
     public static function findEventPresets()
     {
         return self::findRulesValues('presets');
     }
-
-    public static function findEventPresetsByClass($className)
-    {
-        $results = [];
-        foreach (self::findEventPresets() as $code => $definition) {
-            if (array_get($definition, 'event', false) != $className)
-                continue;
-
-            $results[$code] = $definition;
-        }
-
-        return $results;
-    }
 }
diff --git a/language/en/default.php b/language/en/default.php
@@ -36,5 +36,5 @@
 
     'help_event' => 'This rule is triggered by the selected system event',
     'help_actions' => 'Choose one or more actions to perform when this automation is triggered',
-    'help_conditions' => 'Choose one or more conditions that must be met for this automation to be triggered. You must choose at least one condition to enable this automation.',
+    'help_conditions' => 'Choose one or more conditions that must be met for this automation to be triggered. Leave blank to always trigger this automation.',
 ];
diff --git a/models/AutomationRule.php b/models/AutomationRule.php
@@ -50,12 +50,12 @@ class AutomationRule extends Model
     public function triggerRule()
     {
         try {
-            if (!$this->conditions || !$this->actions)
+            if (!$this->actions)
                 return false;
 
             $params = $this->getEventObject()->getEventParams();
 
-            if (!$this->checkConditions($params))
+            if ($this->conditions && !$this->checkConditions($params))
                 return false;
 
             $this->actions->each(function ($action) use ($params) {