Skip to content

Bugfix #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kirankarki merged 3 commits into from
Jul 22, 2025
Merged

Bugfix #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86876c4
fix: hashtag relay & conitibutor count
Jul 22, 2025
5c67e5f
[bugfix] fix communities and Hubs list table max-width in dashboard’
NangKhatMang Jul 22, 2025
baac2ca
Remove un-required logic
kirankarki Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions app/controllers/community_hashtags_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@ def create
def update
begin
community_hashtag = CommunityHashtag.find(params[:id])
old_hashtag = community_hashtag.hashtag
form_community_hashtag_params = params.require(:form_community_hashtag).permit(:hashtag)

perform_hashtag_action(community_hashtag.hashtag, nil, :unfollow)
hashtag = form_community_hashtag_params[:hashtag].gsub('#', '')
community_hashtag.assign_attributes(hashtag: hashtag, name: hashtag)
community_hashtag.save!
perform_hashtag_action(community_hashtag.hashtag, nil, :follow)

new_hashtag = form_community_hashtag_params[:hashtag].gsub('#', '')

if old_hashtag != new_hashtag
perform_hashtag_action(old_hashtag, params[:community_id], :unfollow)
community_hashtag.assign_attributes(hashtag: new_hashtag, name: new_hashtag)
community_hashtag.save!
perform_hashtag_action(new_hashtag, nil, :follow)
end

flash[:notice] = "Hashtag updated successfully!"
rescue CommunityHashtagPostService::InvalidHashtagError => e
flash[:error] = e.message
Expand Down
3 changes: 2 additions & 1 deletion app/views/communities/_form_step3.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
.row
.col
%label
= "Your channel contributors (#{@follow_records.present? ? @follow_records_size : 0})"
- filtered_follow_records = @follow_records.present? ? @follow_records.reject { |r| r.username == 'bsky.brid.gy' } : []
= "Your channel contributors (#{filtered_follow_records.size})"
.col-auto.d-flex.flex-column.justify-content-end
.mt-auto
%button.btn.btn-outline-secondary{title: 'Add a contributor', "data-toggle" => "modal", "data-target" => "#addContributorModal"} Add new
Expand Down
124 changes: 62 additions & 62 deletions app/views/communities/index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,72 +29,72 @@

