fixup! fixup! fixup! Add a service

nextcloud · Jan 23, 2019 · 99b4c3c · 99b4c3c
1 parent 078e9b0
commit 99b4c3c
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/lib/Service/CommandService.php b/lib/Service/CommandService.php
@@ -95,22 +95,24 @@ public function update(int $id, string $cmd, string $name, string $script, int $
 			throw new \InvalidArgumentException('enabled', 5);
 		}
 
-		if ($command->getApp() !== '' && $command->getCommand() !== 'help') {
-			if ($cmd !== $command->getCommand()) {
-				try {
-					$this->mapper->find('', $cmd);
-					throw new \InvalidArgumentException('command', 1);
-				} catch (DoesNotExistException $e) {
-					$command->setCommand($cmd);
-				}
-			}
+		if ($command->getApp() !== '' || $command->getCommand() === 'help') {
+			throw new \InvalidArgumentException('app', 0);
+		}
 
-			// FIXME Validate "bot name"
-			$command->setName($name);
-			// FIXME Validate "script"
-			$command->setScript($script);
+		if ($cmd !== $command->getCommand()) {
+			try {
+				$this->mapper->find('', $cmd);
+				throw new \InvalidArgumentException('command', 1);
+			} catch (DoesNotExistException $e) {
+				$command->setCommand($cmd);
+			}
 		}
 
+		// FIXME Validate "bot name"
+		$command->setName($name);
+		// FIXME Validate "script"
+		$command->setScript($script);
+
 		$command->setResponse($response);
 		$command->setEnabled($enabled);