prepare for name update

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,13 +5,13 @@ body:
 - type: checkboxes
   attributes:
       label: 🧐 Have you fully read the README and viewed similar issues?
-      description: Please read the <a href="https://github.com/SpotX-CLI/SpotX-Mac/blob/main/readme.md">README</a>. Also check the open and closed <a href="https://github.com/SpotX-CLI/SpotX-Mac/issues">issue</a> because your issue may have already been fixed.
+      description: Please read the <a href="https://github.com/Nuzair46/BlockTheSpot-Mac/blob/main/readme.md">README</a>. Also check the open and closed <a href="https://github.com/Nuzair46/BlockTheSpot-Mac/issues">issue</a> because your issue may have already been fixed.
       options:
         - label: I have read the README
           required: true
         - label: I have checked older issues, open and closed
           required: true
-        - label: I did a clean install of Spotify and SpotX
+        - label: I did a clean install of Spotify and BlockTheSpot
           required: true
 - type: markdown
   attributes:
@@ -89,7 +89,7 @@ body:
 - type: textarea
   attributes:
     label: 🖥️ Terminal Input/Output
-    description: Copy input/output from Terminal -- the SpotX command you entered and everything that followed.
+    description: Copy input/output from Terminal -- the BlockTheSpot command you entered and everything that followed.
   validations:
     required: true
 - type: textarea

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Nuzair Rasheed
+Copyright (c) 2022-2024 Nuzair46
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SPOTX_VERSION="1.2.22.982"
+BLOCKTHESPOT_VERSION="1.2.30.1135"
 
 # dependencies check
 command -v perl >/dev/null || { echo -e "\nperl was not found, exiting...\n" >&2; exit 1; }
@@ -15,12 +15,14 @@ PATH_FLAG='false'
 UPDATE_FLAG='false'
 CUSTOM_APP_PATH='false'
 SKIP_CODE_SIGNATURE='false'
+DEVELOPER_MODE='false'
 
-while getopts 'cefhopuP:' flag; do
+while getopts 'fhSPud:' flag; do
   case "${flag}" in
   f) FORCE_FLAG='true' ;;
   h) HIDE_PODCASTS_FLAG='true' ;;
   S) SKIP_CODE_SIGNATURE='true' ;;
+  d) DEVELOPER_MODE='true' ;;
   P)
     APP_PATH="${OPTARG}"
     PATH_FLAG='true'
@@ -61,10 +63,14 @@ XPUI_SPA="${XPUI_PATH}/xpui.spa"
 XPUI_JS="${XPUI_DIR}/xpui.js"
 XPUI_CSS="${XPUI_DIR}/xpui.css"
 VENDOR_XPUI_JS="${XPUI_DIR}/vendor~xpui.js"
+XPUI_DESKTOP_MODAL_JS="${XPUI_DIR}/xpui-desktop-modals.js"
 
 # Find client version
 CLIENT_VERSION=$(awk '/CFBundleShortVersionString/{getline; print}' "${INSTALL_PATH}/Contents/Info.plist" | cut -d\> -f2- | rev | cut -d. -f2- | rev)
 
+# Get Mac OS Architecture
+MAC_ARCH=$(uname -m)
+
 # Version function for version comparison
 function ver { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
 
@@ -74,45 +80,60 @@ PERL="perl -pi -w -e"
 # Ad-related regex
 AD_EMPTY_AD_BLOCK='s|adsEnabled:!0|adsEnabled:!1|'
 AD_PLAYLIST_SPONSORS='s|allSponsorships||'
-AD_UPGRADE_BUTTON='s/(return|.=.=>)"free"===(.+?)(return|.=.=>)"premium"===/$1"premium"===$2$3"free"===/g'
-AD_AUDIO_ADS='s/(case .:|async enable\(.\)\{)(this.enabled=.+?\(.{1,3},"audio"\),|return this.enabled=...+?\(.{1,3},"audio"\))((;case 4:)?this.subscription=this.audioApi).+?this.onAdMessage\)/$1$3.cosmosConnector.increaseStreamTime(-100000000000)/'
-AD_BILLBOARD='s|.(\?\[.{1,6}[a-zA-Z].leaderboard,)|false$1|'
+AD_SPONSORS='s/ht.{14}\...\..{7}\....\/.{8}ap4p\/|ht.{14}\...\..{7}\....\/s.{15}t\/v.\///g'
+# AD_UPGRADE_BUTTON='s/(return|.=.=>)"free"===(.+?)(return|.=.=>)"premium"===/$1"premium"===$2$3"free"===/g'
+# AD_AUDIO_ADS='s/(case .:|async enable\(.\)\{)(this.enabled=.+?\(.{1,3},"audio"\),|return this.enabled=...+?\(.{1,3},"audio"\))((;case 4:)?this.subscription=this.audioApi).+?this.onAdMessage\)/$1$3.cosmosConnector.increaseStreamTime(-100000000000)/'
+AD_BILLBOARD='s|.(?=\?\[.{1,6}[a-zA-Z].leaderboard,)|false|'
 AD_UPSELL='s|Enables quicksilver in-app messaging modal",default:\K!.(?=})|false|s'
 AD_ADS='s#/a\Kd(?=s/v1)|/a\Kd(?=s/v2/t)|/a\Kd(?=s/v2/se)#b#gs'
 AD_SERV='s|(this\._product_state(?:_service)?=(.))|$1,$2.putOverridesValues({pairs:{ads:'\''0'\'',catalogue:'\''premium'\'',product:'\''premium'\'',type:'\''premium'\''}})|'
 AD_PATCH_1='s|\x00\K\x61(?=\x64\x2D\x6C\x6F\x67\x69\x63\x2F\x73)|\x00|'
 AD_PATCH_2='s|\x00\K\x73(?=\x6C\x6F\x74\x73\x00)|\x00|'
