gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'kb_lts' into kb_development

Browse source
This commit is contained in:
KMY 2023-09-24 12:30:59 +09:00
commit 0a42f4b7e2
5 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/reducers/bookmark_categories.js
View file

@ -116,7 +116,6 @@ export default function bookmarkCategories(state = initialState, action) {
case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS: case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS:
return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next); return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next);
case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS: case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS:
console.log('HERE')
return prependToBookmarkCategoryStatusesById(state, action.bookmarkCategoryId, action.statusId); return prependToBookmarkCategoryStatusesById(state, action.bookmarkCategoryId, action.statusId);
case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS: case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS:
return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId); return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId);

2
app/lib/activitypub/activity/create.rb
View file

@ -559,7 +559,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
info = instance_info info = instance_info
return false if info.nil? return false if info.nil?
%w(misskey calckey meisskey).include?(info.software) %w(misskey calckey).include?(info.software)
end end
def misskey_searchability def misskey_searchability

2
app/lib/status_reach_finder.rb
View file

@ -159,7 +159,7 @@ class StatusReachFinder
def banned_domains_for_misskey_of_status(status) def banned_domains_for_misskey_of_status(status)
return [] unless (status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) || (status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription) return [] unless (status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) || (status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription)
from_info = InstanceInfo.where(software: %w(misskey calckey meisskey)).pluck(:domain) from_info = InstanceInfo.where(software: %w(misskey calckey)).pluck(:domain)
from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain) from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
(from_info + from_domain_block).uniq (from_info + from_domain_block).uniq
end end

2
app/services/activitypub/process_account_service.rb
View file

@ -305,7 +305,7 @@ class ActivityPub::ProcessAccountService < BaseService
info = instance_info info = instance_info
return false if info.nil? return false if info.nil?
%w(misskey calckey meisskey).include?(info.software) %w(misskey calckey).include?(info.software)
end end
def subscribable_by def subscribable_by

2
lib/tasks/mastodon.rake
View file

@ -426,7 +426,7 @@ namespace :mastodon do
prompt.say "\n" prompt.say "\n"
env['UPDATE_CHECK_URL'] = '' unless prompt.yes?('Do you want Mastodon to periodically check for important updates and notify you? (Recommended)', default: true) env['UPDATE_CHECK_URL'] = '' unless prompt.yes?('Do you want kmyblue to periodically check for important updates and notify you? (Recommended)', default: true)
prompt.say "\n" prompt.say "\n"
prompt.say 'This configuration will be written to .env.production' prompt.say 'This configuration will be written to .env.production'