diff options
| author | Toshiaki Asai <toshi.alternative@gmail.com> | 2016-10-16 13:37:30 +0900 |
|---|---|---|
| committer | Toshiaki Asai <toshi.alternative@gmail.com> | 2016-10-16 13:37:30 +0900 |
| commit | 1bcbace4f5ec391b780a05c9a01aaf2d0565d2f1 (patch) | |
| tree | 58c841833d7ac78030b6c7f18c0eaa4288922d5a | |
| parent | 34b5b594106cc46ce5a3c984a9ce55d6b327bac0 (diff) | |
| parent | 83645d7dc44052ddbb86b85e6051b28bd015d1eb (diff) | |
| download | mikutter-1bcbace4f5ec391b780a05c9a01aaf2d0565d2f1.tar.gz | |
Merge branch 'master' into develop
| -rw-r--r-- | core/lib/mikutwitter/api_shortcuts.rb | 1 | ||||
| -rw-r--r-- | core/plugin/display_requirements/display_requirements.rb | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/lib/mikutwitter/api_shortcuts.rb b/core/lib/mikutwitter/api_shortcuts.rb index 723c03da..0495a9c1 100644 --- a/core/lib/mikutwitter/api_shortcuts.rb +++ b/core/lib/mikutwitter/api_shortcuts.rb @@ -221,6 +221,7 @@ module MikuTwitter::APIShortcuts parsed_url = Addressable::URI.parse(url) stream_access_token = access_token("#{parsed_url.scheme}://#{parsed_url.host}") http = stream_access_token.consumer.http + http.read_timeout = 90 consumer = stream_access_token.consumer request = consumer.create_signed_request(:post, parsed_url.path, diff --git a/core/plugin/display_requirements/display_requirements.rb b/core/plugin/display_requirements/display_requirements.rb index f9c43699..eb9ce283 100644 --- a/core/plugin/display_requirements/display_requirements.rb +++ b/core/plugin/display_requirements/display_requirements.rb @@ -86,8 +86,7 @@ Plugin.create :display_requirements do on_favorite do |service, user, message| activity(:like, "#{message.user[:idname]}: #{message.to_s}", description:(_("@%{user} がいいねいいねしました") % {user: user[:idname]} + "\n" + - "@#{message.user[:idname]}: #{message.to_s}\n"+ - message.perma_link), + "@%{user}: %{message}\n%{perma_link}" % {user: message.user[:idname], message: message, perma_link: message.perma_link}), icon: user[:profile_image_url], related: message.user.me? || user.me?, service: service) @@ -96,8 +95,7 @@ Plugin.create :display_requirements do on_unfavorite do |service, user, message| activity(:dont_like, "#{message.user[:idname]}: #{message.to_s}", description:(_("@%{user} があんいいねしました") % {user: user[:idname]} + "\n" + - "@#{message.user[:idname]}: #{message.to_s}\n"+ - message.perma_link), + "@%{user}: %{message}\n%{perma_link}" % {user: message.user[:idname], message: message, perma_link: message.perma_link}), icon: user[:profile_image_url], related: message.user.me? || user.me?, service: service) |