Latest and greatest

css/heartbeat.css

@@ -10,6 +10,7 @@
 
 .heartbeat-message img {
   display: block;
+  padding: 4px;
 }
 
 
@@ -27,6 +28,7 @@
 .cboxPhoto {
   max-height: 854px;
   width: auto!important;
+  height: auto!important;
   position: absolute;
   top:0;
   bottom: 0;
@@ -53,37 +55,41 @@
 }
 
 #cboxNext {
-  display: inline-block;
-  transform: translate(821%, 550%);
+  position: absolute;
+  right: 5px;
+  top: 45%;
   color: transparent;
-  background-image: url(/themes/kekistan/images/icons/forward.png);
-  background-repeat: no-repeat;
-  background-position: 10px 20px;
-  width: 45px;
-  height: 75px;
+  background: rgba(45, 45, 45, 0.5) url(/themes/kekistan/images/icons/forward.png) no-repeat 10px 10px;
+  background-size: 30px;
+  width: 10px;
+  height: 50px;
 }
 
 #cboxPrevious {
-  display: inline-block;
-  transform: translate(-800%, 550%);
+  position: absolute;
+  left: 5px;
+  top: 45%;
   color: transparent;
-  background-image: url(/themes/kekistan/images/icons/backward.png);
-  background-repeat: no-repeat;
-  background-position: 10px 21px;
-  width: 45px;
-  height: 75px;
+  background: rgba(45, 45, 45, 0.5) url(/themes/kekistan/images/icons/backward.png) no-repeat 10px 10px;
+  background-size: 30px;
+  width: 10px;
+  height: 50px;
 }
 
 #cboxClose {
   position: absolute;
-  top: 95px;
-  right: 100px;
+  top: 5%;
+  right: 1%;
+  width: 56px;
+  height: 56px;
   color: transparent;
-  background-image: url(/themes/kekistan/images/icons/close.png);
-  background-repeat: no-repeat;
-  background-size: 75%;
-  background-position: 6px 2px;
-  width: 45px;
+  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 {
+  opacity: 0.5;
 }
 
 /*Main Feed Form*/
@@ -150,10 +156,17 @@ Temporarily hiding all irrelevant content */
 #block-heartbeatblock #block-kekistan-breadcrumbs,
 #block-heartbeatblock #block-kekistan-page-title { display: none}
 
-.heartbeat-stream #content {
-  margin-left: 0;
+/*.heartbeat-stream #content {*/
+  /*margin-left: 0;*/
+/*}*/
+
+#block-heartbeatblock #content {
+  margin-left: 0!important;
+  width: 100%!important;
 }
 
+
+
 /*heartbeat-stream section.section {*/
   /*padding: 0;*/
 /*}*/

heartbeat.module

@@ -148,7 +148,7 @@ function heartbeat_entity_insert(EntityInterface $entity) {
                 'type' => $heartbeatTypeEntity->id(),
                 'uid' => $user->id(),
                 'nid' => $entity->id(),
-                'name' => 'Dev Test',
+                'name' => $entity->getTitle(),
                 'status' => !$bundleSaved ? 1 : 0,
               ]);
 
@@ -220,7 +220,7 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
             'type' => $heartbeatTypeEntity->id(),
             'uid' => $user->id(),
             'nid' => $entity->id(),
-            'name' => 'Dev Test',
+            'name' => $entity->getTitle(),
           ]);
 
           $heartbeatActivity->setMessage($heartbeatMessage);
@@ -238,7 +238,7 @@ function heartbeat_handle_entity($entity, $tokenService, $heartbeatTypeService,
             'type' => $heartbeatTypeEntity->id(),
             'uid' => $user->id(),
             'nid' => $entity->id(),
-            'name' => 'Dev Test',
+            'name' => $entity->getTitle(),
             'status' => !$bundleSaved ? 1 : 0,
           ]);
 

js/heartbeat.js

@@ -31,15 +31,11 @@
                 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;
@@ -79,7 +75,17 @@
                 }
               });
             }
-          }
+          };
+
+          let stream = document.querySelector('.heartbeat-stream');
+
+          let observer = new MutationObserver(function(mutations) {
+            listenImages();
+          });
+
+          let config = { attributes: true, childList: true, characterData: true };
+
+          observer.observe(stream, config);
         }
     };
 
