Revert "FEATURE: use groups to control who sees ads" and all later

Revert "Updates to codefund-ad"
Revert "Updates to carbonads-ad"
Revert "Updates to amazon-product-links"

assets/javascripts/discourse/components/ad_component.js.es6

@@ -1,23 +0,0 @@
-import computed from "ember-addons/ember-computed-decorators";
-
-export default Ember.Component.extend({
-  @computed()
-  showToGroups: function() {
-    const currentUser = Discourse.User.current();
-
-    if (
-      !currentUser ||
-      !currentUser.get("groups") ||
-      !this.siteSettings.no_ads_for_groups ||
-      this.siteSettings.no_ads_for_groups.length === 0
-    ) {
-      return true;
-    }
-
-    const noAdsGroupNames = this.siteSettings.no_ads_for_groups.split("|");
-
-    return !currentUser
-      .get("groups")
-      .any(group => noAdsGroupNames.includes(group.name));
-  }
-});

assets/javascripts/discourse/components/amazon-product-links.js.es6

@@ -1,9 +1,6 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad_component";
-import computed from "ember-addons/ember-computed-decorators";
+var currentUser = Discourse.User.current();
 
-const currentUser = Discourse.User.current();
-
-const data = {
+var data = {
   "topic-list-top": {},
   "topic-above-post-stream": {},
   "topic-above-suggested": {},
@@ -122,12 +119,10 @@ if (
   );
 }
 
-export default AdComponent.extend({
+export default Ember.Component.extend({
   classNames: ["amazon-product-links"],
 
-  showAd: Ember.computed.and("showToTrustLevel", "showToGroups"),
-
-  init() {
+  init: function() {
     let placement = this.get("placement");
     this.set("user_input", data[placement]["user_input"]);
     this.set("amazon_width", data[placement]["amazon_width"]);
@@ -138,37 +133,35 @@ export default AdComponent.extend({
     this._super();
   },
 
-  @computed("amazon_width", "amazon_height")
-  adWrapperStyle(w, h) {
-    return `width: ${w}px; height: ${h}px;`.htmlSafe();
-  },
+  adWrapperStyle: function() {
+    return `width: ${this.get("amazon_width")}px; height: ${this.get(
+      "amazon_height"
+    )}px;`.htmlSafe();
+  }.property("amazon_width", "amazon_height"),
 
-  @computed("mobile_amazon_width", "mobile_amazon_height")
-  adWrapperStyleMobile(w, h) {
-    return `width: ${w}px; height: ${h}px;`.htmlSafe();
-  },
+  adWrapperStyleMobile: function() {
+    return `width: ${this.get("mobile_amazon_width")}px; height: ${this.get(
+      "mobile_amazon_height"
+    )}px;`.htmlSafe();
+  }.property("mobile_amazon_width", "mobile_amazon_height"),
 
-  @computed("mobile_amazon_width")
-  adTitleStyleMobile(w) {
-    return `width: ${w}px;`.htmlSafe();
-  },
+  adTitleStyleMobile: function() {
+    return `width: ${this.get("mobile_amazon_width")}px;`.htmlSafe();
+  }.property("mobile_amazon_width"),
 
-  @computed("user_input")
-  userInput(userInput) {
-    return `${userInput}`.htmlSafe();
-  },
+  userInput: function() {
+    return `${this.get("user_input")}`.htmlSafe();
+  }.property("user_input"),
 
-  @computed("user_input_mobile")
-  userInputMobile(userInput) {
-    return `${userInput}`.htmlSafe();
-  },
+  userInputMobile: function() {
+    return `${this.get("user_input_mobile")}`.htmlSafe();
+  }.property("user_input_mobile"),
 
-  @computed()
-  showToTrustLevel() {
+  checkTrustLevels: function() {
     return !(
       currentUser &&
       currentUser.get("trust_level") >
         Discourse.SiteSettings.amazon_through_trust_level
     );
-  }
+  }.property("trust_level")
 });

assets/javascripts/discourse/components/carbonads-ad.js.es6

@@ -1,4 +1,3 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad_component";
 import {
   default as computed,
   observes
@@ -8,20 +7,21 @@ const currentUser = Discourse.User.current(),
   serve_id = Discourse.SiteSettings.carbonads_serve_id,
   placement = Discourse.SiteSettings.carbonads_placement;
 
-export default AdComponent.extend({
-  init() {
+export default Ember.Component.extend({
+  init: function() {
     this.set("serve_id", serve_id);
     this.set("placement", placement);
     this._super();
   },
 
   @computed("serve_id", "placement")
-  url(serveId, placement) {
-    return `//cdn.carbonads.com/carbon.js?serve=${serveId}&placement=${placement}`.htmlSafe();
+  url: function() {
+    return (`//cdn.carbonads.com/carbon.js?serve=${this.get("serve_id")}&placement=${this.get("placement")}`).htmlSafe();
   },
 
-  @computed()
-  showToTrustLevel() {
+
+  @computed("trust_level")
+  checkTrustLevels: function() {
     return !(
       currentUser &&
       currentUser.get("trust_level") >
@@ -29,8 +29,8 @@ export default AdComponent.extend({
     );
   },
 
-  @computed("showToTrustLevel", "showToGroups")
-  showAd(showToTrustLevel, showToGroups) {
-    return placement && serve_id && showToTrustLevel && showToGroups;
+  @computed("checkTrustLevels")
+  showAd: function(checkTrustLevels) {
+    return placement && serve_id && checkTrustLevels;
   }
 });

assets/javascripts/discourse/components/codefund-ad.js.es6

@@ -1,13 +1,11 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad_component";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-let _loaded = false,
-  _promise = null;
-
-const currentUser = Discourse.User.current(),
+var _loaded = false,
+  _promise = null,
+  currentUser = Discourse.User.current(),
   propertyId = Discourse.SiteSettings.codefund_property_id;
 
 function loadCodeFund() {
@@ -50,23 +48,12 @@ function loadCodeFund() {
   return _promise;
 }
 
-export default AdComponent.extend({
+export default Ember.Component.extend({
   classNameBindings: [":codefund-ad"],
   propertyId: propertyId,
   adRequested: false,
   adDetails: {},
 
-  displayPostBottom: Ember.computed.equal("placement", "post-bottom"),
-  displayTopicAbovePostStream: Ember.computed.equal(
-    "placement",
-    "topic-above-post-stream"
-  ),
-  displayTopicAboveSuggested: Ember.computed.equal(
-    "placement",
-    "topic-above-suggested"
-  ),
-  displayTopicListTop: Ember.computed.equal("placement", "topic-list-top"),
-
   _triggerAds() {
     if (!propertyId) return;
 
@@ -96,7 +83,7 @@ export default AdComponent.extend({
   },
 
   @observes("listLoading")
-  waitForLoad() {
+  waitForLoad: function() {
     if (this.get("adRequested")) {
       return;
     } // already requested that this ad unit be populated
@@ -106,7 +93,7 @@ export default AdComponent.extend({
   },
 
   @computed()
-  showToTrustLevel() {
+  checkTrustLevels: function() {
     return !(
       currentUser &&
       currentUser.get("trust_level") >
@@ -114,12 +101,28 @@ export default AdComponent.extend({
     );
   },
 
-  @computed("showToTrustLevel", "showToGroups")
-  showAd(showToTrustLevel, showToGroups) {
-    return (
-      Discourse.SiteSettings.codefund_property_id &&
-      showToTrustLevel &&
-      showToGroups
-    );
+  @computed("checkTrustLevels")
+  showAd: function(checkTrustLevels) {
+    return Discourse.SiteSettings.codefund_property_id && checkTrustLevels;
+  },
+
+  @computed("placement")
+  displayPostBottom: function(placement) {
+    return placement === "post-bottom";
+  },
+
+  @computed("placement")
+  displayTopicAbovePostStream: function() {
+    return this.get("placement") === "topic-above-post-stream";
+  },
+
+  @computed("placement")
+  displayTopicAboveSuggested: function() {
+    return this.get("placement") === "topic-above-suggested";
+  },
+
+  @computed("placement")
+  displayTopicListTop: function() {
+    return this.get("placement") === "topic-list-top";
   }
 });

assets/javascripts/discourse/components/google-adsense.js.es6

@@ -1,4 +1,3 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad_component";
 import {
   default as computed,
   observes
@@ -147,7 +146,7 @@ if (Discourse.SiteSettings.adsense_publisher_code) {
   }
 }
 
-export default AdComponent.extend({
+export default Ember.Component.extend({
   classNameBindings: [
     ":google-adsense",
     "classForSlot",
@@ -194,7 +193,7 @@ export default AdComponent.extend({
   },
 
   @observes("listLoading")
-  waitForLoad() {
+  waitForLoad: function() {
     if (this.get("adRequested")) {
       return;
     } // already requested that this ad unit be populated
@@ -204,34 +203,34 @@ export default AdComponent.extend({
   },
 
   @computed("ad_width")
-  isResponsive(adWidth) {
+  isResponsive: function(adWidth) {
     return adWidth === "auto";
   },
 
-  @computed("placement", "showAd")
-  classForSlot(placement, showAd) {
-    return showAd ? `adsense-${placement}`.htmlSafe() : "";
+  @computed("placement", "checkTrustLevels")
+  classForSlot: function(placement, shown) {
+    return shown ? `adsense-${placement}`.htmlSafe() : "";
   },
 
   @computed("isResponsive")
-  autoAdFormat(isResponsive) {
+  autoAdFormat: function(isResponsive) {
     return isResponsive ? "auto".htmlSafe() : false;
   },
 
   @computed("ad_width", "ad_height", "isResponsive")
-  adWrapperStyle(w, h, isResponsive) {
+  adWrapperStyle: function(w, h, isResponsive) {
     return (isResponsive ? "" : `width: ${w}; height: ${h};`).htmlSafe();
   },
 
   @computed("adWrapperStyle", "isResponsive")
-  adInsStyle(adWrapperStyle, isResponsive) {
+  adInsStyle: function(adWrapperStyle, isResponsive) {
     return `display: ${
       isResponsive ? "block" : "inline-block"
     }; ${adWrapperStyle}`.htmlSafe();
   },
 
   @computed()
-  showToTrustLevel() {
+  checkTrustLevels: function() {
     return !(
       currentUser &&
       currentUser.get("trust_level") >
@@ -239,12 +238,8 @@ export default AdComponent.extend({
     );
   },
 
-  @computed("showToTrustLevel", "showToGroups")
-  showAd(showToTrustLevel, showToGroups) {
-    return (
-      showToTrustLevel &&
-      showToGroups &&
-      Discourse.SiteSettings.adsense_publisher_code
-    );
+  @computed("checkTrustLevels")
+  showAd: function(shown) {
+    return shown && Discourse.SiteSettings.adsense_publisher_code;
   }
 });

assets/javascripts/discourse/components/google-dfp-ad.js.es6

@@ -1,9 +1,3 @@
-import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad_component";
-import {
-  default as computed,
-  observes,
-  on
-} from "ember-addons/ember-computed-decorators";
 import loadScript from "discourse/lib/load-script";
 
 var currentUser = Discourse.User.current(),
@@ -204,56 +198,51 @@ function loadGoogle() {
   return _promise;
 }
 
-export default AdComponent.extend({
+export default Ember.Component.extend({
   classNameBindings: ["adUnitClass"],
   classNames: ["google-dfp-ad"],
   loadedGoogletag: false,
   refreshOnChange: null,
 
-  @computed("placement", "postNumber")
-  divId(placement, postNumber) {
-    if (postNumber) {
-      return `div-gpt-ad-${placement}-${postNumber}`;
+  divId: function() {
+    if (this.get("postNumber")) {
+      return (
+        "div-gpt-ad-" + this.get("placement") + "-" + this.get("postNumber")
+      );
     } else {
-      return `div-gpt-ad-${placement}`;
+      return "div-gpt-ad-" + this.get("placement");
     }
-  },
+  }.property("placement", "postNumber"),
 
-  @computed("placement", "showAd")
-  adUnitClass(placement, showAd) {
-    return showAd ? `dfp-ad-${placement}` : "";
-  },
+  adUnitClass: function() {
+    return "dfp-ad-" + this.get("placement");
+  }.property("placement"),
 
-  @computed("width", "height")
-  adWrapperStyle(w, h) {
-    return `width: ${w}px; height: ${h}px;`.htmlSafe();
-  },
+  adWrapperStyle: function() {
+    return `width: ${this.get("width")}px; height: ${this.get(
+      "height"
+    )}px;`.htmlSafe();
+  }.property("width", "height"),
 
-  @computed("width")
-  adTitleStyleMobile(w) {
-    return `width: ${w}px;`.htmlSafe();
-  },
+  adTitleStyleMobile: function() {
+    return `width: ${this.get("width")}px;`.htmlSafe();
+  }.property("width"),
 
-  @computed("showToTrustLevel", "showToGroups")
-  showAd(showToTrustLevel, showToGroups) {
+  showAd: function() {
     return (
-      Discourse.SiteSettings.dfp_publisher_id &&
-      showToTrustLevel &&
-      showToGroups
+      Discourse.SiteSettings.dfp_publisher_id && this.get("checkTrustLevels")
     );
-  },
+  }.property("checkTrustLevels"),
 
-  @computed()
-  showToTrustLevel() {
+  checkTrustLevels: function() {
     return !(
       currentUser &&
       currentUser.get("trust_level") >
         Discourse.SiteSettings.dfp_through_trust_level
     );
-  },
+  }.property("trust_level"),
 
-  @observes("refreshOnChange")
-  refreshAd() {
+  refreshAd: function() {
     var slot = ads[this.get("divId")];
     if (!(slot && slot.ad)) {
       return;
@@ -271,10 +260,9 @@ export default AdComponent.extend({
         window.googletag.pubads().refresh([ad]);
       });
     }
-  },
+  }.observes("refreshOnChange"),
 
-  @on("didInsertElement")
-  _initGoogleDFP() {
+  _initGoogleDFP: function() {
     if (!this.get("showAd")) {
       return;
     }
@@ -299,7 +287,7 @@ export default AdComponent.extend({
         }
       });
     });
-  },
+  }.on("didInsertElement"),
 
   willRender() {
     this._super(...arguments);
@@ -312,8 +300,7 @@ export default AdComponent.extend({
     this.set("height", size.height);
   },
 
-  @on("willDestroyElement")
-  cleanup() {
+  cleanup: function() {
     destroySlot(this.get("divId"));
-  }
+  }.on("willDestroyElement")
 });

assets/javascripts/discourse/templates/components/amazon-product-links.hbs

@@ -1,4 +1,4 @@
-{{#if showAd}}
+{{#if checkTrustLevels}}
 	{{#if site.mobileView}}
     <div class="amazon-product-links-label" style={{adTitleStyleMobile}}><h2>{{i18n 'adplugin.advertisement_label'}}</h2></div>
 		<iframe style={{adWrapperStyleMobile}} marginwidth="0" marginheight="0" scrolling="no" frameborder="0" src={{userInputMobile}}>

config/locales/client.en.yml

@@ -6,7 +6,6 @@ en:
     admin:
       site_settings:
         categories:
-          ad_plugin: 'Ad Plugin'
           dfp_plugin: 'DFP/Ad Manager'
           adsense_plugin: 'AdSense'
           amazon_plugin: 'Amazon'

config/locales/server.en.yml

@@ -1,7 +1,5 @@
 en:
   site_settings:
-    no_ads_for_groups: "Don't show ads to users in these groups."
-
     dfp_publisher_id: "Input your Google Ad Manager (formerly called DFP) network code, which is found in your network settings."
     dfp_through_trust_level: "Show your ads to users based on trust levels. Users with trust level higher than this value will not see ads."
 

config/settings.yml

@@ -1,11 +1,3 @@
-ad_plugin:
-  no_ads_for_groups:
-    client: true
-    default: ""
-    type: list
-    choices: "Group.pluck(:name)"
-    list_type: compact
-
 adsense_plugin:
   adsense_publisher_code:
     client: true

test/javascripts/acceptance/adsense-test.js.es6

@@ -1,10 +1,8 @@
 import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
-import groupFixtures from "fixtures/group-fixtures";
 
 acceptance("AdSense", {
   loggedIn: true,
   settings: {
-    no_ads_for_groups: "discourse",
     adsense_publisher_code: "MYADSENSEID",
     adsense_through_trust_level: 2,
     adsense_topic_list_top_code: "list_top_ad_unit",
@@ -56,17 +54,3 @@ test("no ads for trust level 3", async assert => {
     "it should render 0 ads"
   );
 });
-
-QUnit.only("can omit ads based on groups", async assert => {
-  replaceCurrentUser({
-    staff: false,
-    trust_level: 1,
-    groups: [groupFixtures["/groups/discourse.json"].group]
-  });
-  await visit("/t/280");
-  assert.equal(
-    find(".google-adsense.adsense-post-bottom").length,
-    0,
-    "it should render 0 ads"
-  );
-});

test/javascripts/acceptance/dfp-test.js.es6

@@ -1,72 +0,0 @@
-import { acceptance, replaceCurrentUser } from "helpers/qunit-helpers";
-import groupFixtures from "fixtures/group-fixtures";
-
-acceptance("DFP Ads", {
-  loggedIn: true,
-  settings: {
-    no_ads_for_groups: "discourse",
-    dfp_publisher_id: "MYdfpID",
-    dfp_through_trust_level: 2,
-    dfp_topic_list_top_code: "list_top_ad_unit",
-    dfp_topic_list_top_ad_sizes: "728*90 - leaderboard",
-    dfp_mobile_topic_list_top_code: "mobile_list_top_ad_unit",
-    dfp_mobile_topic_list_top_ad_size: "300*250 - medium rectangle",
-    dfp_post_bottom_code: "post_bottom_ad_unit",
-    dfp_post_bottom_ad_sizes: "728*90 - leaderboard",
-    dfp_mobile_post_bottom_code: "mobile_post_bottom_ad_unit",
-    dfp_mobile_post_bottom_ad_size: "300*250 - medium rectangle",
-    dfp_nth_post_code: 6
-  }
-});
-
-test("correct number of ads should show", async assert => {
-  replaceCurrentUser({ staff: false, trust_level: 1 });
-  await visit("/t/280"); // 20 posts
-  const ads = find(".google-dfp-ad.dfp-ad-post-bottom");
-  assert.equal(ads.length, 3, "it should render 3 ads");
-  assert.equal(
-    find("#post_6 + .widget-connector").find(
-      ".google-dfp-ad.dfp-ad-post-bottom"
-    ).length,
-    1,
-    "ad after 6th post"
-  );
-  assert.equal(
-    find("#post_12 + .widget-connector").find(
-      ".google-dfp-ad.dfp-ad-post-bottom"
-    ).length,
-    1,
-    "ad after 12th post"
-  );
-  assert.equal(
-    find("#post_18 + .widget-connector").find(
-      ".google-dfp-ad.dfp-ad-post-bottom"
-    ).length,
-    1,
-    "ad after 18th post"
-  );
-});
-
-test("no ads for trust level 3", async assert => {
-  replaceCurrentUser({ staff: false, trust_level: 3 });
-  await visit("/t/280");
-  assert.equal(
-    find(".google-dfp-ad.dfp-ad-post-bottom").length,
-    0,
-    "it should render 0 ads"
-  );
-});
-
-test("can omit ads based on groups", async assert => {
-  replaceCurrentUser({
-    staff: false,
-    trust_level: 1,
-    groups: [groupFixtures["/groups/discourse.json"].group]
-  });
-  await visit("/t/280");
-  assert.equal(
-    find(".google-dfp-ad.dfp-ad-post-bottom").length,
-    0,
-    "it should render 0 ads"
-  );
-});