Browse Source

Fix rubocop issues, introduce usage of frozen literal to improve performance

fox-glitch-changes
Eugen Rochko 3 years ago
parent
commit
fdc17bea58
96 changed files with 329 additions and 126 deletions
  1. 32
    4
      .rubocop.yml
  2. 2
    0
      Gemfile
  3. 2
    0
      app/channels/application_cable/channel.rb
  4. 2
    0
      app/channels/application_cable/connection.rb
  5. 2
    0
      app/channels/hashtag_channel.rb
  6. 2
    0
      app/channels/public_channel.rb
  7. 2
    0
      app/channels/timeline_channel.rb
  8. 2
    0
      app/controllers/about_controller.rb
  9. 3
    4
      app/controllers/accounts_controller.rb
  10. 2
    0
      app/controllers/api/salmon_controller.rb
  11. 2
    0
      app/controllers/api/subscriptions_controller.rb
  12. 5
    3
      app/controllers/api/v1/accounts_controller.rb
  13. 2
    0
      app/controllers/api/v1/apps_controller.rb
  14. 2
    0
      app/controllers/api/v1/follows_controller.rb
  15. 2
    0
      app/controllers/api/v1/media_controller.rb
  16. 5
    3
      app/controllers/api/v1/statuses_controller.rb
  17. 6
    4
      app/controllers/api/v1/timelines_controller.rb
  18. 5
    3
      app/controllers/api_controller.rb
  19. 2
    0
      app/controllers/application_controller.rb
  20. 2
    0
      app/controllers/auth/confirmations_controller.rb
  21. 2
    0
      app/controllers/auth/passwords_controller.rb
  22. 2
    0
      app/controllers/auth/registrations_controller.rb
  23. 2
    0
      app/controllers/auth/sessions_controller.rb
  24. 2
    0
      app/controllers/home_controller.rb
  25. 2
    0
      app/controllers/media_controller.rb
  26. 2
    0
      app/controllers/oauth/authorizations_controller.rb
  27. 2
    0
      app/controllers/settings/preferences_controller.rb
  28. 2
    0
      app/controllers/settings/profiles_controller.rb
  29. 3
    3
      app/controllers/stream_entries_controller.rb
  30. 2
    0
      app/controllers/tags_controller.rb
  31. 6
    4
      app/controllers/xrd_controller.rb
  32. 2
    0
      app/helpers/about_helper.rb
  33. 5
    3
      app/helpers/accounts_helper.rb
  34. 2
    0
      app/helpers/application_helper.rb
  35. 8
    2
      app/helpers/atom_builder_helper.rb
  36. 3
    1
      app/helpers/home_helper.rb
  37. 2
    0
      app/helpers/routing_helper.rb
  38. 2
    0
      app/helpers/stream_entries_helper.rb
  39. 2
    0
      app/helpers/tags_helper.rb
  40. 2
    0
      app/helpers/xrd_helper.rb
  41. 15
    13
      app/lib/feed_manager.rb
  42. 4
    2
      app/lib/formatter.rb
  43. 3
    1
      app/lib/tag_manager.rb
  44. 2
    0
      app/mailers/application_mailer.rb
  45. 2
    0
      app/mailers/notification_mailer.rb
  46. 6
    4
      app/models/account.rb
  47. 2
    0
      app/models/application_record.rb
  48. 2
    0
      app/models/block.rb
  49. 2
    0
      app/models/concerns/paginable.rb
  50. 2
    0
      app/models/concerns/streamable.rb
  51. 2
    0
      app/models/concerns/targetable.rb
  52. 2
    0
      app/models/domain_block.rb
  53. 2
    0
      app/models/favourite.rb
  54. 3
    1
      app/models/feed.rb
  55. 2
    0
      app/models/follow.rb
  56. 2
    0
      app/models/follow_suggestion.rb
  57. 12
    10
      app/models/media_attachment.rb
  58. 2
    0
      app/models/mention.rb
  59. 6
    9
      app/models/status.rb
  60. 7
    1
      app/models/stream_entry.rb
  61. 2
    0
      app/models/tag.rb
  62. 2
    0
      app/models/user.rb
  63. 2
    0
      app/services/base_service.rb
  64. 2
    0
      app/services/block_domain_service.rb
  65. 3
    1
      app/services/block_service.rb
  66. 2
    0
      app/services/fan_out_on_write_service.rb
  67. 2
    0
      app/services/favourite_service.rb
  68. 8
    12
      app/services/fetch_atom_service.rb
  69. 4
    2
      app/services/fetch_remote_account_service.rb
  70. 5
    3
      app/services/fetch_remote_status_service.rb
  71. 4
    2
      app/services/follow_remote_account_service.rb
  72. 3
    1
      app/services/follow_service.rb
  73. 2
    0
      app/services/post_status_service.rb
  74. 3
    3
      app/services/precompute_feed_service.rb
  75. 7
    5
      app/services/process_feed_service.rb
  76. 3
    3
      app/services/process_hashtags_service.rb
  77. 4
    4
      app/services/process_interaction_service.rb
  78. 2
    0
      app/services/process_mentions_service.rb
  79. 2
    0
      app/services/reblog_service.rb
  80. 3
    1
      app/services/remove_status_service.rb
  81. 6
    4
      app/services/search_service.rb
  82. 2
    0
      app/services/send_interaction_service.rb
  83. 2
    0
      app/services/subscribe_service.rb
  84. 2
    0
      app/services/unblock_service.rb
  85. 2
    0
      app/services/unfavourite_service.rb
  86. 3
    1
      app/services/unfollow_service.rb
  87. 7
    5
      app/services/update_remote_profile_service.rb
  88. 2
    0
      app/workers/distribution_worker.rb
  89. 2
    0
      app/workers/hub_ping_worker.rb
  90. 2
    0
      app/workers/notification_worker.rb
  91. 2
    0
      app/workers/processing_worker.rb
  92. 2
    0
      app/workers/regeneration_worker.rb
  93. 2
    0
      app/workers/thread_resolve_worker.rb
  94. 1
    0
      config.ru
  95. 4
    2
      config/initializers/redis.rb
  96. 4
    2
      lib/tasks/mastodon.rake

