Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Skip trigger match should be case insensitive. 

https://meta.discourse.org/t/discobot-not-skipping-tutorial/68498
This commit is contained in:
Guo Xiang Tan 2017-08-22 07:44:20 +09:00
parent 8bd7cfedfd
commit 950fa9e3a8
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,9 +217,7 @@ module DiscourseNarrativeBot
def skip_track? def skip_track?
if @is_pm_to_bot if @is_pm_to_bot
post_raw = @post.raw post_raw = @post.raw
post_raw.match(/((^@#{self.discobot_user.username} #{self.class.skip_trigger})|(^#{self.class.skip_trigger}$))/i)
post_raw.match(/^@#{self.discobot_user.username} #{self.class.skip_trigger}/i) ||
post_raw.strip == self.class.skip_trigger
else else
false false
end end

4
plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
View File

@ -162,7 +162,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
describe 'when reply contains the skip trigger' do describe 'when reply contains the skip trigger' do
it 'should create the right reply' do it 'should create the right reply' do
post.update!(raw: "@#{discobot_user.username} #{skip_trigger}") post.update!(raw: "@#{discobot_user.username} #{skip_trigger.upcase}")
described_class.any_instance.expects(:enqueue_timeout_job).with(user) described_class.any_instance.expects(:enqueue_timeout_job).with(user)
DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
@ -225,7 +225,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
describe 'when reply contains the skip trigger' do describe 'when reply contains the skip trigger' do
it 'should create the right reply' do it 'should create the right reply' do
post.update!(raw: skip_trigger) post.update!(raw: skip_trigger.upcase)
described_class.any_instance.expects(:enqueue_timeout_job).with(user) described_class.any_instance.expects(:enqueue_timeout_job).with(user)
DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select

4
plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
View File

@ -213,7 +213,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
describe 'when reply contains the skip trigger' do describe 'when reply contains the skip trigger' do
it 'should create the right reply' do it 'should create the right reply' do
post.update!(raw: "@#{discobot_user.username} #{skip_trigger}") post.update!(raw: "@#{discobot_user.username} #{skip_trigger.upcase}")
described_class.any_instance.expects(:enqueue_timeout_job).with(user) described_class.any_instance.expects(:enqueue_timeout_job).with(user)
DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
@ -286,7 +286,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
describe 'when user replies to the topic' do describe 'when user replies to the topic' do
describe 'when reply contains the skip trigger' do describe 'when reply contains the skip trigger' do
it 'should create the right reply' do it 'should create the right reply' do
post.update!(raw: skip_trigger) post.update!(raw: skip_trigger.upcase)
described_class.any_instance.expects(:enqueue_timeout_job).with(user) described_class.any_instance.expects(:enqueue_timeout_job).with(user)
DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select