Restructuring Heartbeat to contain submodules

heartbeat.info.yml

@@ -6,3 +6,7 @@ package: Heartbeat
 dependencies:
   - token
   - flag
+  - statusmessage
+  - heartbeat_like
+  - heartbeat_unlike
+  - heartbeat_like_comment

heartbeat.module

@@ -251,7 +251,7 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
             'status' => !$bundleSaved ? 1 : 0,
           ]);
 
-          $heartbeatActivity->setMessage($heartbeatMessage);
+          $heartbeatActivity->setMessage(str_replace('&039;', "'", $heartbeatMessage));
           $heartbeatActivity->save();
 
         } else {

js/heartbeat.js

@@ -24,6 +24,8 @@
       },
       success: function(response) {
         console.dir(response);
+        // let heartbeatLikeFlag = document.querySelector('.flag-heartbeat_like-1111 a.use-ajax');
+        // heartbeatLikeFlag.click();
       }
     });
   };
@@ -173,55 +175,57 @@
     );
   }
 
-  if (drupalSettings.user.uid > 0 && !drupalSettings.path.currentPathIsAdmin) {
-    Drupal.AjaxCommands.prototype.selectFeed = function (ajax, response, status) {
-      $.ajax({
-        type: 'POST',
-        url: '/heartbeat/render_feed/' + response.feed,
-        success: function (response) {
-          feedElement = document.querySelector('.heartbeat-stream');
-
-          if (feedElement != null) {
-            feedElement.innerHTML = response;
-          } else {
-            feedBlock = document.getElementById('block-heartbeatblock');
-            insertNode = document.createElement('div');
-            insertNode.innerHTML = response;
-            feedBlock.appendChild(insertNode);
-          }
-          Drupal.attachBehaviors();
-        }
-      });
-    };
-
-    Drupal.AjaxCommands.prototype.updateFeed = function (ajax, response, status) {
-      if (response.update) {
+  if (Drupal.AjaxCommands) {
+    if (drupalSettings.user.uid > 0 && !drupalSettings.path.currentPathIsAdmin) {
+      Drupal.AjaxCommands.prototype.selectFeed = function (ajax, response, status) {
         $.ajax({
           type: 'POST',
-          url: '/heartbeat/update_feed/' + response.timestamp,
+          url: '/heartbeat/render_feed/' + response.feed,
           success: function (response) {
-
-          }
-        });
-      }
-    };
-
-    Drupal.AjaxCommands.prototype.myfavouritemethodintheworld = function (ajax, response, status) {
-      console.dir(response);
-      if (response.cid) {
-        console.log('this shit is getting called again');
-        let parentComment = document.getElementById('heartbeat-comment-' + response.cid);
-        let text = parentComment.querySelector('.form-textarea');
-
-        text.addEventListener('keydown', function (e) {
-          console.dir(e);
-          if (e.keyCode === 13) {
-            let submitBtn = parentComment.querySelector('.form-submit');
-            submitBtn.click();
+            feedElement = document.querySelector('.heartbeat-stream');
+
+            if (feedElement != null) {
+              feedElement.innerHTML = response;
+            } else {
+              feedBlock = document.getElementById('block-heartbeatblock');
+              insertNode = document.createElement('div');
+              insertNode.innerHTML = response;
+              feedBlock.appendChild(insertNode);
+            }
+            Drupal.attachBehaviors();
           }
         });
-      }
-    };
+      };
+
+      Drupal.AjaxCommands.prototype.updateFeed = function (ajax, response, status) {
+        if (response.update) {
+          $.ajax({
+            type: 'POST',
+            url: '/heartbeat/update_feed/' + response.timestamp,
+            success: function (response) {
+
+            }
+          });
+        }
+      };
+
+      Drupal.AjaxCommands.prototype.myfavouritemethodintheworld = function (ajax, response, status) {
+        console.dir(response);
+        if (response.cid) {
+          console.log('this shit is getting called again');
+          let parentComment = document.getElementById('heartbeat-comment-' + response.cid);
+          let text = parentComment.querySelector('.form-textarea');
+
+          text.addEventListener('keydown', function (e) {
+            console.dir(e);
+            if (e.keyCode === 13) {
+              let submitBtn = parentComment.querySelector('.form-submit');
+              submitBtn.click();
+            }
+          });
+        }
+      };
+    }
   }
 
   function hideCommentForms() {
@@ -273,9 +277,7 @@
 
   function toggleCommentElements(node) {
 
-    console.dir(node);
     if (node.classList.contains('comment-form-hidden')) {
-      console.log('removing comment-form-hidden class from element');
       node.classList.remove('comment-form-hidden');
     } else {
       node.className += ' comment-form-hidden';
@@ -307,6 +309,9 @@
   Drupal.behaviors.heartbeat = {
     attach: function (context, settings) {
 
+      // Drupal.AjaxCommands.prototype.viewsScrollTop = null;
+      // console.dir(Drupal.AjaxCommands.prototype);
+
       if (drupalSettings.friendData != null) {
         let divs = document.querySelectorAll('.flag-friendship a.use-ajax');
 
@@ -324,10 +329,11 @@
       listenCommentPost();
       commentFormListeners();
       feedElement = document.querySelector('.heartbeat-stream');
+      flagListeners();
 
-      if (drupalSettings.feedUpdate == true) {
-        updateFeed();
-      }
+      // if (drupalSettings.feedUpdate == true) {
+      //   updateFeed();
+      // }
     }
   };
 
@@ -338,39 +344,39 @@
     const body = document.getElementsByTagName('body')[0];
     body.appendChild(loader);
 
-    flagListeners();
-
-    let stream = document.getElementById('block-heartbeatblock');
-
-    if (stream !== null) {
-      let observer = new MutationObserver(function (mutations) {
-        console.log('observer observes a change');
-        // Drupal.attachBehaviors();
-        // listenImages();
-        hideCommentForms();
-        // commentFormListeners();
-        // flagListeners();
-        // listenVideos();
-      });
-
-      let config = {attributes: true, childList: true, characterData: true};
-      observer.observe(stream, config);
-    }
-
-    let flagObserver = new MutationObserver(function(mutations) {
-      console.log('observer observes a change');
-      if (mutations[0].target !== null && mutations[0].target.children !== null && mutations[0].target.children.length > 0 && mutations[0].target.children[0].classList.contains('flag')) {
-        flagListeners();
-      }
-    });
-
-    let flagObserveConfig = {subTree: true, childList: true};
-
-    let flags = Array.from(document.querySelectorAll('.heartbeat-like, .heartbeat-unlike'));
-
-    flags.forEach(function(flag) {
-      flagObserver.observe(flag, flagObserveConfig);
-    });
+    // flagListeners();
+    //
+    // let stream = document.getElementById('block-heartbeatblock');
+    //
+    // if (stream !== null) {
+    //   let observer = new MutationObserver(function (mutations) {
+    //     console.log('observer observes a change');
+    //     // Drupal.attachBehaviors();
+    //     // listenImages();
+    //     hideCommentForms();
+    //     // commentFormListeners();
+    //     // flagListeners();
+    //     // listenVideos();
+    //   });
+    //
+    //   let config = {attributes: true, childList: true, characterData: true};
+    //   observer.observe(stream, config);
+    // }
+    //
+    // let flagObserver = new MutationObserver(function(mutations) {
+    //   console.log('observer observes a change');
+    //   if (mutations[0].target !== null && mutations[0].target.children !== null && mutations[0].target.children.length > 0 && mutations[0].target.children[0].classList.contains('flag')) {
+    //     flagListeners();
+    //   }
+    // });
+    //
+    // let flagObserveConfig = {subTree: true, childList: true};
+    //
+    // let flags = Array.from(document.querySelectorAll('.heartbeat-like, .heartbeat-unlike'));
+    //
+    // flags.forEach(function(flag) {
+    //   flagObserver.observe(flag, flagObserveConfig);
+    // });
 
     document.removeEventListener('scroll', addWindowScrollListener);
     document.addEventListener('scroll', addWindowScrollListener);

modules/heartbeat_comment_like/config/install/flag.flag.heartbeat_like.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - heartbeat
+id: heartbeat_like
+label: Heartbeat Like
+entity_type: heartbeat
+global: false
+weight: 0
+flag_short: 'Praise ([flagcount:count])'
+flag_long: ''
+flag_message: ''
+unflag_short: 'Reee ([flagcount:count])'
+unflag_long: ''
+unflag_message: ''
+unflag_denied_text: ''
+flag_type: 'entity:heartbeat'
+link_type: ajax_link
+flagTypeConfig:
+  show_in_links: {  }
+  show_as_field: true
+  show_on_form: false
+  show_contextual_link: false
+  access_author: ''
+linkTypeConfig: {  }

modules/heartbeat_comment_like/heartbeat_like.info.yml

@@ -0,0 +1,11 @@
+name : Heartbeat Like
+type: module
+description : "Allows you to like Heartbeats"
+dependencies:
+  - flag
+  - token
+  - heartbeat
+  - statusmessage
+
+core: '8.x'
+project: 'heartbeat'

modules/heartbeat_comment_like/heartbeat_like.module

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ * Tokenize the flag link strings.
+ */
+function heartbeat_like_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+
+  if ($form_id == 'flag_add_form' || $form_id == 'flag_edit_form')  {
+
+    // Setup for the "Browse available tokens" link.
+    $browse_array = array(
+      '#theme' => 'token_tree_link',
+      '#token_types' => array('heartbeat_like'),
+    );
+
+    // Validation options to add to form elements.
+    $token_options = array(
+      '#element_validate' => array('token_element_validate'),
+      '#token_types' => array(),
+      '#min_tokens' => 1,
+      '#max_tokens' => 10,
+    );
+
+    // Let admin know that this field is now tokenized.
+    $form['messages']['flag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Like [flagcount:count]")');
+    $form['messages']['flag_short']['#suffix'] = render($browse_array);
+    $form['messages']['flag_short'] += $token_options;
+
+    $form['messages']['unflag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Unlike [flagcount:count]")');
+    $form['messages']['unflag_short']['#suffix'] = render($browse_array);
+    $form['messages']['unflag_short'] += $token_options;
+  }
+
+}
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function heartbeat_like_preprocess_flag(&$variables) {
+
+  // Replace the link title with any tokens.
+  $token = Drupal::token();
+  $variables['title'] = $token->replace($variables['title'], array(
+    'flag_id' => $variables['flag']->id(),
+    'entity_id' => $variables['flaggable']->id(),
+  ));
+}

modules/heartbeat_comment_like/heartbeat_like.tokens.inc

@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Token for heartbeat_like.
+ */
+
+use Drupal\Core\Render\BubbleableMetadata;
+
+/**
+ * Implements hook_token_info().
+ */
+function heartbeat_like_token_info() {
+
+  $types = array();
+  $tokens = array();
+
+  // Flag tokens.
+  $types['flagcount'] = array(
+    'name' => t('Flags count'),
+    'description' => t('Tokens related to flag count (heartbeat_like) module.'),
+  );
+  $tokens['flagcount']['count'] = array(
+    'name' => t('Count'),
+    'description' => t('Number of times the flag has been flagged.'),
+    'needs-data' => 'flag',
+  );
+
+  return array(
+    'types' => $types,
+    'tokens' => $tokens,
+  );
+}
+
+ /**
+  * Implements hook_tokens().
+  */
+function heartbeat_like_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
+  $replacements = array();
+
+  if ($type == 'flagcount') {
+    foreach ($tokens as $name => $original) {
+      // Find the desired token by name
+      switch ($name) {
+        case 'count':
+
+          if (isset($data['flag_id']) && isset($data['entity_id'])) {
+
+            // Query the db for the count associated with this entity.
+            $query = \Drupal::database()->select('flag_counts', 'fc');
+            $query->fields('fc', ['count']);
+            $query->condition('fc.flag_id', $data['flag_id']);
+            $query->condition('fc.entity_id', $data['entity_id']);
+            $count_db = $query->execute()->fetchAssoc();
+
+            if (!isset($count_db['count'])) {
+              $count_db['count'] = 0;
+            }
+
+            $replacements[$original] = $count_db['count'];
+          }
+
+          break;
+      }
+    }
+  }
+
+  // Return the replacements.
+  return $replacements;
+}

modules/heartbeat_like/config/install/flag.flag.heartbeat_like.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - heartbeat
+id: heartbeat_like
+label: Heartbeat Like
+entity_type: heartbeat
+global: false
+weight: 0
+flag_short: 'Praise ([flagcount:count])'
+flag_long: ''
+flag_message: ''
+unflag_short: 'Reee ([flagcount:count])'
+unflag_long: ''
+unflag_message: ''
+unflag_denied_text: ''
+flag_type: 'entity:heartbeat'
+link_type: ajax_link
+flagTypeConfig:
+  show_in_links: {  }
+  show_as_field: true
+  show_on_form: false
+  show_contextual_link: false
+  access_author: ''
+linkTypeConfig: {  }

modules/heartbeat_like/heartbeat_like.info.yml

@@ -0,0 +1,11 @@
+name : Heartbeat Like
+type: module
+description : "Allows you to like Heartbeats"
+dependencies:
+  - flag
+  - token
+  - heartbeat
+  - statusmessage
+
+core: 8.x
+project: Heartbeat

modules/heartbeat_like/heartbeat_like.module

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ * Tokenize the flag link strings.
+ */
+function heartbeat_like_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+
+  if ($form_id == 'flag_add_form' || $form_id == 'flag_edit_form')  {
+
+    // Setup for the "Browse available tokens" link.
+    $browse_array = array(
+      '#theme' => 'token_tree_link',
+      '#token_types' => array('heartbeat_like'),
+    );
+
+    // Validation options to add to form elements.
+    $token_options = array(
+      '#element_validate' => array('token_element_validate'),
+      '#token_types' => array(),
+      '#min_tokens' => 1,
+      '#max_tokens' => 10,
+    );
+
+    // Let admin know that this field is now tokenized.
+    $form['messages']['flag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Like [flagcount:count]")');
+    $form['messages']['flag_short']['#suffix'] = render($browse_array);
+    $form['messages']['flag_short'] += $token_options;
+
+    $form['messages']['unflag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Unlike [flagcount:count]")');
+    $form['messages']['unflag_short']['#suffix'] = render($browse_array);
+    $form['messages']['unflag_short'] += $token_options;
+  }
+
+}
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function heartbeat_like_preprocess_flag(&$variables) {
+
+  // Replace the link title with any tokens.
+  $token = Drupal::token();
+  $variables['title'] = $token->replace($variables['title'], array(
+    'flag_id' => $variables['flag']->id(),
+    'entity_id' => $variables['flaggable']->id(),
+  ));
+}

modules/heartbeat_like/heartbeat_like.tokens.inc

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @file
+ * Token for heartbeat_like.
+ */
+
+use Drupal\Core\Render\BubbleableMetadata;
+
+/**
+ * Implements hook_token_info().
+ */
+function heartbeat_like_token_info() {
+
+  $types = array();
+  $tokens = array();
+
+  // Flag tokens.
+  $types['flagcount'] = array(
+    'name' => t('Flags count'),
+    'description' => t('Tokens related to flag count (heartbeat_like) module.'),
+  );
+  $tokens['flagcount']['count'] = array(
+    'name' => t('Count'),
+    'description' => t('Number of times the flag has been flagged.'),
+    'needs-data' => 'flag',
+  );
+
+  return array(
+    'types' => $types,
+    'tokens' => $tokens,
+  );
+}
+
+ /**
+  * Implements hook_tokens().
+  */
+function heartbeat_like_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
+  $replacements = array();
+
+  if ($type == 'flagcount') {
+    foreach ($tokens as $name => $original) {
+      // Find the desired token by name
+      switch ($name) {
+        case 'count':
+
+          if (isset($data['flag_id']) && isset($data['entity_id'])) {
+
+            // Query the db for the count associated with this entity.
+            $query = \Drupal::database()->select('flag_counts', 'fc');
+            $query->fields('fc', ['count']);
+            $query->condition('fc.flag_id', $data['flag_id']);
+            $query->condition('fc.entity_id', $data['entity_id']);
+            $count_db = $query->execute()->fetchAssoc();
+
+            if (!isset($count_db['count'])) {
+//              unset ($replacements[$original]);
+              $replacements[$original] = "99";
+              continue 2;
+            } else {
+
+              $replacements[$original] = $count_db['count'];
+            }
+          }
+
+          break;
+      }
+    }
+  }
+
+  // Return the replacements.
+  return $replacements;
+}
+
+/**
+ * Implements hook_tokens_alter().
+ * @param array $replacements
+ * @param array $context
+ * @param BubbleableMetadata $bubbleable_metadata
+ */
+function heartbeat_like_tokens_alter(array &$replacements, array $context, \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata) {
+
+  foreach ($replacements as $key => $replacement) {
+    if ($key === '[flagcount:count]' && $replacement == 0) {
+      $replacements[$key] = "";
+    }
+  }
+}

modules/heartbeat_like_comment/config/install/flag.flag.heartbeat_like_comment.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - heartbeat
+id: heartbeat_like_comment
+label: Heartbeat Like Comment
+entity_type: comment
+global: false
+weight: 0
+flag_short: 'Praise ([flagcount:count])'
+flag_long: ''
+flag_message: ''
+unflag_short: 'Reee ([flagcount:count])'
+unflag_long: ''
+unflag_message: ''
+unflag_denied_text: ''
+flag_type: 'entity:comment'
+link_type: ajax_link
+flagTypeConfig:
+  show_in_links: {  }
+  show_as_field: true
+  show_on_form: false
+  show_contextual_link: false
+  access_author: ''
+linkTypeConfig: {  }

modules/heartbeat_like_comment/heartbeat_like_comment.info.yml

@@ -0,0 +1,11 @@
+name : Heartbeat Like Comment
+type: module
+description : "Allows you to like Heartbeat Comments"
+dependencies:
+  - flag
+  - token
+  - heartbeat
+  - statusmessage
+
+core: '8.x'
+project: 'Heartbeat'

modules/heartbeat_like_comment/heartbeat_like_comment.module

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ * Tokenize the flag link strings.
+ */
+function heartbeat_like_comment_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+
+  if ($form_id == 'flag_add_form' || $form_id == 'flag_edit_form')  {
+
+    // Setup for the "Browse available tokens" link.
+    $browse_array = array(
+      '#theme' => 'token_tree_link',
+      '#token_types' => array('heartbeat_like_comment'),
+    );
+
+    // Validation options to add to form elements.
+    $token_options = array(
+      '#element_validate' => array('token_element_validate'),
+      '#token_types' => array(),
+      '#min_tokens' => 1,
+      '#max_tokens' => 10,
+    );
+
+    // Let admin know that this field is now tokenized.
+    $form['messages']['flag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Like [flagcount:count]")');
+    $form['messages']['flag_short']['#suffix'] = render($browse_array);
+    $form['messages']['flag_short'] += $token_options;
+
+    $form['messages']['unflag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Unlike [flagcount:count]")');
+    $form['messages']['unflag_short']['#suffix'] = render($browse_array);
+    $form['messages']['unflag_short'] += $token_options;
+  }
+
+}
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function heartbeat_like_comment_preprocess_flag(&$variables) {
+
+  // Replace the link title with any tokens.
+  $token = Drupal::token();
+  $variables['title'] = $token->replace($variables['title'], array(
+    'flag_id' => $variables['flag']->id(),
+    'entity_id' => $variables['flaggable']->id(),
+  ));
+}