+AD_PATCH_3='s|\x70\x6F\x64\x63\x61\x73\x74\K\x2D\x70|\x20\x70|g'
+AD_PATCH_4='s|\x70\x6F\x64\x63\x61\x73\x74\K\x2D\x6D\x69|\x20\x6D\x69|g'
+AD_PATCH_5='s|\x00\K\x67(?=\x61\x62\x6F\x2D\x72\x65\x63\x65\x69\x76\x65\x72\x2D\x73\x65\x72\x76\x69\x63\x65)|\x00|g'
+HPTO_ENABLED='s|hptoEnabled:!\K0|1|s'
+HPTO_PATCH='s|(ADS_PREMIUM,isPremium:)\w(.*?ADS_HPTO_HIDDEN,isHptoHidden:)\w|$1true$2true|'
 
 # Hide Premium-only features
-HIDE_DL_QUALITY='s/(\(.,..jsxs\)\(.{1,3}|(.\(\).|..)createElement\(.{1,4}),\{(filterMatchQuery|filter:.,title|(variant:"viola",semanticColor:"textSubdued"|..:"span",variant:.{3,6}mesto,color:.{3,6}),htmlFor:"desktop.settings.downloadQuality.+?).{1,6}get\("desktop.settings.downloadQuality.title.+?(children:.{1,2}\(.,.\).+?,|\(.,.\){3,4},|,.\)}},.\(.,.\)\),)//'
+HIDE_DL_QUALITY='s|return \K([^;]+?)(?=\?null[^}]+?desktop\.settings\.downloadQuality\.title)|true|'
 HIDE_DL_ICON=' .BKsbV2Xl786X9a09XROH {display:none}'
 HIDE_DL_MENU=' button.wC9sIed7pfp47wZbmU6m.pzkhLqffqF_4hucrVVQA {display:none}'
 HIDE_VERY_HIGH=' #desktop\.settings\.streamingQuality>option:nth-child(5) {display:none}'
 
 # Hide Podcasts/Episodes/Audiobooks on home screen
 HIDE_PODCASTS3='s/(!Array.isArray\(.\)\|\|.===..length)/$1||e[0].key.includes('\''episode'\'')||e[0].key.includes('\''show'\'')/'
 