@@ -165,7 +171,7 @@
 
   document.addEventListener("scroll", function (event) {
 
-    if (getDocHeight() == getScrollXY()[1] + window.innerHeight) {
+    if (drupalSettings.filterMode == false && (getScrollXY()[1] + window.innerHeight) / getDocHeight() > 0.99) {
 
       let streams = document.querySelectorAll('.heartbeat-stream');
       let stream = streams.length > 1 ? streams[streams.length - 1] : streams[0];
@@ -177,23 +183,28 @@
         if (lastHeartbeat !== null) {
 
           let hid = lastHeartbeat.id.substring(lastHeartbeat.id.indexOf('-') + 1);
-          $.ajax({
-            type: 'POST',
-            url: '/heartbeat/update_feed/' + hid,
-            success: function (response) {
-
-              feedBlock = document.getElementById('block-heartbeatblock');
-              insertNode = document.createElement('div');
-              insertNode.innerHTML = response;
-              feedBlock.appendChild(insertNode);
-            }
-          });
+          if (drupalSettings.lastHid !== hid) {
+
+            drupalSettings.lastHid = hid;
+
+            $.ajax({
+              type: 'POST',
+              url: '/heartbeat/update_feed/' + hid,
+              success: function (response) {
+
+                feedBlock = document.getElementById('block-heartbeatblock');
+                insertNode = document.createElement('div');
+                insertNode.innerHTML = response;
+                feedBlock.appendChild(insertNode);
+              }
+            });
+          }
         }
       }
     }
   });
 
-  $(document).bind('cbox_open', function() {
+  $(document).on('cbox_open', function() {
     $("#colorbox").swipe( {
       //Generic swipe handler for all directions
       swipeLeft:function(event, direction, distance, duration, fingerCount) {
@@ -203,21 +214,35 @@
         $.colorbox.next();
       },
       //Default is 75px, set to 0 for demo so any distance triggers swipe
-      threshold:0
-    });
-    let cboxClose = document.getElementById('cboxClose');
-    cboxClose.addEventListener('click', function() {
-      jQuery.colorbox.close();
+      threshold:25
     });
-    cboxClose.addEventListener('touchstart', function() {
-      jQuery.colorbox.close();
+    let cboxCloseBtn = $('#cboxClose');
+    cboxCloseBtn.on('click touchstart', function() {
+      $.colorbox.close();
     });
-    document.addEventListener('keyup', function(e) {
+    cboxCloseBtn.on('keyup', function(e) {
       if (e.keyCode == 27) {
-        jQuery.colorbox.close();
+        $.colorbox().close();
       }
-    })
-  });
+    });
+
+    // let cboxClose = document.getElementById('cboxClose');
+    // cboxClose.addEventListener('click', function() {
+    //   $.colorbox.close();
+    // });
+    // cboxClose.addEventListener('touchstart', function() {
+    //   $.colorbox.close();
+    // });
+    // document.addEventListener('keyup', function(e) {
+    //   if (e.keyCode == 27) {
+    //     $.colorbox.close();
+    //   }
+    // })
+
+    return true;
+
+    }
+  );
 
 })(jQuery, Drupal, drupalSettings);
 

js/heartbeat.original