modules/heartbeat_like_comment/heartbeat_like_comment.tokens.inc

@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Token for heartbeat_like.
+ */
+
+use Drupal\Core\Render\BubbleableMetadata;
+
+/**
+ * Implements hook_token_info().
+ */
+function heartbeat_like_comment_token_info() {
+
+  $types = array();
+  $tokens = array();
+
+  // Flag tokens.
+  $types['flagcount'] = array(
+    'name' => t('Flags count'),
+    'description' => t('Tokens related to flag count (heartbeat_like_comment) module.'),
+  );
+  $tokens['flagcount']['count'] = array(
+    'name' => t('Count'),
+    'description' => t('Number of times the flag has been flagged.'),
+    'needs-data' => 'flag',
+  );
+
+  return array(
+    'types' => $types,
+    'tokens' => $tokens,
+  );
+}
+
+ /**
+  * Implements hook_tokens().
+  */
+function heartbeat_like_comment_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
+  $replacements = array();
+
+  if ($type == 'flagcount') {
+    foreach ($tokens as $name => $original) {
+      // Find the desired token by name
+      switch ($name) {
+        case 'count':
+
+          if (isset($data['flag_id']) && isset($data['entity_id'])) {
+
+            // Query the db for the count associated with this entity.
+            $query = \Drupal::database()->select('flag_counts', 'fc');
+            $query->fields('fc', ['count']);
+            $query->condition('fc.flag_id', $data['flag_id']);
+            $query->condition('fc.entity_id', $data['entity_id']);
+            $count_db = $query->execute()->fetchAssoc();
+
+            if (!isset($count_db['count'])) {
+              $count_db['count'] = 0;
+            }
+
+            $replacements[$original] = $count_db['count'];
+          }
+
+          break;
+      }
+    }
+  }
+
+  // Return the replacements.
+  return $replacements;
+}