+ 32
- 4
.rubocop.yml View File

@@ -18,9 +18,29 @@ Metrics/MethodLength:
CountComments: false
Max: 10

Metrics/ModuleLength:
Metrics/AbcSize:
Max: 100

Metrics/BlockNesting:
Max: 3

Metrics/ClassLength:
CountComments: false
Max: 200

Metrics/CyclomaticComplexity:
Max: 15

Metrics/MethodLength:
Max: 55

Metrics/ModuleLength:
CountComments: false
Max: 200

Metrics/PerceivedComplexity:
Max: 10

Metrics/ParameterLists:
Max: 4
CountKeywordArgs: true
@@ -37,10 +57,10 @@ Style/Documentation:
Enabled: false

Style/DoubleNegation:
Enabled: false
Enabled: true

Style/FrozenStringLiteralComment:
Enabled: false
Enabled: true

Style/SpaceInsideHashLiteralBraces:
EnforcedStyle: space
@@ -51,10 +71,18 @@ Style/TrailingCommaInLiteral:
Style/RegexpLiteral:
Enabled: false

Style/Lambda:
Enabled: false

Rails/HasAndBelongsToMany:
Enabled: false

AllCops:
TargetRubyVersion: 2.2
TargetRubyVersion: 2.3
Exclude:
- 'spec/**/*'
- 'db/**/*'
- 'app/views/**/*'
- 'config/**/*'
- 'bin/*'
- 'Rakefile'

+ 2
- 0
Gemfile View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

source 'https://rubygems.org'

gem 'rails', '5.0.0.1'

+ 2
- 0
app/channels/application_cable/channel.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationCable
class Channel < ActionCable::Channel::Base
protected

+ 2
- 0
app/channels/application_cable/connection.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationCable
class Connection < ActionCable::Connection::Base
identified_by :current_user

+ 2
- 0
app/channels/hashtag_channel.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class HashtagChannel < ApplicationCable::Channel
def subscribed
tag = params[:tag].downcase

