Commit c8a3de4b authored by mgabdev's avatar mgabdev

pulled

parent b620cb13
......@@ -16,7 +16,7 @@ class Api::V1::GroupsController < Api::BaseController
when 'new'
@groups = Group.where(is_archived: false).limit(24).order('created_at DESC').all
when 'member'
@groups = Group.joins(:group_accounts).where(is_archived: false, group_accounts: { account: current_account }).order('group_accounts.unread_count DESC, group_accounts.id DESC').all
@groups = Group.joins(:group_accounts).where(is_archived: false, group_accounts: { account: current_account }).order('group_accounts.id DESC').all
when 'admin'
@groups = Group.joins(:group_accounts).where(is_archived: false, group_accounts: { account: current_account, role: :admin }).all
end
......
......@@ -9,8 +9,6 @@ class Api::V1::Timelines::GroupController < Api::BaseController
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
def show
mark_as_unread
render json: @statuses,
each_serializer: REST::StatusSerializer,
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
......@@ -18,10 +16,6 @@ class Api::V1::Timelines::GroupController < Api::BaseController
private
def mark_as_unread
GroupAccount.where(group: @group, account: current_account).update_all("unread_count = 0")
end
def set_group
@group = Group.find(params[:id])
end
......
......@@ -13,19 +13,12 @@ module GroupInteractions
follow_mapping(GroupAccount.where(group_id: target_group_ids, account_id: account_id, role: :admin), :group_id)
end
def unread_count_map(target_group_ids, account_id)
unread_count_mapping(GroupAccount.where(group_id: target_group_ids, account_id: account_id), :unread_count)
end
private
def follow_mapping(query, field)
query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true }
end
def unread_count_mapping(query, field)
query.pluck(:group_id, :unread_count).each_with_object({}) { |e, mapping| mapping[e[0]] = e[1] }
end
end
def accounts_for_local_distribution
......
......@@ -9,10 +9,10 @@
# role :string
# created_at :datetime not null
# updated_at :datetime not null
# unread_count :integer default(0)
#
class GroupAccount < ApplicationRecord
self.ignored_columns = ["unread_count"]
enum role: { admin: "admin" }
belongs_to :group
......
......@@ -26,6 +26,7 @@
# group_id :integer
# quote_of_id :bigint(8)
# revised_at :datetime
# markdown :text
#
class Status < ApplicationRecord
......@@ -268,7 +269,6 @@ class Status < ApplicationRecord
after_create_commit :store_uri, if: :local?
after_create_commit :update_statistics, if: :local?
after_create_commit :increase_group_unread_counts, if: Proc.new { |status| !status.group_id.nil? }
around_create GabSocial::Snowflake::Callbacks
......@@ -555,7 +555,4 @@ class Status < ApplicationRecord
end
end
def increase_group_unread_counts
GroupAccount.where(group_id: group_id).where.not(account_id: account_id).update_all("unread_count = unread_count + 1")
end
end
# frozen_string_literal: true
class GroupRelationshipsPresenter
attr_reader :member, :admin, :unread_count
attr_reader :member, :admin
def initialize(group_ids, current_account_id, **options)
@group_ids = group_ids.map { |a| a.is_a?(Group) ? a.id : a }
......@@ -9,7 +9,6 @@ class GroupRelationshipsPresenter
@member = Group.member_map(@group_ids, @current_account_id)
@admin = Group.admin_map(@group_ids, @current_account_id)
@unread_count = Group.unread_count_map(@group_ids, @current_account_id)
end
end
\ No newline at end of file
# frozen_string_literal: true
class REST::GroupRelationshipSerializer < ActiveModel::Serializer
attributes :id, :member, :admin, :unread_count
attributes :id, :member, :admin
def id
object.id.to_s
......@@ -15,7 +15,4 @@ class REST::GroupRelationshipSerializer < ActiveModel::Serializer
instance_options[:relationships].admin[object.id] ? true : false
end
def unread_count
instance_options[:relationships].unread_count[object.id] || 0
end
end
class RemoveUnreadCountFromGroupAccounts < ActiveRecord::Migration[5.2]
def change
safety_assured { remove_column :group_accounts, :unread_count, :integer }
end
end
......@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2020_04_30_154012) do
ActiveRecord::Schema.define(version: 2020_05_10_034822) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......@@ -327,7 +327,6 @@ ActiveRecord::Schema.define(version: 2020_04_30_154012) do
t.string "role"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "unread_count", default: 0
t.index ["account_id", "group_id"], name: "index_group_accounts_on_account_id_and_group_id", unique: true
t.index ["account_id"], name: "index_group_accounts_on_account_id"
t.index ["group_id", "account_id"], name: "index_group_accounts_on_group_id_and_account_id"
......@@ -400,7 +399,7 @@ ActiveRecord::Schema.define(version: 2020_04_30_154012) do
create_table "list_accounts", force: :cascade do |t|
t.bigint "list_id", null: false
t.bigint "account_id", null: false
t.bigint "follow_id", default: nil
t.bigint "follow_id", default: 1
t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment