github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Remove restrictions on advanced user track.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-05-26 11:05:09 +08:00
parent 7028bdceed
commit 18dac4ce9f
4 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
View File

@ -95,11 +95,6 @@ module DiscourseNarrativeBot
}
}
def self.can_start?(user)
return true if user.staff? || !SiteSetting.enable_badges
user.badges.where(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?
end
def self.reset_trigger
I18n.t('discourse_narrative_bot.advanced_user_narrative.reset_trigger')
end

11
plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
View File

@ -113,7 +113,6 @@ module DiscourseNarrativeBot
end
def selected_track(klass)
return if klass.respond_to?(:can_start?) && !klass.can_start?(@user)
post_raw = @post.raw
trigger = "#{self.class.reset_trigger} #{klass.reset_trigger}"
@ -164,14 +163,6 @@ module DiscourseNarrativeBot
end
def help_message
tracks = [NewUserNarrative.reset_trigger]
if @user.staff? ||
@user.badges.where(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?
tracks << AdvancedUserNarrative.reset_trigger
end
discobot_username = self.discobot_user.username
message = I18n.t(
@ -179,7 +170,7 @@ module DiscourseNarrativeBot
discobot_username: discobot_username,
reset_trigger: self.class.reset_trigger,
default_track: NewUserNarrative.reset_trigger,
tracks: tracks.join(', ')
tracks: [NewUserNarrative.reset_trigger, AdvancedUserNarrative.reset_trigger].join(', ')
)
message << "\n\n#{I18n.t(self.class.i18n_key('random_mention.bot_actions'),