+ 2
- 0
app/channels/public_channel.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class PublicChannel < ApplicationCable::Channel
def subscribed
stream_from 'timeline:public', lambda { |encoded_message|

+ 2
- 0
app/channels/timeline_channel.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class TimelineChannel < ApplicationCable::Channel
def subscribed
stream_from "timeline:#{current_user.account_id}"

+ 2
- 0
app/controllers/about_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class AboutController < ApplicationController
before_action :set_body_classes


+ 3
- 4
app/controllers/accounts_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class AccountsController < ApplicationController
layout 'public'

@@ -41,10 +43,7 @@ class AccountsController < ApplicationController
end

def set_link_headers
response.headers['Link'] = LinkHeader.new([
[webfinger_account_url, [['rel', 'lrdd'], ['type', 'application/xrd+xml']]],
[account_url(@account, format: 'atom'), [['rel', 'alternate'], ['type', 'application/atom+xml']]]
])
response.headers['Link'] = LinkHeader.new([[webfinger_account_url, [%w(rel lrdd), %w(type application/xrd+xml)]], [account_url(@account, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]]])
end

def webfinger_account_url

+ 2
- 0
app/controllers/api/salmon_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::SalmonController < ApiController
before_action :set_account
respond_to :txt

+ 2
- 0
app/controllers/api/subscriptions_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::SubscriptionsController < ApiController
before_action :set_account
respond_to :txt

+ 5
- 3
app/controllers/api/v1/accounts_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::V1::AccountsController < ApiController
before_action -> { doorkeeper_authorize! :read }, except: [:follow, :unfollow, :block, :unblock]
before_action -> { doorkeeper_authorize! :follow }, only: [:follow, :unfollow, :block, :unblock]
@@ -20,7 +22,7 @@ class Api::V1::AccountsController < ApiController
@accounts = results.map { |f| accounts[f.target_account_id] }

next_path = following_api_v1_account_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
prev_path = following_api_v1_account_url(since_id: results.first.id) if results.size > 0
prev_path = following_api_v1_account_url(since_id: results.first.id) unless results.empty?

set_pagination_headers(next_path, prev_path)

@@ -33,7 +35,7 @@ class Api::V1::AccountsController < ApiController
@accounts = results.map { |f| accounts[f.account_id] }

next_path = followers_api_v1_account_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
prev_path = followers_api_v1_account_url(since_id: results.first.id) if results.size > 0
prev_path = followers_api_v1_account_url(since_id: results.first.id) unless results.empty?

set_pagination_headers(next_path, prev_path)

@@ -56,7 +58,7 @@ class Api::V1::AccountsController < ApiController
set_maps(@statuses)

next_path = statuses_api_v1_account_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = statuses_api_v1_account_url(since_id: @statuses.first.id) if @statuses.size > 0
prev_path = statuses_api_v1_account_url(since_id: @statuses.first.id) unless @statuses.empty?

set_pagination_headers(next_path, prev_path)
end

+ 2
- 0
app/controllers/api/v1/apps_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::V1::AppsController < ApiController
respond_to :json


+ 2
- 0
app/controllers/api/v1/follows_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::V1::FollowsController < ApiController
before_action -> { doorkeeper_authorize! :follow }
before_action :require_user!

+ 2
- 0
app/controllers/api/v1/media_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::V1::MediaController < ApiController
before_action -> { doorkeeper_authorize! :write }
before_action :require_user!

+ 5
- 3
app/controllers/api/v1/statuses_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::V1::StatusesController < ApiController
before_action -> { doorkeeper_authorize! :read }, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
before_action -> { doorkeeper_authorize! :write }, only: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
@@ -10,7 +12,7 @@ class Api::V1::StatusesController < ApiController
end

def context
@context = OpenStruct.new({ ancestors: @status.ancestors, descendants: @status.descendants })
@context = OpenStruct.new(ancestors: @status.ancestors, descendants: @status.descendants)
set_maps([@status] + @context[:ancestors] + @context[:descendants])
end

@@ -20,7 +22,7 @@ class Api::V1::StatusesController < ApiController
@accounts = results.map { |r| accounts[r.account_id] }

next_path = reblogged_by_api_v1_status_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
prev_path = reblogged_by_api_v1_status_url(since_id: results.first.id) if results.size > 0
prev_path = reblogged_by_api_v1_status_url(since_id: results.first.id) unless results.empty?

set_pagination_headers(next_path, prev_path)

@@ -33,7 +35,7 @@ class Api::V1::StatusesController < ApiController
@accounts = results.map { |f| accounts[f.account_id] }

next_path = favourited_by_api_v1_status_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
prev_path = favourited_by_api_v1_status_url(since_id: results.first.id) if results.size > 0
prev_path = favourited_by_api_v1_status_url(since_id: results.first.id) unless results.empty?

set_pagination_headers(next_path, prev_path)


+ 6
- 4
app/controllers/api/v1/timelines_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Api::V1::TimelinesController < ApiController
before_action -> { doorkeeper_authorize! :read }
before_action :require_user!, only: [:home, :mentions]
@@ -10,7 +12,7 @@ class Api::V1::TimelinesController < ApiController
set_maps(@statuses)

next_path = api_v1_home_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_home_timeline_url(since_id: @statuses.first.id) if @statuses.size > 0
prev_path = api_v1_home_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?

set_pagination_headers(next_path, prev_path)

@@ -23,7 +25,7 @@ class Api::V1::TimelinesController < ApiController
set_maps(@statuses)

next_path = api_v1_mentions_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_mentions_timeline_url(since_id: @statuses.first.id) if @statuses.size > 0
prev_path = api_v1_mentions_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?

set_pagination_headers(next_path, prev_path)

@@ -36,7 +38,7 @@ class Api::V1::TimelinesController < ApiController
set_maps(@statuses)

next_path = api_v1_public_timeline_url(max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_public_timeline_url(since_id: @statuses.first.id) if @statuses.size > 0
prev_path = api_v1_public_timeline_url(since_id: @statuses.first.id) unless @statuses.empty?

set_pagination_headers(next_path, prev_path)

@@ -50,7 +52,7 @@ class Api::V1::TimelinesController < ApiController
set_maps(@statuses)

next_path = api_v1_hashtag_timeline_url(params[:id], max_id: @statuses.last.id) if @statuses.size == DEFAULT_STATUSES_LIMIT
prev_path = api_v1_hashtag_timeline_url(params[:id], since_id: @statuses.first.id) if @statuses.size > 0
prev_path = api_v1_hashtag_timeline_url(params[:id], since_id: @statuses.first.id) unless @statuses.empty?

set_pagination_headers(next_path, prev_path)


+ 5
- 3
app/controllers/api_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ApiController < ApplicationController
DEFAULT_STATUSES_LIMIT = 20
DEFAULT_ACCOUNTS_LIMIT = 40
@@ -51,8 +53,8 @@ class ApiController < ApplicationController

def set_pagination_headers(next_path = nil, prev_path = nil)
links = []
links << [next_path, [['rel', 'next']]] if next_path
links << [prev_path, [['rel', 'prev']]] if prev_path
links << [next_path, [%w(rel next)]] if next_path
links << [prev_path, [%w(rel prev)]] if prev_path
response.headers['Link'] = LinkHeader.new(links)
end

@@ -76,7 +78,7 @@ class ApiController < ApplicationController
render json: {}, status: 200
end

def set_maps(statuses)
def set_maps(statuses) # rubocop:disable Style/AccessorMethodName
if current_account.nil?
@reblogs_map = {}
@favourites_map = {}

+ 2
- 0
app/controllers/application_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ApplicationController < ActionController::Base
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.

+ 2
- 0
app/controllers/auth/confirmations_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Auth::ConfirmationsController < Devise::ConfirmationsController
layout 'auth'
end

+ 2
- 0
app/controllers/auth/passwords_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Auth::PasswordsController < Devise::PasswordsController
layout 'auth'
end

+ 2
- 0
app/controllers/auth/registrations_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Auth::RegistrationsController < Devise::RegistrationsController
layout 'auth'


+ 2
- 0
app/controllers/auth/sessions_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Auth::SessionsController < Devise::SessionsController
include Devise::Controllers::Rememberable


+ 2
- 0
app/controllers/home_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class HomeController < ApplicationController
before_action :authenticate_user!


+ 2
- 0
app/controllers/media_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class MediaController < ApplicationController
before_action :set_media_attachment


+ 2
- 0
app/controllers/oauth/authorizations_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
skip_before_action :authenticate_resource_owner!


+ 2
- 0
app/controllers/settings/preferences_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Settings::PreferencesController < ApplicationController
layout 'auth'


+ 2
- 0
app/controllers/settings/profiles_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Settings::ProfilesController < ApplicationController
layout 'auth'


+ 3
- 3
app/controllers/stream_entries_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class StreamEntriesController < ApplicationController
layout 'public'

@@ -29,9 +31,7 @@ class StreamEntriesController < ApplicationController
end

def set_link_headers
response.headers['Link'] = LinkHeader.new([
[account_stream_entry_url(@account, @stream_entry, format: 'atom'), [['rel', 'alternate'], ['type', 'application/atom+xml']]]
])
response.headers['Link'] = LinkHeader.new([[account_stream_entry_url(@account, @stream_entry, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]]])
end

def set_stream_entry

+ 2
- 0
app/controllers/tags_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class TagsController < ApplicationController
layout 'public'


+ 6
- 4
app/controllers/xrd_controller.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class XrdController < ApplicationController
before_action :set_default_format_json, only: :webfinger
before_action :set_default_format_xml, only: :host_meta
@@ -26,11 +28,11 @@ class XrdController < ApplicationController
private

def set_default_format_xml
request.format = 'xml' if request.headers["HTTP_ACCEPT"].nil? && params[:format].nil?
request.format = 'xml' if request.headers['HTTP_ACCEPT'].nil? && params[:format].nil?
end

def set_default_format_json
request.format = 'json' if request.headers["HTTP_ACCEPT"].nil? && params[:format].nil?
request.format = 'json' if request.headers['HTTP_ACCEPT'].nil? && params[:format].nil?
end

def username_from_resource
@@ -44,14 +46,14 @@ class XrdController < ApplicationController

def pem_to_magic_key(public_key)
modulus, exponent = [public_key.n, public_key.e].map do |component|
result = ''
result = []

until component.zero?
result << [component % 256].pack('C')
component >>= 8
end

result.reverse!
result.reverse.join
end

(['RSA'] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.')

+ 2
- 0
app/helpers/about_helper.rb View File

@@ -1,2 +1,4 @@
# frozen_string_literal: true

module AboutHelper
end

+ 5
- 3
app/helpers/accounts_helper.rb View File

@@ -1,10 +1,12 @@
# frozen_string_literal: true

module AccountsHelper
def pagination_options
{
previous_label: "#{fa_icon('chevron-left')} Prev".html_safe,
next_label: "Next #{fa_icon('chevron-right')}".html_safe,
previous_label: safe_join([fa_icon('chevron-left'), 'Prev'], ' '),
next_label: safe_join(['Next', fa_icon('chevron-right')], ' '),
inner_window: 1,
outer_window: 0
outer_window: 0,
}
end
end

+ 2
- 0
app/helpers/application_helper.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationHelper
def active_nav_class(path)
current_page?(path) ? 'active' : ''

+ 8
- 2
app/helpers/atom_builder_helper.rb View File

@@ -1,6 +1,12 @@
# frozen_string_literal: true

module AtomBuilderHelper
def stream_updated_at
@account.stream_entries.last ? (@account.updated_at > @account.stream_entries.last.created_at ? @account.updated_at : @account.stream_entries.last.created_at) : @account.updated_at
if @account.stream_entries.last
(@account.updated_at > @account.stream_entries.last.created_at ? @account.updated_at : @account.stream_entries.last.created_at)
else
@account.updated_at
end
end

def entry(xml, is_root = false, &block)
@@ -98,7 +104,7 @@ module AtomBuilderHelper
end

def in_reply_to(xml, uri, url)
xml['thr'].send('in-reply-to', { ref: uri, href: url, type: 'text/html' })
xml['thr'].send('in-reply-to', ref: uri, href: url, type: 'text/html')
end

def link_mention(xml, account)

+ 3
- 1
app/helpers/home_helper.rb View File

@@ -1,8 +1,10 @@
# frozen_string_literal: true

module HomeHelper
def default_props
{
token: @token,
account: render(file: 'api/v1/accounts/show', locals: { account: current_user.account }, formats: :json)
account: render(file: 'api/v1/accounts/show', locals: { account: current_user.account }, formats: :json),
}
end
end

+ 2
- 0
app/helpers/routing_helper.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module RoutingHelper
extend ActiveSupport::Concern
include Rails.application.routes.url_helpers

+ 2
- 0
app/helpers/stream_entries_helper.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module StreamEntriesHelper
def display_name(account)
account.display_name.blank? ? account.username : account.display_name

+ 2
- 0
app/helpers/tags_helper.rb View File

@@ -1,2 +1,4 @@
# frozen_string_literal: true

module TagsHelper
end

+ 2
- 0
app/helpers/xrd_helper.rb View File

@@ -1,2 +1,4 @@
# frozen_string_literal: true

module XrdHelper
end

+ 15
- 13
app/lib/feed_manager.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'singleton'

class FeedManager
@@ -60,29 +62,29 @@ class FeedManager
private

def redis
$redis
Redis.current
end

def filter_from_home?(status, receiver)
should_filter = false

if status.reply? && !status.thread.account.nil? # Filter out if it's a reply
should_filter = !receiver.following?(status.thread.account) # and I'm not following the person it's a reply to
should_filter = should_filter && !(receiver.id == status.thread.account_id) # and it's not a reply to me
should_filter = should_filter && !(status.account_id == status.thread.account_id) # and it's not a self-reply
elsif status.reblog? # Filter out a reblog
should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person
if status.reply? && !status.thread.account.nil? # Filter out if it's a reply
should_filter = !receiver.following?(status.thread.account) # and I'm not following the person it's a reply to
should_filter &&= !(receiver.id == status.thread.account_id) # and it's not a reply to me
should_filter &&= !(status.account_id == status.thread.account_id) # and it's not a self-reply
elsif status.reblog? # Filter out a reblog
should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person
end

should_filter
end

def filter_from_mentions?(status, receiver)
should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself
should_filter = should_filter || receiver.blocking?(status.account) # or it's from someone I blocked
should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself
should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked

if status.reply? && !status.thread.account.nil? # or it's a reply
should_filter = should_filter || receiver.blocking?(status.thread.account) # to a user I blocked
if status.reply? && !status.thread.account.nil? # or it's a reply
should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked
end

should_filter
@@ -92,9 +94,9 @@ class FeedManager
should_filter = receiver.blocking?(status.account)

if status.reply? && !status.thread.account.nil?
should_filter = should_filter || receiver.blocking?(status.thread.account)
should_filter ||= receiver.blocking?(status.thread.account)
elsif status.reblog?
should_filter = should_filter || receiver.blocking?(status.reblog.account)
should_filter ||= receiver.blocking?(status.reblog.account)
end

should_filter

+ 4
- 2
app/lib/formatter.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'singleton'

class Formatter
@@ -17,7 +19,7 @@ class Formatter
html = link_mentions(html, status.mentions)
html = link_hashtags(html)

html.html_safe
html.html_safe # rubocop:disable Rails/OutputSafety
end

def reformat(html)
@@ -30,7 +32,7 @@ class Formatter
html = encode(account.note)
html = link_urls(html)

html.html_safe
html.html_safe # rubocop:disable Rails/OutputSafety
end

private

+ 3
- 1
app/lib/tag_manager.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'singleton'

class TagManager
@@ -18,7 +20,7 @@ class TagManager
end

def local_domain?(domain)
domain.nil? || domain.gsub(/[\/]/, '').downcase == Rails.configuration.x.local_domain.downcase
domain.nil? || domain.gsub(/[\/]/, '').casecmp(Rails.configuration.x.local_domain).zero?
end

def uri_for(target)

+ 2
- 0
app/mailers/application_mailer.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ApplicationMailer < ActionMailer::Base
default from: (ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost')
layout 'mailer'

+ 2
- 0
app/mailers/notification_mailer.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class NotificationMailer < ApplicationMailer
helper StreamEntriesHelper


+ 6
- 4
app/models/account.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Account < ApplicationRecord
include Targetable
include PgSearch
@@ -92,11 +94,11 @@ class Account < ApplicationRecord
end

def favourited?(status)
(status.reblog? ? status.reblog : status).favourites.where(account: self).count > 0
(status.reblog? ? status.reblog : status).favourites.where(account: self).count.positive?
end

def reblogged?(status)
(status.reblog? ? status.reblog : status).reblogs.where(account: self).count > 0
(status.reblog? ? status.reblog : status).reblogs.where(account: self).count.positive?
end

def keypair
@@ -115,8 +117,8 @@ class Account < ApplicationRecord
def avatar_remote_url=(url)
self.avatar = URI.parse(url) unless self[:avatar_remote_url] == url
self[:avatar_remote_url] = url
rescue OpenURI::HTTPError
#
rescue OpenURI::HTTPError => e
Rails.logger.debug "Error fetching remote avatar: #{e}"
end

def object_type

+ 2
- 0
app/models/application_record.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
end

+ 2
- 0
app/models/block.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Block < ApplicationRecord
belongs_to :account
belongs_to :target_account, class_name: 'Account'

+ 2
- 0
app/models/concerns/paginable.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Paginable
extend ActiveSupport::Concern


+ 2
- 0
app/models/concerns/streamable.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Streamable
extend ActiveSupport::Concern


+ 2
- 0
app/models/concerns/targetable.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

module Targetable
extend ActiveSupport::Concern


+ 2
- 0
app/models/domain_block.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class DomainBlock < ApplicationRecord
validates :domain, presence: true, uniqueness: true


+ 2
- 0
app/models/favourite.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Favourite < ApplicationRecord
include Paginable
include Streamable

+ 3
- 1
app/models/feed.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Feed
def initialize(type, account)
@type = type
@@ -28,6 +30,6 @@ class Feed
end

def redis
$redis
Redis.current
end
end

+ 2
- 0
app/models/follow.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Follow < ApplicationRecord
include Paginable
include Streamable

+ 2
- 0
app/models/follow_suggestion.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class FollowSuggestion
class << self
def get(for_account_id, limit = 10)

+ 12
- 10
app/models/media_attachment.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class MediaAttachment < ApplicationRecord
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
@@ -6,9 +8,9 @@ class MediaAttachment < ApplicationRecord
belongs_to :status, inverse_of: :media_attachments

has_attached_file :file,
styles: -> (f) { file_styles f },
processors: -> (f) { f.video? ? [:transcoder] : [:thumbnail] },
convert_options: { all: "-strip" }
styles: -> (f) { file_styles f },
processors: -> (f) { f.video? ? [:transcoder] : [:thumbnail] },
convert_options: { all: '-strip' }
validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
validates_attachment_size :file, less_than: 4.megabytes

@@ -20,8 +22,8 @@ class MediaAttachment < ApplicationRecord

def file_remote_url=(url)
self.file = URI.parse(url)
rescue OpenURI::HTTPError
#
rescue OpenURI::HTTPError => e
Rails.logger.debug "Error fetching remote attachment: #{e}"
end

def image?
@@ -43,19 +45,19 @@ class MediaAttachment < ApplicationRecord
if f.instance.image?
{
original: '100%',
small: '510x680>'
small: '510x680>',
}
else
{
small: {
convert_options: {
output: {
vf: 'scale=\'min(510\, iw):min(680\, ih)\':force_original_aspect_ratio=decrease'
}
vf: 'scale=\'min(510\, iw):min(680\, ih)\':force_original_aspect_ratio=decrease',
},
},
format: 'png',
time: 1
}
time: 1,
},
}
end
end

+ 2
- 0
app/models/mention.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Mention < ApplicationRecord
belongs_to :account, inverse_of: :mentions
belongs_to :status

+ 6
- 9
app/models/status.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Status < ApplicationRecord
include Paginable
include Streamable
@@ -89,22 +91,17 @@ class Status < ApplicationRecord

def as_public_timeline(account = nil)
query = joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id').where('accounts.silenced = FALSE')

unless account.nil?
query = filter_timeline(query, account)
end
query = filter_timeline(query, account) unless account.nil?

query.with_includes.with_counters
end

def as_tag_timeline(tag, account = nil)
query = tag.statuses
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
.where('accounts.silenced = FALSE')
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
.where('accounts.silenced = FALSE')

unless account.nil?
query = filter_timeline(query, account)
end
query = filter_timeline(query, account) unless account.nil?

query.with_includes.with_counters
end

+ 7
- 1
app/models/stream_entry.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class StreamEntry < ApplicationRecord
include Paginable

@@ -15,7 +17,11 @@ class StreamEntry < ApplicationRecord
scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES, favourite: [:account, :stream_entry, status: STATUS_INCLUDES], follow: [:target_account, :stream_entry]) }

