Shorten some very long lines

Prevent warnings from already defined constants when reloading

app/serializers/post_serializer.rb

@@ -1,7 +1,7 @@
 class PostSerializer < BasicPostSerializer
 
   # To pass in additional information we might need
-  INSTANCE_VARS = [
+  INSTANCE_VARS ||= [
     :topic_view,
     :parent_post,
     :add_raw,
@@ -310,9 +310,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def include_user_custom_fields?
-    return if @topic_view.blank?
+    (@topic_view&.user_custom_fields || {})[object.user_id]
-    custom_fields = @topic_view.user_custom_fields
-    custom_fields && custom_fields[object.user_id]
   end
 
   def static_doc
@@ -354,17 +352,16 @@ class PostSerializer < BasicPostSerializer
   private
 
     def post_actions
-      @post_actions ||= (@topic_view.present? && @topic_view.all_post_actions.present?) ? @topic_view.all_post_actions[object.id] : nil
+      @post_actions ||= (@topic_view&.all_post_actions || {})[object.id]
     end
 
     def active_flags
-      @active_flags ||= (@topic_view.present? && @topic_view.all_active_flags.present?) ? @topic_view.all_active_flags[object.id] : nil
+      @active_flags ||= (@topic_view&.all_active_flags || {})[object.id]
     end
 
     def post_custom_fields
-      @post_custom_fields ||=
+      @post_custom_fields ||= if @topic_view
-        if @topic_view
+        (@topic_view.post_custom_fields || {})[object.id] || {}
-          (@topic_view.post_custom_fields && @topic_view.post_custom_fields[object.id]) || {}
       else
         object.custom_fields
       end

app/serializers/post_stream_serializer_mixin.rb

@@ -20,19 +20,17 @@ module PostStreamSerializerMixin
   end
 
   def posts
-    return @posts if @posts.present?
+    @posts ||= begin
-    @posts = []
+      (object.posts || []).map do |post|
-    if object.posts
+        post.topic = object.topic
-      object.posts.each do |p|
-        ps = PostSerializer.new(p, scope: scope, root: false)
-        ps.add_raw = true if @options[:include_raw]
-        ps.topic_view = object
-        p.topic = object.topic
 
-        @posts << ps.as_json
+        serializer = PostSerializer.new(post, scope: scope, root: false)
+        serializer.add_raw = true if @options[:include_raw]
+        serializer.topic_view = object
+
+        serializer.as_json
       end
     end
-    @posts
   end
 
 end

app/serializers/topic_view_serializer.rb

@@ -255,9 +255,7 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def topic_timer
-    TopicTimerSerializer.new(
+    TopicTimerSerializer.new(object.topic.public_topic_timer, root: false)
-      object.topic.public_topic_timer, root: false
-    )
   end
 
   def tags

lib/plugin/metadata.rb

@@ -3,7 +3,7 @@ module Plugin; end
 
 class Plugin::Metadata
 
-  OFFICIAL_PLUGINS = Set.new([
+  OFFICIAL_PLUGINS ||= Set.new([
     "customer-flair",
     "discourse-adplugin",
     "discourse-akismet",

lib/topic_view.rb

@@ -67,16 +67,14 @@ class TopicView
     filter_posts(options)
 
     if @posts
-      added_fields = User.whitelisted_user_custom_fields(@guardian)
+      if (added_fields = User.whitelisted_user_custom_fields(@guardian)).present?
-      if added_fields.present?
         @user_custom_fields = User.custom_fields_for_ids(@posts.map(&:user_id), added_fields)
       end
-    end
 
-    whitelisted_fields = TopicView.whitelisted_post_custom_fields(@user)
+      if (whitelisted_fields = TopicView.whitelisted_post_custom_fields(@user)).present?
-    if whitelisted_fields.present? && @posts
         @post_custom_fields = Post.custom_fields_for_ids(@posts.map(&:id), whitelisted_fields)
       end
+    end
 
     @draft_key = @topic.draft_key
     @draft_sequence = DraftSequence.current(@user, @draft_key)