Merge pull request #1715 from codidact/0valt/pinned_link_cache_fix

NamespacedEnvCache fix + pinned links caching fix

Author: Oaphi

app/models/pinned_link.rb

@@ -1,4 +1,10 @@
 class PinnedLink < ApplicationRecord
   include MaybeCommunityRelated
   belongs_to :post
+
+  # Is the link time-constrained?
+  # @return [Boolean] check result
+  def timed?
+    shown_before.present? || shown_after.present?
+  end
 end

app/views/layouts/_sidebar.html.erb

@@ -12,11 +12,11 @@
     <% end %>
   <% end %>
 
-
   <% unless @community.is_fake %>
     <%# Featured widget %>
     <% if Rails.env.development? || @pinned_links.to_a.size > 0 %>
-      <% cache @pinned_links do %>
+      <% has_timed = @pinned_links.any?(&:timed?) %>
+      <% cache_unless has_timed, @pinned_links do %>
         <div class="widget has-margin-4 is-teal">
           <% if Rails.env.development? || @pinned_links.to_a.size > 0 %>
             <div class="widget--header">Featured</div>
@@ -122,8 +122,8 @@
           <% if can_see_deleted_posts? && !at_least_moderator? %>
             <li><a href="/mod/deleted">Recent Deletions</a></li>
           <% end %>
-	        <%# this calls into application_helper, not the user model! %>
-	        <% if at_least_moderator? %>
+          <%# this calls into application_helper, not the user model! %>
+          <% if at_least_moderator? %>
             <li><%= link_to 'Moderator Tools', moderator_path %></li>
           <% end %>
           <% if admin? %>

config/environments/development.rb

@@ -14,11 +14,13 @@
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  config.action_controller.perform_caching = ActiveRecord::Type::Boolean.new.cast(ENV['PERFORM_CACHING']) || false
 
   # Enable server timing
   config.server_timing = true
 
+  config.log_level = ENV['LOG_LEVEL'] || :info
+
   # Set the cache store to the redis that was configured in the database.yml
   processed = ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result(binding)
   redis_config = YAML.safe_load(processed, permitted_classes: [], permitted_symbols: [], aliases: true)["redis_#{Rails.env}"]

lib/namespaced_env_cache.rb

@@ -82,6 +82,7 @@ def self.supports_cache_versioning?
     private
 
     def construct_ns_key(key, include_community: true)
+      key = expanded_key(key)
       c_id = RequestContext.community_id if include_community
       "#{Rails.env}://#{[c_id, key].compact.join('/')}"
     end