def object_type
orphaned? ? :activity : (targeted? ? :activity : activity.object_type)
if orphaned?
:activity
else
targeted? ? :activity : activity.object_type
end
end

def verb

+ 2
- 0
app/models/tag.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class Tag < ApplicationRecord
has_and_belongs_to_many :statuses


+ 2
- 0
app/models/user.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class User < ApplicationRecord
devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable


+ 2
- 0
app/services/base_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class BaseService
include ActionView::Helpers::TextHelper
include ActionView::Helpers::SanitizeHelper

+ 2
- 0
app/services/block_domain_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class BlockDomainService < BaseService
def call(domain)
DomainBlock.find_or_create_by!(domain: domain)

+ 3
- 1
app/services/block_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class BlockService < BaseService
def call(account, target_account)
return if account.id == target_account.id
@@ -20,6 +22,6 @@ class BlockService < BaseService
end

def redis
$redis
Redis.current
end
end

+ 2
- 0
app/services/fan_out_on_write_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class FanOutOnWriteService < BaseService
# Push a status into home and mentions feeds
# @param [Status] status

+ 2
- 0
app/services/favourite_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class FavouriteService < BaseService
# Favourite a status and notify remote user
# @param [Account] account

+ 8
- 12
app/services/fetch_atom_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class FetchAtomService < BaseService
def call(url)
response = http_client.head(url)
@@ -9,15 +11,9 @@ class FetchAtomService < BaseService
Rails.logger.debug "Remote status GET request returned code #{response.code}"