modules/heartbeat_unlike/config/install/flag.flag.unlike.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - heartbeat
+id: heartbeat_unlike
+label: Unlike
+entity_type: heartbeat
+global: false
+weight: 0
+flag_short: 'Unlike ([flagcount:count])'
+flag_long: ''
+flag_message: ''
+unflag_short: 'Truce ([flagcount:count])'
+unflag_long: ''
+unflag_message: ''
+unflag_denied_text: ''
+flag_type: 'entity:heartbeat'
+link_type: ajax_link
+flagTypeConfig:
+  show_in_links: {  }
+  show_as_field: true
+  show_on_form: false
+  show_contextual_link: false
+  access_author: ''
+linkTypeConfig: {  }

modules/heartbeat_unlike/heartbeat_unlike.info.yml

@@ -0,0 +1,11 @@
+name : Heartbeat Unlike Flag
+type: module
+description : "A flag to express dislike for a posted Heartbeat"
+dependencies:
+  - flag
+  - token
+  - heartbeat
+  - statusmessage
+
+core: 8.x
+project: Heartbeat

modules/heartbeat_unlike/heartbeat_unlike.module

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ * Tokenize the flag link strings.
+ */
+function heatbeat_unlike_flag_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+
+  if ($form_id == 'flag_add_form' || $form_id == 'flag_edit_form')  {
+
+    // Setup for the "Browse available tokens" link.
+    $browse_array = array(
+      '#theme' => 'token_tree_link',
+      '#token_types' => array('heatbeat_unlike_flag'),
+    );
+
+    // Validation options to add to form elements.
+    $token_options = array(
+      '#element_validate' => array('token_element_validate'),
+      '#token_types' => array(),
+      '#min_tokens' => 1,
+      '#max_tokens' => 10,
+    );
+
+    // Let admin know that this field is now tokenized.
+    $form['messages']['flag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Heatbeat_unlike [flagcount:count]")');
+    $form['messages']['flag_short']['#suffix'] = render($browse_array);
+    $form['messages']['flag_short'] += $token_options;
+
+    $form['messages']['unflag_short']['#description'] .= '<br />' . t('This field supports tokens (try: "Truce [flagcount:count]")');
+    $form['messages']['unflag_short']['#suffix'] = render($browse_array);
+    $form['messages']['unflag_short'] += $token_options;
+  }
+
+}
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function heatbeat_unlike_flag_preprocess_flag(&$variables) {
+
+  // Replace the link title with any tokens.
+  $token = Drupal::token();
+  $variables['title'] = $token->replace($variables['title'], array(
+    'flag_id' => $variables['flag']->id(),
+    'entity_id' => $variables['flaggable']->id(),
+  ));
+}

