Fix Sidekiq pooling issues. Remove API docs from homepage, replace with

a basic home timeline

app/assets/stylesheets/dashboard.scss

@@ -124,6 +124,12 @@
     background: #d9e1e8;
     border-radius: 0 4px 4px 0;
 
+    .dashboard__top-bar {
+      border-radius: 0 4px 0 0;
+    }
+  }
+}
+
 .dashboard__content__content {
   padding: 20px;
   color: #282c37;
@@ -211,12 +217,6 @@
   }
 }
 
-    .dashboard__top-bar {
-      border-radius: 0 4px 0 0;
-    }
-  }
-}
-
 .simple_form {
   .form-actions {
     padding-top: 20px;

app/controllers/home_controller.rb

@@ -4,5 +4,6 @@ class HomeController < ApplicationController
   before_action :authenticate_user!
 
   def index
+    @timeline = Feed.new(:home, current_user.account).get(10, params[:max_id])
   end
 end

app/views/home/index.html.haml

@@ -4,111 +4,7 @@
   .form-actions
     = f.button :submit, 'Post update'
 
-%hr/
+- content_for :raw_content do
-
+  .activity-stream.activity-stream-embedded
-%h3 OAuth2
+    - @timeline.each do |status|
-%p All API methods require a valid access token.
+      = render partial: 'stream_entries/status', locals: { status: status }
-
-%h3 Statuses
-%ul.api-descriptions
-  %li
-    .address
-      %samp.method GET
-      %samp /api/statuses/home
-    .description
-      Returns user's home timeline
-  %li
-    .address
-      %samp.method GET
-      %samp /api/statuses/mentions
-    .description
-      Returns user's mentions timeline
-  %li
-    .address
-      %samp.method POST
-      %samp /api/statuses
-    .options
-      Options:
-      = succeed ',' do
-        %samp status
-      %samp in_reply_to_id
-    .description
-      Creates a new status, optionally as a response to another, from user's account. Returns the new status.
-  %li
-    .address
-      %samp.method GET
-      %samp /api/statuses/:id
-    .description
-      Returns a single status
-  %li
-    .address
-      %samp.method POST
-      %samp /api/statuses/:id/reblog
-    .description
-      Reblogs a status from user's account. Returns the target status.
-  %li
-    .address
-      %samp.method POST
-      %samp /api/statuses/:id/favourite
-    .description
-      Favourites a status from user's account. Returns the target status.
-
-%h3 Accounts
-%ul.api-descriptions
-  %li
-    .address
-      %samp.method GET
-      %samp /api/accounts/:id
-    .description
-      Returns a single account
-  %li
-    .address
-      %samp.method GET
-      %samp /api/accounts/:id/statuses
-    .description
-      Returns an account's statuses
-  %li
-    .address
-      %samp.method GET
-      %samp /api/accounts/:id/followers
-    .description
-      Returns accounts following an account
-  %li
-    .address
-      %samp.method GET
-      %samp /api/accounts/:id/following
-    .description
-      Returns the accounts the target account follows
-  %li
-    .address
-      %samp.method POST
-      %samp /api/accounts/:id/follow
-    .description
-      Follows target account from the user's account. Returns the target account.
-  %li
-    .address
-      %samp.method POST
-      %samp /api/accounts/:id/unfollow
-    .description
-      Unfollows target account from the user's account. Returns the target account.
-  %li
-    .address
-      %samp.method GET
-      %samp /api/accounts/lookup
-    .options
-      Options:
-      %samp usernames
-    .description
-      Returns accounts for a comma-separated list of usernames
-
-%h3 Follows
-%ul.api-descriptions
-  %li
-    .address
-      %samp.method POST
-      %samp /api/follows
-    .options
-      Options:
-      %samp uri
-    .description
-      Follows a user, regardless of where they are, from user's account. URI assumed to be of username@domain form. Returns the target account.

app/views/layouts/dashboard.html.haml

@@ -21,13 +21,18 @@
           = link_to settings_path do
             = fa_icon 'user'
             Edit profile
+
     .dashboard__content
       .dashboard__top-bar
         = content_for?(:page_title) ? yield(:page_title) : 'Mastodon'
         %ul
           %li= link_to fa_icon('gear'), edit_registration_path(current_user), title: 'Change password'
           %li= link_to fa_icon('sign-out'), destroy_user_session_path, method: :delete, title: 'Sign out'
+
       .dashboard__content__content= yield
+
+      = yield(:raw_content)
+
   .footer
     .domain= Rails.configuration.x.local_domain
 

config/database.yml

@@ -1,6 +1,6 @@
 default: &default
   adapter: postgresql
-  pool: 10
+  pool: 15
   timeout: 5000
   encoding: unicode
 

config/initializers/sidekiq.rb

@@ -1,11 +1,10 @@
-redis_conn = proc {
+host = ENV['REDIS_HOST'] || 'localhost'
-  $redis.dup
+port = ENV['REDIS_PORT'] || 6379
-}
 
 Sidekiq.configure_server do |config|
-  config.redis = ConnectionPool.new(size: 5, &redis_conn)
+  config.redis = { host: host, port: port }
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = ConnectionPool.new(size: 5, &redis_conn)
+  config.redis = { host: host, port: port }
 end