Skip to content

Commit 3ed0379

Browse files
committed
Replaced delegator methods with Forwardable def_delegator in Topic
1 parent 61281a3 commit 3ed0379

1 file changed

Lines changed: 10 additions & 30 deletions

File tree

app/models/topic.rb

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ class Topic < ActiveRecord::Base
1010
include ActionView::Helpers::SanitizeHelper
1111
include RateLimiter::OnCreateRecord
1212
include Trashable
13+
extend Forwardable
14+
15+
def_delegator :featured_users, :user_ids, :featured_user_ids
16+
def_delegator :featured_users, :choose, :feature_topic_users
17+
18+
def_delegator :notifier, :watch!, :notify_watch!
19+
def_delegator :notifier, :tracking!, :notify_tracking!
20+
def_delegator :notifier, :regular!, :notifiy_regular!
21+
def_delegator :notifier, :muted!, :notify_muted!
22+
def_delegator :notifier, :toggle_mute, :toggle_mute
1323

1424
def self.max_sort_order
1525
2**31 - 1
@@ -21,14 +31,6 @@ def featured_users
2131
@featured_users ||= TopicFeaturedUsers.new(self)
2232
end
2333

24-
def featured_user_ids
25-
featured_users.user_ids
26-
end
27-
28-
def feature_topic_users(args={})
29-
featured_users.choose(args)
30-
end
31-
3234
def trash!(trashed_by=nil)
3335
update_category_topic_count_by(-1) if deleted_at.nil?
3436
super(trashed_by)
@@ -561,34 +563,12 @@ def notifier
561563
@topic_notifier ||= TopicNotifier.new(self)
562564
end
563565

564-
# notification stuff
565-
def notify_watch!(user)
566-
notifier.watch! user
567-
end
568-
569-
def notify_tracking!(user)
570-
notifier.tracking! user
571-
end
572-
573-
def notify_regular!(user)
574-
notifier.regular! user
575-
end
576-
577-
def notify_muted!(user)
578-
notifier.muted! user
579-
end
580-
581566
def muted?(user)
582567
if user && user.id
583568
notifier.muted?(user.id)
584569
end
585570
end
586571

587-
# Enable/disable the mute on the topic
588-
def toggle_mute(user_id)
589-
notifier.toggle_mute user_id
590-
end
591-
592572
def auto_close_days=(num_days)
593573
@ignore_category_auto_close = true
594574
set_auto_close(num_days)

0 commit comments

Comments
 (0)