+MODAL_CREDITS='s;((..createElement|children:\(.{1,7}\))\(.{1,7},\{source:).{1,7}get\("about.copyright",.\),paragraphClassName:.(?=\}\));$1"<h3>About BlockTheSpot-Mac</h3><br><a href='\''https://github.com/Nuzair46/BlockTheSpot-Mac'\''><svg xmlns='\''http://www.w3.org/2000/svg'\'' width='\''20'\'' height='\''20'\'' viewBox='\''0 0 24 24'\''><path d='\''M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z'\'' fill='\''#fff'\''/></svg> Nuzair46/BlockTheSpot-Mac</a><br><a href='https://discord.gg/eYudMwgYtY'><svg xmlns='\''http://www.w3.org/2000/svg'\'' width='\''20'\'' height='\''20'\'' viewBox='\''0 0 24 24'\''><path id='\''discord'\'' d='\''M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028 14.09 14.09 0 0 0 1.226-1.994.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z'\'' fill='\''#fff'\''/></svg> BlockTheSpot Discord</a><br><a href='https://github.com/mrpond/BlockTheSpot'><svg fill='\''#fff'\'' width='\''20'\'' height='\''20'\'' viewBox='\''0 0 24 24'\'' xmlns='\''http://www.w3.org/2000/svg'\''><path id='\''windows'\'' d='\''m9.84 12.663v9.39l-9.84-1.356v-8.034zm0-10.72v9.505h-9.84v-8.145zm14.16 10.72v11.337l-13.082-1.803v-9.534zm0-12.663v11.452h-13.082v-9.649z'\''/></svg> For Windows 10/11</a><br><br>BlockTheSpot-Mac is provided &quot\;as is&quot\ without any warranties at the users descretion. Use at your own risk.<br><br>Spotify&reg\; is a registered trademark of Spotify Group.";'
+
 # Log-related regex
 LOG_1='s|sp://logging/v3/\w+||g'
 LOG_SENTRY='s|this\.getStackTop\(\)\.client=e|return;$&|'
 
 # Updates
 UPDATE_PATCH='s|\x64(?=\x65\x73\x6B\x74\x6F\x70\x2D\x75\x70)|\x00|g'
 
+# Developer mode
+if [[ "${MAC_ARCH}" == "arm64" ]]; then
+  DEVELOPER_MODE_PATCH='s|\xF8\xFF[\x37\x77\xF7][\x06\x07\x08]\x39\xFF.[\x00\x04]\xB9\xE1[\x03\x43\xC3][\x06\x07\x08]\x91\xE2.[\x02\x03\x13]\x91\K..\x00\x94(?=[\xF7\xF8]\x03)|\x60\x00\x80\xD2|'
+else
+  DEVELOPER_MODE_PATCH='s|\xFF\xFF\x48\xB8\x65\x76\x65.{5}\x48.{36,40}\K\xE8.{2}(?=\x00\x00)|\xB8\x03\x00|'
+fi
+
 # Credits
 echo
 echo "************************"
-echo "SpotX-Mac by @Nuzair46"
+echo "BlockTheSpot-Mac by @Nuzair46"
 echo "************************"
 echo
 
 # Report versions
 echo -e "Spotify version: ${CLIENT_VERSION}"
-echo -e "SpotX-Mac version: ${SPOTX_VERSION}\n"
+echo -e "BlockTheSpot-Mac version: ${BLOCKTHESPOT_VERSION}\n"
 
-if [[ $(ver "${CLIENT_VERSION}") -lt $(ver "${SPOTX_VERSION}") ]]; then
-  echo "This version of SpotX-Mac is not compatible with your Spotify version."
-  echo "Pleas use an older version of SpotX-Mac or update Spotify."
+if [[ $(ver "${CLIENT_VERSION}") -lt $(ver "${BLOCKTHESPOT_VERSION}") ]]; then
+  echo "This version of BlockTheSpot-Mac is not compatible with your Spotify version."
+  echo "Pleas use an older version of BlockTheSpot-Mac or update Spotify."
   exit; fi
 
 if [[ "${SKIP_CODE_SIGNATURE}" == "true" ]]; then
@@ -132,9 +153,9 @@ if [[ ! -f "${XPUI_SPA}" ]]; then
 else
   if [[ "${FORCE_FLAG}" == "false" ]]; then
     if [[ -f "${XPUI_BAK}" ]] || [[ -f "${APP_BINARY_BAK}" ]]; then
-      echo "SpotX backup found, SpotX has already been used on this install."
-      echo -e "Re-run SpotX using the '-f' flag to force xpui patching.\n"
-      echo "Skipping xpui patches and continuing SpotX..."
+      echo "BlockTheSpot backup found, BlockTheSpot has already been used on this install."
+      echo -e "Re-run BlockTheSpot using the '-f' flag to force xpui patching.\n"
+      echo "Skipping xpui patches and continuing BlockTheSpot..."
       XPUI_SKIP="true"
     else
       echo "Creating backup..."
@@ -159,30 +180,37 @@ else
 if [[ "${XPUI_SKIP}" == "false" ]]; then
   echo "Extracting xpui..."
   unzip -qq "${XPUI_SPA}" -d "${XPUI_DIR}"
-  if grep -Fq "SpotX" "${XPUI_JS}"; then
-    echo -e "\nWarning: Detected SpotX patches but no backup file!"
+  if grep -Fq "BlockTheSpot" "${XPUI_JS}"; then
+    echo -e "\nWarning: Detected BlockTheSpot patches but no backup file!"
     echo -e "Further xpui patching not allowed until Spotify is reinstalled/upgraded.\n"
