Heartbeat messages can have multiple media now

css/heartbeat.css

@@ -13,6 +13,15 @@
 }
 
 
+.heartbeat-message img:first-of-type ~ img {
+  display: inline-block;
+  max-width: 25%;
+}
+
+.heartbeat-message img:last-of-type {
+  max-width: 100%;
+}
+
 /*Main Feed Form*/
 #heartbeat-feed-form input[type="radio"] {
     -webkit-appearance: none;

src/Entity/Heartbeat.php

@@ -745,28 +745,26 @@ 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') {
 
           $fieldValue = $field->getValue();
-          $fileId = $fieldValue[0]['target_id'];
-          $file = \Drupal::entityTypeManager()->getStorage('file')->load($fileId);
-
-          if ($file !== NULL && is_object($file)) {
-            $url = Url::fromUri($file->getFileUri());
-            $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());
+          foreach ($fieldValue as $value) {
+            $file = \Drupal::entityTypeManager()->getStorage('file')->load($value['target_id']);
+            if ($file !== NULL && is_object($file)) {
+              $url = Url::fromUri($file->getFileUri());
+              $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 {
+              continue;
             }
-            $types[] = $mediaObject;
-
-          } else {
-            continue;
           }
         }
       }

src/Form/HeartbeatSubCommentForm.php

@@ -29,18 +29,17 @@ class HeartbeatSubCommentForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['comment_body'] = array(
       '#type' => 'textarea',
-      '#title' => $this->t('Comment Body'),
     );
 
     $form['post'] = array(
       '#type' => 'submit',
       '#description' => 'Comment',
-      '#value' => t('Comment'),
+      '#value' => t('Reply'),
       '#ajax' => [
         'callback' => '::commentAjaxSubmit',
         'progress' => array(
           'type' => 'throbber',
-          'message' => t('Posting Comment'),
+          'message' => t('Posting Reply'),
         ),
       ]
     );
@@ -70,9 +69,8 @@ class HeartbeatSubCommentForm extends FormBase {
       ]);
 
       if ($comment->save()) {
-$userview= user_view($comment->getOwner(), 'comment');
-$cid = $comment->id();
-$body = $commentBody;
+        $userview= user_view($comment->getOwner(), 'comment');
+
         $response = new AjaxResponse();
         $response->addCommand(new AppendCommand(
           '#heartbeat-comment-' . $config->get('cid') . ' .sub-comment',