提交: 2cda1637fb7e5e7ae5d07c840066d98b4c198ddd - opentween (git)

OpenTweenのfork

Commit MetaInfo

• 修订版: 2cda1637fb7e5e7ae5d07c840066d98b4c198ddd (tree)
• 时间: 2012-02-18 23:11:16
• 作者: kiri_feather <kiri_feather@user...>
• Commiter: Kimura Youichi

Log Message

0882。API情報取得をAPI使用に戻し。

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@133 e39ad16e-3079-482e-bb30-4b4d378143b6

更改概述

• modified: Tween/My Project/AssemblyInfo.vb
• modified: Tween/Resources/ChangeLog.txt
• modified: Tween/Tween.Designer.vb
• modified: Tween/Tween.resx
• modified: Tween/Twitter.vb

差异

--- a/Tween/My Project/AssemblyInfo.vb	
+++ b/Tween/My Project/AssemblyInfo.vb	
@@ -55,5 +55,5 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
 <Assembly: AssemblyVersion("0.1.0.0")> 
-<Assembly: AssemblyFileVersion("0.8.8.1")> 
+<Assembly: AssemblyFileVersion("0.8.8.2")> 
 

--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -1,5 +1,16 @@
 更新履歴
 
+==== Ver 0.8.8.2(2010/03/12)
+ * 認証エラーが返ってくると、以後更新しなくなってしまうバグ修正
+ * API情報取得が正常に動作しないバグ修正
+ * 検索タブの遡りで、キャッシュが効いてしまう現象への対処
+ * BASIC認証も選べるように（各APIの接続先は共通なので、API制限は共通となります）
+ * ProxyAPI対応として、APIの接続先URLの一部を置き換えできるように設定追加
+ * 1秒以内の同種のAPIリクエストをキャンセルするように
+ * home_timeline,mentions,DirectMessageを遡れるように（Shift-F5,Shift-r）（DMはTwitterが仕様と違う動きをするため取得出来ません）
+ * 公式RTに対するQT返信時に、in_reply_toがつかないバグ修正
+ * 最小化状態で起動するとレイアウトが崩れる問題に対応（Tweenへのショートカットのプロパティで設定すると最小化状態で起動できます）
+ * 投稿時に自動URL短縮される際に、最後のURLしか短縮されない場合があるバグ修正
 ==== Ver 0.8.8.1(2010/03/3)
  * Webモード廃止
  * OAuth（xAuth）対応（API上限が350へ）

--- a/Tween/Tween.Designer.vb
+++ b/Tween/Tween.Designer.vb
@@ -28,6 +28,7 @@ Partial Class TweenMain
         Me.ToolStripContainer1 = New System.Windows.Forms.ToolStripContainer
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip
         Me.StatusLabelUrl = New System.Windows.Forms.ToolStripStatusLabel
+        Me.StatusLabel = New Tween.TweenCustomControl.ToolStripLabelHistory
         Me.HashStripSplitButton = New System.Windows.Forms.ToolStripSplitButton
         Me.ContextMenuStripPostMode = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItemUrlMultibyteSplit = New System.Windows.Forms.ToolStripMenuItem
@@ -62,6 +63,7 @@ Partial Class TweenMain
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator
         Me.SaveIconPictureToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
         Me.NameLabel = New System.Windows.Forms.Label
+        Me.PostBrowser = New System.Windows.Forms.WebBrowser
         Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem
         Me.SearchItem2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
@@ -229,8 +231,6 @@ Partial Class TweenMain
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog
         Me.TimerRefreshIcon = New System.Windows.Forms.Timer(Me.components)
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog
-        Me.PostBrowser = New System.Windows.Forms.WebBrowser
-        Me.StatusLabel = New Tween.TweenCustomControl.ToolStripLabelHistory
         Me.ToolStripContainer1.BottomToolStripPanel.SuspendLayout()
         Me.ToolStripContainer1.ContentPanel.SuspendLayout()
         Me.ToolStripContainer1.TopToolStripPanel.SuspendLayout()
@@ -289,6 +289,14 @@ Partial Class TweenMain
         resources.ApplyResources(Me.StatusLabelUrl, "StatusLabelUrl")
         Me.StatusLabelUrl.Spring = True
         '
+        'StatusLabel
+        '
+        Me.StatusLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right
+        Me.StatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
+        Me.StatusLabel.DoubleClickEnabled = True
+        Me.StatusLabel.Name = "StatusLabel"
+        resources.ApplyResources(Me.StatusLabel, "StatusLabel")
+        '
         'HashStripSplitButton
         '
         Me.HashStripSplitButton.AutoToolTip = False
@@ -523,6 +531,18 @@ Partial Class TweenMain
         Me.NameLabel.Name = "NameLabel"
         Me.NameLabel.UseMnemonic = False
         '
