github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 18:41:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Consolidate likes notifications. (#6879)

Browse Source
This commit is contained in:
Guo Xiang Tan
2019-01-16 10:40:16 +08:00
committed by GitHub
parent 51b19e945c
commit ebe65577ed
18 changed files with 317 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/user_actions_controller.rb
View File

@ -2,7 +2,7 @@ class UserActionsController < ApplicationController
def index
params.require(:username)
params.permit(:filter, :offset)
params.permit(:filter, :offset, :acting_username)
per_chunk = 30
@ -11,13 +11,16 @@ class UserActionsController < ApplicationController
action_types = (params[:filter] || "").split(",").map(&:to_i)
opts = { user_id: user.id,
user: user,
offset: params[:offset].to_i,
limit: per_chunk,
action_types: action_types,
guardian: guardian,
ignore_private_messages: params[:filter] ? false : true }
opts = {
user_id: user.id,
user: user,
offset: params[:offset].to_i,
limit: per_chunk,
action_types: action_types,
guardian: guardian,
ignore_private_messages: params[:filter] ? false : true,
acting_username: params[:acting_username]
}
# Pending is restricted
stream = if opts[:action_types].include?(UserAction::PENDING)