major update

css/heartbeat.css

@@ -78,14 +78,12 @@
 
 #cboxClose {
   position: absolute;
-  top: 5%;
-  right: 1%;
-  width: 56px;
-  height: 56px;
+  top: 16%;
+  right: 10%;
+  width: 65px;
+  height: 67px;
+  background: url(/themes/kekistan/images/icons/cross-circular-button-outline.png) no-repeat center center;
   color: transparent;
-  border-radius: 20px;
-  background-size: contain;
-  background: rgba(45, 45, 45, 0.5) url(/themes/kekistan/images/icons/close.png) no-repeat center center;
 }
 
 #cboxPrev:hover, #cboxNext:hover, #cboxClose:hover {

heartbeat.module

@@ -238,7 +238,7 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
             'type' => $heartbeatTypeEntity->id(),
             'uid' => $user->id(),
             'nid' => $entity->id(),
-            'name' => $entity->getTitle(),
+            'name' => $entity->getName(),
             'status' => !$bundleSaved ? 1 : 0,
           ]);
 
@@ -252,7 +252,7 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
       }
     }
   }
-  updateFeeds();
+//  updateFeeds();
 
 }
 

js/heartbeat.js

@@ -121,14 +121,14 @@
       let comment = comments[i];
       // console.dir(comment);
       comment.addEventListener('click', function() {
-        getParent(comment);
+          getParent(comment);
       })
     }
   }
 
   function getParent(node) {
     console.dir(node);
-    if (node.classList.contains('heartbeat-comment')) {
+    if (node != null && node != undefined && node.classList != undefined && node.classList.contains('heartbeat-comment')) {
       let id = node.id.substr(node.id.indexOf('-') + 1);
       $.ajax({
         type: 'POST',
@@ -137,7 +137,9 @@
         }
       });
     } else {
-      getParent(node.parentNode);
+      if (node != null && node.nodeName !== 'body') {
+        getParent(node.parentNode);
+      }
     }
   }
 

src/Controller/HeartbeatController.php

@@ -177,7 +177,7 @@ class HeartbeatController extends ControllerBase implements ContainerInjectionIn
 
 
   public function updateFeed($hid) {
-    $myConfig = \Drupal::service('config.factory')->getEditable('heartbeat_more.settings');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       $myConfig = \Drupal::service('config.factory')->getEditable('heartbeat_more.settings');
     $myConfig->set('hid', $hid)->save();
 
     return BlockViewBuilder::lazyBuilder('heartbeatmoreblock', 'full');

src/Controller/TestController.php

@@ -94,8 +94,9 @@ public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, Hear
    *   Return Hello string.
    */
   public function start($arg) {
+$jigga = 'what';
 
-    $stuff = '{"USERS": [{"1": {"email": "wortle@wortletjes.com", "name": "Dutchman", "id": 1, "status": 1, "created": 1500268689}}]}';
+    $stuff = file_get_contents('http://cointrx.com:6969/prices/latest');
 
     $decoded = \json_decode($stuff);
 
@@ -117,18 +118,36 @@ public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, Hear
       $heartbeats = array_reverse($heartbeats);
       foreach ($heartbeats as $heartbeat) {
 
-        $message = $heartbeat->getMessage();
-        $heartbeatActivity = Heartbeat::create([
-          'type' => $heartbeat->id(),
-          'uid' => $heartbeat->getOwnerId(),
-          'nid' => $heartbeat->getNid()->getValue()[0]['target_id'],
-          'name' => 'Dev Test',
-          'type' => $heartbeat->getType(),
-          'message' => $heartbeat->getMessage()->getValue()[0]['value']
-        ]);
-
-        if (!$heartbeatActivity->save()) {
-          $errors = true;
+        if ($heartbeat instanceof \Drupal\heartbeat\Entity\Heartbeat) {
+//          try {
+//            $heartbeat->save();
+//          } catch (\Exception $e) {
+//            $message = $e->getMessage();
+//          }
+//        }
+          $nid = $heartbeat->get('nid')->getValue()[0]['target_id'];
+          $title = 'Dev Test';
+          $type = $type = $this->heartbeat_heartbeattype->load($heartbeat->get('type')->getValue()[0]['target_id']);
+
+          if ($type->get('mainentity') == 'node') {
+            $node = $this->entityTypeManager()->getStorage('node')->load($nid);
+            if ($node !== null) {
+              $title = $node->getTitle();
+            }
+          }
+
+
+          $heartbeatActivity = Heartbeat::create([
+            'uid' => $heartbeat->getOwnerId(),
+            'nid' => $heartbeat->getNid()->getValue()[0]['target_id'],
+            'name' => $title,
+            'type' => $heartbeat->getType(),
+            'message' => $heartbeat->getMessage()->getValue()[0]['value']
+          ]);
+
+          if (!$heartbeatActivity->save()) {
+            $errors = true;
+          }
         }
       }
     }
@@ -147,6 +166,11 @@ public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, Hear
       $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
       $heartbeat->delete();
     }
+
+    return [
+      '#type' => 'markup',
+      '#markup' => $this->t('Deleting them Heartbeats')
+    ];
   }
 
 }