return nil if response.code != 200

if response.mime_type == 'application/atom+xml'
return [url, fetch(url)]
elsif !response['Link'].blank?
return process_headers(url, response)
else
return process_html(fetch(url))
end

return [url, fetch(url)] if response.mime_type == 'application/atom+xml'
return process_headers(url, response) unless response['Link'].blank?
process_html(fetch(url))
rescue OpenSSL::SSL::SSLError => e
Rails.logger.debug "SSL error: #{e}"
end
@@ -31,17 +27,17 @@ class FetchAtomService < BaseService
alternate_link = page.xpath('//link[@rel="alternate"]').find { |link| link['type'] == 'application/atom+xml' }

return nil if alternate_link.nil?
return [alternate_link['href'], fetch(alternate_link['href'])]
[alternate_link['href'], fetch(alternate_link['href'])]
end

def process_headers(url, response)
Rails.logger.debug 'Processing link header'

link_header = LinkHeader.parse(response['Link'].is_a?(Array) ? response['Link'].first : response['Link'])
alternate_link = link_header.find_link(['rel', 'alternate'], ['type', 'application/atom+xml'])
alternate_link = link_header.find_link(%w(rel alternate), %w(type application/atom+xml))

return process_html(fetch(url)) if alternate_link.nil?
return [alternate_link.href, fetch(alternate_link.href)]
[alternate_link.href, fetch(alternate_link.href)]
end

