fix(topstories): Closes #3029 Add ETLDs for top stories

mozilla · Jul 31, 2017 · 96d1f42 · 96d1f42
1 parent fdab110
commit 96d1f42
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/system-addon/lib/TopStoriesFeed.jsm b/system-addon/lib/TopStoriesFeed.jsm
@@ -90,7 +90,8 @@ this.TopStoriesFeed = class TopStoriesFeed {
               "description": s.excerpt,
               "image": this._normalizeUrl(s.image_src),
               "referrer": this.stories_referrer,
-              "url": s.dedupe_url
+              "url": s.dedupe_url,
+              "eTLD": this._addETLD(s.dedupe_url)
             }));
           return items;
         })
@@ -162,6 +163,14 @@ this.TopStoriesFeed = class TopStoriesFeed {
     return url;
   }
 
+  _addETLD(url) {
+    try {
+      return Services.eTLD.getPublicSuffix(Services.io.newURI(url));
+    } catch (err) {
+      return "";
+    }
+  }
+
   onAction(action) {
     switch (action.type) {
       case at.INIT:

diff --git a/system-addon/test/unit/lib/TopStoriesFeed.test.js b/system-addon/test/unit/lib/TopStoriesFeed.test.js
@@ -163,7 +163,8 @@ describe("Top Stories Feed", () => {
         "description": "description",
         "image": "image-url",
         "referrer": "referrer",
-        "url": "rec-url"
+        "url": "rec-url",
+        "eTLD": ""
       }];
 
       instance.stories_endpoint = "stories-endpoint";

diff --git a/system-addon/test/unit/unit-entry.js b/system-addon/test/unit/unit-entry.js
@@ -53,7 +53,9 @@ overrider.set({
         };
       }
     },
-    tm: {dispatchToMainThread: cb => cb()}
+    tm: {dispatchToMainThread: cb => cb()},
+    eTLD: {getPublicSuffix() {}},
+    io: {NewURI() {}}
   },
   XPCOMUtils: {
     defineLazyModuleGetter() {},