Better discovery by uid

src/Entity/Heartbeat.php

@@ -466,12 +466,12 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
   }
 
   private static function mediaTag($type, $filePath) {
-
-    if ($type === 'image') {
+    //TODO put this into new method
+    if ($type == 'image') {
       $type = 'img';
       return '<' . $type . ' src="' . str_replace('public://', '/sites/default/files/', $filePath) . '" / >';
-    } else if ($type === 'youtube') {
-      $filePath = str_replace('http://www.youtube.com/embed/', 'youtube://', $filePath);
+    } else if ($type == 'youtube') {
+      $filePath = str_replace('youtube://', 'http://www.youtube.com/embed/', $filePath);
       return '<iframe width="560" height="315" src="' . $filePath . '" frameborder="0"></iframe>';
     }
   }
@@ -584,7 +584,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
 
     foreach ($fields as $field) {
       if ($field instanceof \Drupal\file\Plugin\Field\FieldType\FileFieldItemList) {
-
+      $type = $field->getFieldDefinition()->getType();
         if ($field->getFieldDefinition()->getType() === 'image' ||
             $field->getFieldDefinition()->getType() === 'video' ||
             $field->getFieldDefinition()->getType() === 'audio') {
@@ -595,7 +595,13 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
 
           if ($file !== NULL && is_object($file)) {
             $url = Url::fromUri($file->getFileUri());
-            $mediaObject = self::createHeartbeatMedia($field->getFieldDefinition()->getType(), $url->getUri());
+            $posfind = strpos($url->getUri(), 'youtube://');
+            if ($posfind !== 0 && $posfind !== false) {
+              $mediaObject = self::createHeartbeatMedia($field->getFieldDefinition()->getType(), $url->getUri());
+            } else {
+
+              $mediaObject = self::createHeartbeatMedia('youtube', $url->getUri());
+            }
             $types[] = $mediaObject;
 
           } else {

src/Form/HeartbeatFeedForm.php

@@ -109,10 +109,10 @@ class HeartbeatFeedForm extends FormBase {
 //    ];
 
 
-    $form['submit'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Search'),
-    ];
+//    $form['submit'] = [
+//        '#type' => 'submit',
+//        '#value' => $this->t('Search'),
+//    ];
 
     $form['#attached']['library'][] = 'heartbeat/heartbeat';
 

src/HeartbeatStreamServices.php

@@ -154,7 +154,7 @@ class HeartbeatStreamServices {
           $types[] = $value;
         }
       }
-      $uids[] = $currentUid;
+//      $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')->execute());
 
       if (count($beats) > 0) {

src/Plugin/Block/HeartbeatBlock.php

@@ -77,8 +77,10 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
       $container->get('heartbeat')
     );
   }
+
   /**
    * {@inheritdoc}
+   * @throws \Drupal\Core\Database\InvalidQueryException
    */
   public function build() {
 
@@ -89,17 +91,21 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
     $messages = array();
 
     $query = Database::getConnection()->select('heartbeat_friendship', 'hf')
-      ->fields('hf',['uid_target'])
-      ->condition('hf.uid', \Drupal::currentUser()->id())->execute();
+      ->fields('hf',['uid', 'uid_target']);
+    $conditionOr = $query->orConditionGroup()
+      ->condition('hf.uid', \Drupal::currentUser()->id())
+      ->condition('hf.uid_target', \Drupal::currentUser()->id());
 
-    if ($result = $query->fetchAll()) {
+    $results = $query->condition($conditionOr)->execute();
+    if ($result = $results->fetchAll()) {
       $uids = array();
       foreach ($result as $uid) {
         $uids[] = $uid->uid_target;
+        $uids[] = $uid->uid;
       }
     }
       if ($feed !== null) {
-        if (!empty($uids)) {
+        if (!empty($uids = array_unique($uids))) {
           foreach ($this->heartbeatStreamServices->createStreamForUidsByType($uids, $feed) as $heartbeat) {
             $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
           }