@@ -0,0 +1,198 @@
+/**
+ * Created by logicp on 5/28/17.
+ */
+(function($, Drupal, drupalSettings) {
+    Drupal.behaviors.heartbeat = {
+        attach: function (context, settings) {
+
+          if (drupalSettings.friendData != null) {
+            var divs = document.querySelectorAll('.flag-friendship a.use-ajax');
+
+            for (let i = 0; i < divs.length; i++) {
+              let anchor = divs[i];
+              var userId = anchor.href.substring(anchor.href.indexOf('friendship') + 11, anchor.href.indexOf('?destination'));
+              JSON.parse(drupalSettings.friendData).forEach(function (friendship) {
+                if (friendship.uid_target === userId && friendship.uid == drupalSettings.user.uid && friendship.status == 0) {
+                  anchor.innerHTML = 'Friendship Pending';
+                }
+              });
+            }
+          }
+
+          feedElement = document.querySelector('.heartbeat-stream');
+
+          if (drupalSettings.feedUpdate == true) {
+            updateFeed();
+          }
+
+            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.AjaxCommands.prototype.updateFeed = function(ajax, response, status) {
+              if (response.update) {
+                $.ajax({
+                  type: 'POST',
+                  url:'/heartbeat/update_feed/' + response.timestamp,
+                  success: function(response) {
+
+                  }
+                });
+              }
+            };
+
+            listenImages();
+            listenCommentPost();
+
+          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 updateFeed() {
+
+    $.ajax({
+      type: 'POST',
+      url: '/heartbeat/form/heartbeat_update_feed',
+      success: function (response) {
+      }
+    })
+  }
+
+  function listenImages() {
+    let cboxOptions = {
+      width: '95%',
+      height: '95%',
+      maxWidth: '960px',
+      maxHeight: '960px',
+    };
+
+    $('.heartbeat-content').find('img').each(function() {
+      $(this).colorbox({href: $(this).attr('src'), cboxOptions});
+    });
+  }
+
+  function listenCommentPost() {
+    //TODO is drupal data selector enough? I doubt it.
+    let comments = document.querySelectorAll('[data-drupal-selector]');
+
+    for (let i = 0; i < comments.length; i++) {
+      let comment = comments[i];
+      // console.dir(comment);
+      comment.addEventListener('click', function() {
+        getParent(comment);
+      })
+    }
+  }
+
+  function getParent(node) {
+    console.dir(node);
+    if (node.classList.contains('heartbeat-comment')) {
+      let id = node.id.substr(node.id.indexOf('-') + 1);
+      $.ajax({
+        type: 'POST',
+        url:'/heartbeat/commentupdate/' + id,
+        success: function(response) {
+        }
+      });
+    } else {
+      getParent(node.parentNode);
+    }
+  }
+
+  function getScrollXY() {
+    var scrOfX = 0, scrOfY = 0;
+    if( typeof( window.pageYOffset ) == 'number' ) {
+      //Netscape compliant
+      scrOfY = window.pageYOffset;
+      scrOfX = window.pageXOffset;
+    } else if( document.body && ( document.body.scrollLeft || document.body.scrollTop ) ) {
+      //DOM compliant
+      scrOfY = document.body.scrollTop;
+      scrOfX = document.body.scrollLeft;
+    } else if( document.documentElement && ( document.documentElement.scrollLeft || document.documentElement.scrollTop ) ) {
+      //IE6 standards compliant mode
+      scrOfY = document.documentElement.scrollTop;
+      scrOfX = document.documentElement.scrollLeft;
+    }
+    return [ scrOfX, scrOfY ];
+  }
+
+//taken from http://james.padolsey.com/javascript/get-document-height-cross-browser/
+  function getDocHeight() {
+    var D = document;
+    return Math.max(
+      D.body.scrollHeight, D.documentElement.scrollHeight,
+      D.body.offsetHeight, D.documentElement.offsetHeight,
+      D.body.clientHeight, D.documentElement.clientHeight
+    );
+  }
+
+  document.addEventListener("scroll", function (event) {
+
+    if (getDocHeight() == getScrollXY()[1] + window.innerHeight) {
+
+      let streams = document.querySelectorAll('.heartbeat-stream');
+      let stream = streams.length > 1 ? streams[streams.length - 1] : streams[0];
+
+      if (stream !== null) {
+        console.dir(stream);
+        let lastHeartbeat = stream.lastElementChild;
+
+        if (lastHeartbeat !== null) {
+
+          let hid = lastHeartbeat.id.substring(lastHeartbeat.id.indexOf('-') + 1);
+          $.ajax({
+            type: 'POST',
+            url: '/heartbeat/update_feed/' + hid,
+            success: function (response) {
+
+              feedBlock = document.getElementById('block-heartbeatblock');
+              insertNode = document.createElement('div');
+              insertNode.innerHTML = response;
+              feedBlock.appendChild(insertNode);
+            }
+          });
+        }
+      }
+    }
+  });
+
+
+})(jQuery, Drupal, drupalSettings);
+

src/Controller/HeartbeatController.php

@@ -186,7 +186,7 @@ class HeartbeatController extends ControllerBase implements ContainerInjectionIn
   public function filterFeed($tid) {
     $myConfig = \Drupal::service('config.factory')->getEditable('heartbeat_hashtag.settings');
     $myConfig->set('tid', $tid)->save();
-
+    $block = BlockViewBuilder::lazyBuilder('heartbeathashblock', 'teaser');
     return BlockViewBuilder::lazyBuilder('heartbeathashblock', 'teaser');
   }
 

src/Controller/TestController.php

@@ -62,6 +62,27 @@ public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, Hear
     );
   }
 
