From effee3e7c8a0996432309de74e624461c2665b12 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Mon, 24 Jun 2019 14:34:41 +0800 Subject: [PATCH] support new version watcher data --- app/controllers/users_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d5f6ebfb..4fae7ff7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4206,10 +4206,12 @@ class UsersController < ApplicationController end def user_wathlist_and_fanslist - watch_query = User.watched_by(@user.id) + watch_query = User.joins('left join watchers on watchers.watchable_id = users.id and watchers.watchable_type in ("Principal", "User")') + .where('watchers.user_id = ?', @user.id) @user_watchlist_count = watch_query.count @user_watchlist = watch_query.order("#{Watcher.table_name}.id desc") - fan_query = @user.watcher_users + fan_query = User.joins('left join watchers on watchers.user_id = users.id and watchers.watchable_type in ("Principal", "User")') + .where('watchers.watchable_id = ?', @user.id) @user_fanlist_count = fan_query.count @user_fanlist = fan_query.order("#{Watcher.table_name}.id desc") respond_to do |format|