Fix links of more-button on mobile streams

Fixes #6999

closes #7036

1 files changed, 19 insertions, 9 deletions

diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb
index f3eb25415..73e23d25c 100644
--- a/app/helpers/stream_helper.rb
+++ b/app/helpers/stream_helper.rb
@@ -8,16 +8,8 @@ module StreamHelper
       tag_path(:name => @stream.tag_name, :max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(PeopleController)
       local_or_remote_person_path(@person, :max_time => time_for_scroll(@stream))
-    elsif controller.instance_of?(PostsController)
-      public_stream_path(:max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(StreamsController)
-      if current_page?(:stream)
-        stream_path(:max_time => time_for_scroll(@stream))
-      elsif current_page?(:aspects_stream)
-        aspects_stream_path(:max_time => time_for_scroll(@stream), :a_ids => session[:a_ids])
-      else
-        activity_stream_path(:max_time => time_for_scroll(@stream))
-      end
+      next_stream_path
     else
       raise 'in order to use pagination for this new controller, update next_page_path in stream helper'
     end
@@ -29,6 +21,24 @@ module StreamHelper
 
   private
 
+  def next_stream_path
+    if current_page?(:stream)
+      stream_path(max_time: time_for_scroll(@stream))
+    elsif current_page?(:activity_stream)
+      activity_stream_path(max_time: time_for_scroll(@stream))
+    elsif current_page?(:aspects_stream)
+      aspects_stream_path(max_time: time_for_scroll(@stream), a_ids: session[:a_ids])
+    elsif current_page?(:public_stream)
+      public_stream_path(max_time: time_for_scroll(@stream))
+    elsif current_page?(:mentioned_stream)
+      mentioned_stream_path(max_time: time_for_scroll(@stream))
+    elsif current_page?(:followed_tags_stream)
+      followed_tags_stream_path(max_time: time_for_scroll(@stream))
+    else
+      raise "in order to use pagination for this new stream, update next_stream_path in stream helper"
+    end
+  end
+
   def time_for_scroll(stream)
     if stream.stream_posts.empty?
       (Time.now() + 1).to_i