+        'PostBrowser
+        '
+        Me.PostBrowser.AllowWebBrowserDrop = False
+        Me.TableLayoutPanel1.SetColumnSpan(Me.PostBrowser, 2)
+        Me.PostBrowser.ContextMenuStrip = Me.ContextMenuStrip4
+        resources.ApplyResources(Me.PostBrowser, "PostBrowser")
+        Me.PostBrowser.IsWebBrowserContextMenuEnabled = False
+        Me.PostBrowser.Name = "PostBrowser"
+        Me.PostBrowser.ScriptErrorsSuppressed = True
+        Me.PostBrowser.TabStop = False
+        Me.PostBrowser.Url = New System.Uri("", System.UriKind.Relative)
+        '
         'ContextMenuStrip4
         '
         Me.ContextMenuStrip4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.ToolStripSeparator13, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripSeparator5, Me.FollowContextMenuItem, Me.RemoveContextMenuItem, Me.FriendshipContextMenuItem, Me.ToolStripSeparator32, Me.IdFilterAddMenuItem, Me.ToolStripSeparator33, Me.UseHashtagMenuItem})
@@ -1387,26 +1407,6 @@ Partial Class TweenMain
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
-        'PostBrowser
-        '
-        Me.PostBrowser.AllowWebBrowserDrop = False
-        Me.TableLayoutPanel1.SetColumnSpan(Me.PostBrowser, 2)
-        Me.PostBrowser.ContextMenuStrip = Me.ContextMenuStrip4
-        resources.ApplyResources(Me.PostBrowser, "PostBrowser")
-        Me.PostBrowser.IsWebBrowserContextMenuEnabled = False
-        Me.PostBrowser.Name = "PostBrowser"
-        Me.PostBrowser.ScriptErrorsSuppressed = True
-        Me.PostBrowser.TabStop = False
-        Me.PostBrowser.Url = New System.Uri("", System.UriKind.Relative)
-        '
-        'StatusLabel
-        '
-        Me.StatusLabel.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right
-        Me.StatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
-        Me.StatusLabel.DoubleClickEnabled = True
-        Me.StatusLabel.Name = "StatusLabel"
-        resources.ApplyResources(Me.StatusLabel, "StatusLabel")
-        '
         'TweenMain
         '
         Me.AllowDrop = True

--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -1887,6 +1887,12 @@
   <data name="&gt;&gt;StatusLabelUrl.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;StatusLabel.Name" xml:space="preserve">
+    <value>StatusLabel</value>
+  </data>
+  <data name="&gt;&gt;StatusLabel.Type" xml:space="preserve">
+    <value>Tween.TweenCustomControl.ToolStripLabelHistory, Tween, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
   <data name="&gt;&gt;HashStripSplitButton.Name" xml:space="preserve">
     <value>HashStripSplitButton</value>
   </data>
@@ -2991,12 +2997,6 @@
   <data name="&gt;&gt;OpenFileDialog1.Type" xml:space="preserve">
     <value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;StatusLabel.Name" xml:space="preserve">
-    <value>StatusLabel</value>
-  </data>
-  <data name="&gt;&gt;StatusLabel.Type" xml:space="preserve">
-    <value>Tween.TweenCustomControl.ToolStripLabelHistory, Tween, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>TweenMain</value>
   </data>

--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -3984,31 +3984,31 @@ Public Class Twitter
 
         If _endingFlag Then Return True
 
-        info.MaxCount = twCon.UpperCountApi
-        info.RemainCount = twCon.RemainCountApi
-        info.ResetTime = twCon.ResetTimeApi
-        Return True
-        'Dim res As HttpStatusCode
-        'Dim content As String = ""
-        'Try
-        '    res = twCon.RateLimitStatus(content)
-        'Catch ex As Exception
-        '    Return False
-        'End Try
-
-        'If res <> HttpStatusCode.OK Then Return False
-
-        'Dim xdoc As New XmlDocument
-        'Try
-        '    xdoc.LoadXml(content)
-        '    info.MaxCount = Integer.Parse(xdoc.SelectSingleNode("/hash/hourly-limit").InnerText)
-        '    info.RemainCount = Integer.Parse(xdoc.SelectSingleNode("/hash/remaining-hits").InnerText)
-        '    info.ResetTime = DateTime.Parse(xdoc.SelectSingleNode("/hash/reset-time").InnerText)
-        '    info.ResetTimeInSeconds = Integer.Parse(xdoc.SelectSingleNode("/hash/reset-time-in-seconds").InnerText)
-        '    Return True
-        'Catch ex As Exception
-        '    Return False
-        'End Try
+        'info.MaxCount = twCon.UpperCountApi
+        'info.RemainCount = twCon.RemainCountApi
+        'info.ResetTime = twCon.ResetTimeApi
+        'Return True
+        Dim res As HttpStatusCode
+        Dim content As String = ""
+        Try
+            res = twCon.RateLimitStatus(content)
+        Catch ex As Exception
+            Return False
+        End Try
+
+        If res <> HttpStatusCode.OK Then Return False
+
+        Dim xdoc As New XmlDocument
+        Try
+            xdoc.LoadXml(content)
+            info.MaxCount = Integer.Parse(xdoc.SelectSingleNode("/hash/hourly-limit").InnerText)
+            info.RemainCount = Integer.Parse(xdoc.SelectSingleNode("/hash/remaining-hits").InnerText)
+            info.ResetTime = DateTime.Parse(xdoc.SelectSingleNode("/hash/reset-time").InnerText)
+            'info.ResetTimeInSeconds = Integer.Parse(xdoc.SelectSingleNode("/hash/reset-time-in-seconds").InnerText)
+            Return True
+        Catch ex As Exception
+            Return False
+        End Try
     End Function
 
     Public Function GetHashList() As String()