.card-body
%p.text-muted Here you can see a list of all the #{title.downcase} on your server. From this dashboard, you can easily import #{title.downcase} hosted on other servers, create new ones hosted here or manage your existing #{title.downcase}.
%table.table.no-side-borders.top-bottom-border{data: {url: accounts_url, type: 'account'}}
%thead
%tr
%th.align-left{ style: "width: 40px;" }
= check_box_tag :select_all, '', false, id: 'select_all'
%th{ style: "width: 80px;"} #{title}
%th{ style: "width: 100px;"} Username
- if channel_type_param.eql?('channel') || channel_type_param.eql?('hub')
%th{ style: "width: 100px;"} Address
%th{ style: "width: 50px;"} Followers
%th{ style: "width: 100px;"} Type
%th{ style: "width: 110px;"} Status
%th{ style: "width: 80px;"} Actions
%tbody
- if @records.size == 0
.table-responsive
%table.table.no-side-borders.top-bottom-border{data: {url: accounts_url, type: 'account'}}
%thead
%tr
%td.text-center.info-box-content{colspan: "100%"}
%p.text-muted.small You haven’t added any #{title.downcase} yet
- unless hide_add_button
%a.text-danger.small{ href: create_path } Click here to add one
- @records.each do |community|
- account = community&.community_admins&.first&.account
%tr
%td.text-center{ style: "width: 40px;" }
= check_box_tag "selected_communities[]", community.id, false, class: 'select_community'
%td{ style: "width: 80px;"}= community.name
%td{ style: "width: 100px;"}
- if account.present?
%span.copyable-text{title: "Click to copy", style: "cursor: pointer;", onclick: "copyToClipboard('#{account_url(account)}')"}= "@#{username(account)}@#{domain(account)}"
- else
%span.text-muted -
%th.align-left{ style: "width: 40px;" }
= check_box_tag :select_all, '', false, id: 'select_all'
%th{ style: "width: 80px;"} #{title}
%th{ style: "width: 100px;"} Username
- if channel_type_param.eql?('channel') || channel_type_param.eql?('hub')
%th{ style: "width: 100px;"} Address
%th{ style: "width: 50px;"} Followers
%th{ style: "width: 100px;"} Type
%th{ style: "width: 110px;"} Status
%th{ style: "width: 80px;"} Actions
%tbody
- if @records.size == 0
%tr
%td.text-center.info-box-content{colspan: "100%"}
%p.text-muted.small You haven’t added any #{title.downcase} yet
- unless hide_add_button
%a.text-danger.small{ href: create_path } Click here to add one
- @records.each do |community|
- account = community&.community_admins&.first&.account
%tr
%td.text-center{ style: "width: 40px;" }
= check_box_tag "selected_communities[]", community.id, false, class: 'select_community'
%td{ style: "width: 80px;"}= community.name
%td{ style: "width: 100px;"}
- if address_url(community).present?
%p
= link_to address_url(community).sub('/public', ''), address_url(community), target: '_blank'
- if account.present?
%span.copyable-text{title: "Click to copy", style: "cursor: pointer;", onclick: "copyToClipboard('#{account_url(account)}')"}= "@#{username(account)}@#{domain(account)}"
- else
%p.text-muted -
%td{ style: "width: 50px;"}
- if account&.follower_count && account&.follower_count > 0
%a{ href: follower_list_community_url(id: community), title: "view followers", style: "display: flex; align-items: center;" }
= image_tag("icons/eye.svg", width: "20", height: "20", style: "margin-right: 5px;")
= account&.follower_count
- else
%a{ href: "#", title: "no followers", style: "display: flex; align-items: center; pointer-events: none; color: gray !important;" }
= image_tag("icons/eye.svg", width: "20", height: "20", style: "margin-right: 5px;")
0
%td{ style: "width: 100px;"}= get_channel_content_type(community)
%td{ style: "width: 110px;"}
- if community.visibility.present?
%span.badge.badge-pill.badge-success Complete
- else
%span.badge.badge-pill.badge-warning Incomplete
%td{ style: "width: 80px;"}
- if community.deleted_at.present?
= link_to recover_community_path(community, channel_type_param: channel_type_param), method: :post, data: { confirm: "Are you sure you want to recover this #{keyword}?" } do
= image_tag("icons/recover.svg", title: "Recover", class: "ml-2", width: "16", height: "16")
- else
= link_to edit_community_path(channel_type_param, community) do
= image_tag("icons/edit-btn.svg", title: "Edit", class: "ml-2", width: "16", height: "16")
= link_to community_path(community, channel_type_param: channel_type_param), method: :delete, data: { confirm: "Are you sure you want to delete this #{keyword}?" } do
= image_tag("icons/trash-can.svg", title: "Delete", class: "ml-2", width: "16", height: "16")
- if community.channel_type == 'channel_feed'
= link_to upgrade_community_path(community), method: :post, data: { confirm: "Are you sure you want to upgrade this channel to a community?" } do
= image_tag("icons/upgrade.svg", title: "Upgrade to Community", class: "ml-2", width: "16", height: "16")

%span.text-muted -
- if channel_type_param.eql?('channel') || channel_type_param.eql?('hub')
%td{ style: "width: 100px;"}
- if address_url(community).present?
%p
= link_to address_url(community).sub('/public', ''), address_url(community), target: '_blank'
- else
%p.text-muted -
%td{ style: "width: 50px;"}
- if account&.follower_count && account&.follower_count > 0
%a{ href: follower_list_community_url(id: community), title: "view followers", style: "display: flex; align-items: center;" }
= image_tag("icons/eye.svg", width: "20", height: "20", style: "margin-right: 5px;")
= account&.follower_count
- else
%a{ href: "#", title: "no followers", style: "display: flex; align-items: center; pointer-events: none; color: gray !important;" }
= image_tag("icons/eye.svg", width: "20", height: "20", style: "margin-right: 5px;")
0
%td{ style: "width: 100px;"}= get_channel_content_type(community)
%td{ style: "width: 110px;"}
- if community.visibility.present?
%span.badge.badge-pill.badge-success Complete
- else
%span.badge.badge-pill.badge-warning Incomplete
%td{ style: "width: 80px;"}
- if community.deleted_at.present?
= link_to recover_community_path(community, channel_type_param: channel_type_param), method: :post, data: { confirm: "Are you sure you want to recover this #{keyword}?" } do
= image_tag("icons/recover.svg", title: "Recover", class: "ml-2", width: "16", height: "16")
- else
= link_to edit_community_path(channel_type_param, community) do
= image_tag("icons/edit-btn.svg", title: "Edit", class: "ml-2", width: "16", height: "16")
= link_to community_path(community, channel_type_param: channel_type_param), method: :delete, data: { confirm: "Are you sure you want to delete this #{keyword}?" } do
= image_tag("icons/trash-can.svg", title: "Delete", class: "ml-2", width: "16", height: "16")
- if community.channel_type == 'channel_feed'
= link_to upgrade_community_path(community), method: :post, data: { confirm: "Are you sure you want to upgrade this channel to a community?" } do
= image_tag("icons/upgrade.svg", title: "Upgrade to Community", class: "ml-2", width: "16", height: "16")

- if master_admin?
.row.mt-2
Expand Down