def fetch(url)

+ 4
- 2
app/services/fetch_remote_account_service.rb View File

@@ -1,9 +1,11 @@
# frozen_string_literal: true

class FetchRemoteAccountService < BaseService
def call(url)
atom_url, body = FetchAtomService.new.call(url)

return nil if atom_url.nil?
return process_atom(atom_url, body)
process_atom(atom_url, body)
end

private
@@ -25,7 +27,7 @@ class FetchRemoteAccountService < BaseService
Rails.logger.debug "Unparseable URL given: #{url}"
nil
rescue Nokogiri::XML::XPath::SyntaxError
Rails.logger.debug "Invalid XML or missing namespace"
Rails.logger.debug 'Invalid XML or missing namespace'
nil
end
end

+ 5
- 3
app/services/fetch_remote_status_service.rb View File

@@ -1,9 +1,11 @@
# frozen_string_literal: true

class FetchRemoteStatusService < BaseService
def call(url)
atom_url, body = FetchAtomService.new.call(url)

return nil if atom_url.nil?
return process_atom(atom_url, body)
process_atom(atom_url, body)
end

private
@@ -20,7 +22,7 @@ class FetchRemoteStatusService < BaseService

statuses = ProcessFeedService.new.call(body, account)

return statuses.first
statuses.first
end

