Chuckya
+# 
Chuckya
Chuckya is a close-to-upstream soft fork of Mastodon Glitch Edition (more commonly known as glitch-soc) that aims to introduce more experimental features/fixes with the goal of making the overall experience more enjoyable. Although it's mainly developed for and used on the [wetdry.world](https://wetdry.world) instance, it can be deployed by any server admin as a drop-in, backwards-compatible replacement for Mastodon.
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index a6997b62f7..d7f88a71f3 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -13,6 +13,7 @@ module Admin
def show
authorize :instance, :show?
@time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+ @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(5)
end
def destroy
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 4f727c398a..4759d15bc4 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -2,7 +2,15 @@
module Admin
class TagsController < BaseController
- before_action :set_tag
+ before_action :set_tag, except: [:index]
+
+ PER_PAGE = 20
+
+ def index
+ authorize :tag, :index?
+
+ @tags = filtered_tags.page(params[:page]).per(PER_PAGE)
+ end
def show
authorize @tag, :show?
@@ -31,5 +39,13 @@ module Admin
def tag_params
params.require(:tag).permit(:name, :display_name, :trendable, :usable, :listable)
end
+
+ def filtered_tags
+ TagFilter.new(filter_params.with_defaults(order: 'newest')).results
+ end
+
+ def filter_params
+ params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS)
+ end
end
end
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index c1a5e43f88..0980e0ebbc 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -30,10 +30,10 @@ class Api::BaseController < ApplicationController
protected
- def limit_param(default_limit)
+ def limit_param(default_limit, max_limit = nil)
return default_limit unless params[:limit]
- [params[:limit].to_i.abs, default_limit * 2].min
+ [params[:limit].to_i.abs, max_limit || (default_limit * 2)].min
end
def params_slice(*keys)
diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index 9801d832b8..24f68aa1bd 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -5,6 +5,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
include AccountableConcern
LIMIT = 100
+ MAX_LIMIT = 500
before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_allows' }, only: [:index, :show]
before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_allows' }, except: [:index, :show]
@@ -47,18 +48,13 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
private
def set_domain_allows
- @domain_allows = filtered_domain_allows.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+ @domain_allows = DomainAllow.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id))
end
def set_domain_allow
@domain_allow = DomainAllow.find(params[:id])
end
- def filtered_domain_allows
- # TODO: no filtering yet
- DomainAllow.all
- end
-
def next_path
api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
end
@@ -72,7 +68,7 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
end
def records_continue?
- @domain_allows.size == limit_param(LIMIT)
+ @domain_allows.size == limit_param(LIMIT, MAX_LIMIT)
end
def resource_params
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index a20a4a9c7f..b44ae2ae2a 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -5,6 +5,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
include AccountableConcern
LIMIT = 100
+ MAX_LIMIT = 500
before_action -> { authorize_if_got_token! :'admin:read', :'admin:read:domain_blocks' }, only: [:index, :show]
before_action -> { authorize_if_got_token! :'admin:write', :'admin:write:domain_blocks' }, except: [:index, :show]
@@ -59,18 +60,13 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
end
def set_domain_blocks
- @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+ @domain_blocks = DomainBlock.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT, MAX_LIMIT), params_slice(:max_id, :since_id, :min_id))
end
def set_domain_block
@domain_block = DomainBlock.find(params[:id])
end
- def filtered_domain_blocks
- # TODO: no filtering yet
- DomainBlock.all
- end
-
def domain_block_params
params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
end
@@ -88,7 +84,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
end
def records_continue?
- @domain_blocks.size == limit_param(LIMIT)
+ @domain_blocks.size == limit_param(LIMIT, MAX_LIMIT)
end
def resource_params
diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
index 9ae80c28ed..b4207147c8 100644
--- a/app/controllers/api/v1/notifications/requests_controller.rb
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -5,7 +5,8 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
before_action :require_user!
- before_action :set_request, except: :index
+ before_action :set_request, only: [:show, :accept, :dismiss]
+ before_action :set_requests, only: [:accept_bulk, :dismiss_bulk]
after_action :insert_pagination_headers, only: :index
@@ -32,6 +33,16 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
render_empty
end
+ def accept_bulk
+ @requests.each { |request| AcceptNotificationRequestService.new.call(request) }
+ render_empty
+ end
+
+ def dismiss_bulk
+ @requests.each(&:destroy!)
+ render_empty
+ end
+
private
def load_requests
@@ -53,6 +64,10 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
@request = NotificationRequest.where(account: current_account).find(params[:id])
end
+ def set_requests
+ @requests = NotificationRequest.where(account: current_account, id: Array(params[:id]).uniq.map(&:to_i))
+ end
+
def next_path
api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
end
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index c82900ef66..bdc163d4b6 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -7,6 +7,8 @@ class Api::V1::NotificationsController < Api::BaseController
after_action :insert_pagination_headers, only: :index
DEFAULT_NOTIFICATIONS_LIMIT = 40
+ DEFAULT_NOTIFICATIONS_COUNT_LIMIT = 100
+ MAX_NOTIFICATIONS_COUNT_LIMIT = 1_000
def index
with_read_replica do
@@ -17,6 +19,14 @@ class Api::V1::NotificationsController < Api::BaseController
render json: @notifications, each_serializer: REST::NotificationSerializer, relationships: @relationships
end
+ def unread_count
+ limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT)
+
+ with_read_replica do
+ render json: { count: browserable_account_notifications.paginate_by_min_id(limit, notification_marker&.last_read_id).count }
+ end
+ end
+
def show
@notification = current_account.notifications.without_suspended.find(params[:id])
render json: @notification, serializer: REST::NotificationSerializer
@@ -63,6 +73,10 @@ class Api::V1::NotificationsController < Api::BaseController
)
end
+ def notification_marker
+ current_user.markers.find_by(timeline: 'notifications')
+ end
+
def target_statuses_from_notifications
@notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status)
end
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 300c9faa3f..72f358bb5b 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::ReportsController < Api::BaseController
@report = ReportService.new.call(
current_account,
reported_account,
- report_params
+ report_params.merge(application: doorkeeper_token.application)
)
render json: @report, serializer: REST::ReportSerializer
diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index edba23ab4a..837499e898 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -7,20 +7,49 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
after_action :insert_pagination_headers, only: :index
DEFAULT_NOTIFICATIONS_LIMIT = 40
+ DEFAULT_NOTIFICATIONS_COUNT_LIMIT = 100
+ MAX_NOTIFICATIONS_COUNT_LIMIT = 1_000
def index
with_read_replica do
@notifications = load_notifications
@group_metadata = load_group_metadata
+ @grouped_notifications = load_grouped_notifications
@relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+ @sample_accounts = @grouped_notifications.flat_map(&:sample_accounts)
+
+ # Preload associations to avoid N+1s
+ ActiveRecord::Associations::Preloader.new(records: @sample_accounts, associations: [:account_stat, { user: :role }]).call
end
- render json: @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+ MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#index rendering') do |span|
+ statuses = @grouped_notifications.filter_map { |group| group.target_status&.id }
+
+ span.add_attributes(
+ 'app.notification_grouping.count' => @grouped_notifications.size,
+ 'app.notification_grouping.sample_account.count' => @sample_accounts.size,
+ 'app.notification_grouping.sample_account.unique_count' => @sample_accounts.pluck(:id).uniq.size,
+ 'app.notification_grouping.status.count' => statuses.size,
+ 'app.notification_grouping.status.unique_count' => statuses.uniq.size
+ )
+
+ presenter = GroupedNotificationsPresenter.new(@grouped_notifications)
+ render json: presenter, serializer: REST::DedupNotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+ end
+ end
+
+ def unread_count
+ limit = limit_param(DEFAULT_NOTIFICATIONS_COUNT_LIMIT, MAX_NOTIFICATIONS_COUNT_LIMIT)
+
+ with_read_replica do
+ render json: { count: browserable_account_notifications.paginate_groups_by_min_id(limit, min_id: notification_marker&.last_read_id).count }
+ end
end
def show
@notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
- render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer
+ presenter = GroupedNotificationsPresenter.new([NotificationGroup.from_notification(@notification)])
+ render json: presenter, serializer: REST::DedupNotificationGroupSerializer
end
def clear
@@ -36,25 +65,35 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
private
def load_notifications
- notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
- limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
- params_slice(:max_id, :since_id, :min_id)
- )
+ MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_notifications') do
+ notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
+ limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
+ params_slice(:max_id, :since_id, :min_id)
+ )
- Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
- preload_collection(target_statuses, Status)
+ Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
+ preload_collection(target_statuses, Status)
+ end
end
end
def load_group_metadata
return {} if @notifications.empty?
- browserable_account_notifications
- .where(group_key: @notifications.filter_map(&:group_key))
- .where(id: (@notifications.last.id)..(@notifications.first.id))
- .group(:group_key)
- .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
- .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+ MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_group_metadata') do
+ browserable_account_notifications
+ .where(group_key: @notifications.filter_map(&:group_key))
+ .where(id: (@notifications.last.id)..(@notifications.first.id))
+ .group(:group_key)
+ .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
+ .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+ end
+ end
+
+ def load_grouped_notifications
+ MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
+ @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }
+ end
end
def browserable_account_notifications
@@ -65,6 +104,10 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
)
end
+ def notification_marker
+ current_user.markers.find_by(timeline: 'notifications')
+ end
+
def target_statuses_from_notifications
@notifications.filter_map(&:target_status)
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1d700fa282..9ec5092667 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,7 +23,6 @@ class ApplicationController < ActionController::Base
helper_method :current_theme
helper_method :single_user_mode?
helper_method :use_seamless_external_login?
- helper_method :omniauth_only?
helper_method :sso_account_settings
helper_method :limited_federation_mode?
helper_method :body_class_string
@@ -140,10 +139,6 @@ class ApplicationController < ActionController::Base
Devise.pam_authentication || Devise.ldap_authentication
end
- def omniauth_only?
- ENV['OMNIAUTH_ONLY'] == 'true'
- end
-
def sso_account_settings
ENV.fetch('SSO_ACCOUNT_SETTINGS', nil)
end
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 7ca7be5f8e..bf5c84ccf4 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -5,7 +5,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
layout 'auth'
- before_action :set_body_classes
before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
before_action :redirect_confirmed_user, if: :signed_in_confirmed_user?
@@ -73,10 +72,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
end
- def set_body_classes
- @body_classes = 'lighter'
- end
-
def after_resending_confirmation_instructions_path_for(_resource_name)
if user_signed_in?
if current_user.confirmed? && current_user.approved?
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index de001f062b..7c1ff59671 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -3,7 +3,6 @@
class Auth::PasswordsController < Devise::PasswordsController
skip_before_action :check_self_destruct!
before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid?
- before_action :set_body_classes
layout 'auth'
@@ -24,10 +23,6 @@ class Auth::PasswordsController < Devise::PasswordsController
redirect_to new_password_path(resource_name)
end
- def set_body_classes
- @body_classes = 'lighter'
- end
-
def reset_password_token_is_valid?
resource_class.with_reset_password_token(params[:reset_password_token]).present?
end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index e5a2ac0270..c12960934e 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -105,7 +105,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
private
def set_body_classes
- @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
+ @body_classes = 'admin' if %w(edit update).include?(action_name)
end
def set_invite
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 6ed7b2baac..6210e4dbf9 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -16,8 +16,6 @@ class Auth::SessionsController < Devise::SessionsController
include Auth::TwoFactorAuthenticationConcern
- before_action :set_body_classes
-
content_security_policy only: :new do |p|
p.form_action(false)
end
@@ -103,10 +101,6 @@ class Auth::SessionsController < Devise::SessionsController
private
- def set_body_classes
- @body_classes = 'lighter'
- end
-
def home_paths(resource)
paths = [about_path, '/explore']
diff --git a/app/controllers/auth/setup_controller.rb b/app/controllers/auth/setup_controller.rb
index 40916d2887..ad872dc607 100644
--- a/app/controllers/auth/setup_controller.rb
+++ b/app/controllers/auth/setup_controller.rb
@@ -5,7 +5,6 @@ class Auth::SetupController < ApplicationController
before_action :authenticate_user!
before_action :require_unconfirmed_or_pending!
- before_action :set_body_classes
before_action :set_user
skip_before_action :require_functional!
@@ -35,10 +34,6 @@ class Auth::SetupController < ApplicationController
@user = current_user
end
- def set_body_classes
- @body_classes = 'lighter'
- end
-
def user_params
params.require(:user).permit(:email)
end
diff --git a/app/controllers/concerns/auth/two_factor_authentication_concern.rb b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
index 404164751a..0fb11428dc 100644
--- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
@@ -83,7 +83,6 @@ module Auth::TwoFactorAuthenticationConcern
def prompt_for_two_factor(user)
register_attempt_in_session(user)
- @body_classes = 'lighter'
@webauthn_enabled = user.webauthn_enabled?
@scheme_type = if user.webauthn_enabled? && user_params[:otp_attempt].blank?
'webauthn'
diff --git a/app/controllers/concerns/challengable_concern.rb b/app/controllers/concerns/challengable_concern.rb
index 09874fb405..c8d1a0bef7 100644
--- a/app/controllers/concerns/challengable_concern.rb
+++ b/app/controllers/concerns/challengable_concern.rb
@@ -42,7 +42,6 @@ module ChallengableConcern
end
def render_challenge
- @body_classes = 'lighter'
render 'auth/challenges/new', layout: 'auth'
end
diff --git a/app/controllers/mail_subscriptions_controller.rb b/app/controllers/mail_subscriptions_controller.rb
index 1caeaaacf4..34df75f63a 100644
--- a/app/controllers/mail_subscriptions_controller.rb
+++ b/app/controllers/mail_subscriptions_controller.rb
@@ -5,7 +5,6 @@ class MailSubscriptionsController < ApplicationController
skip_before_action :require_functional!
- before_action :set_body_classes
before_action :set_user
before_action :set_type
@@ -25,10 +24,6 @@ class MailSubscriptionsController < ApplicationController
not_found unless @user
end
- def set_body_classes
- @body_classes = 'lighter'
- end
-
def set_type
@type = email_type_from_param
end
diff --git a/app/helpers/admin/tags_helper.rb b/app/helpers/admin/tags_helper.rb
new file mode 100644
index 0000000000..eb928a6db2
--- /dev/null
+++ b/app/helpers/admin/tags_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Admin::TagsHelper
+ def admin_tags_moderation_options
+ [
+ [t('admin.tags.moderation.reviewed'), 'reviewed'],
+ [t('admin.tags.moderation.review_requested'), 'review_requested'],
+ [t('admin.tags.moderation.unreviewed'), 'unreviewed'],
+ [t('admin.tags.moderation.trendable'), 'trendable'],
+ [t('admin.tags.moderation.not_trendable'), 'not_trendable'],
+ [t('admin.tags.moderation.usable'), 'usable'],
+ [t('admin.tags.moderation.not_usable'), 'not_usable'],
+ ]
+ end
+end
diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
index bb8ef4547c..c5d226f70e 100644
--- a/app/helpers/theme_helper.rb
+++ b/app/helpers/theme_helper.rb
@@ -5,8 +5,10 @@ module ThemeHelper
flavour, theme = flavour_and_skin
if theme == 'system'
- stylesheet_pack_tag("skins/#{flavour}/mastodon-light", media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') +
- stylesheet_pack_tag("skins/#{flavour}/default", media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+ ''.html_safe.tap do |tags|
+ tags << stylesheet_pack_tag("skins/#{flavour}/mastodon-light", media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
+ tags << stylesheet_pack_tag("skins/#{flavour}/default", media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+ end
else
stylesheet_pack_tag "skins/#{flavour}/#{theme}", media: 'all', crossorigin: 'anonymous'
end
@@ -16,8 +18,10 @@ module ThemeHelper
_, theme = flavour_and_skin
if theme == 'system'
- tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') +
- tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+ ''.html_safe.tap do |tags|
+ tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)')
+ tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+ end
else
tag.meta name: 'theme-color', content: theme_color_for(theme)
end
diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
index 40a9b7c0ca..149c1d28d0 100644
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@@ -316,8 +316,8 @@ function loaded() {
const message =
statusEl.dataset.spoiler === 'expanded'
- ? localeData['status.show_less'] ?? 'Show less'
- : localeData['status.show_more'] ?? 'Show more';
+ ? (localeData['status.show_less'] ?? 'Show less')
+ : (localeData['status.show_more'] ?? 'Show more');
spoilerLink.textContent = new IntlMessageFormat(
message,
locale,
diff --git a/app/javascript/flavours/glitch/actions/accounts.js b/app/javascript/flavours/glitch/actions/accounts.js
index 7c31c16998..699b92dd09 100644
--- a/app/javascript/flavours/glitch/actions/accounts.js
+++ b/app/javascript/flavours/glitch/actions/accounts.js
@@ -1,3 +1,5 @@
+import { browserHistory } from 'flavours/glitch/components/router';
+
import api, { getLinks } from '../api';
import {
@@ -722,6 +724,16 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable,
});
};
+export const navigateToProfile = (accountId) => {
+ return (_dispatch, getState) => {
+ const acct = getState().accounts.getIn([accountId, 'acct']);
+
+ if (acct) {
+ browserHistory.push(`/@${acct}`);
+ }
+ };
+};
+
export function fetchPinnedAccountsSuggestions(q) {
return (dispatch) => {
dispatch(fetchPinnedAccountsSuggestionsRequest());
diff --git a/app/javascript/flavours/glitch/actions/app.ts b/app/javascript/flavours/glitch/actions/app.ts
index 6fbfc07f68..be1a5cced2 100644
--- a/app/javascript/flavours/glitch/actions/app.ts
+++ b/app/javascript/flavours/glitch/actions/app.ts
@@ -2,6 +2,9 @@ import { createAction } from '@reduxjs/toolkit';
import type { LayoutType } from '../is_mobile';
+export const focusApp = createAction('APP_FOCUS');
+export const unfocusApp = createAction('APP_UNFOCUS');
+
interface ChangeLayoutPayload {
layout: LayoutType;
}
diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index f0da25b5dc..dd89f7cdd8 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -4,6 +4,7 @@ import axios from 'axios';
import { throttle } from 'lodash';
import api from 'flavours/glitch/api';
+import { browserHistory } from 'flavours/glitch/components/router';
import { search as emojiSearch } from 'flavours/glitch/features/emoji/emoji_mart_search_light';
import { tagHistory } from 'flavours/glitch/settings';
import { recoverHashtags } from 'flavours/glitch/utils/hashtag';
@@ -94,9 +95,9 @@ const messages = defineMessages({
saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' },
});
-export const ensureComposeIsVisible = (getState, routerHistory) => {
+export const ensureComposeIsVisible = (getState) => {
if (!getState().getIn(['compose', 'mounted'])) {
- routerHistory.push('/publish');
+ browserHistory.push('/publish');
}
};
@@ -117,7 +118,7 @@ export function changeCompose(text) {
};
}
-export function replyCompose(status, routerHistory) {
+export function replyCompose(status) {
return (dispatch, getState) => {
const prependCWRe = getState().getIn(['local_settings', 'prepend_cw_re']);
dispatch({
@@ -126,7 +127,19 @@ export function replyCompose(status, routerHistory) {
prependCWRe: prependCWRe,
});
- ensureComposeIsVisible(getState, routerHistory);
+ ensureComposeIsVisible(getState);
+ };
+}
+
+export function replyComposeById(statusId) {
+ return (dispatch, getState) => {
+ const state = getState();
+ const status = state.statuses.get(statusId);
+
+ if (status) {
+ const account = state.accounts.get(status.get('account'));
+ dispatch(replyCompose(status.set('account', account)));
+ }
};
}
@@ -142,38 +155,44 @@ export function resetCompose() {
};
}
-export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => {
+export const focusCompose = (defaultText) => (dispatch, getState) => {
dispatch({
type: COMPOSE_FOCUS,
defaultText,
});
- ensureComposeIsVisible(getState, routerHistory);
+ ensureComposeIsVisible(getState);
};
-export function mentionCompose(account, routerHistory) {
+export function mentionCompose(account) {
return (dispatch, getState) => {
dispatch({
type: COMPOSE_MENTION,
account: account,
});
- ensureComposeIsVisible(getState, routerHistory);
+ ensureComposeIsVisible(getState);
};
}
-export function directCompose(account, routerHistory) {
+export function mentionComposeById(accountId) {
+ return (dispatch, getState) => {
+ dispatch(mentionCompose(getState().accounts.get(accountId)));
+ };
+}
+
+export function directCompose(account) {
return (dispatch, getState) => {
dispatch({
type: COMPOSE_DIRECT,
account: account,
});
- ensureComposeIsVisible(getState, routerHistory);
+ ensureComposeIsVisible(getState);
};
}
-export function submitCompose(routerHistory, overridePrivacy = null) {
+export function submitCompose(overridePrivacy = null) {
return function (dispatch, getState) {
let status = getState().getIn(['compose', 'text'], '');
const media = getState().getIn(['compose', 'media_attachments']);
@@ -230,11 +249,10 @@ export function submitCompose(routerHistory, overridePrivacy = null) {
'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
},
}).then(function (response) {
- if (routerHistory
- && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new')
+ if ((browserHistory.location.pathname === '/publish' || browserHistory.location.pathname === '/statuses/new')
&& window.history.state
&& !getState().getIn(['compose', 'advanced_options', 'threaded_mode'])) {
- routerHistory.goBack();
+ browserHistory.goBack();
}
dispatch(insertIntoTagHistory(response.data.tags, status));
@@ -272,7 +290,7 @@ export function submitCompose(routerHistory, overridePrivacy = null) {
message: statusId === null ? messages.published : messages.saved,
action: messages.open,
dismissAfter: 10000,
- onClick: () => routerHistory.push(`/@${response.data.account.username}/${response.data.id}`),
+ onClick: () => browserHistory.push(`/@${response.data.account.username}/${response.data.id}`),
}));
}
}).catch(function (error) {
diff --git a/app/javascript/flavours/glitch/actions/interactions.js b/app/javascript/flavours/glitch/actions/interactions.js
index 0b4d11cf43..db9b5a2dbd 100644
--- a/app/javascript/flavours/glitch/actions/interactions.js
+++ b/app/javascript/flavours/glitch/actions/interactions.js
@@ -1,7 +1,11 @@
+import { boostModal, favouriteModal } from 'flavours/glitch/initial_state';
+
import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts';
import { importFetchedAccounts, importFetchedStatus } from './importer';
+import { unreblog, reblog } from './interactions_typed';
+import { openModal } from './modal';
export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST';
export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
@@ -443,6 +447,64 @@ export function unpinFail(status, error) {
};
}
+function toggleReblogWithoutConfirmation(status, privacy) {
+ return (dispatch) => {
+ if (status.get('reblogged')) {
+ dispatch(unreblog({ statusId: status.get('id') }));
+ } else {
+ dispatch(reblog({ statusId: status.get('id'), privacy }));
+ }
+ };
+}
+
+export function toggleReblog(statusId, skipModal = false) {
+ return (dispatch, getState) => {
+ const state = getState();
+ let status = state.statuses.get(statusId);
+
+ if (!status)
+ return;
+
+ // The reblog modal expects a pre-filled account in status
+ // TODO: fix this by having the reblog modal get a statusId and do the work itself
+ status = status.set('account', state.accounts.get(status.get('account')));
+
+ const missing_description_setting = state.getIn(['local_settings', 'confirm_boost_missing_media_description']);
+ const missing_description = status.get('media_attachments').some(item => !item.get('description'));
+ if (missing_description_setting && missing_description && !status.get('reblogged')) {
+ dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: (status, privacy) => dispatch(toggleReblogWithoutConfirmation(status, privacy)), missingMediaDescription: true } }));
+ } else if (boostModal && !skipModal) {
+ dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: (status, privacy) => dispatch(toggleReblogWithoutConfirmation(status, privacy)) } }));
+ } else {
+ dispatch(toggleReblogWithoutConfirmation(status));
+ }
+ };
+}
+
+export function toggleFavourite(statusId, skipModal = false) {
+ return (dispatch, getState) => {
+ const state = getState();
+ let status = state.statuses.get(statusId);
+
+ if (!status)
+ return;
+
+ // The favourite modal expects a pre-filled account in status
+ // TODO: fix this by having the reblog modal get a statusId and do the work itself
+ status = status.set('account', state.accounts.get(status.get('account')));
+
+ if (status.get('favourited')) {
+ dispatch(unfavourite(status));
+ } else {
+ if (favouriteModal && !skipModal) {
+ dispatch(openModal({ modalType: 'FAVOURITE', modalProps: { status, onFavourite: (status) => dispatch(favourite(status)) } }));
+ } else {
+ dispatch(favourite(status));
+ }
+ }
+ };
+}
+
export const addReaction = (statusId, name, url) => (dispatch, getState) => {
const status = getState().get('statuses').get(statusId);
let alreadyAdded = false;
diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index a85af1c4be..861eae41ec 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -75,9 +75,17 @@ interface MarkerParam {
}
function getLastNotificationId(state: RootState): string | undefined {
- // @ts-expect-error state.notifications is not yet typed
- // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
- return state.getIn(['notifications', 'lastReadId']);
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+ const enableBeta = state.settings.getIn(
+ ['notifications', 'groupingBeta'],
+ false,
+ ) as boolean;
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+ return enableBeta
+ ? state.notificationGroups.lastReadId
+ : // @ts-expect-error state.notifications is not yet typed
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+ state.getIn(['notifications', 'lastReadId']);
}
const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
new file mode 100644
index 0000000000..e034792275
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -0,0 +1,144 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import {
+ apiClearNotifications,
+ apiFetchNotifications,
+} from 'flavours/glitch/api/notifications';
+import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
+import type {
+ ApiNotificationGroupJSON,
+ ApiNotificationJSON,
+} from 'flavours/glitch/api_types/notifications';
+import { allNotificationTypes } from 'flavours/glitch/api_types/notifications';
+import type { ApiStatusJSON } from 'flavours/glitch/api_types/statuses';
+import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
+import {
+ selectSettingsNotificationsExcludedTypes,
+ selectSettingsNotificationsQuickFilterActive,
+} from 'flavours/glitch/selectors/settings';
+import type { AppDispatch } from 'flavours/glitch/store';
+import {
+ createAppAsyncThunk,
+ createDataLoadingThunk,
+} from 'flavours/glitch/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { NOTIFICATIONS_FILTER_SET } from './notifications';
+import { saveSettings } from './settings';
+
+function excludeAllTypesExcept(filter: string) {
+ return allNotificationTypes.filter((item) => item !== filter);
+}
+
+function dispatchAssociatedRecords(
+ dispatch: AppDispatch,
+ notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+ const fetchedAccounts: ApiAccountJSON[] = [];
+ const fetchedStatuses: ApiStatusJSON[] = [];
+
+ notifications.forEach((notification) => {
+ if (notification.type === 'admin.report') {
+ fetchedAccounts.push(notification.report.target_account);
+ }
+
+ if (notification.type === 'moderation_warning') {
+ fetchedAccounts.push(notification.moderation_warning.target_account);
+ }
+
+ if ('status' in notification) {
+ fetchedStatuses.push(notification.status);
+ }
+ });
+
+ if (fetchedAccounts.length > 0)
+ dispatch(importFetchedAccounts(fetchedAccounts));
+
+ if (fetchedStatuses.length > 0)
+ dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotifications = createDataLoadingThunk(
+ 'notificationGroups/fetch',
+ async (_params, { getState }) => {
+ const activeFilter =
+ selectSettingsNotificationsQuickFilterActive(getState());
+
+ return apiFetchNotifications({
+ exclude_types:
+ activeFilter === 'all'
+ ? selectSettingsNotificationsExcludedTypes(getState())
+ : excludeAllTypesExcept(activeFilter),
+ });
+ },
+ ({ notifications, accounts, statuses }, { dispatch }) => {
+ dispatch(importFetchedAccounts(accounts));
+ dispatch(importFetchedStatuses(statuses));
+ dispatchAssociatedRecords(dispatch, notifications);
+ const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
+ notifications;
+
+ // TODO: might be worth not using gaps for that…
+ // if (nextLink) payload.push({ type: 'gap', loadUrl: nextLink.uri });
+ if (notifications.length > 1)
+ payload.push({ type: 'gap', maxId: notifications.at(-1)?.page_min_id });
+
+ return payload;
+ // dispatch(submitMarkers());
+ },
+);
+
+export const fetchNotificationsGap = createDataLoadingThunk(
+ 'notificationGroups/fetchGap',
+ async (params: { gap: NotificationGap }) =>
+ apiFetchNotifications({ max_id: params.gap.maxId }),
+
+ ({ notifications, accounts, statuses }, { dispatch }) => {
+ dispatch(importFetchedAccounts(accounts));
+ dispatch(importFetchedStatuses(statuses));
+ dispatchAssociatedRecords(dispatch, notifications);
+
+ return { notifications };
+ },
+);
+
+export const processNewNotificationForGroups = createAppAsyncThunk(
+ 'notificationGroups/processNew',
+ (notification: ApiNotificationJSON, { dispatch }) => {
+ dispatchAssociatedRecords(dispatch, [notification]);
+
+ return notification;
+ },
+);
+
+export const loadPending = createAction('notificationGroups/loadPending');
+
+export const updateScrollPosition = createAction<{ top: boolean }>(
+ 'notificationGroups/updateScrollPosition',
+);
+
+export const setNotificationsFilter = createAppAsyncThunk(
+ 'notifications/filter/set',
+ ({ filterType }: { filterType: string }, { dispatch }) => {
+ dispatch({
+ type: NOTIFICATIONS_FILTER_SET,
+ path: ['notifications', 'quickFilter', 'active'],
+ value: filterType,
+ });
+ // dispatch(expandNotifications({ forceLoad: true }));
+ void dispatch(fetchNotifications());
+ dispatch(saveSettings());
+ },
+);
+
+export const clearNotifications = createDataLoadingThunk(
+ 'notifications/clear',
+ () => apiClearNotifications(),
+);
+
+export const markNotificationsAsRead = createAction(
+ 'notificationGroups/markAsRead',
+);
+
+export const mountNotifications = createAction('notificationGroups/mount');
+export const unmountNotifications = createAction('notificationGroups/unmount');
diff --git a/app/javascript/flavours/glitch/actions/notification_policies.ts b/app/javascript/flavours/glitch/actions/notification_policies.ts
index 76452de324..65b9882d3b 100644
--- a/app/javascript/flavours/glitch/actions/notification_policies.ts
+++ b/app/javascript/flavours/glitch/actions/notification_policies.ts
@@ -1,3 +1,5 @@
+import { createAction } from '@reduxjs/toolkit';
+
import {
apiGetNotificationPolicy,
apiUpdateNotificationsPolicy,
@@ -14,3 +16,7 @@ export const updateNotificationsPolicy = createDataLoadingThunk(
'notificationPolicy/update',
(policy: Partial
+ {counter}
+
+ )}
);
};
diff --git a/app/javascript/flavours/glitch/components/domain.tsx b/app/javascript/flavours/glitch/components/domain.tsx
index ed5e8e7e4c..e3eec2bd9b 100644
--- a/app/javascript/flavours/glitch/components/domain.tsx
+++ b/app/javascript/flavours/glitch/components/domain.tsx
@@ -3,6 +3,8 @@ import { useCallback } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
+import { unblockDomain } from 'flavours/glitch/actions/domain_blocks';
+import { useAppDispatch } from 'flavours/glitch/store';
import { IconButton } from './icon_button';
@@ -13,17 +15,15 @@ const messages = defineMessages({
},
});
-interface Props {
+export const Domain: React.FC<{
domain: string;
- onUnblockDomain: (domain: string) => void;
-}
-
-export const Domain: React.FC
diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
index 26c828fd64..051ae6299a 100644
--- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
@@ -20,7 +20,7 @@ let id = 0;
class DropdownMenu extends PureComponent {
static propTypes = {
- items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+ items: PropTypes.array.isRequired,
loading: PropTypes.bool,
scrollable: PropTypes.bool,
onClose: PropTypes.func.isRequired,
@@ -39,6 +39,7 @@ class DropdownMenu extends PureComponent {
if (this.node && !this.node.contains(e.target)) {
this.props.onClose();
e.stopPropagation();
+ e.preventDefault();
}
};
@@ -164,7 +165,7 @@ class Dropdown extends PureComponent {
children: PropTypes.node,
icon: PropTypes.string,
iconComponent: PropTypes.func,
- items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
+ items: PropTypes.array.isRequired,
loading: PropTypes.bool,
size: PropTypes.number,
title: PropTypes.string,
diff --git a/app/javascript/flavours/glitch/components/follow_button.tsx b/app/javascript/flavours/glitch/components/follow_button.tsx
index a6b2064703..a27872c1aa 100644
--- a/app/javascript/flavours/glitch/components/follow_button.tsx
+++ b/app/javascript/flavours/glitch/components/follow_button.tsx
@@ -1,12 +1,11 @@
import { useCallback, useEffect } from 'react';
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
import { useIdentity } from '@/flavours/glitch/identity_context';
import {
fetchRelationships,
followAccount,
- unfollowAccount,
} from 'flavours/glitch/actions/accounts';
import { openModal } from 'flavours/glitch/actions/modal';
import { Button } from 'flavours/glitch/components/button';
@@ -59,29 +58,14 @@ export const FollowButton: React.FC<{
if (accountId === me) {
return;
- } else if (relationship.following || relationship.requested) {
+ } else if (account && (relationship.following || relationship.requested)) {
dispatch(
- openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: (
- @{account?.acct} }}
- />
- ),
- confirm: intl.formatMessage(messages.unfollow),
- onConfirm: () => {
- dispatch(unfollowAccount(accountId));
- },
- },
- }),
+ openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
);
} else {
dispatch(followAccount(accountId));
}
- }, [dispatch, intl, accountId, relationship, account, signedIn]);
+ }, [dispatch, accountId, relationship, account, signedIn]);
let label;
diff --git a/app/javascript/flavours/glitch/components/load_gap.tsx b/app/javascript/flavours/glitch/components/load_gap.tsx
index f0d15d3776..1870185c29 100644
--- a/app/javascript/flavours/glitch/components/load_gap.tsx
+++ b/app/javascript/flavours/glitch/components/load_gap.tsx
@@ -9,18 +9,18 @@ const messages = defineMessages({
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
});
-interface Props {
+interface Props {
disabled: boolean;
- maxId: string;
- onClick: (maxId: string) => void;
+ param: T;
+ onClick: (params: T) => void;
}
-export const LoadGap: React.FC = ({ disabled, maxId, onClick }) => {
+export const LoadGap = ({ disabled, param, onClick }: Props) => {
const intl = useIntl();
const handleClick = useCallback(() => {
- onClick(maxId);
- }, [maxId, onClick]);
+ onClick(param);
+ }, [param, onClick]);
return (