adding fallback for feed parameters on Heartbeat feeds / blocks

src/Controller/HeartbeatAutocompleteController.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: logicp
+ * Date: 9/5/17
+ * Time: 11:20 PM
+ */

src/Plugin/Block/FriendInteractBlock.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\heartbeat\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\file\Entity\File;
+use Drupal\heartbeat\Entity\Heartbeat;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a 'FriendInteractBlock' block.
+ *
+ * @Block(
+ *  id = "friend_interact_block",
+ *  admin_label = @Translation("Friend interact block"),
+ * )
+ */
+class FriendInteractBlock extends BlockBase {
+
+  private $entityTypeManager;
+
+
+  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->entityTypeManager = \Drupal::entityTypeManager();
+  }
+
+  /**
+   * {@inheritdoc}
+   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
+   */
+  public function build() {
+
+    $uid = \Drupal::config('heartbeat_friend_interact.settings')->get('uid');
+    $user = $this->entityTypeManager->getStorage('user')->load($uid);
+
+    $userPic = $user->get('user_picture')->getValue();
+
+    if (!empty($userPic) && $profilePic = $user->get('user_picture')->getValue()[0]['target_id']) {
+      $pic = File::load($profilePic);
+
+      if ($pic !== NULL) {
+        $style = $this->entityTypeManager->getStorage('image_style')
+          ->load('thumbnail');
+        $rendered = $style->buildUrl($pic->getFileUri());
+      }
+    }
+
+
+    $flagMarkup = Heartbeat::flagAjaxBuilder('friendship', $user, \Drupal::service('flag'));
+
+    return [
+      '#theme' => 'friend_interaction',
+      '#user' => 'This user',
+      '#flag' => $flagMarkup,
+      '#userPic' => $rendered,
+      '#cache' => array('max-age' => 0)
+    ];
+  }
+
+}

src/Plugin/Block/FriendSearchBlock.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\heartbeat\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Config\ConfigManager;
+
+/**
+ * Provides a 'FriendSearchBlock' block.
+ *
+ * @Block(
+ *  id = "friend_search_block",
+ *  admin_label = @Translation("Friend search block"),
+ * )
+ */
+class FriendSearchBlock extends BlockBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Drupal\Core\Config\ConfigManager definition.
+   *
+   * @var \Drupal\Core\Config\ConfigManager
+   */
+  private $configManager;
+  /**
+   * Constructs a new FriendSearchBlock object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param string $plugin_definition
+   *   The plugin implementation definition.
+   */
+  public function __construct(
+        array $configuration,
+        $plugin_id,
+        $plugin_definition,
+        ConfigManager $config_manager
+  ) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->configManager = $config_manager;
+  }
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('config.manager')
+    );
+  }
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    return \Drupal::formBuilder()->getForm('Drupal\heartbeat\Form\FriendSearchForm');
+  }
+
+}

src/Plugin/Block/HeartbeatBlock.php

@@ -11,8 +11,6 @@ use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\flag\FlagService;
 use Drupal\comment\Entity\Comment;
-use Drupal\User\Entity\User;
-use Drupal\Flag\Entity\Flag;
 use Drupal\Core\Datetime\DateFormatter;
 use Drupal\file\Entity\File;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -125,8 +123,13 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
     if (\Drupal::currentUser()->id() > 0) {
       $myConfig = \Drupal::service('config.factory')->getEditable('heartbeat_feed.settings');
       $friendData = \Drupal::config('heartbeat_friendship.settings')->get('data');
-
+      //TODO Use User IDs from friendData as conditions for heartbeats, rather than retrieving friendships in a separate query as is what follows in the lines ahead
       $feed = $myConfig->get('message');
+      if ($feed === null || $feed === 'null') {
+        $feed = "Public";
+        $myConfig->set('message', $feed)->save();
+      }
+
       $uids = null;
 
       $query = Database::getConnection()->select('heartbeat_friendship', 'hf')
@@ -200,7 +203,7 @@ class HeartbeatBlock extends BlockBase implements ContainerFactoryPluginInterfac
       $userPic = $user->get('user_picture')->getValue();
 
       if (!empty($userPic)) {
-        $profilePic = $user->get('user_picture')->getValue()[0]['target_id'];
+        $profilePic = $userPic[0]['target_id'];
       }
 
       if (NULL === $profilePic) {

src/Plugin/Block/HeartbeatMoreBlock.php

@@ -118,6 +118,7 @@ class HeartbeatMoreBlock extends BlockBase implements ContainerFactoryPluginInte
     $friendData = \Drupal::config('heartbeat_friendship.settings')->get('data');
 
     $hid = $myConfig->get('hid');
+    //TODO This naming convention should be changed to something more specific, like last Heartbeat ID
     $feed = $feedConfig->get('message');
 
     $uids = null;