modules/heartbeat_unlike/heartbeat_unlike.tokens.inc

@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Token for heatbeat_unlike_flag.
+ */
+
+use Drupal\Core\Render\BubbleableMetadata;
+
+/**
+ * Implements hook_token_info().
+ */
+function heatbeat_unlike_flag_token_info() {
+
+  $types = array();
+  $tokens = array();
+
+  // Flag tokens.
+  $types['flagcount'] = array(
+    'name' => t('Flags count'),
+    'description' => t('Tokens related to flag count (heatbeat_unlike_flag) module.'),
+  );
+  $tokens['flagcount']['count'] = array(
+    'name' => t('Count'),
+    'description' => t('Number of times the flag has been flagged.'),
+    'needs-data' => 'flag',
+  );
+
+  return array(
+    'types' => $types,
+    'tokens' => $tokens,
+  );
+}
+
+ /**
+  * Implements hook_tokens().
+  */
+function heatbeat_unlike_flag_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
+  $replacements = array();
+
+  if ($type == 'flagcount') {
+    foreach ($tokens as $name => $original) {
+      // Find the desired token by name
+      switch ($name) {
+        case 'count':
+
+          if (isset($data['flag_id']) && isset($data['entity_id'])) {
+
+            // Query the db for the count associated with this entity.
+            $query = \Drupal::database()->select('flag_counts', 'fc');
+            $query->fields('fc', ['count']);
+            $query->condition('fc.flag_id', $data['flag_id']);
+            $query->condition('fc.entity_id', $data['entity_id']);
+            $count_db = $query->execute()->fetchAssoc();
+
+            if (!isset($count_db['count'])) {
+              $count_db['count'] = 0;
+            }
+
+            $replacements[$original] = $count_db['count'];
+          }
+
+          break;
+      }
+    }
+  }
+
+  // Return the replacements.
+  return $replacements;
+}

