mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-01 08:18:53 +09:00
Code

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

Browse Source
This commit is contained in:
Eugen Rochko 2016-11-05 17:44:14 +01:00
parent 48b9619439
commit a698b767c1
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/status_content.jsx
View File

@ -23,7 +23,7 @@ const StatusContent = React.createClass({
if (mention) { if (mention) {
link.addEventListener('click', this.onMentionClick.bind(this, mention), false); 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); link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
} else { } else {
link.setAttribute('target', '_blank'); link.setAttribute('target', '_blank');

3
app/controllers/tags_controller.rb
View File

@ -1,4 +1,7 @@
class TagsController < ApplicationController class TagsController < ApplicationController
layout 'public'
def show 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
end end

8
app/views/tags/show.html.haml
View File

@ -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