zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix up news feed a bit

Browse source
This commit is contained in:
Kyle Drake 2014-08-14 22:02:26 -07:00
parent 19ad676df6
commit c085fd068d
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
models/site.rb
View file

@ -629,12 +629,15 @@ class Site < Sequel::Model
end
def latest_events(current_page=1, limit=10)
events_dataset.exclude(site_id: self.id).order(:created_at.desc).paginate(current_page, limit)
events_dataset.order(:created_at.desc).paginate(current_page, limit)
end
def news_feed(current_page=1, limit=10)
following_ids = self.followings_dataset.select(:site_id).all.collect {|f| f.site_id}
Event.filter(site_id: following_ids+[self.id]).order(:created_at.desc).paginate(current_page, limit)
Event.filter(site_id: following_ids+[self.id]).
order(:created_at.desc).
exclude(actioning_site_id: self.id).
paginate(current_page, limit)
end
def host

18
views/_news.erb
View file

@ -19,10 +19,14 @@
<div class="title">
<div class="icon"></div>
<% actioning_site = event.actioning_site_dataset.select(:username, :title, :domain).first %>
<% event_site = event.site_dataset.select(:username, :title, :domain).first %>
<% event_site = event.site_dataset.select(:id, :username, :title, :domain).first %>
<a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><%= actioning_site.title.shorten(40) %></a>
is following
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.title.shorten(40) %></a>
<% if event_site.id == current_site.id %>
your site!
<% else %>
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.title.shorten(40) %></a>
<% end %>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
@ -31,8 +35,12 @@
<div class="news-item update">
<div class="title">
<div class="icon"></div>
<% event_site = event.site_dataset.select(:username, :title, :domain).first %>
<a href="/site/<%= event_site.username %>" class="user"><%= event_site.title %></a> has been updated.
<% event_site = event.site_dataset.select(:id, :username, :title, :domain).first %>
<% if event_site.id == current_site.id %>
Your site was updated.
<% else %>
<a href="/site/<%= event_site.username %>" class="user"><%= event_site.title %></a> has been updated.
<% end %>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
@ -70,7 +78,7 @@
<div class="content">
<div class="comments">
<% event.comments.each do |comment| %>
<% comment_actioning_site = comment.actioning_site_dataset.select(:title, :domain, :username).first %>
<% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username).first %>
<div class="comment" id="comment_<%= comment.id %>">
<img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '82x62') %>">
<a href="/site/<%= comment_actioning_site.username %>" class="user"><%= comment_actioning_site.title %></a>