zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-05-13 07:57:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixes for non-unique results and missing current site

Browse source
This commit is contained in:
Kyle Drake 2024-09-04 13:16:10 -05:00
parent 1f1ee0b64e
commit ccb6c85c41
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/activity.rb
View file

@ -32,7 +32,7 @@ get '/activity' do
query2 = query2.where(Sequel.|({events__site_id: nil}, ~{events__site_id: blocking_site_ids})).where(Sequel.|({events__actioning_site_id: nil}, ~{events__actioning_site_id: blocking_site_ids})) query2 = query2.where(Sequel.|({events__site_id: nil}, ~{events__site_id: blocking_site_ids})).where(Sequel.|({events__actioning_site_id: nil}, ~{events__actioning_site_id: blocking_site_ids}))
end end
ds = query1.union(query2, all: true).order(Sequel.desc(:created_at)) ds = query1.union(query2, all: false).order(Sequel.desc(:created_at))
else else
ds = Event.news_feed_default_dataset.exclude(sites__is_nsfw: true) ds = Event.news_feed_default_dataset.exclude(sites__is_nsfw: true)

4
views/activity.erb
View file

@ -31,7 +31,7 @@
</div> </div>
<% end %> <% end %>
<%== erb :'_news', locals: {current_site: nil, events: @events} %> <%== erb :'_news', layout: false, locals: {current_site: current_site, events: @events} %>
<%== erb :'_browse_tags' %> <%== erb :'_browse_tags', layout: false %>
</div> </div>
</div> </div>

2
views/browse.erb
View file

@ -143,7 +143,7 @@
<% end %> <% end %>
<% unless is_education? %> <% unless is_education? %>
<%== erb :_browse_tags %> <%== erb :_browse_tags, layout: false %>
<div class="row content misc"> <div class="row content misc">
<h3>Text Search</h3> <h3>Text Search</h3>
<form id="searchForm" method="GET" action="https://duckduckgo.com" class="content" onsubmit="return addSiteToSearch()"> <form id="searchForm" method="GET" action="https://duckduckgo.com" class="content" onsubmit="return addSiteToSearch()">