Mon Dec 24 15:35:28 2018 +0600 f86c0d2433 (HEAD -> history_read_limit) Configurable history time  [Yuriy Shupen'ko]
diff --git a/core/modules/comment/comment.services.yml b/core/modules/comment/comment.services.yml
index ec133bbcab..4973f5f685 100644
--- a/core/modules/comment/comment.services.yml
+++ b/core/modules/comment/comment.services.yml
@@ -7,7 +7,7 @@ services:
 
   comment.manager:
     class: Drupal\comment\CommentManager
-    arguments: ['@entity.manager', '@config.factory', '@string_translation', '@module_handler', '@current_user']
+    arguments: ['@entity.manager', '@config.factory', '@string_translation', '@module_handler', '@current_user', '@datetime.time']
 
   comment.statistics:
     class: Drupal\comment\CommentStatistics
diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php
index 25e53e70c4..3afa7d59c7 100644
--- a/core/modules/comment/src/CommentManager.php
+++ b/core/modules/comment/src/CommentManager.php
@@ -3,6 +3,7 @@
 namespace Drupal\comment;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -57,6 +58,20 @@ class CommentManager implements CommentManagerInterface {
    */
   protected $currentUser;
 
+  /**
+   * History modules settings config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $historyConfig;
+
+  /**
+   * Time manager.
+   *
+   * @var \Drupal\Component\Datetime\TimeInterface
+   */
+  protected $time;
+
   /**
    * Construct the CommentManager object.
    *
@@ -70,13 +85,17 @@ class CommentManager implements CommentManagerInterface {
    *   The module handler service.
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current user.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   Time manager.
    */
-  public function __construct(EntityManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation, ModuleHandlerInterface $module_handler, AccountInterface $current_user) {
+  public function __construct(EntityManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation, ModuleHandlerInterface $module_handler, AccountInterface $current_user, TimeInterface $time) {
     $this->entityManager = $entity_manager;
     $this->userConfig = $config_factory->get('user.settings');
     $this->stringTranslation = $string_translation;
     $this->moduleHandler = $module_handler;
     $this->currentUser = $current_user;
+    $this->historyConfig = $config_factory->get('history.settings');
+    $this->time = $time;
   }
 
   /**
@@ -193,7 +212,8 @@ public function getCountNewComments(EntityInterface $entity, $field_name = NULL,
           }
         }
       }
-      $timestamp = ($timestamp > HISTORY_READ_LIMIT ? $timestamp : HISTORY_READ_LIMIT);
+      $history_read_limit = $this->time->getRequestTime() - $this->historyConfig->get('history_mark_read');
+      $timestamp = ($timestamp > $history_read_limit ? $timestamp : $history_read_limit);
 
       // Use the timestamp to retrieve the number of new comments.
       $query = $this->entityManager->getStorage('comment')->getQuery()
diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index bfb0b5cbd8..7e5eba03f6 100644
--- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Database\Connection;
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -35,6 +37,20 @@ public function usesGroupBy() {
    */
   protected $database;
 
+  /**
+   * History config.
+   *
+   * @var \Drupal\Core\Config\Config|\Drupal\Core\Config\ImmutableConfig
+   */
+  protected $historyConfig;
+
+  /**
+   * Time manager.
+   *
+   * @var \Drupal\Component\Datetime\TimeInterface
+   */
+  protected $time;
+
   /**
    * Constructs a \Drupal\comment\Plugin\views\field\NodeNewComments object.
    *
@@ -46,18 +62,24 @@ public function usesGroupBy() {
    *   The plugin implementation definition.
    * @param \Drupal\Core\Database\Connection $database
    *   Database Service Object.
+   * @param \Drupal\Core\Config\ConfigFactory $configFactory
+   *   Config factory service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   Time manager.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, Connection $database) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, Connection $database, ConfigFactory $configFactory, TimeInterface $time) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->database = $database;
+    $this->historyConfig = $configFactory->get('history.settings');
+    $this->time = $time;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('database'));
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('database'), $container->get('config.factory'), $container->get('datetime.time'));
   }
 
   /**
@@ -127,14 +149,15 @@ public function preRender(&$values) {
     }
 
     if ($nids) {
+      $history_read_limit = $this->time->getRequestTime() - $this->historyConfig->get('history_mark_read');
       $result = $this->database->query("SELECT n.nid, COUNT(c.cid) as num_comments FROM {node} n INNER JOIN {comment_field_data} c ON n.nid = c.entity_id AND c.entity_type = 'node' AND c.default_langcode = 1
         LEFT JOIN {history} h ON h.nid = n.nid AND h.uid = :h_uid WHERE n.nid IN ( :nids[] )
         AND c.changed > GREATEST(COALESCE(h.timestamp, :timestamp1), :timestamp2) AND c.status = :status GROUP BY n.nid", [
         ':status' => CommentInterface::PUBLISHED,
         ':h_uid' => $user->id(),
         ':nids[]' => $nids,
-        ':timestamp1' => HISTORY_READ_LIMIT,
-        ':timestamp2' => HISTORY_READ_LIMIT,
+        ':timestamp1' => $history_read_limit,
+        ':timestamp2' => $history_read_limit,
       ]);
       foreach ($result as $node) {
         foreach ($ids[$node->nid] as $id) {
diff --git a/core/modules/comment/tests/src/Unit/CommentManagerTest.php b/core/modules/comment/tests/src/Unit/CommentManagerTest.php
index fe8b24d910..ce3daa10c9 100644
--- a/core/modules/comment/tests/src/Unit/CommentManagerTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentManagerTest.php
@@ -49,7 +49,8 @@ public function testGetFields() {
       $this->getMock('Drupal\Core\Config\ConfigFactoryInterface'),
       $this->getMock('Drupal\Core\StringTranslation\TranslationInterface'),
       $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface'),
-      $this->getMock('Drupal\Core\Session\AccountInterface')
+      $this->getMock('Drupal\Core\Session\AccountInterface'),
+      $this->getMock('Drupal\Component\Datetime\TimeInterface')
     );
     $comment_fields = $comment_manager->getFields('node');
     $this->assertArrayHasKey('field_foobar', $comment_fields);
diff --git a/core/modules/forum/src/ForumManager.php b/core/modules/forum/src/ForumManager.php
index 1ecd3b68fa..38f2b737d4 100644
--- a/core/modules/forum/src/ForumManager.php
+++ b/core/modules/forum/src/ForumManager.php
@@ -304,19 +304,22 @@ protected function getTopicOrder($sortby) {
    *
    * @return int
    *   The timestamp when the user last viewed this node, if the user has
-   *   previously viewed the node; otherwise HISTORY_READ_LIMIT.
+   *   previously viewed the node; otherwise - history read limit.
    */
   protected function lastVisit($nid, AccountInterface $account) {
+    $history_read_limit = $this->configFactory
+      ->get('history.settings')
+      ->get('history_mark_read');
     if (empty($this->history[$nid])) {
       $result = $this->connection->select('history', 'h')
         ->fields('h', ['nid', 'timestamp'])
         ->condition('uid', $account->id())
         ->execute();
       foreach ($result as $t) {
-        $this->history[$t->nid] = $t->timestamp > HISTORY_READ_LIMIT ? $t->timestamp : HISTORY_READ_LIMIT;
+        $this->history[$t->nid] = $t->timestamp > $history_read_limit ? $t->timestamp : $history_read_limit;
       }
     }
-    return isset($this->history[$nid]) ? $this->history[$nid] : HISTORY_READ_LIMIT;
+    return isset($this->history[$nid]) ? $this->history[$nid] : $history_read_limit;
   }
 
   /**
@@ -474,6 +477,9 @@ public function checkNodeType(NodeInterface $node) {
    * {@inheritdoc}
    */
   public function unreadTopics($term, $uid) {
+    $history_read_limit = $this->configFactory
+      ->get('history.settings')
+      ->get('history_mark_read');
     $query = $this->connection->select('node_field_data', 'n');
     $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', [':tid' => $term]);
     $query->leftJoin('history', 'h', 'n.nid = h.nid AND h.uid = :uid', [':uid' => $uid]);
@@ -483,7 +489,7 @@ public function unreadTopics($term, $uid) {
       // @todo This should be actually filtering on the desired node status
       //   field language and just fall back to the default language.
       ->condition('n.default_langcode', 1)
-      ->condition('n.created', HISTORY_READ_LIMIT, '>')
+      ->condition('n.created', $history_read_limit, '>')
       ->isNull('h.nid')
       ->addTag('node_access')
       ->execute()
diff --git a/core/modules/forum/src/ForumManagerInterface.php b/core/modules/forum/src/ForumManagerInterface.php
index 9e8833ebcf..4f81ae0997 100644
--- a/core/modules/forum/src/ForumManagerInterface.php
+++ b/core/modules/forum/src/ForumManagerInterface.php
@@ -79,7 +79,7 @@ public function checkNodeType(NodeInterface $node);
   /**
    * Calculates the number of new posts in a forum that the user has not yet read.
    *
-   * Nodes are new if they are newer than HISTORY_READ_LIMIT.
+   * Nodes are new if they are newer than history read limit.
    *
    * @param int $term
    *   The term ID of the forum.
diff --git a/core/modules/history/config/install/history.settings.yml b/core/modules/history/config/install/history.settings.yml
new file mode 100644
index 0000000000..3b72c3c63d
--- /dev/null
+++ b/core/modules/history/config/install/history.settings.yml
@@ -0,0 +1,5 @@
+# Entities changed before this time are always shown as read.
+#
+# Entities changed within this time may be marked as new, updated, or read,
+# depending on their state for the current user. Defaults to 30 days ago.
+history_mark_read: 2592000
diff --git a/core/modules/history/config/schema/history.settings.schema.yml b/core/modules/history/config/schema/history.settings.schema.yml
new file mode 100644
index 0000000000..530dddd111
--- /dev/null
+++ b/core/modules/history/config/schema/history.settings.schema.yml
@@ -0,0 +1,7 @@
+history.settings:
+  type: config_object
+  label: 'History settings'
+  mapping:
+    history_mark_read:
+      type: integer
+      label: 'Entities changed within this time period may be marked as new.'
diff --git a/core/modules/history/history.module b/core/modules/history/history.module
index 44dfb13924..a999376799 100644
--- a/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -14,14 +14,6 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\user\UserInterface;
 
-/**
- * Entities changed before this time are always shown as read.
- *
- * Entities changed within this time may be marked as new, updated, or read,
- * depending on their state for the current user. Defaults to 30 days ago.
- */
-define('HISTORY_READ_LIMIT', REQUEST_TIME - 30 * 24 * 60 * 60);
-
 /**
  * Implements hook_help().
  */
@@ -125,8 +117,9 @@ function history_write($nid, $account = NULL) {
  * Implements hook_cron().
  */
 function history_cron() {
+  $history_read_limit = \Drupal::time()->getRequestTime() - \Drupal::config('history.settings')->get('history_mark_read');
   \Drupal::database()->delete('history')
-    ->condition('timestamp', HISTORY_READ_LIMIT, '<')
+    ->condition('timestamp', $history_read_limit, '<')
     ->execute();
 }
 
diff --git a/core/modules/history/history.post_update.php b/core/modules/history/history.post_update.php
new file mode 100644
index 0000000000..abe4416b72
--- /dev/null
+++ b/core/modules/history/history.post_update.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for History module.
+ */
+
+/**
+ * Installing config for existing instances.
+ */
+function history_post_update_install_config(&$sandbox = NULL) {
+  \Drupal::service('config.installer')->installDefaultConfig('module', 'history');
+}
diff --git a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
index 617cd23e12..6e9c5ef3c8 100644
--- a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
@@ -3,10 +3,12 @@
 namespace Drupal\history\Plugin\views\field;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\node\Plugin\views\field\Node;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Field handler to display the marker for new content.
@@ -18,7 +20,43 @@
  *
  * @ViewsField("history_user_timestamp")
  */
-class HistoryUserTimestamp extends Node {
+class HistoryUserTimestamp extends Node implements ContainerFactoryPluginInterface {
+
+  /**
+   * History read limit
+   *
+   * @var int
+   */
+  protected $historyReadLimit;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      REQUEST_TIME - $container->get('config.factory')->get('history.settings')->get('history_mark_read')
+    );
+  }
+
+  /**
+   * HistoryUserTimestamp constructor.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param integer $history_read_limit
+   *   History read limit.
+   */
+  public function __construct($configuration, $plugin_id, $plugin_definition, $history_read_limit) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->historyReadLimit = $history_read_limit;
+  }
 
   /**
    * {@inheritdoc}
@@ -92,13 +130,13 @@ public function render(ResultRow $values) {
 
       $last_comment = \Drupal::moduleHandler()->moduleExists('comment') && !empty($this->options['comments']) ? $this->getValue($values, 'last_comment') : 0;
 
-      if (!$last_read && $changed > HISTORY_READ_LIMIT) {
+      if (!$last_read && $changed > $this->historyReadLimit) {
         $mark = MARK_NEW;
       }
-      elseif ($changed > $last_read && $changed > HISTORY_READ_LIMIT) {
+      elseif ($changed > $last_read && $changed > $this->historyReadLimit) {
         $mark = MARK_UPDATED;
       }
-      elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) {
+      elseif ($last_comment > $last_read && $last_comment > $this->historyReadLimit) {
         $mark = MARK_UPDATED;
       }
       $build = [
diff --git a/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
index 02288da1c4..4443ef205a 100644
--- a/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
@@ -4,7 +4,9 @@
 
 use Drupal\Core\Cache\UncacheableDependencyTrait;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\views\Plugin\views\filter\FilterPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Filter for new content.
@@ -16,10 +18,44 @@
  *
  * @ViewsFilter("history_user_timestamp")
  */
-class HistoryUserTimestamp extends FilterPluginBase {
+class HistoryUserTimestamp extends FilterPluginBase implements ContainerFactoryPluginInterface {
 
   use UncacheableDependencyTrait;
 
+  /**
+   * History read limit
+   *
+   * @var int
+   */
+  protected $historyReadLimit;
+
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      REQUEST_TIME - $container->get('config.factory')->get('history.settings')->get('history_mark_read')
+
+    );
+  }
+
+  /**
+   * HistoryUserTimestamp constructor.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param integer $history_read_limit
+   *   History read limit.
+   */
+  public function __construct($configuration, $plugin_id, $plugin_definition, $history_read_limit) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->historyReadLimit = $history_read_limit;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -80,8 +116,8 @@ public function query() {
     }
 
     // Hey, Drupal kills old history, so nodes that haven't been updated
-    // since HISTORY_READ_LIMIT are bzzzzzzzt outta here!
-    $limit = REQUEST_TIME - HISTORY_READ_LIMIT;
+    // since history_cron() are bzzzzzzzt outta here!
+    $limit = $this->historyReadLimit;
 
     $this->ensureMyTable();
     $field = "$this->tableAlias.$this->realField";
diff --git a/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php b/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php
index f66ce52476..5622eeda8f 100644
--- a/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php
+++ b/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php
@@ -40,6 +40,7 @@ protected function setUp($import_test_views = TRUE) {
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
     $this->installSchema('history', ['history']);
+    $this->installConfig('history');
     // Use classy theme because its marker is wrapped in a span so it can be
     // easily targeted with xpath.
     \Drupal::service('theme_handler')->install(['classy']);
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 5c6c88633c..bc08bc7e1e 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -246,6 +246,7 @@ function node_title_list(StatementInterface $result, $title = NULL) {
 function node_mark($nid, $timestamp) {
 
   $cache = &drupal_static(__FUNCTION__, []);
+  $history_read_limit = REQUEST_TIME - \Drupal::config('history.settings')->get('history_mark_read');
 
   if (\Drupal::currentUser()->isAnonymous() || !\Drupal::moduleHandler()->moduleExists('history')) {
     return MARK_READ;
@@ -253,10 +254,10 @@ function node_mark($nid, $timestamp) {
   if (!isset($cache[$nid])) {
     $cache[$nid] = history_read($nid);
   }
-  if ($cache[$nid] == 0 && $timestamp > HISTORY_READ_LIMIT) {
+  if ($cache[$nid] == 0 && $timestamp > $history_read_limit) {
     return MARK_NEW;
   }
-  elseif ($timestamp > $cache[$nid] && $timestamp > HISTORY_READ_LIMIT) {
+  elseif ($timestamp > $cache[$nid] && $timestamp > $history_read_limit) {
     return MARK_UPDATED;
   }
   return MARK_READ;