From 070aadf916961f9b986df514a07dc31d541c1671 Mon Sep 17 00:00:00 2001
From: Toshiaki Asai <toshi.alternative@gmail.com>
Date: Tue, 11 Oct 2016 07:58:09 +0900
Subject: UserStreamのタイムアウトを90秒に変更 refs #912
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/mikutwitter/api_shortcuts.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/lib/mikutwitter/api_shortcuts.rb b/core/lib/mikutwitter/api_shortcuts.rb
index 56ddd2ad..f05c9eea 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
     http.ssl_version = 'TLSv1'
     consumer = stream_access_token.consumer
     request = consumer.create_signed_request(:post,
-- 
cgit v1.2.3


From 520fc99902d084213a34f9579e829025dea621ef Mon Sep 17 00:00:00 2001
From: Toshiaki Asai <toshi.alternative@gmail.com>
Date: Thu, 13 Oct 2016 07:18:24 +0900
Subject: We love developers. refs #908

---
 core/plugin/display_requirements/display_requirements.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/plugin/display_requirements/display_requirements.rb b/core/plugin/display_requirements/display_requirements.rb
index 0909916e..2eeae2be 100644
--- a/core/plugin/display_requirements/display_requirements.rb
+++ b/core/plugin/display_requirements/display_requirements.rb
@@ -90,8 +90,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: user[:idname], message: message, perma_link: message.perma_link}),
              icon: user[:profile_image_url],
              related: message.user.me? || user.me?,
              service: service)
@@ -100,8 +99,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: user[:idname], message: message, perma_link: message.perma_link}),
              icon: user[:profile_image_url],
              related: message.user.me? || user.me?,
              service: service)
-- 
cgit v1.2.3


From 05e90ed57d91031e890a77a48c0df3496f8259e4 Mon Sep 17 00:00:00 2001
From: Toshiaki Asai <toshi.alternative@gmail.com>
Date: Fri, 14 Oct 2016 21:03:55 +0900
Subject: :shit: refs #908

---
 core/plugin/display_requirements/display_requirements.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/plugin/display_requirements/display_requirements.rb b/core/plugin/display_requirements/display_requirements.rb
index 2eeae2be..a78b9390 100644
--- a/core/plugin/display_requirements/display_requirements.rb
+++ b/core/plugin/display_requirements/display_requirements.rb
@@ -90,7 +90,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" +
-                          "@%{user}: %{message}\n%{perma_link}" % {user: user[:idname], message: message, perma_link: 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)
@@ -99,7 +99,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" +
-                          "@%{user}: %{message}\n%{perma_link}" % {user: user[:idname], message: message, perma_link: 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)
-- 
cgit v1.2.3


From 83645d7dc44052ddbb86b85e6051b28bd015d1eb Mon Sep 17 00:00:00 2001
From: Toshiaki Asai <toshi.alternative@gmail.com>
Date: Sun, 16 Oct 2016 13:00:32 +0900
Subject: version 3.4.6

---
 core/config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/config.rb b/core/config.rb
index 8207bbe9..aa5f3eb5 100644
--- a/core/config.rb
+++ b/core/config.rb
@@ -47,6 +47,6 @@ module CHIConfig
   NeverRetrieveOverlappedMumble = false
 
   # このソフトのバージョン。
-  VERSION = [3,4,5,9999]
+  VERSION = [3,4,6,9999]
 
 end
-- 
cgit v1.2.3