Merge branch 'asonix/changes' into asonix/blimps

Gemfile

@@ -41,7 +41,7 @@ gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.2'
 
-gem 'doorkeeper', '~> 4.4'
+gem 'doorkeeper', '~> 5.0'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'

Gemfile.lock

@@ -181,7 +181,7 @@ GEM
     docile (1.3.0)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.4.2)
+    doorkeeper (5.0.0)
       railties (>= 4.2)
     dotenv (2.2.2)
     dotenv-rails (2.2.2)
@@ -670,7 +670,7 @@ DEPENDENCIES
   devise (~> 4.4)
   devise-two-factor (~> 3.0)
   devise_pam_authenticatable2 (~> 9.1)
-  doorkeeper (~> 4.4)
+  doorkeeper (~> 5.0)
   dotenv-rails (~> 2.2, < 2.3)
   fabrication (~> 2.20)
   faker (~> 1.8)

app/javascript/styles/contrast-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'contrast';

app/javascript/styles/mastodon-light-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'mastodon-light';

app/javascript/styles/mastodon-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'application';

app/javascript/styles/pop-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'pop';

app/javascript/styles/pop.scss

@@ -25,4 +25,4 @@ $ui-primary-color: #c9c7c5;      // Echo Blue
 $ui-secondary-color: #ebe9e8;    // Pattens Blue
 $ui-highlight-color: #48b9c7;    // Summer Sky
 
-@import 'custom';
+@import 'application';

app/javascript/styles/wide.scss

@@ -1,5 +1,4 @@
-@import 'application';
-
 .column {
   flex-grow: 1 !important;
+  max-width: 540px;
 }

app/services/activitypub/fetch_remote_account_service.rb

@@ -7,14 +7,14 @@ class ActivityPub::FetchRemoteAccountService < BaseService
 
   # Should be called when uri has already been checked for locality
   # Does a WebFinger roundtrip on each call
-  def call(uri, id: true, prefetched_body: nil)
+  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false)
     @json = if prefetched_body.nil?
               fetch_resource(uri, id)
             else
               body_to_json(prefetched_body, compare_id: id ? uri : nil)
             end
 
-    return unless supported_context? && expected_type?
+    return if !supported_context? || !expected_type? || (break_on_redirect && @json['movedTo'].present?)
 
     @uri      = @json['id']
     @username = @json['preferredUsername']

app/services/activitypub/process_account_service.rb

@@ -175,7 +175,7 @@ class ActivityPub::ProcessAccountService < BaseService
 
   def moved_account
     account   = ActivityPub::TagManager.instance.uri_to_resource(@json['movedTo'], Account)
-    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true)
+    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true)
     account
   end
 

config/locales/dog.yml

@@ -810,9 +810,13 @@ dog:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/en.yml

@@ -810,9 +810,13 @@ en:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/lion.yml

@@ -809,9 +809,13 @@ lion:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/squeak.yml

@@ -810,9 +810,13 @@ squeak:
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
     contrast: High contrast
-    default: Dog
-    mastodon: The default Mastodon theme
+    contrast-wider: High contrast (wider)
+    pop: Pop
+    pop-wider: Pop (wider)
+    mastodon: Mastodon
+    mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)
+    mastodon-light-wider: Mastodon (light, wider)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/settings.yml

@@ -7,7 +7,7 @@
 # For more information, see docs/Running-Mastodon/Administration-guide.md
 #
 defaults: &defaults
-  site_title: asonix.dog
+  site_title: Mastodon
   site_description: ''
   site_extended_description: ''
   site_terms: ''
@@ -30,7 +30,7 @@ defaults: &defaults
   reduce_motion: false
   system_font_ui: false
   noindex: false
-  theme: 'default'
+  theme: 'mastodon'
   notification_emails:
     follow: false
     reblog: false

config/themes.yml

@@ -1,3 +1,8 @@
-default: styles/application.scss
 contrast: styles/contrast.scss
+contrast-wider: styles/contrast-wider.scss
+pop-wider: styles/pop-wider.scss
+pop: styles/pop.scss
+mastodon: styles/application.scss
+mastodon-wider: styles/mastodon-wider.scss
 mastodon-light: styles/mastodon-light.scss
+mastodon-light-wider: styles/mastodon-light-wider.scss

db/migrate/20180528141303_fix_accounts_unique_index.rb

@@ -1,4 +1,17 @@
 class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
+  class Account < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+    has_one :user, inverse_of: :account
+
+    def local?
+      domain.nil?
+    end
+
+    def acct
+      local? ? username : "#{username}@#{domain}"
+    end
+  end
+
   disable_ddl_transaction!
 
   def up

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      4
+      5
     end
 
     def pre