Merge branch 'master' of https://github.com/mrpond/BlockTheSpot

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,20 +10,21 @@ assignees: ''
 **Important**
  - Make sure you use [latest spotify](https://www.spotify.com) before reporting a bug.
  - Make sure you use the [latest blockthespot](https://www.github.com/mrpond/BlockTheSpot/releases) before reporting a bug.
- - Make sure if blockthespot DLL got replaced after spotify update (important).
+ - Make sure if blockthespot DLL got replaced after Spotify update (important).
 
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**Desktop (please complete the following information):**
+**Desktop:**
+<!--(please complete the following information)-->
  - OS: [e.g. Windows 10]
- - Spotify Version: [e.g. 1.1.27.472.gf6574b97]
- - BlockTheSpot Product Version: [right click chrome_elf.dll -> Details]
+ - Spotify Version: [e.g. 1.1.47.684.g136419d9]
+ - BlockTheSpot Product Version: [e.g. 0.51.0.0] <!--[right click chrome_elf.dll -> Details -> Product Version]-->
 
 **Additional context**
 Add any other context about the problem here. 
 If ad blocking is not working, please include a debug log by
  1. edit config.ini and set Log = 1 
- 2. after ads song play close spotify
+ 2. after ads song play close Spotify
  3. zip the main_log.txt, utility_log.txt

BlockTheSpot.bat

@@ -22,6 +22,7 @@ Author: @rednek46
 
 $SpotifyDirectory = "$env:APPDATA\Spotify"
 $SpotifyExecutable = "$SpotifyDirectory\Spotify.exe"
+$SpotifyApps = "$SpotifyDirectory\Apps"
 
 Write-Host 'Stopping Spotify...'`n
 Stop-Process -Name Spotify
@@ -71,8 +72,21 @@ try {
   Write-Output $_
   Sleep
 }
+try {
+  $webClient.DownloadFile(
+    # Remote file URL
+    'https://github.com/mrpond/BlockTheSpot/files/5767943/zlink.zip',
+    # Local file path
+    "$PWD\zlink.zip"
+  )
+} catch {
+  Write-Output $_
+  Sleep
+}
 Expand-Archive -Force -LiteralPath "$PWD\chrome_elf.zip" -DestinationPath $PWD
 Remove-Item -LiteralPath "$PWD\chrome_elf.zip"
+Expand-Archive -Force -LiteralPath "$PWD\zlink.zip" -DestinationPath $PWD
+Remove-Item -LiteralPath "$PWD\zlink.zip"
 
 $spotifyInstalled = (Test-Path -LiteralPath $SpotifyExecutable)
 if (-not $spotifyInstalled) {
@@ -110,8 +124,18 @@ if (!(test-path $SpotifyDirectory/chrome_elf.dll.bak)){
 
 Write-Host 'Patching Spotify...'
 $patchFiles = "$PWD\chrome_elf.dll", "$PWD\config.ini"
+$remup = "$PWD\zlink.spa"
 Copy-Item -LiteralPath $patchFiles -Destination "$SpotifyDirectory"
 
+$ch = Read-Host -Prompt "Optional - Remove Upgrade Button. (Y/N) "
+if ($ch -eq 'y'){
+    move $SpotifyApps\zlink.spa $SpotifyApps\zlink.spa.bak >$null 2>&1
+    Copy-Item -LiteralPath $remup -Destination "$SpotifyApps"
+} else{
+     Write-Host @'
+Won't remove Upgrade Button.
+'@`n
+}
 $tempDirectory = $PWD
 Pop-Location
 

README.md

@@ -1,28 +1,28 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/31l6ynm0a1fhr2vs/branch/master?svg=true)](https://ci.appveyor.com/project/mrpond/blockthespot/branch/master)
 
 <center>
-    <h3 align="center"><a href=https://en.wikipedia.org/wiki/2020_Thai_protests>Support 2020 Thai protest</a></h3>
-    <h3 align="center">help me stop dictatorship!</h3>
-    <h3 align="center"><a href="https://twitter.com/search?q=%23whatishappeninginthailand">#whatishappeninginthailand</a></h3>
-    <h3 align="center"><a href="https://twitter.com/search?q=%23whatshappeninginindonesia">#whatshappeninginindonesia</a></h3>
-    <h3 align="center"><a href="https://twitter.com/search?q=%23WhatIsHappeningInPhilippines">#WhatIsHappeningInPhilippines</a></h3>
+    <h3 align="center"><a href=https://en.wikipedia.org/wiki/2020_Thai_protests>Support the 2020 Thai protests</a></h3>
+    <h3 align="center">Help me stop the dictatorship!</h3>
+    <h3 align="center"><a href="https://twitter.com/search?q=%23whatishappeninginthailand">#WhatIsHappeningInThailand</a></h3>
+    <h3 align="center"><a href="https://twitter.com/search?q=%23whatshappeninginindonesia">#WhatsHappeninginIndonesia</a></h3>
+    <h3 align="center"><a href="https://twitter.com/search?q=%23whatshappeninginphilippines">#WhatsHappeningInPhilippines</a></h3>
     <h3 align="center">Southeast Asia strong together!</h3>
 </center>
 
 <center>
     <h1 align="center">BlockTheSpot</h1>
-    <h4 align="center">A multi-purpose adblocker and skip bypass for the <strong>Windows</strong> Spotify Desktop Application.</h4>
+    <h4 align="center">A multi-purpose adblocker and skip-bypass for the <strong>Windows</strong> Spotify desktop application.</h4>
     <h5 align="center">Please support Spotify by purchasing premium</h5>
     <p align="center">
-        <strong>Last updated:</strong> 30 September 2020<br>
-        <strong>Last tested version:</strong> 1.1.44.538.g8057de92
+        <strong>Last updated:</strong> 10 December 2020<br>
+        <strong>Last tested version:</strong> 1.1.48.625.g1c87c7f7
     </p> 
 </center>
 
-#### IMPORTANT FOR LIVING IN 2020 AND SO ON:
-0. Windows update, Spotify/Other Software update, BlockTheSpot update
-1. Goto "windows security" -> "Virus & Threat protection"
-2. Click "Allowed threats" -> Remove all allowed threats
+#### Important checks prior to install:
+0. Update Windows, Update Spotify/other software, update BlockTheSpot
+1. Goto "Windows Security" -> "Virus & Threat Protection"
+2. Click "Allowed threats" -> "Remove all allowed threats"
 
 ### Features:
 * Blocks all banner/video/audio ads within the app
@@ -32,27 +32,27 @@
 :warning: This mod is for the [**Desktop Application**](https://www.spotify.com/download/windows/) of Spotify on Windows, **not the Microsoft Store version**.
 
 #### Installation/Update:
-* Just run BlockTheSpot.bat
+* Just download and run [BlockTheSpot.bat](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/mrpond/BlockTheSpot/blob/master/BlockTheSpot.bat)
 or
-1. Browse to Spotify installation folder `%APPDATA%\Spotify`
-2. Download chrome_elf.zip from [releases](https://github.com/mrpond/BlockTheSpot/releases)
-3. Replace chrome_elf.dll, config.ini from chrome_elf.zip to that folder. 
+1. Browse to your Spotify installation folder `%APPDATA%\Spotify`
+2. Download `chrome_elf.zip` from [releases](https://github.com/mrpond/BlockTheSpot/releases)
+3. Unzip and replace `chrome_elf.dll` and `config.ini` 
 
 #### Uninstall:
 * Just run uninstall.bat
 or
-* reinstall spotify
+* Reinstall Spotify 
 
 #### Note:
-* "chrome_elf.dll" gets replaced by Spotify Installer each time it updates, make sure to replace it again.
-* Ads banner maybe appear if you network use 'Web Proxy Auto-Discovery Protocol'
-https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol
-set Skip_wpad in config.ini to 1 may help.
-* For spotify premium user, set Block_BannerOnly = 1 this will block only banner at home.
-* if automatic install/uninstall .bat not working please contact (https://github.com/rednek46)
-
-#### Note2:
-<center>
-<b>ki</b>ng<b>ller<b/>
-<img src="JUNTA.jpg">
-</center>
+* "chrome_elf.dll" gets replaced by the Spotify installer each time it updates, make sure to replace it after an update
+* The ad banner may appear if your network uses [Web Proxy Auto-Discovery Protocol](https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol)
+    * Setting `Skip_wpad = 1` in config.ini may help
+* For Spotify Premium users, setting `Block_BannerOnly = 1` will only block the banner at home
+* If the automatic install/uninstall scripts do not work, please contact [rednek46](https://github.com/rednek46)
+
+#### Update on protests:
+
+<p align="center"><b>ki</b>ng<b>ller<b/></p>
+<p align="center">
+    <img src="JUNTA.jpg" width="600">
+</p>

uninstall.bat

@@ -4,5 +4,7 @@ echo Author: @rednek46
 echo *****************
 echo Removing Patch
 del /s /q "%APPDATA%\Spotify\chrome_elf.dll" > NUL 2>&1
+del /s /q "%APPDATA%\Spotify\Apps\zlink.spa" > NUL 2>&1
 move "%APPDATA%\Spotify\chrome_elf.dll.bak" "%APPDATA%\Spotify\chrome_elf.dll" > NUL 2>&1
+move "%APPDATA%\Spotify\Apps\zlink.spa.bak" "%APPDATA%\Spotify\Apps\zlink.spa" > NUL 2>&1
 pause