Merge branch 'iv-org:master' into verified-badge

Author: jonas-w

Makefile

@@ -62,7 +62,8 @@ test:
 	crystal spec
 
 verify:
-	crystal build src/invidious.cr --no-codegen --progress --stats --error-trace
+	crystal build src/invidious.cr -Dskip_videojs_download \
+	  --no-codegen --progress --stats --error-trace
 
 
 # -----------------------
@@ -88,28 +89,28 @@ distclean: clean
 # -----------------------
 
 help:
-	echo "Targets available in this Makefile:"
-	echo ""
-	echo "get-libs         Fetch Crystal libraries"
-	echo "invidious        Build Invidious"
-	echo "run              Launch Invidious"
-	echo ""
-	echo "format           Run the Crystal formatter"
-	echo "test             Run tests"
-	echo "verify           Just make sure that the code compiles, but without"
-	echo "                 generating any binaries. Useful to search for errors"
-	echo ""
-	echo "clean            Remove build artifacts"
-	echo "distclean        Remove build artifacts and libraries"
-	echo ""
-	echo ""
-	echo "Build options available for this Makefile:"
-	echo ""
-	echo "RELEASE          Make a release build      (Default: 1)"
-	echo "STATIC           Link libraries statically (Default: 0)"
-	echo ""
-	echo "DISABLE_QUIC     Disable support for QUIC  (Default: 0)"
-	echo "NO_DBG_SYMBOLS   Strip debug symbols       (Default: 0)"
+	@echo "Targets available in this Makefile:"
+	@echo ""
+	@echo "  get-libs         Fetch Crystal libraries"
+	@echo "  invidious        Build Invidious"
+	@echo "  run              Launch Invidious"
+	@echo ""
+	@echo "  format           Run the Crystal formatter"
+	@echo "  test             Run tests"
+	@echo "  verify           Just make sure that the code compiles, but without"
+	@echo "                   generating any binaries. Useful to search for errors"
+	@echo ""
+	@echo "  clean            Remove build artifacts"
+	@echo "  distclean        Remove build artifacts and libraries"
+	@echo ""
+	@echo ""
+	@echo "Build options available for this Makefile:"
+	@echo ""
+	@echo "  RELEASE          Make a release build      (Default: 1)"
+	@echo "  STATIC           Link libraries statically (Default: 0)"
+	@echo ""
+	@echo "  DISABLE_QUIC     Disable support for QUIC  (Default: 0)"
+	@echo "  NO_DBG_SYMBOLS   Strip debug symbols       (Default: 0)"
 
 
 

README.md

@@ -51,8 +51,8 @@
   <img alt="Mastodon: @[email protected]" src="https://img.shields.io/badge/Mastodon-%40invidious%40social.tchncs.de-darkgreen">
   </a>
   <br>
-  <a href="#contact-the-team-directly">
-  <img alt="Contact the team directly" src="https://img.shields.io/badge/E%2d%2dmail-darkgreen">
+  <a href="https://invidious.io/contact/">
+  <img alt="E-mail" src="https://img.shields.io/badge/E%2d%2dmail-darkgreen">
   </a>
 </div>
 
@@ -152,19 +152,6 @@ Weblate also allows you to log-in with major SSO providers like Github, Gitlab,
 - [HoloPlay](https://github.com/stephane-r/HoloPlay): Funny Android application connecting on Invidious API's with search, playlists and favorites.
 
 
-## Contact the team directly
-
-Every team member is available through GitHub or through the Matrix room (bridged to IRC), however, if you need/have to, you can contact the team directly via e-mail (remove `+SPAMGUARD` from the addresses):
-
-- General Inquiries (forwarded to all team members): `contact +SPAMGUARD [at] invidious [dot] io`
-
-Note: before sending a bug report please check that it hasn't already be reported on GitHub - bug reports sent to this address will be copied to GitHub
-
-- Security issues (forwarded to the two project owners, <a href="https://github.com/TheFrenchGhosty">@TheFrenchGhosty</a> and <a href="https://github.com/Perflyst">@Perflyst</a>): `security +SPAMGUARD [at] invidious [dot] io`
-
-Note: the creation of a PGP key for this address is planned
-
-
 ## Liability
 
 We take no responsibility for the use of our tool, or external instances

assets/js/handlers.js

@@ -150,13 +150,13 @@
 
         // Ignore shortcuts if any text input is focused
         let focused_tag = document.activeElement.tagName.toLowerCase();
-        let focused_type = document.activeElement.type.toLowerCase();
-        let allowed = /^(button|checkbox|file|radio|submit)$/;
+        const allowed = /^(button|checkbox|file|radio|submit)$/;
 
-        if (focused_tag === "textarea" ||
-           (focused_tag === "input" && !focused_type.match(allowed))
-        )
-            return;
+        if (focused_tag === "textarea") return;
+        if (focused_tag === "input") {
+            let focused_type = document.activeElement.type.toLowerCase();
+            if (!focused_type.match(allowed)) return;
+        }
 
         // Focus search bar on '/'
         if (event.key == "/") {