0f688b9d73
The notifications need to be grouped by the same date as they are sorted, otherwise the date used for the group doesn't match all timestamps in the group and also the groups are sorted by the wrong date. This fixes #7647, a regression of #7568. closes #7648
111 lines
3.7 KiB
Ruby
111 lines
3.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# Copyright (c) 2010-2011, Diaspora Inc. This file is
|
|
# licensed under the Affero General Public License version 3 or later. See
|
|
# the COPYRIGHT file.
|
|
|
|
class NotificationsController < ApplicationController
|
|
before_action :authenticate_user!
|
|
|
|
def update
|
|
note = Notification.where(:recipient_id => current_user.id, :id => params[:id]).first
|
|
if note
|
|
note.set_read_state(params[:set_unread] != "true" )
|
|
|
|
respond_to do |format|
|
|
format.json { render :json => { :guid => note.id, :unread => note.unread } }
|
|
end
|
|
|
|
else
|
|
respond_to do |format|
|
|
format.json { render :json => {}.to_json }
|
|
end
|
|
end
|
|
end
|
|
|
|
def index
|
|
conditions = {:recipient_id => current_user.id}
|
|
if params[:type] && types.has_key?(params[:type])
|
|
conditions[:type] = types[params[:type]]
|
|
end
|
|
if params[:show] == "unread" then conditions[:unread] = true end
|
|
page = params[:page] || 1
|
|
per_page = params[:per_page] || 25
|
|
@notifications = WillPaginate::Collection.create(page, per_page, Notification.where(conditions).count ) do |pager|
|
|
result = Notification.where(conditions)
|
|
.includes(:target, :actors => :profile)
|
|
.order("updated_at desc")
|
|
.limit(pager.per_page)
|
|
.offset(pager.offset)
|
|
|
|
pager.replace(result)
|
|
end
|
|
@group_days = @notifications.group_by {|note| note.updated_at.strftime("%Y-%m-%d") }
|
|
|
|
@unread_notification_count = current_user.unread_notifications.count
|
|
|
|
@grouped_unread_notification_counts = {}
|
|
|
|
types.each_with_object(current_user.unread_notifications.group_by(&:type)) {|(name, type), notifications|
|
|
@grouped_unread_notification_counts[name] = notifications.has_key?(type) ? notifications[type].count : 0
|
|
}
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.xml { render :xml => @notifications.to_xml }
|
|
format.json {
|
|
render json: render_as_json(@unread_notification_count, @grouped_unread_notification_counts, @notifications)
|
|
}
|
|
end
|
|
end
|
|
|
|
def default_serializer_options
|
|
{
|
|
context: self,
|
|
root: false
|
|
}
|
|
end
|
|
|
|
def read_all
|
|
current_type = types[params[:type]]
|
|
notifications = Notification.where(recipient_id: current_user.id, unread: true)
|
|
notifications = notifications.where(type: current_type) if params[:type]
|
|
notifications.update_all(unread: false)
|
|
respond_to do |format|
|
|
if current_user.unread_notifications.count > 0
|
|
format.html { redirect_to notifications_path }
|
|
format.mobile { redirect_to notifications_path }
|
|
else
|
|
format.html { redirect_to stream_path }
|
|
format.mobile { redirect_to stream_path }
|
|
end
|
|
format.xml { render :xml => {}.to_xml }
|
|
format.json { render :json => {}.to_json }
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def render_as_json(unread_count, unread_count_by_type, notification_list)
|
|
{
|
|
unread_count: unread_count,
|
|
unread_count_by_type: unread_count_by_type,
|
|
notification_list: notification_list.map {|note|
|
|
NotificationSerializer.new(note, default_serializer_options).as_json
|
|
}
|
|
}.as_json
|
|
end
|
|
|
|
def types
|
|
{
|
|
"also_commented" => "Notifications::AlsoCommented",
|
|
"comment_on_post" => "Notifications::CommentOnPost",
|
|
"liked" => "Notifications::Liked",
|
|
"mentioned" => "Notifications::MentionedInPost",
|
|
"mentioned_in_comment" => "Notifications::MentionedInComment",
|
|
"reshared" => "Notifications::Reshared",
|
|
"started_sharing" => "Notifications::StartedSharing"
|
|
}
|
|
end
|
|
helper_method :types
|
|
end
|