Major fixes

config/schema/heartbeat.schema.yml

@@ -10,9 +10,6 @@ heartbeat.heartbeat_type.*:
       label: 'Label'
     uuid:
       type: string
-    hid:
-      type: serial
-      label: 'hid'
     message_id:
       type: string
       label: 'message_id'
@@ -28,6 +25,9 @@ heartbeat.heartbeat_type.*:
     message:
       type: string
       label: 'message'
+    weight:
+      type: integer
+      label: 'Weight'
 #    message_concat:
 #      type: string
 #      label: 'message_concat'

heartbeat.module

@@ -12,6 +12,7 @@ use Drupal\Core\Form\FormState;
 use Drupal\node\NodeInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Entity;
+use Drupal\Core\Database\Database;
 use Drupal\heartbeat\Entity\FILE_FIELD;
 use Drupal\heartbeat\Entity\Heartbeat;
 use GuzzleHttp\Exception\RequestException;
@@ -322,6 +323,34 @@ function updateFeeds() {
  */
 function heartbeat_ajax_render_alter(array &$data) {
 
+}
+
+/**
+ * Implements hook_cron().
+ */
+function heartbeat_cron() {
+  //Iterate over the Heartbeat Types and ensure that the weight of bundle-specific types are lower than that of their
+  //parent type. This will allow us to ensure Bundle specific types end up being published as opposed to
+  //Types which represent all content types
+  $heartbeatTypes = \Drupal::service('entity.query')->get('heartbeat_type')->condition('mainentity', 'node')->execute();
+
+  if (count($heartbeatTypes) > 1) {
+    foreach($heartbeatTypes as $heartbeatType) {
+
+      $entity = \Drupal::service('entity_type.manager')->getStorage('heartbeat_type')->load($heartbeatType);
+
+      if ($entity->getBundle() === null) {
+        $entity->setWeight(99);
+        $entity->save();
+      } else {
+        $entity->setWeight(0);
+        $entity->save();
+      }
+
+    }
+  }
+
+
 }
 
 /**

src/Entity/Heartbeat.php

@@ -467,8 +467,13 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
 
   private static function mediaTag($type, $filePath) {
     //TODO put this into new method
-    if ($type == 'image') { $type = 'img';}
-    return '<'. $type . ' src="' . str_replace('public://', '/sites/default/files/', $filePath) . '" / >';
+    if ($type == 'image') {
+      $type = 'img';
+      return '<' . $type . ' src="' . str_replace('public://', '/sites/default/files/', $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>';
+    }
   }
 
   protected static function handleMultipleEntities(Token $tokenService, $message, $entities) {
@@ -579,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') {
@@ -590,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/Entity/HeartbeatStream.php

@@ -77,12 +77,13 @@ class HeartbeatStream extends RevisionableContentEntityBase implements Heartbeat
   protected $settings;
   protected $variables;
   protected $types;
+  protected $weight;
 
   /**
    * @return array
    */
   public function getTypes() {
-    return $this->types;
+    return $this->get('types');
   }
 
   /**
@@ -423,8 +424,27 @@ class HeartbeatStream extends RevisionableContentEntityBase implements Heartbeat
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'heartbeat_type');
 
+    $fields['weight'] = BaseFieldDefinition::create('integer')
+      ->setLabel(t('Weight'))
+      ->setDescription(t('The weight of the stream'))
+      ->setDefaultValue(0);
+
 
     return $fields;
   }
 
+  /**
+   * @return mixed
+   */
+  public function setWeight($weight) {
+    $this->set('weight', $weight);
+  }
+
+  /**
+   * @param $weight
+   * @return mixed
+   */
+  public function getWeight() {
+    return $this->get('weight');
+  }
 }

src/Entity/HeartbeatStreamInterface.php

@@ -214,4 +214,15 @@ interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInt
 
   public function setTypes($heartbeat_types);
 