def extract_author(url, xml)
@@ -34,7 +36,7 @@ class FetchRemoteStatusService < BaseService

return FollowRemoteAccountService.new.call("#{username}@#{domain}")
rescue Nokogiri::XML::XPath::SyntaxError
Rails.logger.debug "Invalid XML or missing namespace"
Rails.logger.debug 'Invalid XML or missing namespace'
nil
end
end

+ 4
- 2
app/services/follow_remote_account_service.rb View File

@@ -1,7 +1,9 @@
# frozen_string_literal: true

class FollowRemoteAccountService < BaseService
include OStatus2::MagicKey

DFRN_NS = 'http://purl.org/macgirvin/dfrn/1.0'.freeze
DFRN_NS = 'http://purl.org/macgirvin/dfrn/1.0'

# Find or create a local account for a remote user.
# When creating, look up the user's webfinger and fetch all
@@ -49,7 +51,7 @@ class FollowRemoteAccountService < BaseService
get_profile(xml, account)
account.save!

return account
account
end

private

+ 3
- 1
app/services/follow_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class FollowService < BaseService
# Follow a remote user, notify remote user about the follow
# @param [Account] source_account From which to follow
@@ -35,7 +37,7 @@ class FollowService < BaseService
end

def redis
$redis
Redis.current
end

def follow_remote_account_service

+ 2
- 0
app/services/post_status_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class PostStatusService < BaseService
# Post a text status update, fetch and notify remote users mentioned
# @param [Account] account Account from which to post

+ 3
- 3
app/services/precompute_feed_service.rb View File

@@ -1,10 +1,10 @@
# frozen_string_literal: true

class PrecomputeFeedService < BaseService
# Fill up a user's home/mentions feed from DB and return a subset
# @param [Symbol] type :home or :mentions
# @param [Account] account
def call(type, account)
instant_return = []

