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

FIX: narrative bot on subfolder installs

Browse Source
This commit is contained in:
Neil Lalonde
2017-06-01 15:15:22 -04:00
parent 19d5eb903c
commit 23dfddbfb4
7 changed files with 202 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
View File

@ -91,9 +91,11 @@ module DiscourseNarrativeBot
if post = Post.find_by(id: @data[:last_post_id])
reply_to(post, I18n.t("discourse_narrative_bot.timeout.message",
username: user.username,
skip_trigger: TrackSelector.skip_trigger,
reset_trigger: "#{TrackSelector.reset_trigger} #{self.class.reset_trigger}",
i18n_post_args(
username: user.username,
skip_trigger: TrackSelector.skip_trigger,
reset_trigger: "#{TrackSelector.reset_trigger} #{self.class.reset_trigger}"
)
))
end
end
@ -102,12 +104,11 @@ module DiscourseNarrativeBot
options = {
user_id: @user.id,
date: Time.zone.now.strftime('%b %d %Y'),
host: Discourse.base_url,
format: :svg
}
options.merge!(type: type) if type
src = DiscourseNarrativeBot::Engine.routes.url_helpers.certificate_url(options)
src = Discourse.base_url + DiscourseNarrativeBot::Engine.routes.url_helpers.certificate_path(options)
"<img class='discobot-certificate' src='#{src}' width='650' height='464' alt='#{I18n.t("#{self.class::I18N_KEY}.certificate.alt")}'>"
end
@ -154,6 +155,10 @@ module DiscourseNarrativeBot
end
end
def i18n_post_args(extra={})
{base_uri: Discourse.base_uri}.merge(extra)
end
def valid_topic?(topic_id)
topic_id == @data[:topic_id]
end