Merge branch 'master' into skylight

.env.production.sample

@@ -36,8 +36,7 @@ OTP_SECRET=
 # E-mail configuration
 # Note: Mailgun and SparkPost (https://sparkpo.st/smtp) each have good free tiers
 # If you want to use an SMTP server without authentication (e.g local Postfix relay)
-# then set SMTP_AUTH_METHOD to 'none' and *comment* SMTP_LOGIN and SMTP_PASSWORD.
-# Leaving them blank is not enough for authentication method 'none'.
+# then set SMTP_AUTH_METHOD to 'none' and leave SMTP_LOGIN and SMTP_PASSWORD blank
 SMTP_SERVER=smtp.mailgun.org
 SMTP_PORT=587
 SMTP_LOGIN=

.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 cache: bundler
-dist: trusty
-sudo: required
 
 notifications:
   email: false
@@ -26,9 +24,8 @@ bundler_args: --without development production --retry=3 --jobs=3
 
 before_install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo add-apt-repository -y ppa:mc3man/trusty-media
   - sudo apt-get -qq update
-  - sudo apt-get -qq install g++-4.8 ffmpeg
+  - sudo apt-get -qq install g++-4.8
 install:
   - nvm install
   - npm install -g yarn

Gemfile

@@ -62,6 +62,9 @@ gem 'react-rails'
 gem 'browserify-rails'
 gem 'autoprefixer-rails'
 
+gem 'skylight'
+gem 'sidekiq-skylight'
+
 group :development, :test do
   gem 'rspec-rails'
   gem 'pry-rails'

Gemfile.lock

@@ -401,6 +401,9 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    sidekiq-skylight (0.2.0)
+      sidekiq (>= 3.3.0)
+      skylight (>= 0.5.2)
     sidekiq-unique-jobs (5.0.0)
       sidekiq (>= 4.0)
       thor
@@ -414,6 +417,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    skylight (1.2.0)
+      activesupport (>= 3.0.0)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -532,10 +537,12 @@ DEPENDENCIES
   ruby-oembed
   sass-rails (~> 5.0)
   sidekiq
+  sidekiq-skylight
   sidekiq-unique-jobs
   simple-navigation
   simple_form
   simplecov
+  skylight
   sprockets-rails
   statsd-instrument
   twitter-text

app/assets/javascripts/components/locales/es.jsx

