fix display of `admin:eval` comments
parent
f0506110c4
commit
1edc2f1aeb
|
@ -9,6 +9,8 @@ class Bangtags
|
||||||
@account = status.account
|
@account = status.account
|
||||||
@parent_status = Status.find(status.in_reply_to_id) if status.in_reply_to_id
|
@parent_status = Status.find(status.in_reply_to_id) if status.in_reply_to_id
|
||||||
|
|
||||||
|
@crunch_newlines = false
|
||||||
|
|
||||||
@prefix_ns = {
|
@prefix_ns = {
|
||||||
'permalink' => ['link'],
|
'permalink' => ['link'],
|
||||||
'cloudroot' => ['link'],
|
'cloudroot' => ['link'],
|
||||||
|
@ -557,7 +559,6 @@ class Bangtags
|
||||||
@chunks << "<em>Unauthorized.</em>"
|
@chunks << "<em>Unauthorized.</em>"
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
@chunks << "<strong>Input:</strong>"
|
|
||||||
unless cmd[2].present? && cmd[2].downcase == 'last'
|
unless cmd[2].present? && cmd[2].downcase == 'last'
|
||||||
@vars.delete("_admin:eval")
|
@vars.delete("_admin:eval")
|
||||||
@vore_stack.push("_admin:eval")
|
@vore_stack.push("_admin:eval")
|
||||||
|
@ -666,6 +667,8 @@ class Bangtags
|
||||||
account.user.save
|
account.user.save
|
||||||
|
|
||||||
text = @chunks.join
|
text = @chunks.join
|
||||||
|
text.gsub!(/\n\n+/, "\n") if @crunch_newlines
|
||||||
|
|
||||||
if text.blank?
|
if text.blank?
|
||||||
RemoveStatusService.new.call(@status)
|
RemoveStatusService.new.call(@status)
|
||||||
else
|
else
|
||||||
|
@ -696,15 +699,18 @@ class Bangtags
|
||||||
next if post_cmd[1].nil?
|
next if post_cmd[1].nil?
|
||||||
case post_cmd[1]
|
case post_cmd[1]
|
||||||
when 'eval'
|
when 'eval'
|
||||||
|
@crunch_newlines = true
|
||||||
|
@vars["_admin:eval"].strip!
|
||||||
|
@chunks << "\n<strong>Input:</strong>"
|
||||||
@chunks << "<pre><code>"
|
@chunks << "<pre><code>"
|
||||||
@chunks << html_entities.encode(@vars["_admin:eval"]).gsub("\n", '<br/>')
|
@chunks << html_entities.encode(@vars["_admin:eval"]).gsub("\n", '<br/>')
|
||||||
@chunks << "</code></pre>\n"
|
@chunks << "</code></pre>"
|
||||||
@chunks << "<strong>Output:</strong>"
|
|
||||||
begin
|
begin
|
||||||
result = eval(@vars["_admin:eval"])
|
result = eval(@vars["_admin:eval"])
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
result = "\u274c #{e.message}"
|
result = "\u274c #{e.message}"
|
||||||
end
|
end
|
||||||
|
@chunks << "<strong>Output:</strong>"
|
||||||
@chunks << "<pre><code>"
|
@chunks << "<pre><code>"
|
||||||
@chunks << html_entities.encode(result).gsub("\n", '<br/>')
|
@chunks << html_entities.encode(result).gsub("\n", '<br/>')
|
||||||
@chunks << "</code></pre>"
|
@chunks << "</code></pre>"
|
||||||
|
|
Loading…
Reference in New Issue