Rename name Click to Load files (#300)

In the configuration, the Click to Load feature name was mistakenly set
to "clickToPlay". Now that we have corrected that, let's fix
references to "clickToPlay" in this repository, and fix the
corresponding filenames.

Also, let's remove the "Facebook" vs "Facebook, Inc." workaround,
since that inconsistent entity naming was fixed in the configuration
too.

Author: kzar

CODEOWNERS

@@ -4,8 +4,8 @@
 src/features/fingerprinting-* @jonathanKingston @englehardt
 src/canvas.js @jonathanKingston @englehardt
 src/element-hiding.js @jonathanKingston @dharb
-src/features/click-to-play.js @kzar @ladamski
-src/locales/click-to-play/ @kzar @ladamski
+src/features/click-to-load.js @kzar @ladamski
+src/locales/click-to-load/ @kzar @ladamski
 
 # Platform owners
 inject/android.js @jonathanKingston @joshliebe

package.json

@@ -11,7 +11,7 @@
     "copy-sjcl": "node scripts/generateSJCL.js",
     "bundle-config": "node scripts/bundleConfig.mjs",
     "build": "npm run build-locales && npm run build-firefox && npm run build-chrome && npm run build-apple && npm run build-android && npm run build-windows && npm run build-integration && npm run build-chrome-mv3",
-    "build-locales": "mkdir -p build/locales && node scripts/buildLocales src/locales/click-to-play > build/locales/ctl-locales.js",
+    "build-locales": "mkdir -p build/locales && node scripts/buildLocales src/locales/click-to-load > build/locales/ctl-locales.js",
     "build-firefox": "mkdir -p build/firefox/ && node scripts/inject.mjs firefox > build/firefox/inject.js",
     "build-chrome": "mkdir -p build/chrome/ && node scripts/inject.mjs chrome > build/chrome/inject.js",
     "build-chrome-mv3": "mkdir -p build/chrome-mv3/ && node scripts/inject.mjs chrome-mv3 > build/chrome-mv3/inject.js",

src/content-scope-features.js

@@ -36,7 +36,7 @@ export async function load (args) {
         'fingerprintingScreenSize',
         'fingerprintingTemporaryStorage',
         'navigatorInterface',
-        'clickToPlay',
+        'clickToLoad',
         'elementHiding'
     ]
 

src/features/click-to-play.js renamed to src/features/click-to-load.js

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { createCustomEvent, sendMessage, OriginalCustomEvent, originalWindowDispatchEvent } from '../utils.js'
-import { logoImg, loadingImages, closeIcon } from './click-to-play/ctl-assets.js'
-import { styles, getConfig } from './click-to-play/ctl-config.js'
+import { logoImg, loadingImages, closeIcon } from './click-to-load/ctl-assets.js'
+import { styles, getConfig } from './click-to-load/ctl-config.js'
 
 let devMode = false
 let isYoutubePreviewsEnabled = false
@@ -557,7 +557,7 @@ async function replaceClickToLoadElements (targetElement) {
 /**
  * @typedef unblockClickToLoadContentRequest
  * @property {string} entity
- *   The entity to unblock requests for (e.g. "Facebook").
+ *   The entity to unblock requests for (e.g. "Facebook, Inc.").
  * @property {bool} [isLogin=false]
  *   True if we should "allow social login", defaults to false.
  * @property {string} action
@@ -1343,21 +1343,16 @@ const knownMessageResponseType = Object.prototype.hasOwnProperty.bind(messageRes
 
 export function init (args) {
     const websiteOwner = args?.site?.parentEntity
-    const settings = args?.featureSettings?.clickToPlay || {}
+    const settings = args?.featureSettings?.clickToLoad || {}
     const locale = args?.locale || 'en'
     const localizedConfig = getConfig(locale)
     config = localizedConfig.config
     sharedStrings = localizedConfig.sharedStrings
 
     for (const entity of Object.keys(config)) {
-        // TODO: Remove this workaround once the privacy-configuration has been
-        //       updated, and 'Facebook, Inc.' is used consistently in
-        //       content-scope-scripts too.
-        const normalizedEntity = entity === 'Facebook' ? 'Facebook, Inc.' : entity
-
         // Strip config entities that are first-party, or aren't enabled in the
-        // extension's clickToPlay settings.
-        if ((websiteOwner && normalizedEntity === websiteOwner) ||
+        // extension's clickToLoad settings.
+        if ((websiteOwner && entity === websiteOwner) ||
             !settings[entity] ||
             settings[entity].state !== 'enabled') {
             delete config[entity]

src/features/click-to-play/ctl-assets.js renamed to src/features/click-to-load/ctl-assets.js

@@ -600,7 +600,7 @@ export function getConfig (locale) {
 
     const sharedStrings = locales[locale]['shared.json']
     const config = {
-        Facebook: {
+        'Facebook, Inc.': {
             informationalModal: {
                 icon: blockedFBLogo,
                 messageTitle: fbStrings.informationalModalMessageTitle,