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

make rubocop happy

This commit is contained in:
Neil Lalonde 2017-11-07 14:20:46 -05:00
parent 234f0262b8
commit 667b025d12
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/import_scripts/bbpress.rb
View File

@ -47,9 +47,9 @@ class ImportScripts::Bbpress < ImportScripts::Base
last_user_id = -1
total_users = bbpress_query(<<-SQL
SELECT COUNT(DISTINCT(u.id)) AS cnt
FROM #{BB_PRESS_PREFIX}users u
LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id
WHERE p.post_type IN ('forum', 'reply', 'topic')
FROM #{BB_PRESS_PREFIX}users u
LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id
WHERE p.post_type IN ('forum', 'reply', 'topic')
AND user_email LIKE '%@%'
SQL
).first["cnt"]
@ -58,7 +58,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
users = bbpress_query(<<-SQL
SELECT u.id, user_nicename, display_name, user_email, user_registered, user_url, user_pass
FROM #{BB_PRESS_PREFIX}users u
LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id
LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id
WHERE user_email LIKE '%@%'
AND p.post_type IN ('forum', 'reply', 'topic')
AND u.id > #{last_user_id}
@ -305,7 +305,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
topics.each do |t|
topic = topic_lookup_from_imported_post_id(t['id'])
Permalink.create( url: URI.parse(t['guid']).path.chomp('/'), topic_id: topic[:topic_id] ) rescue nil
Permalink.create(url: URI.parse(t['guid']).path.chomp('/'), topic_id: topic[:topic_id]) rescue nil
end
last_topic_id = topics[-1]["id"].to_i
end

4
script/import_scripts/phpbb3/support/text_processor.rb
View File

@ -49,7 +49,7 @@ module ImportScripts::PhpBB3
# [url=https&#58;//google&#46;com:1qh1i7ky]click here[/url:1qh1i7ky]
# [quote=&quot;cybereality&quot;:b0wtlzex]Some text.[/quote:b0wtlzex]
text.gsub!(/:(?:\w{8})\]/, ']')
# remove color tags
text.gsub!(/\[\/?color(=#[a-z0-9]*)?\]/i, "")
end
@ -148,7 +148,7 @@ module ImportScripts::PhpBB3
end
def process_code(text)
text.gsub!(/<span class="syntax.*?>(.*?)<\/span>/) {"#{$1}"}
text.gsub!(/<span class="syntax.*?>(.*?)<\/span>/) { "#{$1}" }
text.gsub!(/\[code(=[a-z]*)?\](.*?)\[\/code\]/i) { "[code]#{@he.decode($2)}[/code]" }
text.gsub!(/<br \/>/, "\n")
text