Friendship now working and /friendactivity stream is functional

config/install/flag.flag.friendship.deactivated

@@ -0,0 +1,33 @@
+uuid: 3e253d24-c0a3-4b9a-9816-fdc0cab7287e
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+id: friendship
+label: Friendship
+bundles: {  }
+entity_type: user
+global: false
+weight: 0
+flag_short: 'Befriend this cat'
+flag_long: 'Become friends with this mofo'
+flag_message: Fam
+unflag_short: 'Unfriend this cuck'
+unflag_long: 'Throw our friendship away'
+unflag_message: Cuck
+unflag_denied_text: ''
+flag_type: 'entity:user'
+link_type: ajax_link
+flagTypeConfig:
+  show_in_links:
+    full: full
+    token: token
+  show_as_field: true
+  show_on_form: false
+  show_contextual_link: false
+  extra_permissions:
+    owner: '0'
+  show_on_profile: true
+linkTypeConfig: {  }
+

config/schema/heartbeat.schema.yml

@@ -43,3 +43,22 @@ heartbeat.heartbeat_type.*:
     attachments:
       type: blob
       label: 'attachments'
+heartbeat.friendship.*:
+  type: config_entity
+  label: 'Heartbeat Friendship config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    uid:
+      type: integer
+      label: 'uid'
+    uid_target:
+      type: integer
+      label: 'uid_target'
+    status:
+      type: integer
+      label: 'status'
+    created:
+      type: integer
+      label: 'Created timestamp'

heartbeat.install