+  public function saveHeartbeats() {
+    $heartbeats = $this->entityQuery->get("heartbeat")->execute();
+    $data = array();
+    foreach ($heartbeats as $hid) {
+      $beat = $this->entityTypeManager->getStorage("heartbeat")->load($hid);
+      $data[] = $beat;
+    }
+
+    $result = '';
+
+     $result = file_put_contents("public://heartbeats.dat", serialize($data)) ? 'Saved Heartbeats' : 'Error saving heartbeats';
+
+    return [
+      '#type' => 'markup',
+      '#markup' => $this->t($result),
+    ];
+
+
+  }
+
+
   /**
    * Start.
    *
@@ -74,30 +95,14 @@ public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, Hear
    */
   public function start($arg) {
 
-    $statusTwitter = new StatusTwitter('https://twitter.com/lvd_drm/status/874429014684745728');
-    $nid = $statusTwitter->sendRequest();
+    $stuff = '{"USERS": [{"1": {"email": "wortle@wortletjes.com", "name": "Dutchman", "id": 1, "status": 1, "created": 1500268689}}]}';
 
-    return [
-      '#type' => 'markup',
-      '#markup' => $this->t('Implement method: start with parameter(s): ' . $arg),
-    ];
-  }
+    $decoded = \json_decode($stuff);
 
-  public function saveHeartbeats() {
-    $heartbeats = $this->entityQuery->get("heartbeat")->execute();
-    $data = array();
-    foreach ($heartbeats as $hid) {
-      $beat = $this->entityTypeManager->getStorage("heartbeat")->load($hid);
-      $data[] = $beat;
-    }
-
-    $result = '';
-
-     $result = file_put_contents("public://heartbeats.dat", serialize($data)) ? 'Saved Heartbeats' : 'Error saving heartbeats';
 
     return [
       '#type' => 'markup',
-      '#markup' => $this->t($result),
+      '#markup' => $this->t('jizzla'),
     ];
 
 
@@ -135,7 +140,7 @@ public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, Hear
     ];
 
   }
