2022.8.25.0

SLT-World · Aug 25, 2022 · 7e241dc · 7e241dc
1 parent 6919437
commit 7e241dc
Show file tree

Hide file tree

Showing 144 changed files with 1,585 additions and 23,437 deletions.
diff --git a/SLBr/App.xaml.cs b/SLBr/App.xaml.cs
@@ -30,7 +30,7 @@ public partial class App : Application
 
         //private static Mutex SingleInstanceMutex;
 
-        static Mutex mutex = new Mutex(true, "{SLBrSLTBrowser-SLT-WORLD-BROWSER-SLBr}");
+        //static Mutex mutex = new Mutex(true, "{SLBrSLTBrowser-SLT-WORLD-BROWSER-SLBr}");
         [STAThread]
         private void Application_Startup(object sender, StartupEventArgs e)
         {
@@ -40,7 +40,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 SelfHost.Main(args);
                 return;
             }
-            if (mutex.WaitOne(TimeSpan.Zero, true))
+            /*if (mutex.WaitOne(TimeSpan.Zero, true))
                 mutex.ReleaseMutex();
             else
             {
@@ -51,7 +51,9 @@ private void Application_Startup(object sender, StartupEventArgs e)
                     IntPtr.Zero,
                     IntPtr.Zero);
                 Current.Shutdown();
-            }
+            }*/
+
+
             /*bool IsNewInstance = false;
             SingleInstanceMutex = new Mutex(true, "SLBrSLTBrowser", out IsNewInstance);
             if (!IsNewInstance)
@@ -94,7 +96,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             JumpTask PrivateOpenTask = new JumpTask
             {
                 Title = "Open in private mode",
-                Arguments = "Private",
+                Arguments = "--private",
                 //Description = "No browsing history will be saved, in memory cache will be used (Incognito)",
                 CustomCategory = "Actions",
                 ApplicationPath = ExecutablePath,
@@ -103,7 +105,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             JumpTask DeveloperOpenTask = new JumpTask
             {
                 Title = "Open in developer mode",
-                Arguments = "Developer",
+                Arguments = "--developer",
                 //Description = "Access to developer features of SLBr and bypass the i5 processor check",
                 CustomCategory = "Actions",
                 ApplicationPath = ExecutablePath,
@@ -112,7 +114,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             JumpTask ChromiumOpenTask = new JumpTask
             {
                 Title = "Open in chromium mode",
-                Arguments = "Chromium",
+                Arguments = "--chromium",
                 //Description = "Access to developer features of SLBr and bypass the i5 processor check",
                 CustomCategory = "Actions",
                 ApplicationPath = ExecutablePath,
@@ -121,7 +123,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             JumpTask IEOpenTask = new JumpTask
             {
                 Title = "Open in Internet Explorer mode",
-                Arguments = "IE",
+                Arguments = "--ie",
                 //Description = "Access to developer features of SLBr and bypass the i5 processor check",
                 CustomCategory = "Actions",
                 ApplicationPath = ExecutablePath,

diff --git a/SLBr/Components/ChromiumWebBrowser.cs b/SLBr/Components/ChromiumWebBrowser.cs
@@ -12,7 +12,7 @@ namespace SLBr
 {
 	public class ChromiumWebBrowser : CefSharp.Wpf.ChromiumWebBrowser
 	{
-		public ChromiumWebBrowser() : base()
+        public ChromiumWebBrowser() : base()
 		{
 		}
 		public ChromiumWebBrowser(string path) : base(path)

diff --git a/SLBr/Handlers/ContextMenuHandler.cs b/SLBr/Handlers/ContextMenuHandler.cs
@@ -52,6 +52,7 @@ public void OnBeforeContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser
                     model.AddItem((CefMenuCommand)26505, "Reset Zoom Level");
                     model.AddSeparator();
                     model.AddItem((CefMenuCommand)26506, "Screenshot");
+                    model.AddItem((CefMenuCommand)26511, "Translate to English");
                     model.AddSeparator();
                     /*IMenuModel _EditSubMenuModel = model.AddSubMenu(CefMenuCommand.NotFound, "Edit");
                     _EditSubMenuModel.AddItem(CefMenuCommand.Undo, "Undo");
@@ -201,21 +202,15 @@ public bool RunContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser, IFr
 
             webBrowser.Dispatcher.Invoke(() =>
             {
-                var menu = new ContextMenu
-                {
-                    IsOpen = true
-                };
+                var menu = new ContextMenu { IsOpen = true };
 
                 RoutedEventHandler handler = null;
 
                 handler = (s, e) =>
                 {
                     menu.Closed -= handler;
-
                     if (!callback.IsDisposed)
-                    {
                         callback.Cancel();
-                    }
                 };
 
                 menu.Closed += handler;
@@ -365,6 +360,11 @@ public bool RunContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser, IFr
                                         chromiumWebBrowser.StartDownload(Parameters.SourceUrl);
                                         break;
                                     }
+                                case (CefMenuCommand)26511:
+                                    {
+                                        MainWindow.Instance.Translate();
+                                        break;
+                                    }
                             }
                         })
                     });

diff --git a/SLBr/Handlers/JSBindingHandler.cs b/SLBr/Handlers/JSBindingHandler.cs
@@ -25,6 +25,10 @@ public string SearchProviderPrefix()
             return MainWindow.Instance.MainSave.Get("Search_Engine");
             //return "Bruh";
         }
+        public int AdsBlocked() =>
+            MainWindow.Instance.AdsBlocked;
+        public int TrackersBlocked() =>
+            MainWindow.Instance.TrackersBlocked;
         public string SayHello(string name) { return $"Hello {name}!"; }
 
         public void PromptExample()

diff --git a/SLBr/Handlers/RequestHandler.cs b/SLBr/Handlers/RequestHandler.cs
@@ -24,13 +24,15 @@ public bool GetAuthCredentials(IWebBrowser chromiumWebBrowser, IBrowser browser,
 
 		public bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect)
 		{
-			if (request.Url.Contains("roblox.com"))
-				return true;
+			if (request.Url.StartsWith("weblight://") && bool.Parse(MainWindow.Instance.MainSave.Get("WeblightScheme")))
+				frame.LoadUrl("https://googleweblight.com/?lite_url=" + Utils.CleanUrl(request.Url.Replace("weblight://", "")));
+			//if (request.Url.Contains("roblox.com"))
+			//	return true;
 			//if (request.Url != frame.Url)
 			//	return true;
 			if (Utils.CanCheck(request.TransitionType) && !Utils.IsProtocolNotHttp(request.Url) && !Utils.IsProgramUrl(request.Url))//(isRedirect || userGesture || frame.IsMain)
 			{
-				string Response = MainWindow.Instance._SafeBrowsing.Response(request.Url.Replace("https://googleweblight.com/?lite_url=", ""));
+				string Response = MainWindow.Instance._SafeBrowsing.Response(request.Url.Replace("https://googleweblight.com/?lite_url=", "").Replace("weblight://", ""));
 				Utils.SafeBrowsing.ThreatType _ThreatType = Utils.CheckForInternetConnection() ? MainWindow.Instance._SafeBrowsing.GetThreatType(Response) : Utils.SafeBrowsing.ThreatType.Unknown;
 				if (_ThreatType == Utils.SafeBrowsing.ThreatType.Malware || _ThreatType == Utils.SafeBrowsing.ThreatType.Unwanted_Software)
 					//chromiumWebBrowser.LoadHtml(File.ReadAllText(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Resources", "Malware.html")), request.Url);

diff --git a/SLBr/Handlers/ResourceRequestHandler.cs b/SLBr/Handlers/ResourceRequestHandler.cs
@@ -50,7 +50,7 @@ public IResponseFilter GetResourceResponseFilter(IWebBrowser chromiumWebBrowser,
             "smartadserver.com", "bidswitch.net", "taboola", "amazon-adsystem.com", "survey.min.js", "survey.js", "social-icons.js", "intergrator.js", "cookie.js", "analytics.js", "ads.js",
             "ad.js", "tracker.js", "tracker.ga.js", "tracker.min.js", "bugsnag.min.js", "async-ads.js", "displayad.js", "j.ad", "ads-beacon.js", "adframe.js", "ad-provider.js",
             "admanager.js", "adserver", "smartadserver", "usync.js", "moneybid.js", "miner.js", "prebid", "youtube.com/ptracking", "fls.doubleclick.net", "google.com/ads",
-            "advertising.js", "adsense.js"
+            "advertising.js", "adsense.js", "track", "plusone.js"
         };
         FastHashSet<string> Miners = new FastHashSet<string> {
             "cryptonight.wasm", "deepminer.js", "deepminer.min.js", "coinhive.min.js", "monero-miner.js", "wasmminer.wasm", "wasmminer.js", "cn-asmjs.min.js", "gridcash.js",
@@ -104,7 +104,9 @@ public IResponseFilter GetResourceResponseFilter(IWebBrowser chromiumWebBrowser,
             "ids.ad.gt", "powerad.ai", "hb.brainlyads.com", "pixel.quantserve.com", "ads.anura.io", "static.getclicky.com",
             "ad.turn.com", "rtb.mfadsrvr.com", "ad.mrtnsvr.com", "s.ad.smaato.net", "rtb-csync.smartadserver.com", "ssbsync.smartadserver.com",
             "adpush.technoratimedia.com", "pixel.tapad.com", "secure.adnxs.com", "data.adsrvr.org", "px.adhigh.net",
-            "epnt.ebay.com", "mb.moatads.com", "ad.adsrvr.org", "a.ad.gt", "pixels.ad.gt", "z.moatads.com", "px.moatads.com"
+            "epnt.ebay.com", "mb.moatads.com", "ad.adsrvr.org", "a.ad.gt", "pixels.ad.gt", "z.moatads.com", "px.moatads.com", "s.pubmine.com", "px.ads.linkedin.com", "p.adsymptotic.com",
+            "btloader.com", "ad-delivery.net", "ad.doubleclick.net",
+            "services.vlitag.com", "tag.vlitag.com", "assets.vlitag.com"
         };
         FastHashSet<string> Analytics = new FastHashSet<string> { "google-analytics.com", "ssl.google-analytics.com",
             "stats.wp.com",
@@ -150,7 +152,7 @@ public IResponseFilter GetResourceResponseFilter(IWebBrowser chromiumWebBrowser,
             "sync.outbrain.com", "widgets.outbrain.com",
             "collect.mopinion.com", "pb-server.ezoic.com",
             "demand.trafficroots.com", "sync.srv.stackadapt.com", "sync.ipredictive.com", "analytics.vdo.ai", "tag-api-2-1.ccgateway.net", "sync.search.spotxchange.com",
-            "reporting.powerad.ai", "monitor.ebay.com", "beacon.walmart.com"
+            "reporting.powerad.ai", "monitor.ebay.com", "beacon.walmart.com", "capture.condenastdigital.com", "a.pub.network"
         };
         public CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback)
         {
@@ -168,6 +170,10 @@ public CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrow
             //if (Utils.IsDataOffender(request.ResourceType))
             //{
             //}
+
+            //if (request.Url.StartsWith("ipfs://"))
+            //    request.Url = request.Url.Replace("ipfs://", "https://cloudflare-ipfs.com/ipfs/");
+
             if (Utils.IsPossiblyAd(request.ResourceType))
             {
                 if (AdBlock || TrackerBlock)
@@ -201,15 +207,15 @@ public CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrow
                             if (Analytics.Contains(Host))
                             {
                                 Continue = false;
-                                MainWindow.Instance.BlockedTrackers++;
+                                MainWindow.Instance.TrackersBlocked++;
                             }
                         if (Continue)
                         {
                             if (AdBlock)
                                 if (Ads.Contains(Host))
                                 {
                                     Continue = false;
-                                    MainWindow.Instance.BlockedAds++;
+                                    MainWindow.Instance.AdsBlocked++;
                                 }
                         }
                     }