From 63e604d81bf4559eab2c34b0694253ffadb1cf67 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 17 Apr 2019 11:26:57 -0400
Subject: [PATCH] Updates to codefund-ad

---
 .../discourse/components/codefund-ad.js.es6   | 55 +++++++++----------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/assets/javascripts/discourse/components/codefund-ad.js.es6 b/assets/javascripts/discourse/components/codefund-ad.js.es6
index 1d76f53..edb9817 100644
--- a/assets/javascripts/discourse/components/codefund-ad.js.es6
+++ b/assets/javascripts/discourse/components/codefund-ad.js.es6
@@ -1,11 +1,13 @@
+import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad_component";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-var _loaded = false,
-  _promise = null,
-  currentUser = Discourse.User.current(),
+let _loaded = false,
+  _promise = null;
+
+const currentUser = Discourse.User.current(),
   propertyId = Discourse.SiteSettings.codefund_property_id;
 
 function loadCodeFund() {
@@ -48,12 +50,23 @@ function loadCodeFund() {
   return _promise;
 }
 
-export default Ember.Component.extend({
+export default AdComponent.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;
 
@@ -83,7 +96,7 @@ export default Ember.Component.extend({
   },
 
   @observes("listLoading")
-  waitForLoad: function() {
+  waitForLoad() {
     if (this.get("adRequested")) {
       return;
     } // already requested that this ad unit be populated
@@ -93,7 +106,7 @@ export default Ember.Component.extend({
   },
 
   @computed()
-  checkTrustLevels: function() {
+  showToTrustLevel() {
     return !(
       currentUser &&
       currentUser.get("trust_level") >
@@ -101,28 +114,12 @@ export default Ember.Component.extend({
     );
   },
 
-  @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";
+  @computed("showToTrustLevel", "showToGroups")
+  showAd(showToTrustLevel, showToGroups) {
+    return (
+      Discourse.SiteSettings.codefund_property_id &&
+      showToTrustLevel &&
+      showToGroups
+    );
   }
 });