fix Bilibili api

MikiraSora · MikiraSora · commit 5aafde7094cf · 2019-03-27T18:50:54.000+08:00
diff --git a/DefaultPlugin/Sources/BiliBili/Bilibili_dm/DanmakuLoader.cs b/DefaultPlugin/Sources/BiliBili/Bilibili_dm/DanmakuLoader.cs
@@ -58,7 +58,7 @@ public async Task<bool> ConnectAsync(int roomId)
                     {
                         var request2 = WebRequest.Create(CIDInfoUrl + channelId);
                         request2.Timeout = 2000;
-                        var response2 = await request2.GetResponseAsync();
+                        var response2 = request2.GetResponse();
                         using (var stream = response2.GetResponseStream())
                         {
                             using (var sr = new StreamReader(stream))
@@ -67,7 +67,8 @@ public async Task<bool> ConnectAsync(int roomId)
                                 var xml = "<root>" + text + "</root>";
                                 XmlDocument doc = new XmlDocument();
                                 doc.LoadXml(xml);
-                                ChatHost = doc["root"]["server"].InnerText;
+                                ChatHost = doc["root"]["dm_server"].InnerText;
+                                ChatPort = int.Parse(doc["root"]["dm_port"].InnerText);
                             }
                         }
                     }
@@ -85,7 +86,7 @@ public async Task<bool> ConnectAsync(int roomId)
                 }
                 Client = new TcpClient();
 
-                await Client.ConnectAsync(ChatHost, ChatPort);
+                Client.Connect(ChatHost, ChatPort);
 
                 NetStream = Client.GetStream();
 
diff --git a/DefaultPlugin/Sources/BiliBili/Bilibili_sender/BiliBiliSender.cs b/DefaultPlugin/Sources/BiliBili/Bilibili_sender/BiliBiliSender.cs
@@ -82,23 +82,28 @@ public void setCookies(string cookies)
         /// <param name="msg">弹幕</param>
         public void send(string msg)
         {
-            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(new Uri("http://live.bilibili.com/msg/send"));
+            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(new Uri("http://api.live.bilibili.com/msg/send"));
             long unix = (DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000;
-            byte[] byteArray = Encoding.UTF8.GetBytes("color=16777215&fontsize=25&mode=1&msg=" + msg + "&rnd=" + unix + "&roomid=" + BiliBili.BiliBili.RoomID + "");
+            var body= "color=16777215&fontsize=25&mode=1&msg="+msg+"&rnd="+unix+"&roomid="+BiliBili.BiliBili.RoomID+"";
             string[] cookies = BiliBili.BiliBili.Cookies.ToString().Split("; ".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
             Uri live = new Uri("http://live.bilibili.com/");
 
-            req.Method = "POST";
-            req.ContentType = "application/x-www-form-urlencoded";
-            req.ContentLength = byteArray.Length;
-            req.CookieContainer = new CookieContainer();
+            req.Method="POST";
+            req.ContentType="application/x-www-form-urlencoded";
+            req.Headers[HttpRequestHeader.Cookie]=BiliBili.BiliBili.Cookies.ToString();
 
-            foreach (var i in cookies)
+            var result=cookies.Select(x => x.Split(new[] { '=' }, 2)).FirstOrDefault(x=>x[0]=="bili_jct");
+
+            if (result==null||result.Length<2)
             {
-                string[] cookie = i.Split("=".ToCharArray(), 2);
-                req.CookieContainer.Add(live, new Cookie(cookie[0], cookie[1].Replace(',', '_')));
+                //no CSRF , cant send message
+                return;
             }
+            
+            body+="&csrf="+result[1];
 
+            byte[] byteArray = Encoding.UTF8.GetBytes(body);
+            req.ContentLength=byteArray.Length;
 
             using (Stream dataStream = req.GetRequestStream())
             {
diff --git a/DefaultPlugin/Sources/Twitch/TwitchIRCIO.cs b/DefaultPlugin/Sources/Twitch/TwitchIRCIO.cs
@@ -30,7 +30,7 @@ public class TwitchIRCIO
         string oauth = @"oauth:pjaicvg4jon0o0doiwjlo5z9s05a7l";
         string name = @"osuSync";
         string client_id = "esmhw2lcvrgtqw545ourqjwlg7twee";
-        string ircAddress = @"irc.twitch.tv";
+        string ircAddress = @"irc.chat.twitch.tv";
         int ircPort = 6667;
         string channelName = null;
 
@@ -98,7 +98,9 @@ private void initStart()
             outputStreamSender = new StreamWriter(rawSocketStream);
             inputStreamReciever = new StreamReader(rawSocketStream);
 
-            outputStreamSender.WriteLine($"PASS {oauth}\nNICK {name.ToLower()}");
+            outputStreamSender.WriteLine($"PASS {oauth}");
+            outputStreamSender.Flush();
+            outputStreamSender.WriteLine($"NICK mikirasora");
             outputStreamSender.Flush();
 
             outputStreamSender.WriteLine(@"CAP REQ :twitch.tv/membership");

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public async Task<bool> ConnectAsync(int roomId)`
`58`	`58`	`{`
`59`	`59`	`var request2 = WebRequest.Create(CIDInfoUrl + channelId);`
`60`	`60`	`request2.Timeout = 2000;`
`61`		`- var response2 = await request2.GetResponseAsync();`
	`61`	`+ var response2 = request2.GetResponse();`
`62`	`62`	`using (var stream = response2.GetResponseStream())`
`63`	`63`	`{`
`64`	`64`	`using (var sr = new StreamReader(stream))`
`@@ -67,7 +67,8 @@ public async Task<bool> ConnectAsync(int roomId)`
`67`	`67`	`var xml = "<root>" + text + "</root>";`
`68`	`68`	`XmlDocument doc = new XmlDocument();`
`69`	`69`	`doc.LoadXml(xml);`
`70`		`- ChatHost = doc["root"]["server"].InnerText;`
	`70`	`+ ChatHost = doc["root"]["dm_server"].InnerText;`
	`71`	`+ ChatPort = int.Parse(doc["root"]["dm_port"].InnerText);`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`	`}`
`@@ -85,7 +86,7 @@ public async Task<bool> ConnectAsync(int roomId)`
`85`	`86`	`}`
`86`	`87`	`Client = new TcpClient();`
`87`	`88`
`88`		`- await Client.ConnectAsync(ChatHost, ChatPort);`
	`89`	`+ Client.Connect(ChatHost, ChatPort);`
`89`	`90`
`90`	`91`	`NetStream = Client.GetStream();`
`91`	`92`