remove redundant sub client check
Dieser Commit ist enthalten in:
Ursprung
7f245d6a59
Commit
a8af37b334
1 geänderte Dateien mit 14 neuen und 20 gelöschten Zeilen
|
@ -105,24 +105,22 @@ class CustomWizard::Subscription
|
||||||
:product_slug
|
:product_slug
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
if CustomWizard::Subscription.client_installed?
|
result = DiscourseSubscriptionClient.find_subscriptions("discourse-custom-wizard")
|
||||||
result = DiscourseSubscriptionClient.find_subscriptions("discourse-custom-wizard")
|
|
||||||
|
|
||||||
if result&.any?
|
if result&.any?
|
||||||
ids_and_slugs = result.subscriptions.map do |subscription|
|
ids_and_slugs = result.subscriptions.map do |subscription|
|
||||||
{
|
{
|
||||||
id: subscription.product_id,
|
id: subscription.product_id,
|
||||||
slug: result.products[subscription.product_id]
|
slug: result.products[subscription.product_id]
|
||||||
}
|
}
|
||||||
end
|
|
||||||
|
|
||||||
id_and_slug = ids_and_slugs.sort do |a, b|
|
|
||||||
PRODUCT_HIERARCHY.index(b[:slug]) - PRODUCT_HIERARCHY.index(a[:slug])
|
|
||||||
end.first
|
|
||||||
|
|
||||||
@product_id = id_and_slug[:id]
|
|
||||||
@product_slug = id_and_slug[:slug]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
id_and_slug = ids_and_slugs.sort do |a, b|
|
||||||
|
PRODUCT_HIERARCHY.index(b[:slug]) - PRODUCT_HIERARCHY.index(a[:slug])
|
||||||
|
end.first
|
||||||
|
|
||||||
|
@product_id = id_and_slug[:id]
|
||||||
|
@product_slug = id_and_slug[:slug]
|
||||||
end
|
end
|
||||||
|
|
||||||
@product_slug ||= ENV["CUSTOM_WIZARD_PRODUCT_SLUG"]
|
@product_slug ||= ENV["CUSTOM_WIZARD_PRODUCT_SLUG"]
|
||||||
|
@ -176,10 +174,6 @@ class CustomWizard::Subscription
|
||||||
product_slug === "community"
|
product_slug === "community"
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.client_installed?
|
|
||||||
defined?(DiscourseSubscriptionClient) == 'constant' && DiscourseSubscriptionClient.class == Module
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.subscribed?
|
def self.subscribed?
|
||||||
new.subscribed?
|
new.subscribed?
|
||||||
end
|
end
|
||||||
|
|
Laden …
In neuem Issue referenzieren