modules/statusmessage

@@ -0,0 +1 @@
+Subproject commit bc4a6d59369a74a463ddc472fc0b501fdfd202ae

src/Entity/Heartbeat.php

@@ -632,9 +632,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
       if (count($tid) > 0) {
         $term = Term::load(array_values($tid)[0]);
         $link = Link::fromTextAndUrl('#' . $realHashtag, $term->toUrl());
-        $lenComparison = strlen($hashtag) === strlen($realHashtag);
         $textToAddBack = $link->toString() . str_replace($realHashtag, '', $hashtag);
-
         $tagsArray[$i] = '<div class="heartbeat-hashtag">';
         $tagsArray[$i] .= !$lastRow ? $textToAddBack . ' </div>' : $textToAddBack . '</div>' . $remainder;
       }

src/EventSubscriber/HeartbeatEventSubscriber.php

@@ -6,9 +6,10 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Drupal\Core\Database\Database;
 use Drupal\flag\FlagService;
+use Drupal\flag\Entity\Flagging;
 use Drupal\user\Entity\User;
 use Drupal\heartbeat\Entity\Heartbeat;
-use Drupal\heartbeat\HeartbeatTypeServices;
+use Drupal\heartbeat\HeartbeatTypeService;
 use Drupal\heartbeat\HeartbeatStreamServices;
 use Drupal\heartbeat\HeartbeatService;
 