-
+//
   public function deleteHeartbeats() {
     $entities = \Drupal::service("entity.query")->get("heartbeat")->execute();
     foreach($entities as $entity) {

src/Entity/Heartbeat.php

@@ -542,7 +542,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
       $type = 'img';
       return '<' . $type . ' src="' . str_replace('public://', '/sites/default/files/', $filePath) . '" class="heartbeat-image" / >';
     } else if ($type == 'youtube') {
-      $filePath = str_replace('youtube://', 'http://www.youtube.com/embed/', $filePath);
+      $filePath = str_replace('youtube://', 'https://www.youtube.com/embed/', $filePath);
       return '<iframe class="heartbeat-youtube" width="auto" height="auto" src="' . $filePath . '" frameborder="0"></iframe>';
     } else if ($type == 'video') {
       return '<' . $type . ' controls src="' . str_replace('public://', '/sites/default/files/', $filePath) . '" class="heartbeat-video"></' . $type . '>';

src/Form/HeartbeatCommentForm.php

@@ -30,6 +30,7 @@ class HeartbeatCommentForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['comment_body'] = array(
       '#type' => 'textarea',
+      '#prefix' => '<div class="heartbeat-comment-button">Comment</div>',
       '#title' => $this->t('Comment Body'),
     );
 
@@ -76,7 +77,7 @@ $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></div>')
+          '<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;

src/Form/HeartbeatSubCommentForm.php

@@ -74,7 +74,7 @@ class HeartbeatSubCommentForm extends FormBase {
         $response = new AjaxResponse();
         $response->addCommand(new AppendCommand(
           '#heartbeat-comment-' . $config->get('cid') . ' .sub-comment',
-          '<div 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></div>')
+          '<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;

src/HeartbeatStreamServices.php

@@ -63,7 +63,7 @@ class HeartbeatStreamServices {
    * @param EntityTypeRepository $entityTypeRepository
    * @param QueryFactory $entityQuery
    * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   * @param \Drupal\Core\Database\Database $database
+   * @param Connection|\Drupal\Core\Database\Database $database
    */
   public function __construct(EntityTypeManager $entityTypeManager, EntityTypeRepository $entityTypeRepository, QueryFactory $entityQuery, ConfigFactoryInterface $configFactory, Connection $database) {
     $this->entityTypeManager = $entityTypeManager;
@@ -119,7 +119,15 @@ class HeartbeatStreamServices {
         }
       }
     }
-    return $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', array_column($types, 'target_id'), 'IN')->sort('created', 'DESC')->execute());
+    return $this->entityTypeManager->getStorage(
+      'heartbeat')->loadMultiple(
+        $this->entityQuery->get(
+          'heartbeat')
+          ->condition('status', 1)
+          ->condition('type', array_column($types, 'target_id'), 'IN')
+          ->sort('created', 'DESC')
+
+        ->execute());
   }
 
   /*
@@ -130,11 +138,20 @@ class HeartbeatStreamServices {
   }
 
   public function createStreamForUids($uids) {
-    return $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('uid', $uids, 'IN')->sort('created', 'DESC')->range(0,50)->execute());
+    return $this->entityTypeManager->getStorage(
+      'heartbeat')->loadMultiple(
+        $this->entityQuery->get(
+          'heartbeat')
+          ->condition('status', 1)
+          ->condition('uid', $uids, 'IN')
+          ->sort('created', 'DESC')
+          ->range(0,25)
+        ->execute());
   }
 
   public function createStreamByType($type) {
-    $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
+    $stream = $this->entityTypeManager->getStorage(
+      'heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
     if ($stream !== null) {
       $types = array();
       foreach ($stream->getTypes() as $heartbeatType) {
@@ -143,12 +160,23 @@ class HeartbeatStreamServices {
           $types[] = $value;
         }
       }
-      $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', $types, 'IN')->sort('created', 'DESC')->range(0,50)->execute());
+      $beats = $this->entityTypeManager->getStorage(
+        'heartbeat')->loadMultiple(
+          $this->entityQuery->get('heartbeat')
+            ->condition('status', 1)
+            ->condition('type', $types, 'IN')
+            ->sort('created', 'DESC')
+            ->range(0,25)
+
+          ->execute());
 
       if (count($beats) > 0) {
         $this->lastId = call_user_func('end', array_keys($beats));
-//TODO make this multiline
-        $this->configFactory->getEditable('heartbeat_update_feed.settings')->set('lastId', $this->lastId)->set('update', false)->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())->save();
+        $this->configFactory->getEditable(
+          'heartbeat_update_feed.settings')->set('lastId', $this->lastId)
+                                           ->set('update', false)
+                                           ->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())
+          ->save();
 
         return $beats;
       }
@@ -158,7 +186,6 @@ class HeartbeatStreamServices {
 
 
   public function createStreamForUidsByType($uids, $type) {
-    $currentUid = \Drupal::currentUser()->id();
     $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
     if ($stream !== null) {
       $types = array();
@@ -168,13 +195,28 @@ class HeartbeatStreamServices {
           $types[] = $value;
         }
       }
-//      $uids[] = $currentUid;
-      $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', $types, 'IN')->condition('uid', $uids, 'IN')->sort('created', 'DESC')->range(0,50)->execute());
+      $beats = $this->entityTypeManager->getStorage(
+        'heartbeat')->loadMultiple(
+          $this->entityQuery->get(
+            'heartbeat')
+            ->condition('status', 1)
+            ->condition('type', $types, 'IN')
+            ->condition('uid', $uids, 'IN')
+            ->sort('created', 'DESC')
+            ->range(0,25)
+
+          ->execute());
 
       if (count($beats) > 0) {
         $this->lastId = call_user_func('end', array_keys($beats));
 
-        $this->configFactory->getEditable('heartbeat_update_feed.settings')->set('lastId', $this->lastId)->set('update', false)->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())->save();
+        $this->configFactory->getEditable(
+          'heartbeat_update_feed.settings')
+          ->set('lastId', $this->lastId)
+          ->set('update', false)
+          ->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())
+
+        ->save();
 
         return $beats;
       }
@@ -183,7 +225,6 @@ class HeartbeatStreamServices {
   }
 
   public function getOlderStreamForUidsByType($uids, $type, $hid) {
-    $currentUid = \Drupal::currentUser()->id();
     $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
     if ($stream !== null) {
       $types = array();
@@ -193,13 +234,29 @@ class HeartbeatStreamServices {
           $types[] = $value;
         }
       }
-//      $uids[] = $currentUid;
-      $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('id', $hid, '<')->condition('type', $types, 'IN')->condition('uid', $uids, 'IN')->sort('created', 'DESC')->range(0,50)->execute());
+      $beats = $this->entityTypeManager->getStorage(
+        'heartbeat')->loadMultiple(
+          $this->entityQuery->get(
+            'heartbeat')
+            ->condition('status', 1)
+            ->condition('id', $hid, '<')
+            ->condition('type', $types, 'IN')
+            ->condition('uid', $uids, 'IN')
+            ->sort('created', 'DESC')
+            ->range(0,25)
+
+          ->execute());
 
       if (count($beats) > 0) {
         $this->lastId = call_user_func('end', array_keys($beats));
 
-        $this->configFactory->getEditable('heartbeat_update_feed.settings')->set('lastId', $this->lastId)->set('update', false)->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())->save();
+        $this->configFactory->getEditable(
+          'heartbeat_update_feed.settings')
+          ->set('lastId', $this->lastId)
+          ->set('update', false)
+          ->set('timestamp', array_values($beats)[0]->getRevisionCreationTime())
+
+        ->save();
 
         return $beats;
       }
@@ -209,8 +266,6 @@ class HeartbeatStreamServices {
 
 
   public function createHashStreamForUidsByType($uids, $type, $tid) {
-    $currentUid = \Drupal::currentUser()->id();
-//    $nids = $this->entityQuery->get('node')
     $query = $this->database->query('
       SELECT id
       FROM heartbeat_field_revision hr
@@ -227,11 +282,13 @@ class HeartbeatStreamServices {
 
     if (!empty($hids)) {
       $beats = $this->entityTypeManager->getStorage('heartbeat')
-        ->loadMultiple($this->entityQuery->get('heartbeat')
-          ->condition('status', 1)
-          ->condition('uid', $uids, 'IN')
-          ->condition('id', $hids, 'IN')
-          ->sort('created', 'DESC')
+        ->loadMultiple(
+          $this->entityQuery->get('heartbeat')
+            ->condition('status', 1)
+            ->condition('uid', $uids, 'IN')
+            ->condition('id', $hids, 'IN')
+            ->sort('created', 'DESC')
+
           ->execute());
 
       if (count($beats) > 0) {
@@ -254,8 +311,16 @@ class HeartbeatStreamServices {
     $currentUid = \Drupal::currentUser()->id();
     $stream = $this->entityTypeManager->getStorage('heartbeat_stream')->load(array_values($this->loadStream($type))[0]);
     $uids[] = $currentUid;
-    return $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('revision_created', $this->latestTimestamp, '>')->condition('type', array_column($stream->getTypes(), 'target_id'), 'IN')->condition('uid', $uids, 'IN')->sort('created', 'DESC')->execute());
-//range(0,50)->
+    return $this->entityTypeManager->getStorage(
+      'heartbeat')->loadMultiple(
+        $this->entityQuery->get(
+          'heartbeat')
+          ->condition('status', 1)
+          ->condition('revision_created', $this->latestTimestamp, '>')
+          ->condition('type', array_column($stream->getTypes(), 'target_id'), 'IN')
+          ->condition('uid', $uids, 'IN')
+          ->sort('created', 'DESC')
+        ->execute());
   }
 
 }