diff options
41 files changed, 126 insertions, 122 deletions
diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 00000000000..3a638a00927 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,14 @@ +Rails: + Enabled: true + +Metrics/LineLength: + Enabled: false + +Style/PerlBackrefs: + AutoCorrect: false + +Style/ClassAndModuleChildren: + Enabled: false + +Documentation: + Enabled: false diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb index d56fa30f4d8..d6726972830 100644 --- a/app/channels/application_cable/channel.rb +++ b/app/channels/application_cable/channel.rb @@ -1,4 +1,3 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading. module ApplicationCable class Channel < ActionCable::Channel::Base end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb index 772b76a6e55..0c4cac875da 100644 --- a/app/channels/application_cable/connection.rb +++ b/app/channels/application_cable/connection.rb @@ -1,4 +1,3 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading. module ApplicationCable class Connection < ActionCable::Connection::Base identified_by :current_user diff --git a/app/channels/timeline_channel.rb b/app/channels/timeline_channel.rb index 4b34f8ed54e..9e5a811882e 100644 --- a/app/channels/timeline_channel.rb +++ b/app/channels/timeline_channel.rb @@ -1,4 +1,3 @@ -# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading. class TimelineChannel < ApplicationCable::Channel def subscribed stream_from "timeline:#{current_user.account_id}" diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index bfdc5b6d91a..55b1f3c4593 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -7,7 +7,7 @@ class AccountsController < ApplicationController def show respond_to do |format| format.html do - @statuses = @account.statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10) + @statuses = @account.statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10) if user_signed_in? status_ids = @statuses.collect { |s| [s.id, s.reblog_of_id] }.flatten.uniq diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb index 329b258a41f..8bd653d7d94 100644 --- a/app/controllers/api/salmon_controller.rb +++ b/app/controllers/api/salmon_controller.rb @@ -3,7 +3,7 @@ class Api::SalmonController < ApiController respond_to :txt def update - ProcessInteractionService.new.(request.body.read, @account) + ProcessInteractionService.new.call(request.body.read, @account) head 201 end diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb index c8fa60260ac..c5190b1364f 100644 --- a/app/controllers/api/subscriptions_controller.rb +++ b/app/controllers/api/subscriptions_controller.rb @@ -4,7 +4,7 @@ class Api::SubscriptionsController < ApiController def show if @account.subscription(api_subscription_url(@account.id)).valid?(params['hub.topic']) - @account.update(subscription_expires_at: Time.now + ((params['hub.lease_seconds'] || 86400).to_i).seconds) + @account.update(subscription_expires_at: Time.now.utc + (params['hub.lease_seconds'] || 86_400).to_i.seconds) render plain: HTMLEntities.new.encode(params['hub.challenge']), status: 200 else head 404 @@ -15,7 +15,7 @@ class Api::SubscriptionsController < ApiController body = request.body.read if @account.subscription(api_subscription_url(@account.id)).verify(body, request.headers['HTTP_X_HUB_SIGNATURE']) - ProcessFeedService.new.(body, @account) + ProcessFeedService.new.call(body, @account) head 201 else head 202 diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index 23f48782f95..50e6df80e0b 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -19,19 +19,19 @@ class Api::V1::AccountsController < ApiController end def follow - @follow = FollowService.new.(current_user.account, @account.acct) + @follow = FollowService.new.call(current_user.account, @account.acct) set_relationship render action: :relationship end def unfollow - @unfollow = UnfollowService.new.(current_user.account, @account) + @unfollow = UnfollowService.new.call(current_user.account, @account) set_relationship render action: :relationship end def relationships - ids = params[:id].is_a?(Enumerable) ? params[:id].map { |id| id.to_i } : [params[:id].to_i] + ids = params[:id].is_a?(Enumerable) ? params[:id].map(&:to_i) : [params[:id].to_i] @accounts = Account.find(ids) @following = Account.following_map(ids, current_user.account_id) @followed_by = Account.followed_by_map(ids, current_user.account_id) diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb index de006f6712c..f688f2e72c1 100644 --- a/app/controllers/api/v1/follows_controller.rb +++ b/app/controllers/api/v1/follows_controller.rb @@ -3,11 +3,9 @@ class Api::V1::FollowsController < ApiController respond_to :json def create - if params[:uri].blank? - raise ActiveRecord::RecordNotFound - end + raise ActiveRecord::RecordNotFound if params[:uri].blank? - @account = FollowService.new.(current_user.account, params[:uri]).try(:target_account) + @account = FollowService.new.call(current_user.account, params[:uri]).try(:target_account) render action: :show end end diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 4196852f249..14b86b2a280 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -13,34 +13,34 @@ class Api::V1::StatusesController < ApiController end def create - @status = PostStatusService.new.(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), params[:media_ids]) + @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), params[:media_ids]) render action: :show end def destroy @status = Status.where(account_id: current_user.account).find(params[:id]) - RemoveStatusService.new.(@status) + RemoveStatusService.new.call(@status) render_empty end def reblog - @status = ReblogService.new.(current_user.account, Status.find(params[:id])).reload + @status = ReblogService.new.call(current_user.account, Status.find(params[:id])).reload render action: :show end def unreblog - RemoveStatusService.new.(Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!) + RemoveStatusService.new.call(Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!) @status = Status.find(params[:id]) render action: :show end def favourite - @status = FavouriteService.new.(current_user.account, Status.find(params[:id])).status.reload + @status = FavouriteService.new.call(current_user.account, Status.find(params[:id])).status.reload render action: :show end def unfavourite - @status = UnfavouriteService.new.(current_user.account, Status.find(params[:id])).status.reload + @status = UnfavouriteService.new.call(current_user.account, Status.find(params[:id])).status.reload render action: :show end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 90e923951e2..9b6367187d7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base rescue_from ActiveRecord::RecordNotFound, with: :not_found def raise_not_found - raise ActionController::RoutingError.new("No route matches #{params[:unmatched_route]}") + raise ActionController::RoutingError, "No route matches #{params[:unmatched_route]}" end protected diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 8472edc6920..71eb0905e94 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -1,13 +1,13 @@ class Auth::RegistrationsController < Devise::RegistrationsController layout 'auth' - before_filter :configure_sign_up_params, only: [:create] + before_action :configure_sign_up_params, only: [:create] protected def build_resource(hash = nil) super(hash) - self.resource.build_account if self.resource.account.nil? + resource.build_account if resource.account.nil? end def configure_sign_up_params diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 974c5f7fd52..4e6b2a87967 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -7,7 +7,7 @@ class HomeController < ApplicationController @mentions = Feed.new(:mentions, current_user.account).get(20) @token = find_or_create_access_token.token end - + private def authenticate_user! diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 0e6393a6292..e4a246ec910 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,6 +1,6 @@ class SettingsController < ApplicationController layout 'auth' - + before_action :authenticate_user! before_action :set_account diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index 0d6b9ea8ec1..fd8b97c9f78 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -13,7 +13,7 @@ class StreamEntriesController < ApplicationController @descendants = @stream_entry.activity.descendants if user_signed_in? - status_ids = [@stream_entry.activity_id] + @ancestors.map { |s| s.id } + @descendants.map { |s| s.id } + status_ids = [@stream_entry.activity_id] + @ancestors.map(&:id) + @descendants.map(&:id) @favourited = Status.favourites_map(status_ids, current_user.account_id) @reblogged = Status.reblogs_map(status_ids, current_user.account_id) else diff --git a/app/controllers/xrd_controller.rb b/app/controllers/xrd_controller.rb index 1e39a3e4c79..9201eb6c116 100644 --- a/app/controllers/xrd_controller.rb +++ b/app/controllers/xrd_controller.rb @@ -31,9 +31,9 @@ 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 == 0 do + until component.zero? result << [component % 256].pack('C') component >>= 8 end @@ -41,7 +41,7 @@ class XrdController < ApplicationController result.reverse! end - (["RSA"] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.') + (['RSA'] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.') end def resource_param diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb index 39ea20e3123..c1ca8c619b4 100644 --- a/app/helpers/atom_builder_helper.rb +++ b/app/helpers/atom_builder_helper.rb @@ -200,6 +200,6 @@ module AtomBuilderHelper end def single_link_avatar(xml, account, size, px) - xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => px, 'media:height' =>px, 'href' => full_asset_url(account.avatar.url(size, false))) + xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => px, 'media:height' => px, 'href' => full_asset_url(account.avatar.url(size, false))) end end diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index ce77206ea0c..e994155b634 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -17,15 +17,15 @@ module StreamEntriesHelper end def relative_time(date) - date < 5.days.ago ? date.strftime("%d.%m.%Y") : "#{time_ago_in_words(date)} ago" + date < 5.days.ago ? date.strftime('%d.%m.%Y') : "#{time_ago_in_words(date)} ago" end def reblogged_by_me_class(status) - user_signed_in? && @reblogged.has_key?(status.id) ? 'reblogged' : '' + user_signed_in? && @reblogged.key?(status.id) ? 'reblogged' : '' end def favourited_by_me_class(status) - user_signed_in? && @favourited.has_key?(status.id) ? 'favourited' : '' + user_signed_in? && @favourited.key?(status.id) ? 'favourited' : '' end def proper_status(status) diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 959ede95e8e..17d2dfc5852 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -35,7 +35,7 @@ class Formatter def link_mentions(html, mentions) |