diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2019-11-22 14:57:51 +0300 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2019-12-13 18:04:50 +0300 |
commit | c6baf40fa1ca81f5dcd8ad5ae4ee5500de63a9e4 (patch) | |
tree | 760d7662ecaa1ae9890990ba94f3cf91059ee100 /lib/Flow | |
parent | 8e81d703a2fc80165f84f7f8e2d477fe0e2495b9 (diff) |
add flow operation, frontend part
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/Flow')
-rw-r--r-- | lib/Flow/Operation.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Flow/Operation.php b/lib/Flow/Operation.php index 5d0d5a6e4..a8cdcf890 100644 --- a/lib/Flow/Operation.php +++ b/lib/Flow/Operation.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace OCA\Talk\Flow; +use OC_Util; use OCA\Talk\Chat\ChatManager; use OCA\Talk\Exceptions\ParticipantNotFoundException; use OCA\Talk\Exceptions\RoomNotFoundException; @@ -73,6 +74,7 @@ class Operation implements IOperation { $dispatcher->addListener(FlowManager::EVENT_NAME_REG_OPERATION, function (GenericEvent $event) { $operation = \OC::$server->query(Operation::class); $event->getSubject()->registerOperation($operation); + OC_Util::addScript('spreed', 'flow'); }); } @@ -142,16 +144,14 @@ class Operation implements IOperation { protected function parseOperationConfig(string $raw): array { /** - * We expect $operation be a base64 encoded json string, containing + * We expect $operation be a json string, containing * 't' => string, the room token * 'm' => int 1..3, the mention-mode (none, yourself, room) - * 'u' => string, the applicable user id * * setting up room mentions are only permitted to moderators */ - $decoded = base64_decode($raw); - $opConfig = \json_decode($decoded, true); + $opConfig = \json_decode($raw, true); if(!is_array($opConfig) || empty($opConfig)) { throw new UnexpectedValueException('Cannot decode operation details'); } |