@@ -30,9 +31,9 @@ class HeartbeatEventSubscriber implements EventSubscriberInterface {
    */
   protected $flagService;
   /**
-   * Drupal\heartbeat\HeartbeatTypeServices definition.
+   * Drupal\heartbeat\HeartbeatTypeService definition.
    *
-   * @var \Drupal\heartbeat\HeartbeatTypeServices
+   * @var \Drupal\heartbeat\HeartbeatTypeService
    */
   protected $heartbeatTypeService;
   /**
@@ -51,7 +52,7 @@ class HeartbeatEventSubscriber implements EventSubscriberInterface {
   /**
    * Constructor.
    */
-  public function __construct(FlagService $flag, HeartbeatTypeServices $heartbeat_heartbeattype, HeartbeatStreamServices $heartbeatstream, HeartbeatService $heartbeat) {
+  public function __construct(FlagService $flag, HeartbeatTypeService $heartbeat_heartbeattype, HeartbeatStreamServices $heartbeatstream, HeartbeatService $heartbeat) {
     $this->flagService = $flag;
     $this->heartbeatTypeService = $heartbeat_heartbeattype;
     $this->heartbeatStreamService = $heartbeatstream;
@@ -79,82 +80,96 @@ class HeartbeatEventSubscriber implements EventSubscriberInterface {
     $friendStatus = NOT_FRIEND;
     $flagging = $event->getFlagging();
 
-    if ($flagging->getFlagId() === 'friendship') {
-      $entity = $this->flagService->getFlagById($flagging->getFlagId());
+    if ($flagging instanceof Flagging) {
 
-      $user = $flagging->getOwner();
+      $flagId = $flagging->getFlagId();
 
-      if ($entity->id() && $user->isAuthenticated()) {
+      if ($flagId === 'friendship') {
+        $entity = $this->flagService->getFlagById($flagging->getFlagId());
 
-        $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
-        $tokenService = \Drupal::service('token');
+        $user = $flagging->getOwner();
 
-        foreach ($heartbeatTypeService->getTypes() as $type) {
+        if ($entity->id() && $user->isAuthenticated()) {
 
-          $heartbeatTypeEntity = $heartbeatTypeService->load($type);
+          $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
+          $tokenService = \Drupal::service('token');
 
-          if ($heartbeatTypeEntity->getMainEntity() === "flagging") {
+          foreach ($heartbeatTypeService->getTypes() as $type) {
 
-            $arguments = json_decode($heartbeatTypeEntity->getArguments());
-            $user2 = User::load($flagging->getFlaggableId());
-            $targetUserFriendships = $this->flagService->getFlagFlaggings($entity, $user2);
+            $heartbeatTypeEntity = $heartbeatTypeService->load($type);
 
-            foreach ($targetUserFriendships as $friendship) {
-              if ($friendship->getFlaggableId() === $user->id()) {
-                $friendStatus = FRIEND;
-                break;
+            if ($heartbeatTypeEntity->getMainEntity() === "flagging") {
+
+              $arguments = json_decode($heartbeatTypeEntity->getArguments());
+              $user2 = User::load($flagging->getFlaggableId());
+              $targetUserFriendships = $this->flagService->getFlagFlaggings($entity, $user2);
+
+              foreach ($targetUserFriendships as $friendship) {
+                if ($friendship->getFlaggableId() === $user->id()) {
+                  $friendStatus = FRIEND;
+                  break;
+                }
               }
-            }
 
-            $friendStatus = $friendStatus == FRIEND ? FRIEND : PENDING;
+              $friendStatus = $friendStatus == FRIEND ? FRIEND : PENDING;
 
-            foreach ($arguments as $key => $argument) {
-              $variables[$key] = $argument;
-            }
+              foreach ($arguments as $key => $argument) {
+                $variables[$key] = $argument;
+              }
 
-            Heartbeat::updateFriendship($user->id(), $user2->id(), time(), $friendStatus);
+              Heartbeat::updateFriendship($user->id(), $user2->id(), time(), $friendStatus);
 
-            $preparsedMessageString = strtr($heartbeatTypeEntity->getMessage(), $variables);
-            $entitiesObj = new \stdClass();
-            $entitiesObj->type = 'user';
-            $entitiesObj->entities = [$user, $user2];
-            $entities = array(
-              'flagging' => $entity,
-              'user' => $entitiesObj,
-            );
+              $preparsedMessageString = strtr($heartbeatTypeEntity->getMessage(), $variables);
+              $entitiesObj = new \stdClass();
+              $entitiesObj->type = 'user';
+              $entitiesObj->entities = [$user, $user2];
+              $entities = array(
+                'flagging' => $entity,
+                'user' => $entitiesObj,
+              );
 
-            $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $entity->getEntityTypeId(), null);
+              $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $entity->getEntityTypeId(), null);
 
-            $heartbeatActivity = Heartbeat::create([
-              'type' => $heartbeatTypeEntity->id(),
-              'uid' => $user->id(),
-              'nid' => $entity->id(),
-              'name' => 'Dev Test',
-            ]);
+              $heartbeatActivity = Heartbeat::create([
+                'type' => $heartbeatTypeEntity->id(),
+                'uid' => $user->id(),
+                'nid' => $entity->id(),
+                'name' => 'Dev Test',
+              ]);
 
-            $heartbeatActivity->setMessage($heartbeatMessage);
-            $heartbeatActivity->save();
+              $heartbeatActivity->setMessage($heartbeatMessage);
+              $heartbeatActivity->save();
 
+            }
           }
         }
-      }
-      $friendships = Database::getConnection()->select("heartbeat_friendship", "hf")
-        ->fields('hf', array('status', 'uid', 'uid_target'))
-        ->execute();
-
-      $friendData = $friendships->fetchAll();
+        $friendships = Database::getConnection()->select("heartbeat_friendship", "hf")
+          ->fields('hf', array('status', 'uid', 'uid_target'))
+          ->execute();
 
-      $friendConfig = \Drupal::configFactory()->getEditable('heartbeat_friendship.settings');
+        $friendData = $friendships->fetchAll();
 
-      $friendConfig->set('data', json_encode($friendData))->save();
-    }
-    if ($flagging->getFlagId() === 'heartbeat_like') {
-
-    }
-    if ($flagging->getFlagId() === 'jihad_flag') {
+        $friendConfig = \Drupal::configFactory()->getEditable('heartbeat_friendship.settings');
 
+        $friendConfig->set('data', json_encode($friendData))->save();
+      }
+//      if ($flagging->getFlaggableType() === 'heartbeat') {
+//        $oppositeFlag = null;
+//        if ($flagging->getFlagId() === 'heartbeat_like') {
+//          $oppositeFlag = $this->flagService->getFlagById('heartbeat_unlike');
+//        } elseif ($flagging->getFlagId() === 'heartbeat_unlike') {
+//          $oppositeFlag = $this->flagService->getFlagById('heartbeat_unlike');
+//        }
+//        if ($oppositeFlag) {
+//          $entity = $flagging->getFlaggable();
+//          $user = \Drupal::currentUser()->getAccount();
+//          $oppositeFlagging = $this->flagService->getFlagging($oppositeFlag, $entity, $user);
+//          if ($oppositeFlagging) {
+//            $this->flagService->unflag($oppositeFlag, $entity, $user);
+//          }
+//        }
+//      }
     }
-
   }
 
   /**

src/HeartbeatAltServices.php

@@ -5,7 +5,7 @@ use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\EntityTypeRepository;
-use Drupal\heartbeat\HeartbeatTypeServices;
+use Drupal\heartbeat\HeartbeatTypeService;
 
 /**
  * Class HeartbeatAltServices.
@@ -39,15 +39,15 @@ class HeartbeatAltServices {
 //   */
 //  protected $;
 //  /**
-//   * Drupal\heartbeat\HeartbeatTypeServices definition.
+//   * Drupal\heartbeat\HeartbeatTypeService definition.
 //   *
-//   * @var \Drupal\heartbeat\HeartbeatTypeServices
+//   * @var \Drupal\heartbeat\HeartbeatTypeService
 //   */
 //  protected $;
 //  /**
 //   * Constructor.
 //   */
-//  public function __construct(QueryFactory $entity_query, EntityManager $entity_manager, EntityTypeManager $entity_type_manager, EntityTypeRepository $entity_type_repository, HeartbeatTypeServices $heartbeat_heartbeattype) {
+//  public function __construct(QueryFactory $entity_query, EntityManager $entity_manager, EntityTypeManager $entity_type_manager, EntityTypeRepository $entity_type_repository, HeartbeatTypeService $heartbeat_heartbeattype) {
 //    $this-> = $entity_query;
 //    $this-> = $entity_manager;
 //    $this-> = $entity_type_manager;

src/HeartbeatService.php

@@ -52,5 +52,21 @@ class HeartbeatService {
   public function loadByTypes($types) {
     return $this->entityTypeManager->getStorage("heartbeat")->loadMultiple($this->entityQuery->get('heartbeat')->condition('type', $types, 'IN')->sort('created', 'DESC')->execute());
   }
+
+  public function loadByNid($nid) {
+    return $this->entityTypeManager->getStorage('heartbeat')->load($this->entityQuery->get('heartbeat')->condition('nid', $nid)->sort('created', 'DESC')->execute());
+  }
+
+  public function loadByUid($uid) {
+    $hid = $this->entityQuery->get('heartbeat')
+      ->condition('uid', $uid)
+      ->condition('status', 1)
+      ->sort('created', 'DESC')
+      ->range(0,1)
+
+      ->execute();
+
+    return $this->entityTypeManager->getStorage('heartbeat')->load(array_values($hid)[0]);
+  }
 }
 

src/HeartbeatStreamServices.php

@@ -290,8 +290,8 @@ class HeartbeatStreamServices {
       )
     );
     $hids = array();
-    foreach ($query->fetchAllKeyed() as $id => $row) {
-      $hids[] = $id;
+    foreach ($query->fetchAll() as $id) {
+      $hids[] = $id->id;
     }
 
     if (!empty($hids)) {

src/HeartbeatTypeService.php

@@ -8,11 +8,11 @@ use Drupal\Core\Entity\EntityTypeBundleInfo;
 use Drupal\Core\Entity\Query\QueryFactory;
 
 /**
- * Class HeartbeatTypeServices.
+ * Class HeartbeatTypeService.
  *
  * @package Drupal\heartbeat
  */
-class HeartbeatTypeServices {
+class HeartbeatTypeService {
 
   /**
    * Drupal\Core\Entity\EntityTypeManager definition.

src/Plugin/Block/HeartbeatBlock.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\heartbeat\Plugin\Block;
 
+use Drupal\Core\Render\Renderer;
 use Drupal\heartbeat\Entity\Heartbeat;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Config\ConfigFactory;
@@ -316,9 +317,67 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
         'comments' => array_reverse($comments),
         'commentCount' => $commentCount > 0 ? $commentCount : '',
         'likeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_like', $heartbeat, $this->flagService),
-        'unlikeFlag' => Heartbeat::flagAjaxBuilder('jihad_flag', $heartbeat, $this->flagService)
+        'unlikeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_unlike', $heartbeat, $this->flagService)
         );
     }
+
+    public static function renderOneHeartbeat(Heartbeat $heartbeat) {
+        $timeago = 'Just now';
+
+        $user = $heartbeat->getOwner();
+        $userView = user_view($user, 'compact');
+        $userPic = $user->get('user_picture')->getValue();
+
+        if (!empty($userPic)) {
+          $profilePic = $userPic[0]['target_id'];
+        }
+
+        if (NULL === $profilePic) {
+          $profilePic = 86;
+        }
+
+        $pic = File::load($profilePic);
+
+        if ($pic !== NULL) {
+          $style = \Drupal::entityTypeManager()->getStorage('image_style')
+            ->load('thumbnail');
+          $rendered = $style->buildUrl($pic->getFileUri());
+        }
+
+        $flagService = \Drupal::service('flag');
+        $form = \Drupal::service('form_builder')->getForm('\Drupal\heartbeat\Form\HeartbeatCommentForm', $heartbeat);
+
+        return '<div class="heartbeat-message" id="heartbeat-' . $heartbeat->id() . '">
+      <div class="heartbeat-message-wrap">
+        <div class="heartbeat-owner">
+          <a href="/user/' . $user->id() . '"><img src="' . $rendered . '" />
+            ' . $user->getAccountName() . '
+          </a>
+          ' . \Drupal::service('renderer')->render($userView)->__toString() . '
+          <div class="time-ago"> . ' . $timeago . '</div>
+        </div>
+        <div class="heartbeat-content hid-' . $heartbeat->id() . '">
+        ' . $heartbeat->getMessage()->getValue()[0]['value'] . '
+        </div>
+      </div>
+      <div class="heartbeat-interaction-wrap">
+        <div class="heartbeat-like">
+           ' . \Drupal::service('renderer')->renderplain(Heartbeat::flagAjaxBuilder('heartbeat_like', $heartbeat, $flagService))->__toString() . '
+        </div>
+        <div class="heartbeat-unlike">
+          ' . \Drupal::service('renderer')->renderplain(Heartbeat::flagAjaxBuilder('heartbeat_unlike', $heartbeat, $flagService))->__toString() . '
+        </div>
+        <div class="heartbeat-comment-button">
+          Comment
+        </div>
+        <div class="heartbeat-comment" id="comment-' . $heartbeat->id() . '">
+        ' . \Drupal::service('renderer')->renderplain($form)->__toString() . '
+        <div class="heartbeat-comments"></div>
+        </div>
+      </div>
+    </div>';
+    }
+
 }
 
 

src/Plugin/Block/HeartbeatHashBlock.php

@@ -303,7 +303,7 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
       'comments' => array_reverse($comments),
       'commentCount' => $commentCount > 0 ? $commentCount : '',
       'likeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_like', $heartbeat, $this->flagService),
-      'unlikeFlag' => Heartbeat::flagAjaxBuilder('jihad_flag', $heartbeat, $this->flagService)
+      'unlikeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_unlike', $heartbeat, $this->flagService)
     );
   }
 }

src/Plugin/Block/HeartbeatMoreBlock.php

@@ -299,7 +299,7 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
       'comments' => array_reverse($comments),
       'commentCount' => $commentCount > 0 ? $commentCount : '',
       'likeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_like', $heartbeat, $this->flagService),
-      'unlikeFlag' => Heartbeat::flagAjaxBuilder('jihad_flag', $heartbeat, $this->flagService)
+      'unlikeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_unlike', $heartbeat, $this->flagService)
     );
   }
 }

src/Plugin/Block/HeartbeatUsernameBlock.php

@@ -305,7 +305,7 @@ class HeartbeatUsernameBlock extends BlockBase implements ContainerFactoryPlugin
       'comments' => array_reverse($comments),
       'commentCount' => $commentCount > 0 ? $commentCount : '',
       'likeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_like', $heartbeat, $this->flagService),
-      'unlikeFlag' => Heartbeat::flagAjaxBuilder('jihad_flag', $heartbeat, $this->flagService)
+      'unlikeFlag' => Heartbeat::flagAjaxBuilder('heartbeat_unlike', $heartbeat, $this->flagService)
     );
   }
 }

src/Plugin/Derivative/HeartbeatBlockDeriver.php

@@ -6,7 +6,7 @@ use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\heartbeat\HeartbeatTypeServices;
+use Drupal\heartbeat\HeartbeatTypeService;
 use Drupal\heartbeat\HeartbeatStreamServices;
 use Drupal\heartbeat\HeartbeatService;
 
@@ -17,9 +17,9 @@ use Drupal\heartbeat\HeartbeatService;
 class HeartbeatBlockDeriver extends DeriverBase implements ContainerDeriverInterface {
 
   /**
-   * Drupal\heartbeat\HeartbeatTypeServices definition.
+   * Drupal\heartbeat\HeartbeatTypeService definition.
    *
-   * @var \Drupal\heartbeat\HeartbeatTypeServices
+   * @var \Drupal\heartbeat\HeartbeatTypeService
    */
   protected $heartbeatTypeService;
   /**
@@ -46,7 +46,7 @@ protected $heartbeatService;
    */
   public function __construct(
     $plugin_id,
-    HeartbeatTypeServices $heartbeat_heartbeattype,
+    HeartbeatTypeService $heartbeat_heartbeattype,
     HeartbeatStreamServices $heartbeatstream,
     HeartbeatService $heartbeat
   ) {