0
0
Fork 0

Adding config for puma, dashboard layout, fixing some queries

This commit is contained in:
Eugen Rochko 2016-03-12 16:09:46 +01:00
parent 447cfef62d
commit aab9f57e36
25 changed files with 264 additions and 134 deletions

View file

@ -5,7 +5,7 @@ class AccountsController < ApplicationController
before_action :set_webfinger_header
def show
@statuses = @account.statuses.order('id desc').includes(thread: [:account], reblog: [:account], stream_entry: [])
@statuses = @account.statuses.order('id desc').with_includes.with_counters
respond_to do |format|
format.html

View file

@ -15,7 +15,7 @@ class Api::AccountsController < ApiController
end
def statuses
@statuses = @account.statuses.order('created_at desc')
@statuses = @account.statuses.with_includes.with_counts.order('created_at desc')
end
def follow

View file

@ -1,8 +1,16 @@
class HomeController < ApplicationController
layout 'dashboard'
before_action :authenticate_user!
def index
feed = Feed.new(:home, current_user.account)
@statuses = feed.get(20, (params[:offset] || 0).to_i)
end
def mentions
feed = Feed.new(:mentions, current_user.account)
@statuses = feed.get(20, (params[:offset] || 0).to_i)
render action: :index
end
end