Fix linking of remote hashtags in UI, add public view of hashtags

diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index 2006e965a3b229dd7b74086d14f7eae252ba5ad6..118635ed394544f62143810a4f2e0da55568d97c 100644 (file)
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -23,7 +23,7 @@ const StatusContent = React.createClass({
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
-      } else if (link.text[0] === '#' || (link.previousSibling && link.previousSibling.text === '#')) {
+      } else if (link.text[0] === '#' || (link.previousSibling && link.previousSibling.text[link.previousSibling.text.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
       } else {
         link.setAttribute('target', '_blank');

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index c1aaf7e479cf8738fe319191a35f8c6c4264106d..ca5ee2f8343bfdfb420d4d310dff43a5fe4f53a8 100644 (file)
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,4 +1,7 @@
 class TagsController < ApplicationController
+  layout 'public'
+
   def show
+    @statuses = Tag.find_by!(name: params[:id].downcase).statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)
   end
 end

diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e6fd2db7ae3ae283481fa8b3e65794a5fa43800 100644 (file)
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -0,0 +1,8 @@
+- if @statuses.empty?
+  .accounts-grid
+    = render partial: 'accounts/nothing_here'
+- else
+  .activity-stream
+    = render partial: 'stream_entries/status', collection: @statuses, as: :status, cached: true
+
+= will_paginate @statuses, pagination_options