+
+  /**
+   * @return mixed
+   */
+  public function setWeight($weight);
+
+  /**
+   * @param $weight
+   * @return mixed
+   */
+  public function getWeight();
 }

src/Entity/HeartbeatType.php

@@ -363,4 +363,19 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
   public function getBundle() {
     return $this->get('bundle');
   }
+
+  /**
+   * @return mixed
+   */
+  public function setWeight($weight) {
+    $this->set('weight', $weight);
+  }
+
+  /**
+   * @param $weight
+   * @return mixed
+   */
+  public function getWeight() {
+    return $this->get('weight');
+  }
 }

src/Entity/HeartbeatTypeInterface.php

@@ -210,6 +210,16 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
   public function getBundle();
 
 
+  /**
+   * @return mixed
+   */
+  public function setWeight($weight);
+
+  /**
+   * @param $weight
+   * @return mixed
+   */
+  public function getWeight();
 
 //  /**
 //   * Sets the attachments for this message stream

src/Form/HeartbeatFeedForm.php

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

src/Form/HeartbeatStreamForm.php

@@ -100,6 +100,12 @@ class HeartbeatStreamForm extends ContentEntityForm {
       '#default' => $entity->getPath(),
     );
 
+    $form['weight'] = array(
+      '#type' => 'number',
+      '#description' => 'The weight of the stream',
+      '#default' => $entity->getWeight()
+    );
+
     return $form;
   }
 
@@ -129,6 +135,8 @@ class HeartbeatStreamForm extends ContentEntityForm {
 
       $entity->setPath($form_state->getValue('path'));
 
+      $entity->setWeight($form_state->getValue('weight'));
+
       $entity->save();
     }
 

src/HeartbeatStreamServices.php

@@ -124,8 +124,9 @@ class HeartbeatStreamServices {
     if ($stream !== null) {
       $types = array();
       foreach ($stream->getTypes() as $heartbeatType) {
-        if (!empty($heartbeatType['target_id']) && $heartbeatType['target_id'] !== "0") {
-          $types[] = $heartbeatType['target_id'];
+        $value = $heartbeatType->getValue()['target_id'];
+        if ($value !== "0") {
+          $types[] = $value;
         }
       }
       $beats = $this->entityTypeManager->getStorage('heartbeat')->loadMultiple($this->entityQuery->get('heartbeat')->condition('status', 1)->condition('type', $types, 'IN')->sort('created', 'DESC')->execute());
@@ -148,11 +149,12 @@ class HeartbeatStreamServices {
     if ($stream !== null) {
       $types = array();
       foreach ($stream->getTypes() as $heartbeatType) {
-        if (!empty($heartbeatType['target_id']) && $heartbeatType['target_id'] !== "0") {
-          $types[] = $heartbeatType['target_id'];
+        $value = $heartbeatType->getValue()['target_id'];
+        if ($value !== "0") {
+          $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/HeartbeatTypeServices.php

@@ -49,7 +49,7 @@ class HeartbeatTypeServices {
 
 
   public function getTypes() {
-    return $this->entityQuery->get('heartbeat_type')->execute();
+    return $this->entityQuery->get('heartbeat_type')->sort('weight', 'ASC')->execute();
   }
 
   public function load($id) {

src/Plugin/Block/HeartbeatBlock.php

@@ -77,29 +77,36 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
       $container->get('heartbeat')
     );
   }
+
   /**
    * {@inheritdoc}
+   * @throws \Drupal\Core\Database\InvalidQueryException
    */
   public function build() {
 
     $myConfig = \Drupal::service('config.factory')->getEditable('heartbeat_feed.settings');
 
     $feed = $myConfig->get('message');
-
+    $uids = null;
     $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 ($uids !== null && count($uids) > 0) {
+      $uids = count($uids) > 1 ? array_unique($uids) : $uids;
+        if (!empty($uids)) {
           foreach ($this->heartbeatStreamServices->createStreamForUidsByType($uids, $feed) as $heartbeat) {
             $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
           }