@@ -35,10 +35,6 @@ const es = {
   "column.community": "Historia local",
   "column.public": "Historia federada",
   "column.notifications": "Notificaciones",
-  "column.blocks": "Usuarios bloqueados",
-  "column.favourites": "Favoritos",
-  "column.follow_requests": "Solicitudes para seguirte",
-  "column.mutes": "Usuarios silenciados",
   "tabs_bar.compose": "Redactar",
   "tabs_bar.home": "Inicio",
   "tabs_bar.mentions": "Menciones",
@@ -60,8 +56,6 @@ const es = {
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.info": "Información adicional",
   "navigation_bar.logout": "Cerrar sesión",
-  "navigation_bar.follow_requests": "Solicitudes para seguirte",
-  "navigation_bar.mutes": "Usuarios silenciados",
   "reply_indicator.cancel": "Cancelar",
   "search.placeholder": "Buscar",
   "search.account": "Cuenta",

app/assets/javascripts/components/locales/nl.jsx

@@ -11,32 +11,28 @@ const nl = {
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.sensitive_toggle": "Klik om te zien",
   "video_player.toggle_sound": "Geluid in-/uitschakelen",
-  "account.mention": "Vermeld @{name}",
+  "account.mention": "@{name} vermelden",
   "account.edit_profile": "Profiel bewerken",
-  "account.unblock": "Deblokkeer @{name}",
+  "account.unblock": "@{name} deblokkeren",
   "account.unfollow": "Ontvolgen",
-  "account.block": "Blokkeer @{name}",
+  "account.block": "@{name} blokkeren",
   "account.follow": "Volgen",
   "account.posts": "Berichten",
   "account.follows": "Volgt",
   "account.followers": "Volgers",
   "account.follows_you": "Volgt jou",
   "account.requested": "Wacht op goedkeuring",
-  "account.mute": "Negeer @{name}",
-  "account.unmute": "Negeer @{name} niet meer",
-  "account.report": "Rapporteer @{name}",
+  "account.mute": "@{name} negeren",
+  "account.unmute": "@{name} niet meer negeren",
+  "account.report": "Report @{name}",
   "getting_started.heading": "Beginnen",
   "getting_started.about_addressing": "Je kunt mensen volgen als je hun gebruikersnaam en het domein van hun server kent. Voer hiervoor het e-mailachtige adres in het zoekveld in.",
   "getting_started.about_shortcuts": "Als de gezochte gebruiker op hetzelfde domein zit als jijzelf, is invoeren van de gebruikersnaam genoeg. Dat geldt ook als je mensen in toots wilt vermelden.",
   "getting_started.open_source_notice": "Mastodon is open-sourcesoftware. Je kunt bijdragen of problemen melden op GitHub via {github}. {apps}.",
-  "getting_started.apps": "Er zijn meerdere apps beschikbaar",
   "column.home": "Jouw tijdlijn",
   "column.community": "Lokale tijdlijn",
   "column.public": "Globale tijdlijn",
   "column.notifications": "Meldingen",
-  "column.favourites": "Favorieten",
-  "column.blocks": "Geblokkeerde gebruikers",
-  "column.mutes": "Genegeerde gebruikers",
   "tabs_bar.compose": "Schrijven",
   "tabs_bar.home": "Jouw tijdlijn",
   "tabs_bar.mentions": "Vermeldingen",
@@ -48,7 +44,7 @@ const nl = {
   "compose_form.spoiler": "Tekst achter waarschuwing verbergen",
   "compose_form.spoiler_placeholder": "Waarschuwingstekst",
   "compose_form.private": "Als privé markeren",
-  "compose_form.privacy_disclaimer": "Jouw privétoot wordt afgeleverd aan de vermelde gebruikers op {domains}. Vertrouw jij {domainsCount, plural, one {die server} other {die servers}}? Het privé plaatsen van toots werkt alleen op Mastodon-servers. Wanneer {domains} {domainsCount, plural, one {geen Mastodon-server is} other {geen Mastodon-servers zijn}}, dan wordt er niet aangegeven dat de toot privé is, waardoor het kan worden geboost of op een andere manier zichtbaar wordt gemaakt voor mensen waarvoor het niet was bedoeld.",
+  "compose_form.privacy_disclaimer": "Jouw privétoot wordt afgeleverd aan de vermelde gebruikers op {domains}. Vertrouw jij {domainsCount, plural, one {that server} andere {those servers}}? Het privé plaatsen van toots werkt alleen op Mastodon-servers. Als {domains} {domainsCount, plural, een {is not a Mastodon instance} andere {are not Mastodon instances}}, dan wordt er niet aangegeven dat de toot besloten is, waardoor het kan worden geboost of op een andere manier zichtbaar wordt gemaakt voor mensen waarvoor het niet was bedoeld.",
   "compose_form.unlisted": "Niet op openbare tijdlijnen tonen",
   "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.preferences": "Voorkeuren",
@@ -59,7 +55,6 @@ const nl = {
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
   "navigation_bar.mutes": "Genegeerde gebruikers",
   "navigation_bar.logout": "Afmelden",
-  "navigation_bar.favourites": "Favorieten",
   "reply_indicator.cancel": "Annuleren",
   "search.placeholder": "Zoeken",
   "search.account": "Account",

app/models/account.rb

@@ -8,7 +8,7 @@ class Account < ApplicationRecord
 
   # Local users
   has_one :user, inverse_of: :account
-  validates :username, presence: true, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: 'local?'
+  validates :username, presence: true, format: { with: /\A[a-z0-9_]+\z/i, message: 'only letters, numbers and underscores' }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: 'local?'
   validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
 
   # Avatar upload

app/models/media_attachment.rb

@@ -106,18 +106,13 @@ class MediaAttachment < ApplicationRecord
   end
 
   def set_type_and_extension
+    if file.blank?
+      self.type = :unknown
+    else
       self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
-    extension = appropriate_extension
+      extension = Paperclip::Interpolations.content_type_extension(file, :original)
       basename  = Paperclip::Interpolations.basename(file, :original)
       file.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
     end
-
-  def appropriate_extension
-    mime_type = MIME::Types[file.content_type]
-
-    extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
-    original_extension       = Paperclip::Interpolations.extension(file, :original)
-
-    extensions_for_mime_type.include?(original_extension) ? original_extension : extensions_for_mime_type.first
   end
 end

app/models/status.rb

@@ -29,7 +29,7 @@ class Status < ApplicationRecord
   validates :uri, uniqueness: true, unless: 'local?'
   validates :text, presence: true, unless: 'reblog?'
   validates_with StatusLengthValidator
-  validates :reblog, uniqueness: { scope: :account }, if: 'reblog?'
+  validates :reblog, uniqueness: { scope: :account, message: 'of status already exists' }, if: 'reblog?'
 
   default_scope { order('id desc') }
 

app/workers/processing_worker.rb

@@ -3,7 +3,7 @@
 class ProcessingWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true
+  sidekiq_options queue: 'pull', backtrace: true
 
   def perform(account_id, body)
     ProcessFeedService.new.call(body, Account.find(account_id))

app/workers/salmon_worker.rb

@@ -3,7 +3,7 @@
 class SalmonWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true
+  sidekiq_options queue: 'pull', backtrace: true
 
   def perform(account_id, body)
     ProcessInteractionService.new.call(body, Account.find(account_id))

config/activerecord.en.yml

@@ -1,12 +0,0 @@
-en:
-  activerecord:
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: only letters, numbers and underscores
-        status:
-          attributes:
-            reblog:
-              taken: of status already exists

config/activerecord.ja.yml

@@ -1,12 +0,0 @@
-ja:
-  activerecord:
-    errors:
-      models:
-        account:
-          attributes:
-            username:
-              invalid: アルファベット・数値・アンダーバー(_)で入力してください
-        status:
-          attributes:
-            reblog:
-              taken: のブーストはすでに存在します

config/deploy.rb

@@ -1,14 +1,12 @@
-# frozen_string_literal: true
-
 lock '3.8.0'
 
-set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
-set :branch, ENV.fetch('BRANCH', 'master')
-
 set :application, 'mastodon'
+set :repo_url, 'https://github.com/tootsuite/mastodon.git'
+set :branch, 'skylight'
 set :rbenv_type, :user
 set :rbenv_ruby, File.read('.ruby-version').strip
 set :migration_role, :app
+set :conditional_migrate, true
 
-append :linked_files, '.env.production', 'public/robots.txt'
-append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system'
+append :linked_files, '.env.production'
+append :linked_dirs, 'vendor/bundle', 'public/system'

lib/paperclip/gif_transcoder.rb

@@ -7,11 +7,7 @@ module Paperclip
     def make
       num_frames = identify('-format %n :file', file: file.path).to_i
 
-      unless options[:style] == :original && num_frames > 1
-        tmp_file = Paperclip::TempfileFactory.new.generate(attachment.instance.file_file_name)
-        tmp_file << file.read
-        return tmp_file
-      end
+      return file unless options[:style] == :original && num_frames > 1
 
       final_file = Paperclip::Transcoder.make(file, options, attachment)
 

spec/models/media_attachment_spec.rb

@@ -1,27 +1,5 @@
 require 'rails_helper'
 
 RSpec.describe MediaAttachment, type: :model do
-  describe 'animated gif conversion' do
-    let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }
 
-    it 'sets type to gifv' do
-      expect(media.type).to eq 'gifv'
-    end
-
-    it 'converts original file to mp4' do
-      expect(media.file_content_type).to eq 'video/mp4'
-    end
-  end
-
-  describe 'non-animated gif non-conversion' do
-    let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('attachment.gif')) }
-
-    it 'sets type to image' do
-      expect(media.type).to eq 'image'
-    end
-
-    it 'leaves original file as-is' do
-      expect(media.file_content_type).to eq 'image/gif'
-    end
-  end
 end