Merge regex into master

list.txt

@@ -6,11 +6,12 @@
 ! Homepage: https://github.com/gijsdev/ublock-hide-yt-shorts
 ! License: https://github.com/gijsdev/ublock-hide-yt-shorts/blob/master/LICENSE.md
 
+! Remove empty spaces in grid
+www.youtube.com##ytd-rich-grid-row,#contents.ytd-rich-grid-row:style(display: contents !important)
+
 ! Hide all videos containing the phrase "#shorts"
-www.youtube.com##ytd-grid-video-renderer:has(#video-title:has-text(#shorts))
-www.youtube.com##ytd-grid-video-renderer:has(#video-title:has-text(#Shorts))
-www.youtube.com##ytd-grid-video-renderer:has(#video-title:has-text(#short))
-www.youtube.com##ytd-grid-video-renderer:has(#video-title:has-text(#Short))
+www.youtube.com##ytd-grid-video-renderer:has(#video-title:has-text(/(^| )#Shorts?( |$)/i))
+www.youtube.com##ytd-rich-item-renderer:has(#video-title:has-text(/(^| )#Shorts?( |$)/i))
 
 ! Hide all videos with the shorts indicator on the thumbnail
 www.youtube.com##ytd-grid-video-renderer:has([overlay-style="SHORTS"])
@@ -19,12 +20,13 @@ www.youtube.com##ytd-video-renderer:has([overlay-style="SHORTS"])
 www.youtube.com##ytd-item-section-renderer.ytd-section-list-renderer[page-subtype="subscriptions"]:has(ytd-video-renderer:has([overlay-style="SHORTS"]))
 
 ! Hide shorts button in sidebar
-www.youtube.com##ytd-guide-entry-renderer:has-text(Shorts)
-www.youtube.com##ytd-mini-guide-entry-renderer:has-text(Shorts)
+www.youtube.com##ytd-guide-entry-renderer:has(yt-formatted-string:has-text(/^Shorts$/i))
+! Tablet resolution
+www.youtube.com##ytd-mini-guide-entry-renderer:has(.title:has-text(/^Shorts$/i))
 
 ! Hide shorts section on homepage
-www.youtube.com##ytd-rich-section-renderer:has(#rich-shelf-header:has-text(Shorts))
-www.youtube.com##ytd-reel-shelf-renderer:has(.ytd-reel-shelf-renderer:has-text(Shorts))
+www.youtube.com##ytd-rich-section-renderer:has(#title:has-text(/(^| )Shorts( |$)/i))
+www.youtube.com##ytd-reel-shelf-renderer:has(.ytd-reel-shelf-renderer:has-text(/(^| )Shorts( |$)/i))
 
 ! Hide shorts tab on channel pages`
 ! Old style
@@ -33,27 +35,18 @@ www.youtube.com##tp-yt-paper-tab:has(.tp-yt-paper-tab:has-text(Shorts))
 www.youtube.com##yt-tab-shape:has-text(/^Shorts$/)
 
 ! Hide short remixes in video descriptions
-www.youtube.com##ytd-reel-shelf-renderer.ytd-structured-description-content-renderer:has-text("Shorts remixing this video")
-
-! Remove empty spaces in grid
-www.youtube.com##ytd-rich-grid-row,#contents.ytd-rich-grid-row:style(display: contents !important)
+www.youtube.com##ytd-reel-shelf-renderer.ytd-structured-description-content-renderer:has-text(/^Shorts remixing this video$/i)
 
 ! Hide shorts category on homepage and search pages
 www.youtube.com##yt-chip-cloud-chip-renderer:has(yt-formatted-string:has-text(/^Shorts$/i))
 
 !!! MOBILE !!!
 
 ! Hide all videos in home feed containing the phrase "#shorts"
-m.youtube.com##ytm-rich-item-renderer:has(#video-title:has-text(#shorts))
-m.youtube.com##ytm-rich-item-renderer:has(#video-title:has-text(#Shorts))
-m.youtube.com##ytm-rich-item-renderer:has(#video-title:has-text(#short))
-m.youtube.com##ytm-rich-item-renderer:has(#video-title:has-text(#Short))
+www.youtube.com##ytm-rich-item-renderer:has(#video-title:has-text(/(^| )#Shorts?( |$)/i))
 
 ! Hide all videos in subscription feed containing the phrase "#shorts"
-m.youtube.com##ytm-item-section-renderer:has(#video-title:has-text(#shorts))
-m.youtube.com##ytm-item-section-renderer:has(#video-title:has-text(#Shorts))
-m.youtube.com##ytm-item-section-renderer:has(#video-title:has-text(#short))
-m.youtube.com##ytm-item-section-renderer:has(#video-title:has-text(#Short))
+m.youtube.com##ytm-item-section-renderer:has(#video-title:has-text(/(^| )#Shorts?( |$)/i))
 
 ! Hide shorts button in the bottom navigation bar
 m.youtube.com##ytm-pivot-bar-item-renderer:has(.pivot-shorts)
@@ -62,8 +55,8 @@ m.youtube.com##ytm-pivot-bar-item-renderer:has(.pivot-shorts)
 m.youtube.com##ytm-video-with-context-renderer:has([data-style="SHORTS"])
 
 ! Hide shorts sections
-m.youtube.com##ytm-rich-section-renderer:has(ytm-reel-shelf-renderer:has(.reel-shelf-title-wrapper:has-text(Shorts)))
-m.youtube.com##ytm-reel-shelf-renderer.item:has(.reel-shelf-title-wrapper:has-text(Shorts))
+m.youtube.com##ytm-rich-section-renderer:has(.reel-shelf-title-wrapper .yt-core-attributed-string:has-text(/(^| )Shorts( |$)/i))
+m.youtube.com##ytm-reel-shelf-renderer.item:has(.reel-shelf-title-wrapper .yt-core-attributed-string:has-text(/(^| )Shorts( |$)/i))
 
 ! Hide shorts tab on channel pages
 ! Old style
@@ -72,7 +65,7 @@ m.youtube.com##.single-column-browse-results-tabs>a:has-text(Shorts)
 m.youtube.com##yt-tab-shape:has-text(/^Shorts$/)
 
 ! Hide short remixes in video descriptions
-m.youtube.com##ytm-reel-shelf-renderer:has-text("Shorts remixing this video")
+m.youtube.com##ytm-reel-shelf-renderer:has(.reel-shelf-title-wrapper .yt-core-attributed-string:has-text(/^Shorts remixing this video$/i))
 
 ! Hide shorts category on homepage
 m.youtube.com##ytm-chip-cloud-chip-renderer:has(.yt-core-attributed-string:has-text(/^Shorts$/i))