chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-10 17:34:07 +02:00
Code

Add $TD.makeGetRequest and fix template plugin AJAX

Browse Source 
Closes
This commit is contained in:
chylex 2020-04-25 03:15:52 +02:00
parent e90f6ebc63
commit 89529f9c96
2 changed files with 24 additions and 4 deletions
Browser/Bridge
TweetDeckBridge.cs
Resources/Plugins/templates
browser.js

22
Browser/Bridge/TweetDeckBridge.cs
View File

@ -1,4 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using System.Windows.Forms;
using CefSharp;
using TweetDuck.Browser.Handling;
@ -8,6 +10,7 @@
using TweetDuck.Management;
using TweetDuck.Utils;
using TweetLib.Core.Features.Notifications;
using TweetLib.Core.Utils;
namespace TweetDuck.Browser.Bridge{
[SuppressMessage("ReSharper", "UnusedMember.Global")]
@ -116,6 +119,23 @@ public void OpenBrowser(string url){
form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
}
public void MakeGetRequest(string url, IJavascriptCallback onSuccess, IJavascriptCallback onError){
Task.Run(async () => {
var client = WebUtils.NewClient(BrowserUtils.UserAgentVanilla);
try{
var result = await client.DownloadStringTaskAsync(url);
await onSuccess.ExecuteAsync(result);
}catch(Exception e){
await onError.ExecuteAsync(e.Message);
}finally{
onSuccess.Dispose();
onError.Dispose();
client.Dispose();
}
});
}
public int GetIdleSeconds(){
return NativeMethods.GetIdleSeconds();
}

6
Resources/Plugins/templates/browser.js
View File

@ -132,16 +132,16 @@ enabled(){
return;
}
$.get(url, function(data){
$TD.makeGetRequest(url, function(data){
if (evaluator){
resolve([ index, eval(evaluator.replace(/\$/g, "'"+data.replace(/(["'\\\n\r\u2028\u2029])/g, "\\$1")+"'"))]);
}
else{
resolve([ index, data ]);
}
}, "text").fail(function(){
}, function(err){
resolve([ index, "" ]);
alert("error|Failed executing AJAX request: " + url);
$TD.alert("error", "Error executing AJAX request: "+err);
});
});
};