Convert mix of JSON.parse and JSON.load_file (#38242)
This commit is contained in:
1 parent
4d33490ec8
commit
b9d25bde3e
9 files changed
+18
-18
No files matched your search
@@ -140,13 +140,13 @@ module Mastodon::CLI
|
||||
Request.new(:get, "https://#{domain}/api/v1/instance").perform do |res|
|
||||
next unless res.code == 200
|
||||
|
||||
stats[domain] = Oj.load(res.to_s)
|
||||
stats[domain] = JSON.parse(res.to_s)
|
||||
end
|
||||
|
||||
Request.new(:get, "https://#{domain}/api/v1/instance/peers").perform do |res|
|
||||
next unless res.code == 200
|
||||
|
||||
Oj.load(res.to_s).reject { |peer| stats.key?(peer) }.each do |peer|
|
||||
JSON.parse(res.to_s).reject { |peer| stats.key?(peer) }.each do |peer|
|
||||
pool.post(peer, &work_unit)
|
||||
end
|
||||
end
|
||||
@@ -154,7 +154,7 @@ module Mastodon::CLI
|
||||
Request.new(:get, "https://#{domain}/api/v1/instance/activity").perform do |res|
|
||||
next unless res.code == 200
|
||||
|
||||
stats[domain]['activity'] = Oj.load(res.to_s)
|
||||
stats[domain]['activity'] = JSON.parse(res.to_s)
|
||||
end
|
||||
rescue
|
||||
failed.increment
|
||||
|
||||
@@ -109,7 +109,7 @@ namespace :emojis do
|
||||
emojis_light = '👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️🪽🪿'
|
||||
emojis_dark = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲🚲🪮🐦⬛'
|
||||
|
||||
map = Oj.load(File.read(src))
|
||||
map = JSON.parse(File.read(src))
|
||||
|
||||
emojis_light.each_grapheme_cluster do |emoji|
|
||||
gen_border map[emoji], 'black'
|
||||
@@ -193,7 +193,7 @@ namespace :emojis do
|
||||
require 'vips'
|
||||
|
||||
src = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_data.json')
|
||||
sheet = Oj.load(File.read(src))
|
||||
sheet = JSON.load_file(src)
|
||||
|
||||
max = 0
|
||||
sheet['emojis'].each_value do |row|
|
||||
|
||||
+2
-2
@@ -22,7 +22,7 @@ namespace :repo do
|
||||
|
||||
while url.present?
|
||||
response = HTTP.get(url)
|
||||
contributors = Oj.load(response.body)
|
||||
contributors = JSON.parse(response.body)
|
||||
|
||||
contributors.each do |c|
|
||||
file << "* [#{c['login']}](#{c['html_url']})\n" if c['login']
|
||||
@@ -68,7 +68,7 @@ namespace :repo do
|
||||
end
|
||||
end
|
||||
|
||||
pull_request = Oj.load(response.to_s)
|
||||
pull_request = JSON.parse(response.to_s)
|
||||
pull_request['user']['login']
|
||||
end
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ module ViteRuby::ManifestIntegrityExtension
|
||||
end
|
||||
|
||||
def load_name_lookup_cache
|
||||
Oj.load(config.build_output_dir.join('.vite/manifest-lookup.json').read)
|
||||
JSON.load_file(config.build_output_dir.join('.vite/manifest-lookup.json'))
|
||||
end
|
||||
|
||||
# Upstream's `virtual` type is a hack, re-implement it with efficient exact name lookup
|
||||
|
||||
Reference in new issue
Block a user