Make ghostery_id optional

ghostery · Aug 3, 2023 · 23fbd2c · 23fbd2c
1 parent 10f6097
commit 23fbd2c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/packages/adblocker/src/engine/metadata/patterns.ts b/packages/adblocker/src/engine/metadata/patterns.ts
@@ -19,7 +19,7 @@ export interface IPattern {
   readonly organization: string | null;
   readonly alias: string | null;
   readonly website_url: string | null;
-  readonly ghostery_id: string;
+  readonly ghostery_id: string | null;
   readonly domains: string[];
   readonly filters: string[];
 }
@@ -73,10 +73,6 @@ export function isValid(pattern: any): pattern is IPattern {
     return false;
   }
 
-  if (typeof ghosteryId !== 'string') {
-    return false;
-  }
-
   if (!Array.isArray(domains) || !domains.every((domain) => typeof domain === 'string')) {
     return false;
   }
@@ -126,7 +122,7 @@ export function getSerializedSize(pattern: IPattern): number {
     sizeOfUTF8(pattern.organization || '') +
     sizeOfUTF8(pattern.alias || '') +
     sizeOfUTF8(pattern.website_url || '') +
-    sizeOfUTF8(pattern.ghostery_id) +
+    sizeOfUTF8(pattern.ghostery_id || '') +
     sizeOfDomains +
     sizeOfFilters
   );
@@ -139,7 +135,7 @@ export function serialize(pattern: IPattern, view: StaticDataView) {
   view.pushUTF8(pattern.organization || '');
   view.pushUTF8(pattern.alias || '');
   view.pushUTF8(pattern.website_url || '');
-  view.pushUTF8(pattern.ghostery_id);
+  view.pushUTF8(pattern.ghostery_id || '');
 
   view.pushLength(pattern.domains.length);
   for (const domain of pattern.domains) {
@@ -159,7 +155,7 @@ export function deserialize(view: StaticDataView): IPattern {
   const organization = view.getUTF8() || null;
   const alias = view.getUTF8() || null;
   const website_url = view.getUTF8() || null;
-  const ghostery_id = view.getUTF8();
+  const ghostery_id = view.getUTF8() || null;
 
   const numberOfDomains = view.getLength();
   const domains = [];