-    echo "Skipping xpui patches and continuing SpotX..."
+    echo "Skipping xpui patches and continuing BlockTheSpot..."
     XPUI_SKIP="true"
     rm "${XPUI_BAK}" 2>/dev/null
     rm -rf "${XPUI_DIR}" 2>/dev/null
   else
     rm "${XPUI_SPA}"; fi; fi
 
-echo "Applying SpotX patches..."
+echo "Applying BlockTheSpot patches..."
 
 if [[ "${XPUI_SKIP}" == "false" ]]; then
-  # Remove Empty ad block
   echo "Removing ad-related content..."
   $PERL "${AD_ADS}" "${XPUI_JS}"
-  $PERL "${AD_ADS}" "${APP_BINARY}"
   $PERL "${AD_BILLBOARD}" "${XPUI_JS}"
   $PERL "${AD_EMPTY_AD_BLOCK}" "${XPUI_JS}"
   $PERL "${AD_SERV}" "${XPUI_JS}"
-  $PERL "${AD_PATCH_1}" "${APP_BINARY}"
   $PERL "${AD_PLAYLIST_SPONSORS}" "${XPUI_JS}"
-  $PERL "${AD_PATCH_2}" "${APP_BINARY}"
   $PERL "${AD_UPSELL}" "${XPUI_JS}"
+  $PERL "${AD_SPONSORS}" "${XPUI_JS}"
+  $PERL "${HPTO_ENABLED}" "${XPUI_JS}"
+  $PERL "${HPTO_PATCH}" "${XPUI_JS}"
+
+  echo "Patching Binary..."
+  $PERL "${AD_ADS}" "${APP_BINARY}"
+  $PERL "${AD_PATCH_1}" "${APP_BINARY}"
+  $PERL "${AD_PATCH_2}" "${APP_BINARY}"
+  $PERL "${AD_PATCH_3}" "${APP_BINARY}"
+  $PERL "${AD_PATCH_4}" "${APP_BINARY}"
+  $PERL "${AD_PATCH_5}" "${APP_BINARY}"
 
   # Remove Premium-only features
   echo "Removing premium-only features..."
@@ -191,12 +219,21 @@ if [[ "${XPUI_SKIP}" == "false" ]]; then
   echo "${HIDE_DL_MENU}" >> "${XPUI_CSS}"
   echo "${HIDE_VERY_HIGH}" >> "${XPUI_CSS}"; fi
 
+if [[ "${DEVELOPER_MODE}" == "true" ]]; then
+  echo "Enabling developer mode..."
+  $PERL "${DEVELOPER_MODE_PATCH}" "${APP_BINARY}"; fi
+
 # Remove logging
 if [[ "${XPUI_SKIP}" == "false" ]]; then
   echo "Removing logging..."
   $PERL "${LOG_1}" "${XPUI_JS}"
   $PERL "${LOG_SENTRY}" "${VENDOR_XPUI_JS}"; fi
 
+# Modal credits
+if [[ "${XPUI_SKIP}" == "false" ]]; then
+  echo "Adding credits..."
+  $PERL "${MODAL_CREDITS}" "${XPUI_DESKTOP_MODAL_JS}"; fi
+
 # Hide podcasts, episodes and audiobooks on home screen
 if [[ "${XPUI_SKIP}" == "false" ]]; then
   if [[ "${HIDE_PODCASTS_FLAG}" == "true" ]]; then
@@ -208,11 +245,6 @@ if [[ "${XPUI_SKIP}" == "false" ]]; then
 if [[ "${UPDATE_FLAG}" == "true" ]]; then
   echo "Blocking updates..."
   $PERL "${UPDATE_PATCH}" "${APP_BINARY}"; fi
-
-# Rebuild xpui.spa
-if [[ "${XPUI_SKIP}" == "false" ]]; then
-  echo "Rebuilding xpui..."
-  echo -e "\n//# SpotX was here" >> "${XPUI_JS}"; fi
 
 # Zip files inside xpui folder
 if [[ "${XPUI_SKIP}" == "false" ]]; then
@@ -223,4 +255,4 @@ if [[ "${XPUI_SKIP}" == "false" ]]; then
 echo "Signing Spotify..."
 codesign -f --deep -s - "${APP_PATH}" 2>/dev/null;
 
-echo -e "SpotX finished patching!\n"
+echo -e "BlockTheSpot finished patching!\n"

readme.md