src/Entity/Heartbeat.php

@@ -11,6 +11,7 @@ use Drupal\Core\Utility\Token;
 use Drupal\Core\Url;
 use Drupal\Core\Link;
 use Drupal\Core\Database\Database;
+use Drupal\flag\FlagService;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\user\Entity\User;
 use Drupal\user\UserInterface;
@@ -319,7 +320,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
       ->setDescription(t('The name of the Heartbeat entity.'))
       ->setRevisionable(TRUE)
       ->setSettings(array(
-        'max_length' => 50,
+        'max_length' => 128,
         'text_processing' => 0,
       ))
       ->setDefaultValue('')
@@ -827,6 +828,19 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
     return $message;
   }
 
+
+  public static function flagAjaxMarkup($flagId, $entity, FlagService $flagService) {
+    $flag = $flagService->getFlagById($flagId);
+    $link = $flag->getLinkTypePlugin()->getAsLink($flag, $entity);
+    $options = $link->getUrl()->getOptions();
+    $options['query']['destination'] = 'node';
+    $link->getUrl()->setOptions($options);
+    $action = $flag->getLinkTypePlugin()->getAsFlagLink($flag, $entity)['#action'];
+    $url = $link->getUrl()->toString();
+
+    return '<div class="flag flag-' . $flagId . '  flag-' . $flagId . '-' . $entity->id() . ' action-' . $action. '"><a href="' . $url . '" class="use-ajax" rel="nofollow"></a></div>';
+  }
+
   /**
    * Updates the friendship status of these two users
    *

src/Form/HeartbeatCommentForm.php

@@ -37,7 +37,7 @@ class HeartbeatCommentForm extends FormBase {
     $form['post'] = array(
       '#type' => 'submit',
       '#description' => 'Comment',
-      '#value' => t('Comment'),
+      '#value' => t('Submit'),
       '#ajax' => [
         'callback' => '::commentAjaxSubmit',
         'progress' => array(
@@ -59,28 +59,28 @@ class HeartbeatCommentForm extends FormBase {
       $commentBody = $form_state->getValue('comment_body');
       $config = \Drupal::config('heartbeat_comment.settings');
 
-
-      $comment = Comment::create([
-        'entity_type' => 'heartbeat',
-        'entity_id' => $config->get('entity_id'),
-        'field_name' => 'comment',
-        'comment_body' => $commentBody,
-        'comment_type' => 'comment',
-        'subject' => 'Heartbeat Comment',
-        'uid' => \Drupal::currentUser()->id(),
-      ]);
-
-      if ($comment->save()) {
-$userview= user_view($comment->getOwner(), 'comment');
-$cid = $comment->id();
-$body = $commentBody;
-        $response = new AjaxResponse();
-        $response->addCommand(new AppendCommand(
-          '#heartbeat-' . $config->get('entity_id') . ' .heartbeat-comments',
-          '<div id="heartbeat-comment-' . $comment->id() . '"><span class="comment-owner"><span class="comment-username">' . \Drupal::currentUser()->getAccountName() . '</span>' . render($userview) . '<span class"comment-ago">1 sec ago</span></span><span class="comment-body">' . $commentBody . '</span><span class="sub-comment"><a href="/heartbeat/subcommentrequest/' . $cid . '" class="button button-action use-ajax">Reply</a></span></div>')
-        );
-
-        return $response;
+      if (strlen(trim($commentBody)) > 1) {
+        $comment = Comment::create([
+          'entity_type' => 'heartbeat',
+          'entity_id' => $config->get('entity_id'),
+          'field_name' => 'comment',
+          'comment_body' => $commentBody,
+          'comment_type' => 'comment',
+          'subject' => 'Heartbeat Comment',
+          'uid' => \Drupal::currentUser()->id(),
+        ]);
+
+        if ($comment->save()) {
+          $userview = user_view($comment->getOwner(), 'comment');
+          $cid = $comment->id();
+          $body = $commentBody;
+          $response = new AjaxResponse();
+          $response->addCommand(new AppendCommand(
+              '#heartbeat-' . $config->get('entity_id') . ' .heartbeat-comments',
+              '<div id="heartbeat-comment-' . $comment->id() . '"><span class="comment-owner"><span class="comment-username">' . \Drupal::currentUser()->getAccountName() . '</span>' . render($userview) . '<span class"comment-ago">1 sec ago</span></span><span class="comment-body">' . $commentBody . '</span><span class="sub-comment"><a href="/heartbeat/subcommentrequest/' . $cid . '" class="button button-action use-ajax">Reply</a></span></div>')
+          );
+          return $response;
+        }
       }
     }
     return null;

src/Form/HeartbeatSubCommentForm.php

@@ -56,28 +56,28 @@ class HeartbeatSubCommentForm extends FormBase {
       $commentBody = $form_state->getValue('comment_body');
       $config = \Drupal::config('heartbeat_comment.settings');
 
-
-      $comment = Comment::create([
-        'entity_type' => 'comment',
-        'entity_id' => $config->get('cid'),
-        'pid' => $config->get('cid'),
-        'field_name' => 'comment',
-        'comment_body' => $commentBody,
-        'comment_type' => 'comment',
-        'subject' => 'Heartbeat Comment',
-        'uid' => \Drupal::currentUser()->id(),
-      ]);
-
-      if ($comment->save()) {
-        $userview= user_view($comment->getOwner(), 'comment');
-
-        $response = new AjaxResponse();
-        $response->addCommand(new AppendCommand(
-          '#heartbeat-comment-' . $config->get('cid') . ' .sub-comment',
-          '<div class="heartbeat-subcomment" id="sub-comment-' . $comment->id() . '"><span class="comment-owner"><span class="comment-username">' . \Drupal::currentUser()->getAccountName() . '</span>' . render($userview) . '<span class"comment-ago">1 sec ago</span></span><span class="comment-body">' . $commentBody . '</span><span class="sub-comment"><a href="/heartbeat/subcommentrequest/' . $cid . '" class="button button-action use-ajax">Reply</a></span></div>')
-        );
-
-        return $response;
+      if (strlen(trim($commentBody)) > 1) {
+        $comment = Comment::create([
+          'entity_type' => 'comment',
+          'entity_id' => $config->get('cid'),
+          'pid' => $config->get('cid'),
+          'field_name' => 'comment',
+          'comment_body' => $commentBody,
+          'comment_type' => 'comment',
+          'subject' => 'Heartbeat Comment',
+          'uid' => \Drupal::currentUser()->id(),
+        ]);
+
+        if ($comment->save()) {
+          $userview= user_view($comment->getOwner(), 'comment');
+
+          $response = new AjaxResponse();
+          $response->addCommand(new AppendCommand(
+              '#heartbeat-comment-' . $config->get('cid') . ' .sub-comment',
+              '<div class="heartbeat-subcomment" id="sub-comment-' . $comment->id() . '"><span class="comment-owner"><span class="comment-username">' . \Drupal::currentUser()->getAccountName() . '</span>' . render($userview) . '<span class"comment-ago">1 sec ago</span></span><span class="comment-body">' . $commentBody . '</span><span class="sub-comment"><a href="/heartbeat/subcommentrequest/' . $cid . '" class="button button-action use-ajax">Reply</a></span></div>')
+          );
+          return $response;
+        }
       }
     }
     return null;

src/Plugin/Block/HeartbeatBlock.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\heartbeat\Plugin\Block;
 
+use Drupal\heartbeat\Entity\Heartbeat;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Entity\EntityTypeManager;
@@ -189,13 +190,9 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
       }
 
       $user = $heartbeat->getOwner();
-//      $rendered = $this->entityTypeManager->getViewBuilder('user')->view($user, 'full');
       $userView = user_view($user, 'compact');
-//      $flag = $this->flagService->getFlagById("friendship");
-//      $flagLink = $flag->getLinkTypePlugin()->getAsLink($flag, $user);
-//      $flagUrl = $flagLink->getUrl()->toString();
-//      $flagText = $flagLink->getText();
       $userPic = $user->get('user_picture')->getValue();
+
       if (!empty($userPic)) {
         $profilePic = $user->get('user_picture')->getValue()[0]['target_id'];
       }
@@ -228,16 +225,6 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
         $commentLink['#attributes'] = array('class' => array('button', 'button-action', 'use-ajax'));
 
         $comment = Comment::load($cid);
-        $commentLike = $this->flagService->getFlagById('heartbeat_like_comment');
-        $commentLikeKey = 'flag_' . $commentLike->id();
-        $commentLikeData = [
-          '#lazy_builder' => ['flag.link_builder:build', [
-            $comment->getEntityTypeId(),
-            $comment->id(),
-            $commentLike->id(),
-          ]],
-          '#create_placeholder' => TRUE,
-        ];
 
         $commentOwner = user_view($comment->getOwner(), 'comment');
 
@@ -266,17 +253,6 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
                 break;
             }
 
-            $subCommentLike = $this->flagService->getFlagById('heartbeat_like_comment');
-            $subCommentLikeKey = 'flag_' . $subCommentLike->id();
-            $subCommentLikeData = [
-              '#lazy_builder' => ['flag.link_builder:build', [
-                $subComment->getEntityTypeId(),
-                $subComment->id(),
-                $subCommentLike->id(),
-              ]],
-              '#create_placeholder' => TRUE,
-            ];
-
             $subCommentOwner = user_view($subComment->getOwner(), 'comment');
             $subCommentTime = $this->timestamp - $subComment->getCreatedTime() < 172800 ? $this->dateFormatter->formatInterval(REQUEST_TIME - $subComment->getCreatedTime()) . ' ago': $this->dateFormatter->format($subComment->getCreatedTime(), 'heartbeat_medium');
             $subComments[] = [
@@ -285,7 +261,7 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
               'username' => $subComment->getAuthorName(),
               'owner' => $subCommentOwner,
               'timeAgo' => $subCommentTime,
-              'commentLike' => [$subCommentLikeKey => $subCommentLikeData],
+              'commentLike' => Heartbeat::flagAjaxMarkup('heartbeat_like_comment', $subComment, $this->flagService)
             ];
 
           }
@@ -311,7 +287,7 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
           'username' => $comment->getAuthorName(),
           'owner' => $commentOwner,
           'timeAgo' => $cTimeago,
-          'commentLike' => [$commentLikeKey => $commentLikeData],
+          'commentLike' => Heartbeat::flagAjaxMarkup('heartbeat_like_comment', $comment, $this->flagService),
           'reply' => $commentLink,
           'subComments' => $subComments
         ];
@@ -320,29 +296,6 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
 
       $form = \Drupal::service('form_builder')->getForm('\Drupal\heartbeat\Form\HeartbeatCommentForm', $heartbeat);
 
-      $likeFlag = $this->flagService->getFlagById('heartbeat_like');
-      $unlikeFlag = $this->flagService->getFlagById('jihad_flag');
-
-      $unlikeKey = 'flag_' . $unlikeFlag->id();
-      $unlikeData = [
-        '#lazy_builder' => ['flag.link_builder:build', [
-          $heartbeat->getEntityTypeId(),
-          $heartbeat->id(),
-          $unlikeFlag->id(),
-        ]],
-        '#create_placeholder' => TRUE,
-      ];
-
-      $likeKey = 'flag_' . $likeFlag->id();
-      $likeData = [
-        '#lazy_builder' => ['flag.link_builder:build', [
-          $heartbeat->getEntityTypeId(),
-          $heartbeat->id(),
-          $likeFlag->id(),
-        ]],
-        '#create_placeholder' => TRUE,
-      ];
-
       $messages[] = array('heartbeat' => $heartbeat->getMessage()->getValue()[0]['value'],
         'userPicture' => $rendered,
         'userId' => $user->id(),
@@ -352,8 +305,8 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
         'user' => $userView,
         'commentForm' => $form,
         'comments' => $comments,
-        'likeFlag' => [$likeKey => $likeData],
-        'unlikeFlag' => [$unlikeKey => $unlikeData]
+        'likeFlag' => Heartbeat::flagAjaxMarkup('heartbeat_like', $heartbeat, $this->flagService),
+        'unlikeFlag' => Heartbeat::flagAjaxMarkup('jihad_flag', $heartbeat, $this->flagService)
         );
     }
 }

src/Plugin/Block/HeartbeatHashBlock.php

@@ -9,6 +9,7 @@ use Drupal\Core\Form\FormBuilder;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\flag\FlagService;
+use Drupal\heartbeat\Entity\Heartbeat;
 use Drupal\User\Entity\User;
 use Drupal\Flag\Entity\Flag;
 use Drupal\Core\Datetime\DateFormatter;
@@ -185,13 +186,9 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
     }
 
     $user = $heartbeat->getOwner();
-//      $rendered = $this->entityTypeManager->getViewBuilder('user')->view($user, 'full');
     $userView = user_view($user, 'compact');
-//      $flag = $this->flagService->getFlagById("friendship");
-//      $flagLink = $flag->getLinkTypePlugin()->getAsLink($flag, $user);
-//      $flagUrl = $flagLink->getUrl()->toString();
-//      $flagText = $flagLink->getText();
     $userPic = $user->get('user_picture')->getValue();
+
     if (!empty($userPic)) {
       $profilePic = $user->get('user_picture')->getValue()[0]['target_id'];
     }
@@ -224,16 +221,6 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
       $commentLink['#attributes'] = array('class' => array('button', 'button-action', 'use-ajax'));
 
       $comment = Comment::load($cid);
-      $commentLike = $this->flagService->getFlagById('heartbeat_like_comment');
-      $commentLikeKey = 'flag_' . $commentLike->id();
-      $commentLikeData = [
-        '#lazy_builder' => ['flag.link_builder:build', [
-          $comment->getEntityTypeId(),
-          $comment->id(),
-          $commentLike->id(),
-        ]],
-        '#create_placeholder' => TRUE,
-      ];
 
       $commentOwner = user_view($comment->getOwner(), 'comment');
 
@@ -262,17 +249,6 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
               break;
           }
 
-          $subCommentLike = $this->flagService->getFlagById('heartbeat_like_comment');
-          $subCommentLikeKey = 'flag_' . $subCommentLike->id();
-          $subCommentLikeData = [
-            '#lazy_builder' => ['flag.link_builder:build', [
-              $subComment->getEntityTypeId(),
-              $subComment->id(),
-              $subCommentLike->id(),
-            ]],
-            '#create_placeholder' => TRUE,
-          ];
-
           $subCommentOwner = user_view($subComment->getOwner(), 'comment');
           $subCommentTime = $this->timestamp - $subComment->getCreatedTime() < 172800 ? $this->dateFormatter->formatInterval(REQUEST_TIME - $subComment->getCreatedTime()) . ' ago': $this->dateFormatter->format($subComment->getCreatedTime(), 'heartbeat_medium');
           $subComments[] = [
@@ -281,7 +257,7 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
             'username' => $subComment->getAuthorName(),
             'owner' => $subCommentOwner,
             'timeAgo' => $subCommentTime,
-            'commentLike' => [$subCommentLikeKey => $subCommentLikeData],
+            'commentLike' => Heartbeat::flagAjaxMarkup('heartbeat_like_comment', $subComment, $this->flagService)
           ];
 
         }
@@ -307,7 +283,7 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
         'username' => $comment->getAuthorName(),
         'owner' => $commentOwner,
         'timeAgo' => $cTimeago,
-        'commentLike' => [$commentLikeKey => $commentLikeData],
+        'commentLike' => Heartbeat::flagAjaxMarkup('heartbeat_like_comment', $comment, $this->flagService),
         'reply' => $commentLink,
         'subComments' => $subComments
       ];
@@ -316,29 +292,6 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
 
     $form = \Drupal::service('form_builder')->getForm('\Drupal\heartbeat\Form\HeartbeatCommentForm', $heartbeat);
 
-    $likeFlag = $this->flagService->getFlagById('heartbeat_like');
-    $unlikeFlag = $this->flagService->getFlagById('jihad_flag');
-
-    $unlikeKey = 'flag_' . $unlikeFlag->id();
-    $unlikeData = [
-      '#lazy_builder' => ['flag.link_builder:build', [
-        $heartbeat->getEntityTypeId(),
-        $heartbeat->id(),
-        $unlikeFlag->id(),
-      ]],
-      '#create_placeholder' => TRUE,
-    ];
-
-    $likeKey = 'flag_' . $likeFlag->id();
-    $likeData = [
-      '#lazy_builder' => ['flag.link_builder:build', [
-        $heartbeat->getEntityTypeId(),
-        $heartbeat->id(),
-        $likeFlag->id(),
-      ]],
-      '#create_placeholder' => TRUE,
-    ];
-
     $messages[] = array('heartbeat' => $heartbeat->getMessage()->getValue()[0]['value'],
       'userPicture' => $rendered,
       'userId' => $user->id(),
@@ -348,8 +301,8 @@ class HeartbeatHashBlock extends BlockBase implements ContainerFactoryPluginInte
       'user' => $userView,
       'commentForm' => $form,
       'comments' => $comments,
-      'likeFlag' => [$likeKey => $likeData],
-      'unlikeFlag' => [$unlikeKey => $unlikeData]
+      'likeFlag' => Heartbeat::flagAjaxMarkup('heartbeat_like', $heartbeat, $this->flagService),
+      'unlikeFlag' => Heartbeat::flagAjaxMarkup('jihad_flag', $heartbeat, $this->flagService)
     );
   }
 }

src/Plugin/Block/HeartbeatMoreBlock.php

@@ -9,6 +9,7 @@ use Drupal\Core\Form\FormBuilder;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\flag\FlagService;
+use Drupal\heartbeat\Entity\Heartbeat;
 use Drupal\User\Entity\User;
 use Drupal\Flag\Entity\Flag;
 use Drupal\Core\Datetime\DateFormatter;
@@ -180,13 +181,9 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
     }
 
     $user = $heartbeat->getOwner();
-//      $rendered = $this->entityTypeManager->getViewBuilder('user')->view($user, 'full');
     $userView = user_view($user, 'compact');
-//      $flag = $this->flagService->getFlagById("friendship");
-//      $flagLink = $flag->getLinkTypePlugin()->getAsLink($flag, $user);
-//      $flagUrl = $flagLink->getUrl()->toString();
-//      $flagText = $flagLink->getText();
     $userPic = $user->get('user_picture')->getValue();
+
     if (!empty($userPic)) {
       $profilePic = $user->get('user_picture')->getValue()[0]['target_id'];
     }
@@ -219,16 +216,6 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
       $commentLink['#attributes'] = array('class' => array('button', 'button-action', 'use-ajax'));
 
       $comment = Comment::load($cid);
-      $commentLike = $this->flagService->getFlagById('heartbeat_like_comment');
-      $commentLikeKey = 'flag_' . $commentLike->id();
-      $commentLikeData = [
-        '#lazy_builder' => ['flag.link_builder:build', [
-          $comment->getEntityTypeId(),
-          $comment->id(),
-          $commentLike->id(),
-        ]],
-        '#create_placeholder' => TRUE,
-      ];
 
       $commentOwner = user_view($comment->getOwner(), 'comment');
 
@@ -257,17 +244,6 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
               break;
           }
 
-          $subCommentLike = $this->flagService->getFlagById('heartbeat_like_comment');
-          $subCommentLikeKey = 'flag_' . $subCommentLike->id();
-          $subCommentLikeData = [
-            '#lazy_builder' => ['flag.link_builder:build', [
-              $subComment->getEntityTypeId(),
-              $subComment->id(),
-              $subCommentLike->id(),
-            ]],
-            '#create_placeholder' => TRUE,
-          ];
-
           $subCommentOwner = user_view($subComment->getOwner(), 'comment');
           $subCommentTime = $this->timestamp - $subComment->getCreatedTime() < 172800 ? $this->dateFormatter->formatInterval(REQUEST_TIME - $subComment->getCreatedTime()) . ' ago': $this->dateFormatter->format($subComment->getCreatedTime(), 'heartbeat_medium');
           $subComments[] = [
@@ -276,7 +252,7 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
             'username' => $subComment->getAuthorName(),
             'owner' => $subCommentOwner,
             'timeAgo' => $subCommentTime,
-            'commentLike' => [$subCommentLikeKey => $subCommentLikeData],
+            'commentLike' => Heartbeat::flagAjaxMarkup('heartbeat_like_comment', $subComment, $this->flagService)
           ];
 
         }
@@ -302,7 +278,7 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
         'username' => $comment->getAuthorName(),
         'owner' => $commentOwner,
         'timeAgo' => $cTimeago,
-        'commentLike' => [$commentLikeKey => $commentLikeData],
+        'commentLike' => Heartbeat::flagAjaxMarkup('heartbeat_like_comment', $comment, $this->flagService),
         'reply' => $commentLink,
         'subComments' => $subComments
       ];
@@ -311,29 +287,6 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
 
     $form = \Drupal::service('form_builder')->getForm('\Drupal\heartbeat\Form\HeartbeatCommentForm', $heartbeat);
 
-    $likeFlag = $this->flagService->getFlagById('heartbeat_like');
-    $unlikeFlag = $this->flagService->getFlagById('jihad_flag');
-
-    $unlikeKey = 'flag_' . $unlikeFlag->id();
-    $unlikeData = [
-      '#lazy_builder' => ['flag.link_builder:build', [
-        $heartbeat->getEntityTypeId(),
-        $heartbeat->id(),
-        $unlikeFlag->id(),
-      ]],
-      '#create_placeholder' => TRUE,
-    ];
-
-    $likeKey = 'flag_' . $likeFlag->id();
-    $likeData = [
-      '#lazy_builder' => ['flag.link_builder:build', [
-        $heartbeat->getEntityTypeId(),
-        $heartbeat->id(),
-        $likeFlag->id(),
-      ]],
-      '#create_placeholder' => TRUE,
-    ];
-//TODO move this method as a static method on Heartbeat entity
     $messages[] = array('heartbeat' => $heartbeat->getMessage()->getValue()[0]['value'],
       'userPicture' => $rendered,
       'userId' => $user->id(),
@@ -343,8 +296,8 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
       'user' => $userView,
       'commentForm' => $form,
       'comments' => $comments,
-      'likeFlag' => [$likeKey => $likeData],
-      'unlikeFlag' => [$unlikeKey => $unlikeData]
+      'likeFlag' => Heartbeat::flagAjaxMarkup('heartbeat_like', $heartbeat, $this->flagService),
+      'unlikeFlag' => Heartbeat::flagAjaxMarkup('jihad_flag', $heartbeat, $this->flagService)
     );
   }
 }