Status.send("as_#{type}_timeline", account).limit(FeedManager::MAX_ITEMS).each do |status|
next if FeedManager.instance.filter?(type, status, account)
redis.zadd(FeedManager.instance.key(type, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
@@ -14,6 +14,6 @@ class PrecomputeFeedService < BaseService
private

def redis
$redis
Redis.current
end
end

+ 7
- 5
app/services/process_feed_service.rb View File

@@ -1,6 +1,8 @@
# frozen_string_literal: true

class ProcessFeedService < BaseService
ACTIVITY_NS = 'http://activitystrea.ms/spec/1.0/'.freeze
THREAD_NS = 'http://purl.org/syndication/thread/1.0'.freeze
ACTIVITY_NS = 'http://activitystrea.ms/spec/1.0/'
THREAD_NS = 'http://purl.org/syndication/thread/1.0'

def call(body, account)
xml = Nokogiri::XML(body)
@@ -89,13 +91,13 @@ class ProcessFeedService < BaseService
account = @account
end

status = Status.create!({
status = Status.create!(
uri: id(entry),
url: url(entry),
account: account,
text: content(entry),
created_at: published(entry),
})
created_at: published(entry)
)

if thread?(entry)
Rails.logger.debug "Trying to attach #{status.id} (#{id(entry)}) to #{thread(entry).first}"

+ 3
- 3
app/services/process_hashtags_service.rb View File

@@ -1,8 +1,8 @@
# frozen_string_literal: true

class ProcessHashtagsService < BaseService
def call(status, tags = [])
if status.local?
tags = status.text.scan(Tag::HASHTAG_RE).map(&:first)
end
tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local?

tags.map(&:downcase).uniq.each do |tag|
status.tags << Tag.where(name: tag).first_or_initialize(name: tag)

+ 4
- 4
app/services/process_interaction_service.rb View File

@@ -1,5 +1,7 @@
# frozen_string_literal: true

class ProcessInteractionService < BaseService
ACTIVITY_NS = 'http://activitystrea.ms/spec/1.0/'.freeze
ACTIVITY_NS = 'http://activitystrea.ms/spec/1.0/'

# Record locally the remote interaction with our user
# @param [String] envelope Salmon envelope
@@ -76,9 +78,7 @@ class ProcessInteractionService < BaseService

return if status.nil?

if account.id == status.account_id
remove_status_service.call(status)
end
remove_status_service.call(status) if account.id == status.account_id
end

def favourite!(xml, from_account)

+ 2
- 0
app/services/process_mentions_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ProcessMentionsService < BaseService
# Scan status for mentions and fetch remote mentioned users, create
# local mention pointers, send Salmon notifications to mentioned

+ 2
- 0
app/services/reblog_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ReblogService < BaseService
# Reblog a status and notify its remote author
# @param [Account] account Account to reblog from

+ 3
- 1
app/services/remove_status_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class RemoveStatusService < BaseService
def call(status)
remove_from_self(status) if status.account.local?
@@ -62,6 +64,6 @@ class RemoveStatusService < BaseService
end

def redis
$redis
Redis.current
end
end

+ 6
- 4
app/services/search_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class SearchService < BaseService
def call(query, limit, resolve = false)
return if query.blank?
@@ -5,10 +7,10 @@ class SearchService < BaseService
username, domain = query.split('@')

results = if domain.nil?
Account.search_for(username)
else
Account.search_for("#{username} #{domain}")
end
Account.search_for(username)
else
Account.search_for("#{username} #{domain}")
end

results = results.limit(limit).with_counters


+ 2
- 0
app/services/send_interaction_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class SendInteractionService < BaseService
# Send an Atom representation of an interaction to a remote Salmon endpoint
# @param [StreamEntry] stream_entry

+ 2
- 0
app/services/subscribe_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class SubscribeService < BaseService
def call(account)
account.secret = SecureRandom.hex

+ 2
- 0
app/services/unblock_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class UnblockService < BaseService
def call(account, target_account)
account.unblock!(target_account) if account.blocking?(target_account)

+ 2
- 0
app/services/unfavourite_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class UnfavouriteService < BaseService
def call(account, status)
favourite = Favourite.find_by!(account: account, status: status)

+ 3
- 1
app/services/unfollow_service.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class UnfollowService < BaseService
# Unfollow and notify the remote user
# @param [Account] source_account Where to unfollow from
@@ -21,6 +23,6 @@ class UnfollowService < BaseService
end

def redis
$redis
Redis.current
end
end

+ 7
- 5
app/services/update_remote_profile_service.rb View File

@@ -1,14 +1,16 @@
# frozen_string_literal: true

class UpdateRemoteProfileService < BaseService
POCO_NS = 'http://portablecontacts.net/spec/1.0'

def call(author_xml, account)
return if author_xml.nil?

if author_xml.at_xpath('./poco:displayName', poco: POCO_NS).nil?
account.display_name = account.username
else
account.display_name = author_xml.at_xpath('./poco:displayName', poco: POCO_NS).content
end
account.display_name = if author_xml.at_xpath('./poco:displayName', poco: POCO_NS).nil?
account.username
else
author_xml.at_xpath('./poco:displayName', poco: POCO_NS).content
end

unless author_xml.at_xpath('./poco:note').nil?
account.note = author_xml.at_xpath('./poco:note', poco: POCO_NS).content

+ 2
- 0
app/workers/distribution_worker.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class DistributionWorker
include Sidekiq::Worker


+ 2
- 0
app/workers/hub_ping_worker.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class HubPingWorker
include Sidekiq::Worker
include RoutingHelper

+ 2
- 0
app/workers/notification_worker.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class NotificationWorker
include Sidekiq::Worker


+ 2
- 0
app/workers/processing_worker.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ProcessingWorker
include Sidekiq::Worker


+ 2
- 0
app/workers/regeneration_worker.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class RegenerationWorker
include Sidekiq::Worker


+ 2
- 0
app/workers/thread_resolve_worker.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ThreadResolveWorker
include Sidekiq::Worker


+ 1
- 0
config.ru View File

@@ -1,3 +1,4 @@
# frozen_string_literal: true
# This file is used by Rack-based servers to start the application.

require ::File.expand_path('../config/environment', __FILE__)

+ 4
- 2
config/initializers/redis.rb View File

@@ -1,5 +1,7 @@
$redis = Redis.new({
# frozen_string_literal: true

Redis.current = Redis.new(
host: ENV.fetch('REDIS_HOST') { 'localhost' },
port: ENV.fetch('REDIS_PORT') { 6379 },
driver: :hiredis
})
)

+ 4
- 2
lib/tasks/mastodon.rake View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

namespace :mastodon do
namespace :media do
desc 'Removes media attachments that have not been assigned to any status for longer than a day'
@@ -28,7 +30,7 @@ namespace :mastodon do
task refresh: :environment do
Account.expiring(1.day.from_now).find_each do |a|
Rails.logger.debug "PuSH re-subscribing to #{a.acct}"
SubscribeService.new.(a)
SubscribeService.new.call(a)
end
end
end
@@ -36,7 +38,7 @@ namespace :mastodon do
namespace :feeds do
desc 'Clears all timelines so that they would be regenerated on next hit'
task clear: :environment do
$redis.keys('feed:*').each { |key| $redis.del(key) }
Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
end
end


Loading…
Cancel
Save