From 0adec602591bc2c5861bba97362492d4bc61243a Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 15 Dec 2019 15:26:26 -0600 Subject: [PATCH] recommender: replace HttpartyCache with Danbooru::Http. --- app/logical/recommender_service.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/logical/recommender_service.rb b/app/logical/recommender_service.rb index ab7b947d1..7f0d13b09 100644 --- a/app/logical/recommender_service.rb +++ b/app/logical/recommender_service.rb @@ -18,22 +18,20 @@ module RecommenderService end def recommend_for_user(user, tags: nil, limit: 50) - body, status = HttpartyCache.get("#{Danbooru.config.recommender_server}/recommend/#{user.id}", params: { limit: limit }, expiry: CACHE_LIFETIME) - return [] if status != 200 + response = Danbooru::Http.cache(CACHE_LIFETIME).get("#{Danbooru.config.recommender_server}/recommend/#{user.id}", params: { limit: limit }) + return [] if rsponse.status != 200 - process_recs(body, tags: tags, uploader: user, favoriter: user) + process_recs(response.parse, tags: tags, uploader: user, favoriter: user) end def recommend_for_post(post, tags: nil, limit: 50) - body, status = HttpartyCache.get("#{Danbooru.config.recommender_server}/similar/#{post.id}", params: { limit: limit }, expiry: CACHE_LIFETIME) - return [] if status != 200 + response = Danbooru::Http.cache(CACHE_LIFETIME).get("#{Danbooru.config.recommender_server}/similar/#{post.id}", params: { limit: limit }) + return [] if response.status != 200 - process_recs(body, post: post, tags: tags) + process_recs(response.parse, post: post, tags: tags) end def process_recs(recs, post: nil, uploader: nil, favoriter: nil, tags: nil) - recs = JSON.parse(recs) - posts = Post.where(id: recs.map(&:first)) posts = posts.where.not(id: post.id) if post posts = posts.where.not(uploader_id: uploader.id) if uploader