Revert "DEV: migrate no_ads_for_groups to use IDs instead of group names (#77)" (#78)

Revert “DEV: migrate no_ads_for_groups to use IDs instead of group names (#77)” (#78)

This reverts commit 09a92f34388042b9e3fe8f74c96cfe2718bad8c2.

diff --git a/assets/javascripts/discourse/components/ad-component.js.es6 b/assets/javascripts/discourse/components/ad-component.js.es6
index 1cfd7a4..52393bb 100644
--- a/assets/javascripts/discourse/components/ad-component.js.es6
+++ b/assets/javascripts/discourse/components/ad-component.js.es6
@@ -46,21 +46,12 @@ export default Ember.Component.extend({
       return true;
     }
 
-    let noAdsGroups = this.siteSettings.no_ads_for_groups
-        .split("|")
+    const groupNames = groups.map(g => g.name.toLowerCase());
+    const noAdsGroupNames = this.siteSettings.no_ads_for_groups
+      .split("|")
+      .map(g => g.toLowerCase());
 
-    // TODO: Remove when 2.4 becomes the new stable. This is for backwards compatibility.
-    const groupListUseIDs = this.site.group_list_use_ids;
-
-    let currentGroups = groups;
-    if (groupListUseIDs) {
-      currentGroups = currentGroups.map(g => g.id.toString());
-    } else {
-      currentGroups = currentGroups.map(g => g.name.toLowerCase());
-      noAdsGroups = noAdsGroups.map(g => g.toLowerCase());
-    }
-
-    return !currentGroups.any(g => noAdsGroups.includes(g));
+    return !groupNames.any(g => noAdsGroupNames.includes(g));
   },
 
   @computed(
diff --git a/plugin.rb b/plugin.rb
index ea513bc..7c5aa5d 100755
--- a/plugin.rb
+++ b/plugin.rb
@@ -35,11 +35,6 @@ after_initialize do
   require_dependency File.expand_path('../app/controllers/house_ad_settings_controller', __FILE__)
   require_dependency 'application_controller'
 
-  # TODO: remove when 2.4 becomes the new stable
-  current_version = ActiveRecord::Migrator.current_version
-  min_version = 201_907_081_533_31
-  add_to_serializer(:site, :group_list_use_ids) { current_version >= min_version }
-
   add_to_serializer :site, :house_creatives do
     AdPlugin::HouseAdSetting.settings_and_ads
   end

GitHub sha: dee02ac3

DEV: migrate no_ads_for_groups to use IDs instead of group names (#77) [Undo revert] (#79)