@@ -1,21 +1,19 @@
-  <p align="center">
-  <a href="https://github.com/SpotX-CLI/SpotX-Mac"><img src="https://raw.githubusercontent.com/SpotX-CLI/SpotX-commons/main/.github/Pic/Logo/logo-mac.png" />
-</p>
-
 <p align="center">        
-      <a href="https://discord.gg/eYudMwgYtY"><img src="https://discord.com/api/guilds/807273906872123412/widget.png"></a>
-      </p>
-
----
+  <a href="https://discord.gg/eYudMwgYtY"><img src="https://discord.com/api/guilds/807273906872123412/widget.png"></a>
+</p>
 
 <center>
-    <h4 align="center">A multi-featured adblocker for the Spotify macOS application.</h4>
+    <h1 align="center">BlockTheSpot-Mac</h1>
+    <h4 align="center">A multi-purpose adblocker and skip-bypass for the <strong>Spotify for MacOS</strong> </h4>
+    <h5 align="center">Please support Spotify by purchasing premium</h5>
     <p align="center">
-        <strong>Last updated:</strong> 18 October 2023<br>
-        <strong>Last tested version:</strong> 1.2.22.982
+        <strong>Last updated:</strong> 11 February 2024<br>
+        <strong>Last tested version:</strong> 1.2.30.1135
     </p> 
 </center>
 
+---
+
 ## We need collaborators.
 
 - We are running short of people who can collaborate and maintain this project. If you are good with bash scripting, please create an issue here or contact red.dev in discord.
@@ -27,19 +25,20 @@
 - Unlocks the skip function for any track
 - Blocks Spotify automatic updates (optional)
 - Hides podcasts, episodes and audiobooks on Home Screen (optional)
+- Enable Developer Mode (optional)
 
 ### Installation/Update:
 
 - Close Spotify completely.
 - Run The following command in Terminal:
 
 ```
-bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Mac/main/install.sh)
+bash <(curl -sSL https://raw.githubusercontent.com/Nuzair46/BlockTheSpot-Mac/main/install.sh)
 ```
 
 #### Note:
 
-- SpotX-Mac now requires codesign to sign the binaries after patching.
+- BlockTheSpot-Mac now requires codesign to sign the binaries after patching.
 - For this, you will need to have Xcode installed on your mac.
 - To install xcode, use the following command in terminal:
 
@@ -56,13 +55,14 @@ xcode-select --install
 `-h` Hide podcasts, episodes and audiobooks on home screen  
 `-P` Path to Spotify.app -- set custom Spotify app path  
 `-u` Block updated -- blocks automatic updates  
+`-d` Enable Developer Mode
 `-S` Skip Codesign -- only to be used if you have intel mac
 
 Use any combination of flags.  
 The following example clears app cache, adds experimental features, leaves new UI enabled and blocks updates:
 
 ```
-bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Mac/main/install.sh) -hu
+bash <(curl -sSL https://raw.githubusercontent.com/Nuzair46/BlockTheSpot-Mac/main/install.sh) -hu
 ```
 
 ### Uninstall:
@@ -71,7 +71,7 @@ bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Mac/main/inst
 - Run The following command in Terminal:
 
 ```
-bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Mac/main/uninstall.sh)
+bash <(curl -sSL https://raw.githubusercontent.com/Nuzair46/BlockTheSpot-Mac/main/uninstall.sh)
 ```
 
 or
@@ -80,9 +80,9 @@ or
 
 ### Notes:
 
-- Audio/video ads during Podcast playback are currently NOT blocked with SpotX.
-- Spicetify users: When using SpotX-Mac + Spicetify, the current script requires running SpotX first.
+- Audio/video ads during Podcast playback are currently NOT blocked with BlockTheSpot.
+- Spicetify users: When using BlockTheSpot-Mac + Spicetify, the current script requires running BlockTheSpot first.
 
 ### DISCLAIMER
 
-- Ad blocking is the main concern of this repo. Any other feature provided by SpotX-Mac or consequence of using those features will be the sole responsibility of the user, not BlockTheSpot/SpotX/SpotX-Mac.
+- Ad blocking is the main concern of this repo. Any other feature provided by BlockTheSpot-Mac or consequence of using those features will be the sole responsibility of the user, not BlockTheSpot/BlockTheSpot-Mac.

uninstall.sh

@@ -19,7 +19,7 @@ done
 # Credits
 echo
 echo "************************"
-echo "SpotX-Mac by @Nuzair46"
+echo "BlockTheSpot-Mac by @Nuzair46"
 echo "************************"
 echo