[feat] Add option to skip content warnings

src/components/requestPreprocessor.js

@@ -32,7 +32,7 @@ export function handleXhrOpen(method, url, xhr) {
         });
     }
 
-    if (method === 'POST' && ['/youtubei/v1/player', '/youtubei/v1/next'].includes(url.pathname)) {
+    if (Config.SKIP_CONTENT_WARNINGS && method === 'POST' && ['/youtubei/v1/player', '/youtubei/v1/next'].includes(url.pathname)) {
         // Add content check flags to player and next request (this will skip content warnings)
         interceptors.attachGenericInterceptor(xhr, 'send', (args) => {
             if (typeof args[0] === 'string') {
@@ -67,7 +67,7 @@ export function handleFetchRequest(url, requestOptions) {
         }
     }
 
-    if (['/youtubei/v1/player', '/youtubei/v1/next'].includes(url.pathname)) {
+    if (Config.SKIP_CONTENT_WARNINGS && ['/youtubei/v1/player', '/youtubei/v1/next'].includes(url.pathname)) {
         // Add content check flags to player and next request (this will skip content warnings)
         requestOptions.body = setContentCheckOk(requestOptions.body);
     }

src/components/strategies/player.js

@@ -1,9 +1,7 @@
 import { innertube, proxy } from '../endpoints';
 import { isEmbed, isConfirmed, getCurrentVideoStartTime, getYtcfgValue, getSignatureTimestamp } from '../../utils';
 
-export default function getUnlockStrategies(originalPlayerResponse) {
-    const videoId = originalPlayerResponse.videoDetails?.videoId || getYtcfgValue('PLAYER_VARS').video_id;
-    const reason = originalPlayerResponse.playabilityStatus?.status || originalPlayerResponse.previewPlayabilityStatus?.status;
+export default function getUnlockStrategies(videoId, reason) {
     const clientName = getYtcfgValue('INNERTUBE_CLIENT_NAME') || 'WEB';
     const clientVersion = getYtcfgValue('INNERTUBE_CLIENT_VERSION') || '2.20220203.04.00';
     const signatureTimestamp = getSignatureTimestamp();

src/components/unlocker/index.js

@@ -1,4 +1,4 @@
 export { default as unlockPlayerResponse } from './player.js';
 export { default as unlockNextResponse } from './next.js';
 
-export { lastPlayerUnlockReason, getLastProxiedGoogleVideoId } from './player.js';
+export { lastPlayerUnlockReason, lastPlayerUnlockVideoId, getLastProxiedGoogleVideoId } from './player.js';

src/components/unlocker/player.js

@@ -10,6 +10,7 @@ const messagesMap = {
     fail: 'Unable to unlock this video 🙁 - More information in the developer console',
 };
 
+export let lastPlayerUnlockVideoId = null;
 export let lastPlayerUnlockReason = null;
 
 let lastProxiedGoogleVideoUrlParams;
@@ -27,7 +28,18 @@ export default function unlockResponse(playerResponse) {
         return playerResponse;
     }
 
-    const unlockedPlayerResponse = getUnlockedPlayerResponse(playerResponse);
+    const videoId = playerResponse.videoDetails?.videoId || getYtcfgValue('PLAYER_VARS').video_id;
+    const reason = playerResponse.playabilityStatus?.status || playerResponse.previewPlayabilityStatus?.status;
+
+    if (!Config.SKIP_CONTENT_WARNINGS && reason.includes('CHECK_REQUIRED')) {
+        logger.info(`SKIP_CONTENT_WARNINGS disabled and ${reason} status detected.`);
+        return playerResponse;
+    }
+
+    lastPlayerUnlockVideoId = videoId;
+    lastPlayerUnlockReason = reason;
+
+    const unlockedPlayerResponse = getUnlockedPlayerResponse(videoId, reason);
 
     // account proxy error?
     if (unlockedPlayerResponse.errorMessage) {
@@ -62,15 +74,11 @@ export default function unlockResponse(playerResponse) {
     Toast.show(messagesMap.success);
 }
 
-function getUnlockedPlayerResponse(playerResponse) {
-    const videoId = playerResponse.videoDetails?.videoId || getYtcfgValue('PLAYER_VARS').video_id;
-
+function getUnlockedPlayerResponse(videoId, reason) {
     // Check if response is cached
     if (cachedPlayerResponse.videoId === videoId) return createDeepCopy(cachedPlayerResponse);
 
-    lastPlayerUnlockReason = playerResponse.playabilityStatus?.status || playerResponse.previewPlayabilityStatus?.status;
-
-    const unlockStrategies = getPlayerUnlockStrategies(playerResponse);
+    const unlockStrategies = getPlayerUnlockStrategies(videoId, reason);
 
     let unlockedPlayerResponse = {};
 

src/config.js

@@ -14,6 +14,9 @@ export let ENABLE_UNLOCK_CONFIRMATION_EMBED = true;
 // Show notification?
 export let ENABLE_UNLOCK_NOTIFICATION = true;
 
+// Disable content warnings?
+export let SKIP_CONTENT_WARNINGS = false;
+
 // Some Innertube bypass methods require the following authentication headers of the currently logged in user.
 export const GOOGLE_AUTH_HEADER_NAMES = ['Authorization', 'X-Goog-AuthUser'];