diff --git a/app/controllers/api/v1/groups_controller.rb b/app/controllers/api/v1/groups_controller.rb
index f59db12c..eaf0bc1c 100644
--- a/app/controllers/api/v1/groups_controller.rb
+++ b/app/controllers/api/v1/groups_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::GroupsController < Api::BaseController
when 'featured'
@groups = Group.where(is_featured: true).limit(50).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
diff --git a/app/controllers/api/v1/timelines/group_controller.rb b/app/controllers/api/v1/timelines/group_controller.rb
index b66abe2c..6ef63ef1 100644
--- a/app/controllers/api/v1/timelines/group_controller.rb
+++ b/app/controllers/api/v1/timelines/group_controller.rb
@@ -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
diff --git a/app/javascript/gabsocial/features/groups/sidebar_panel/item.js b/app/javascript/gabsocial/features/groups/sidebar_panel/item.js
index a4015c18..22ef3d91 100644
--- a/app/javascript/gabsocial/features/groups/sidebar_panel/item.js
+++ b/app/javascript/gabsocial/features/groups/sidebar_panel/item.js
@@ -30,15 +30,9 @@ class Item extends ImmutablePureComponent {
// Wait for relationships
if (!relationships) return null;
- const unreadCount = relationships.get('unread_count');
-
return (
{group.get('title')}
-
- {unreadCount > 0 && {shortNumberFormat(unreadCount)} {intl.formatMessage(messages.new_statuses)}}
- {unreadCount === 0 && {intl.formatMessage(messages.no_recent_activity)}}
-
);
}
diff --git a/app/models/concerns/group_interactions.rb b/app/models/concerns/group_interactions.rb
index e15e1836..a0833165 100644
--- a/app/models/concerns/group_interactions.rb
+++ b/app/models/concerns/group_interactions.rb
@@ -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
diff --git a/app/models/group_account.rb b/app/models/group_account.rb
index b5aa62bc..0f059eee 100644
--- a/app/models/group_account.rb
+++ b/app/models/group_account.rb
@@ -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
diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index 87b49822..54d9191a 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -6,7 +6,7 @@
# id :bigint(8) not null, primary key
# list_id :bigint(8) not null
# account_id :bigint(8) not null
-# follow_id :bigint(8) not null
+# follow_id :bigint(8) default(1)
#
class ListAccount < ApplicationRecord
diff --git a/app/models/status.rb b/app/models/status.rb
index 85aaf7e4..2524c7a4 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -25,6 +25,7 @@
# group_id :integer
# quote_of_id :bigint(8)
# revised_at :datetime
+# markdown :text
#
class Status < ApplicationRecord
@@ -266,7 +267,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
@@ -553,7 +553,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
diff --git a/app/presenters/group_relationships_presenter.rb b/app/presenters/group_relationships_presenter.rb
index b6e217d5..55466cf6 100644
--- a/app/presenters/group_relationships_presenter.rb
+++ b/app/presenters/group_relationships_presenter.rb
@@ -1,7 +1,7 @@
# 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
diff --git a/app/serializers/rest/group_relationship_serializer.rb b/app/serializers/rest/group_relationship_serializer.rb
index a420ddbc..ce875681 100644
--- a/app/serializers/rest/group_relationship_serializer.rb
+++ b/app/serializers/rest/group_relationship_serializer.rb
@@ -1,7 +1,7 @@
# 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
diff --git a/db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb b/db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb
new file mode 100644
index 00000000..bb9c6d59
--- /dev/null
+++ b/db/migrate/20200510034822_remove_unread_count_from_group_accounts.rb
@@ -0,0 +1,5 @@
+class RemoveUnreadCountFromGroupAccounts < ActiveRecord::Migration[5.2]
+ def change
+ safety_assured { remove_column :group_accounts, :unread_count, :integer }
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2570abba..ba38cf45 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_03_10_224203) 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_03_10_224203) 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_03_10_224203) 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", null: false
+ 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"
@@ -711,6 +710,7 @@ ActiveRecord::Schema.define(version: 2020_03_10_224203) do
t.integer "group_id"
t.bigint "quote_of_id"
t.datetime "revised_at"
+ t.text "markdown"
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
t.index ["group_id"], name: "index_statuses_on_group_id"
t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id"