@@ -41,200 +41,128 @@ function heartbeat_requirements($phase) {
  * ** //TODO Have not yet set export schema for CTOOLS as CTOOLS is not yet a part of Drupal 8
  */
 function heartbeat_schema() {
-  $schema['heartbeat_messages'] = array(
-    'description' => 'Table that contains predefined messages that can be used in heartbeat views.',
-    'fields' => array(
-      'hid' => array(
-        'description' => 'Primary Key: Unique heartbeat_messages event ID.',
-        'type' => 'serial',
-        'not null' => TRUE,
-      ),
-      'message_id' => array(
-        'description' => 'The message id which is unique to identify activity.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => FALSE,
-        'default' => '',
-      ),
-      'description' => array(
-        'description' => 'Description and help text',
-        'type' => 'text',
-        'not null' => FALSE,
-        'size' => 'big'
-      ),
-      'message' => array(
-        'type' => 'text',
-        'not null' => TRUE,
-        'size' => 'big',
-        'description' => 'Text of log message to be passed into the ) function.',
-        //'alias' => 'message_orig', // Internal heartbeat field/property
-      ),
-      'message_concat' => array(
-        'type' => 'text',
-        'not null' => TRUE,
-        'size' => 'big',
-        'description' => 'Text of translatable log message for in concatenated form.',
-        //'alias' => 'message_concat_orig', // Internal heartbeat field/property
-      ),
-      'perms' => array(
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => FALSE,
-        'default' => 4,
-        'description' => 'Permissions for this message.',
-      ),
-      'group_type' => array(
-        'type' => 'varchar',
-        'length' => 20,
-        'not null' => TRUE,
-        'default' => 'single',
-        'description' => 'The group type of the template',
-      ),
-      'concatargs' => array(
-        'description' => 'Arguments for concatenation message.',
-        'type' => 'blob',
-        'serialize' => TRUE,
-        'not null' => FALSE,
-      ),
-      'variables' => array(
-        'description' => 'Variables to parse into the message (used in message).',
-        'type' => 'blob',
-        'serialize' => TRUE,
-        'not null' => FALSE,
-      ),
-      'attachments' => array(
-        'description' => 'Attachments on messages.',
-        'type' => 'blob',
-        'serialize' => TRUE,
-        'not null' => FALSE,
-      ),
-    ),
-    'primary key' => array('hid'),
-    'indexes' => array(
-      'message_id' => array('message_id'),
-    ),
-  );
-
-
-
-//  $schema['heartbeat'] = array(
-//    'description' => 'Table that contains logs of all user triggerable actions.',
+//  $schema['heartbeat_messages'] = array(
+//    'description' => 'Table that contains predefined messages that can be used in heartbeat views.',
 //    'fields' => array(
-//      'id' => array(
+//      'hid' => array(
+//        'description' => 'Primary Key: Unique heartbeat_messages event ID.',
 //        'type' => 'serial',
 //        'not null' => TRUE,
-//        'description' => 'Primary Key: Unique heartbeat_activity event ID.',
-//      ),
-//      'uid' => array(
-//        'type' => 'int',
-//        'unsigned' => TRUE,
-//        'not null' => TRUE,
-//        'default' => 0,
-//        'description' => 'The {users}.uid of the user who triggered the event (requester).',
 //      ),
-//      'uid_target' => array(
-//        'type' => 'int',
-//        'unsigned' => TRUE,
+//      'message_id' => array(
+//        'description' => 'The message id which is unique to identify activity.',
+//        'type' => 'varchar',
+//        'length' => 255,
 //        'not null' => FALSE,
-//        'default' => 0,
-//        'description' => 'The target User ID',
+//        'default' => '',
 //      ),
-//      'nid' => array(
-//        'description' => 'The Node ID.',
-//        'type' => 'int',
-//        'unsigned' => TRUE,
+//      'description' => array(
+//        'description' => 'Description and help text',
+//        'type' => 'text',
 //        'not null' => FALSE,
+//        'size' => 'big'
 //      ),
-//      'nid_target' => array(
-//        'description' => 'The target Node ID (E.g. Group id, node reference, ...).',
-//        'type' => 'int',
-//        'unsigned' => TRUE,
-//        'not null' => FALSE,
+//      'message' => array(
+//        'type' => 'text',
+//        'not null' => TRUE,
+//        'size' => 'big',
+//        'description' => 'Text of log message to be passed into the ) function.',
+//        //'alias' => 'message_orig', // Internal heartbeat field/property
 //      ),
-//      'cid' => array(
-//        'description' => 'The target comment ID (optional).',
-//        'type' => 'int',
-//        'unsigned' => TRUE,
-//        'not null' => FALSE,
+//      'message_concat' => array(
+//        'type' => 'text',
+//        'not null' => TRUE,
+//        'size' => 'big',
+//        'description' => 'Text of translatable log message for in concatenated form.',
+//        //'alias' => 'message_concat_orig', // Internal heartbeat field/property
 //      ),
-//      'vid' => array(
-//        'description' => 'The revision ID.',
+//      'perms' => array(
 //        'type' => 'int',
 //        'unsigned' => TRUE,
 //        'not null' => FALSE,
+//        'default' => 4,
+//        'description' => 'Permissions for this message.',
 //      ),
-//      'access' => array(
-//        'type' => 'int',
-//        'not null' => TRUE,
-//        'size' => 'tiny',
-//        'description' => 'Access for this message to others.',
-//        'default' => 0,
-//      ),
-//      'message_id' => array(
+//      'group_type' => array(
 //        'type' => 'varchar',
-//        'length' => 255,
-//        'not null' => FALSE,
-//        'default' => '',
-//        'description' => 'The message id which links to the heartbeat message.',
-//      ),
-//      'timestamp' => array(
-//        'description' => 'The activity\'s unix timestamp when action occurred',
-//        'type' => 'int',
-//        'unsigned' => TRUE,
+//        'length' => 20,
 //        'not null' => TRUE,
-//        'default' => 0,
+//        'default' => 'single',
+//        'description' => 'The group type of the template',
 //      ),
-//      'language' => array(
-//        'type' => 'varchar',
-//        'length' => 12,
+//      'concatargs' => array(
+//        'description' => 'Arguments for concatenation message.',
+//        'type' => 'blob',
+//        'serialize' => TRUE,
 //        'not null' => FALSE,
-//        'default' => 'en',
-//        'description' => 'language for a log".',
 //      ),
-//      'type' => array(
-//        'type' => 'varchar',
-//        'length' => 255,
+//      'variables' => array(
+//        'description' => 'Variables to parse into the message (used in message).',
+//        'type' => 'blob',
+//        'serialize' => TRUE,
 //        'not null' => FALSE,
-//        'default' => '',
-//        'description' => 'The Heartbeat Type of this Heartbeat Message',
 //      ),
-////      'variables' => array(
-////        'type' => 'text',
-////        'not null' => FALSE,
-////        'size' => 'big',
-////        'description' => 'Serialized array of variables that match the message string and that is passed into the ) function.',
-////      ),
-//      'in_group' => array(
-//        'type' => 'int',
-//        'not null' => TRUE,
-//        'size' => 'big',
-//        'description' => 'Indicates whether the activity is related to a group',
-//        'default' => 0,
+//      'attachments' => array(
+//        'description' => 'Attachments on messages.',
+//        'type' => 'blob',
+//        'serialize' => TRUE,
+//        'not null' => FALSE,
 //      ),
 //    ),
-//    'primary key' => array('id'),
+//    'primary key' => array('hid'),
 //    'indexes' => array(
-//      'timestamp' => array('timestamp'),
-//      'uid' => array('uid'),
 //      'message_id' => array('message_id'),
-//      'uid_target' => array('uid_target'),
-//      'nid' => array('nid'),
-//      'nid_target' => array('nid_target'),
-//      'cid' => array('cid'),
-//      'language' => array('language'),
-//      ),
-//
+//    ),
 //  );
 
-  $schema['heartbeat_activity']['fields']['in_group'] = array(
-    'type' => 'int',
-    'not null' => TRUE,
-    'size' => 'big',
-    'description' => 'Indicates whether the activity is related to a group.',
-    'default' => 0,
+  $schema['heartbeat_friendship'] = array(
+    'fields' => array(
+      'id' => array(
+        'type' => 'serial',
+        'not null' => TRUE,
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'uid_target' => array(
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => FALSE,
+        'default' => 0,
+      ),
+      'status' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'size' => 'tiny',
+        'default' => -1,
+      ),
+      'created' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+      'uid_relation' => array('uid', 'uid_target')
+    )
   );
-  $schema['heartbeat_activity']['indexes']['in_group'] = array('in_group');
-  $schema['heartbeat_user_templates'] = heartbeat_install_table_user_templates();
+//    'indexes' => array(
+//      'created' => array('created'),
+//    ),
+//  );
+
+//  $schema['heartbeat_activity']['fields']['in_group'] = array(
+//    'type' => 'int',
+//    'not null' => TRUE,
+//    'size' => 'big',
+//    'description' => 'Indicates whether the activity is related to a group.',
+//    'default' => 0,
+//  );
+//  $schema['heartbeat_activity']['indexes']['in_group'] = array('in_group');
+//  $schema['heartbeat_user_templates'] = heartbeat_install_table_user_templates();
 
 
 //  $schema['heartbeat_stream'] = array(
@@ -333,7 +261,7 @@ function heartbeat_schema() {
 //  );
 
   //TODO determine if these foreign keys are to be added
-//  db_add_unique_key('heartbeat_activity', 'uaid', array('uaid'));
+//  db_add_unique_key('heartbeat_act/ivity', 'uaid', array('uaid'));
 //  db_add_unique_key('heartbeat_activity', 'uaid_uid', array('uaid', 'uid'));
 //  db_add_unique_key('heartbeat_activity', 'uaid_nid', array('uaid', 'nid'));
 //  db_add_unique_key('heartbeat_activity', 'uaid_uid_nid', array('uaid', 'uid', 'nid'))
@@ -369,18 +297,16 @@ function heartbeat_install_table_user_templates() {
 }
 
 function heartbeat_uninstall() {
-  $entities = \Drupal::service("entity.query")->get("heartbeat")->execute();
-  foreach($entities as $entity) {
-    $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
-    $heartbeat->delete();
-  }
-
-  $entities = \Drupal::service("entity.query")->get("heartbeat_stream")->execute();
-
-  foreach($entities as $entity) {
-    $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
-    $heartbeat->delete();
-  }
-
-
+//  $entities = \Drupal::service("entity.query")->get("heartbeat")->execute();
+//  foreach($entities as $entity) {
+//    $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
+//    $heartbeat->delete();
+//  }
+//
+//  $entities = \Drupal::service("entity.query")->get("heartbeat_stream")->execute();
+//
+//  foreach($entities as $entity) {
+//    $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
+//    $heartbeat->delete();
+//  }
 }

heartbeat.module

@@ -138,11 +138,13 @@ function heartbeat_entity_insert(EntityInterface $entity) {
 
 }
 
-function heartbeat_node_presave(NodeInterface $node) {
-  $uid = $node->getOwnerId();
-  $stuffTOdo = null;
-}
+/**
+ * Implements hook_ajax_render_alter().
+ */
+function heartbeat_ajax_render_alter(array &$data)
+{
 
+}
 //TODO Add heartbeat language to Javascript
 //TODO Determine necessity of polling
 //Add

src/Controller/StreamTestController.php

@@ -103,7 +103,7 @@ class StreamTestController extends ControllerBase {
    */
   public function friendstream() {
     $messages = array();
-    $types = $this->heartbeatStreamService->getTypesById(3);
+    $types = $this->heartbeatStreamService->getTypesById(2);
     foreach ($types as $type) {
       if ($type != null) {
 

src/Entity/Heartbeat.php

@@ -7,7 +7,9 @@ use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\RevisionableContentEntityBase;
 use Drupal\Core\Entity\EntityChangedTrait;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\token\TokenServiceProvider;
+use Drupal\Core\Url;
+use Drupal\Core\Link;
+use Drupal\Core\Database\Database;
 use Drupal\user\UserInterface;
 
 /**
@@ -109,7 +111,6 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
     parent::preCreate($storage_controller, $values);
   }
 
-
   /**
    * {@inheritdoc}
    */
@@ -468,7 +469,24 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
                   $i++;
                 }
                 if (count($replacements) == 2) {
-                  $rebuiltMessage = $replacements[0] . $messageArray[1] . $replacements[1];
+                  $uid = $entityValue->entities[0]->id();
+                  $uid_target = $entityValue->entities[1]->id();
+                  $query = Database::getConnection()->query('
+                    SELECT status
+                    FROM heartbeat_friendship
+                    WHERE uid = :uid AND uid_target = :uid_target', array(
+                      ':uid' => $uid,
+                      ':uid_target' => $uid_target
+                    )
+                  );
+                  if ($query->fetchCol()[0] < 1) {
+                    $messageArray[1] = ' has requested friendship with ';
+                  }
+
+                  $user1Link = Link::fromTextAndUrl($replacements[0], $entityValue->entities[0]->toUrl());
+                  $user2Link = Link::fromTextAndUrl($replacements[1], $entityValue->entities[1]->toUrl());
+
+                  $rebuiltMessage = $user1Link->toString() . $messageArray[1] . $user2Link->toString();
                   return $rebuiltMessage;
                 }
               }
@@ -480,6 +498,13 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
     return null;
   }
 
+
+  /**
+   * Helper method to identify the number of times a word is repeated in a phrase
+   *
+   * @param $phrase
+   * @return array
+   */
   public static function getWordRepeats($phrase) {
     $counts = array();
       $words = explode(' ', $phrase);
@@ -494,14 +519,6 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
   }
 
 
-  function user_mail_tokens(&$replacements, $data, $options) {
-    if (isset($data['user'])) {
-      $replacements['[user:one-time-login-url]'] = user_pass_reset_url($data['user'], $options);
-      $replacements['[user:cancel-url]'] = user_cancel_url($data['user'], $options);
-    }
-  }
-
-
   /**
    * Returns class of argument
    *
@@ -547,7 +564,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
           $file = \Drupal::entityTypeManager()->getStorage('file')->load($fileId);
 
           if ($file !== NULL && is_object($file)) {
-            $url = \Drupal\Core\Url::fromUri($file->getFileUri());
+            $url = Url::fromUri($file->getFileUri());
             $mediaObject = self::createHeartbeatMedia($field->getFieldDefinition()->getType(), $url->getUri());
             $types[] = $mediaObject;
 
@@ -603,6 +620,30 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
     return $names;
   }
 
+
+  /**
+   * Updates the friendship status of these two users
+   *
+   * @param $uid
+   * @param $uid_target
+   * @param $unixtime
+   * @param $friendStatus
+   * @return \Drupal\Core\Database\StatementInterface|int|null
+   */
+  public static function updateFriendship($uid, $uid_target, $unixtime, $friendStatus) {
+    $query = Database::getConnection()->upsert('heartbeat_friendship')
+      ->fields(array(
+        'uid' => $uid,
+        'uid_target' => $uid_target,
+        'created' => $unixtime,
+        'status' => $friendStatus,
+      ))
+      ->key('uid_relation');
+    return $query->execute();
+  }
+
+
+
   /**
    * Gets the Heartbeat user.
    *

src/EventSubscriber/HeartbeatEventSubscriber.php

@@ -111,6 +111,8 @@ class HeartbeatEventSubscriber implements EventSubscriberInterface {
               $variables[$key] = $argument;
             }
 
+            Heartbeat::updateFriendship($user->id(), $user2->id(), time(), $friendStatus);
+
             $preparsedMessageString = strtr($heartbeatTypeEntity->getMessage(), $variables);
             $entitiesObj = new \stdClass();
             $entitiesObj->type = 'user';
@@ -122,15 +124,16 @@ class HeartbeatEventSubscriber implements EventSubscriberInterface {
 
             $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $entity->getEntityTypeId(), null);
 
-//            $heartbeatActivity = Heartbeat::create([
-//              'type' => $heartbeatTypeEntity->id(),
-//              'uid' => $user->id(),
-//              'nid' => $entity->id(),
-//              'name' => 'Dev Test',
-//            ]);
+            $heartbeatActivity = Heartbeat::create([
+              'type' => $heartbeatTypeEntity->id(),
+              'uid' => $user->id(),
+              'nid' => $entity->id(),
+              'name' => 'Dev Test',
+            ]);
+
+            $heartbeatActivity->setMessage($heartbeatMessage);
+            $heartbeatActivity->save();
 
-//            $heartbeatActivity->setMessage($heartbeatMessage);
-//            $heartbeatActivity->save();
           }
         }
       }