From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 27 Apr 2017 16:04:28 +0000 (+0900)
Subject: Fix Doorkeeper error (#2534)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c25426ca47a05700cd2b78cb823afc713c18ead7;p=mastodon.git

Fix Doorkeeper error (#2534)

* Fix Doorkeeper error

* use Doorkeeper::OAuth::Scopes.from_string
---

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 0a25b52aa..1d41892cd 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -18,6 +18,12 @@ class HomeController < ApplicationController
   end
 
   def find_or_create_access_token
-    Doorkeeper::AccessToken.find_or_create_for(Doorkeeper::Application.where(superapp: true).first, current_user.id, 'read write follow', Doorkeeper.configuration.access_token_expires_in, Doorkeeper.configuration.refresh_token_enabled?)
+    Doorkeeper::AccessToken.find_or_create_for(
+      Doorkeeper::Application.where(superapp: true).first,
+      current_user.id,
+      Doorkeeper::OAuth::Scopes.from_string('read write follow'),
+      Doorkeeper.configuration.access_token_expires_in,
+      Doorkeeper.configuration.refresh_token_enabled?
+    )
   end
 end