MAJOR DEVELOPMENT

Data restructured to improve use of tokens
HeartbeatType message is parsed to replace arbitrary variable keywords with tokens
parsed string is then parsed again using Token Service to replace tokens with values as per any provided Entities

config/schema/heartbeat.schema.yml

@@ -31,9 +31,9 @@ heartbeat.heartbeat_type.*:
     group_type:
       type: string
       label: 'group_type'
-    concat_args:
+    arguments:
       type: blob
-      label: 'concat_args'
+      label: 'arguments'
     variables:
       type: blob
       label: 'variables'

config/schema/heartbeat_stream.schema.yml

@@ -31,9 +31,9 @@ heartbeat_stream.heartbeat_type.*:
     group_type:
       type: string
       label: 'group_type'
-    concat_args:
+    arguments:
       type: blob
-      label: 'concat_args'
+      label: 'arguments'
     variables:
       type: blob
       label: 'variables'

heartbeat.install

@@ -90,7 +90,7 @@ function heartbeat_schema() {
         'default' => 'single',
         'description' => 'The group type of the template',
       ),
-      'concat_args' => array(
+      'concatargs' => array(
         'description' => 'Arguments for concatenation message.',
         'type' => 'blob',
         'serialize' => TRUE,
@@ -117,7 +117,7 @@ function heartbeat_schema() {
 
 
 
-  $schema['heartbeat_activity'] = array(
+  $schema['heartbeat'] = array(
     'description' => 'Table that contains logs of all user triggerable actions.',
     'fields' => array(
       'uaid' => array(
@@ -224,7 +224,7 @@ function heartbeat_schema() {
   $schema['heartbeat_user_templates'] = heartbeat_install_table_user_templates();
 
 
-  $schema['heartbeat_streams'] = array(
+  $schema['heartbeat_stream'] = array(
     'description' => 'Table that contains heartbeat streams.',
     // CTools export definitions.
 //    'export' => array(

heartbeat.module

@@ -82,23 +82,33 @@ if ($entity instanceof \Drupal\node\Entity\Node) {
 
   /** @noinspection NestedTernaryOperatorInspection */
   /** @noinspection ArrayCastingEquivalentInspection */
-  $variables = array(
-    '!nid' => $nid,
-    '!entityType' => $type,
-    '!uid' => $user->id(),
-    '!user' => $user->getAccountName(),
-    'media' => $media,
-  );
+//  $variables = array(
+//    '!nid' => $nid,
+//    '!entityType' => $type,
+//    '!uid' => $user->id(),
+//    '!user' => $user->getAccountName(),
+//    'media' => $media,
+//  );
 
 }
 
   if ($nid) {
 
     $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
+    $tokenService= \Drupal::service('token');
 
     foreach ($heartbeatTypeService->getTypes() as $type) {
 
       $heartbeatTypeEntity = $heartbeatTypeService->load($type);
+      $arguments = json_decode($heartbeatTypeEntity->getArguments());
+      $argKeys = array_keys($arguments);
+
+      foreach ($arguments as $key => $argument) {
+        $variables[$key] = $argument;
+      }
+
+      $preparsedMessageString = strtr($heartbeatTypeEntity->getMessage(), $variables);
+      $replacedMessageString = $tokenService->replace($preparsedMessageString, array('node' => $entity, 'user' => $user));
 
       $messageTemplate = Heartbeat::buildMessage($heartbeatTypeEntity, $media);
 

src/Entity/HeartbeatType.php

@@ -53,7 +53,7 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
   protected $description;
   protected $perms;
   protected $messageConcat;
-  protected $concatArgs;
+  protected $arguments;
   protected $message;
   protected $variables;
   protected $attachments;
@@ -187,11 +187,12 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
   /**
    * Sets the arguments for the concatenated message
    *
-   * @param string $concatArgs
+   * @param string $arguments
    *
    */
-  public function setConcatArgs($concatArgs) {
-    $this->concatArgs = $concatArgs;
+  public function setArguments($arguments) {
+    $this->set('arguments', $arguments);
+//    $this->arguments = $arguments;
   }
 
   /**
@@ -200,8 +201,9 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
    * @return string
    *  The stream's arguments for the concatenated message
    */
-  public function getConcateArgs() {
-    return $this->concatArgs;
+  public function getArguments() {
+    return $this->get('arguments');
+//    return $this->arguments;
   }
 
   /**
@@ -340,4 +342,6 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
   public function getMainEntity() {
     return $this->get('mainEntity');
   }
+
+
 }

src/Entity/HeartbeatTypeInterface.php

@@ -156,7 +156,7 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
    */
 
 
-  public function setConcatArgs($concatArgs);
+  public function setArguments($arguments);
 
 
   /**
@@ -166,7 +166,7 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
    *  The stream's arguments for the concatenated message
    */
 
-  public function getConcateArgs();
+  public function getArguments();
 
 
 

src/Form/HeartbeatTypeForm.php

@@ -34,6 +34,8 @@ class HeartbeatTypeForm extends EntityForm {
 
   private $treeAdded = false;
 
+  private $messageMap = array();
+
 
   /**
    * {@inheritdoc}
@@ -295,12 +297,14 @@ class HeartbeatTypeForm extends EntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $heartbeat_type = $this->entity;
-
+    $mapValue = $form_state->getValue('messageMap');
+    $mapObj = $form_state->get('messageMap');
     $heartbeat_type->set('description', $form_state->getValue('description'));
     $heartbeat_type->set('message', $form_state->getValue('message'));
     $heartbeat_type->set('perms', $form_state->getValue('perms'));
     $heartbeat_type->set('variables', $form_state->getValue('variables'));
-//    $heartbeat_type
+    $heartbeat_type->set('arguments', json_encode($form_state->get('messageMap')));
+
     $status = $heartbeat_type->save();
 
     switch ($status) {
@@ -328,13 +332,22 @@ class HeartbeatTypeForm extends EntityForm {
 
     $messageArgString = $form_state->getValue('message');
 
-    $argsArray = $this->extractMessageArguments($messageArgString);
+    if ($form_state != NULL) {
+      $argsArray = $this->extractMessageArguments($messageArgString, $form_state);
 
-    $form_state->set('data_hidden', $argsArray);
-    $form_state->setRebuild();
+      foreach ($argsArray as $key => $arg) {
+        $this->messageMap[$key] = '!' . $arg;
+      }
 
-    return $form['variables'];
+      $form_state->set('messageMapKey', $this->messageMap);
+      $form_state->set('data_hidden', $argsArray);
+      $form_state->setRebuild();
+
+      return $form['variables'];
 
+    } else {
+      return NULL;
+    }
   }
 
   public function prepareVariables(&$form, FormStateInterface $form_state) {
@@ -343,6 +356,9 @@ class HeartbeatTypeForm extends EntityForm {
 
 
   private function extractMessageArguments($message) {
+//TODO find solution for trailing exclamation marks being wrongly interpreted
+    //ie parse each word in string and reconstruct string prior to exploding it on
+    //exclamation marks again
     $messageArguments = array_slice(explode('!', $message), 1);
 
     $argsArray = array();
@@ -353,12 +369,34 @@ class HeartbeatTypeForm extends EntityForm {
 
         $cleanArgument = strpos($argument, ' ') ? substr($argument, 0, strpos($argument, ' ')) : $argument;
         $argsArray[] = $cleanArgument;
+        $this->messageMap[] = '!' . $cleanArgument;
 
       }
     }
+
     return $argsArray;
   }
 
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+
+    $messageMapKeysget = $form_state->get('messageMapKey');
+
+    if ($variables = $form_state->getValue('variables')) {
+
+      $num = count($variables);
+
+      for ($i = 0; $i < $num; $i++) {
+        if (!is_string($variables[$i])) { continue; }
+          $this->messageMap[$messageMapKeysget[$i]] = $variables[$i];
+      }
+
+      $form_state->set('messageMap', $this->messageMap);
+
+      parent::submitForm($form, $form_state);
+
+    }
+  }
+
   /**
    * Custom form validation to rebuild
    * Form field for mapping Message Arguments