Merge branch 'kb_lts' into kb_development

kmycode · Sep 24, 2023 · 0a42f4b · 0a42f4b
2 parents 70258ea + a8f02d0
commit 0a42f4b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/app/javascript/mastodon/reducers/bookmark_categories.js b/app/javascript/mastodon/reducers/bookmark_categories.js
@@ -116,7 +116,6 @@ export default function bookmarkCategories(state = initialState, action) {
   case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS:
     return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next);
   case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS:
-    console.log('HERE')
     return prependToBookmarkCategoryStatusesById(state, action.bookmarkCategoryId, action.statusId);
   case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS:
     return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId);

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
@@ -559,7 +559,7 @@ def misskey_software?
     info = instance_info
     return false if info.nil?
 
-    %w(misskey calckey meisskey).include?(info.software)
+    %w(misskey calckey).include?(info.software)
   end
 
   def misskey_searchability

diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
@@ -159,7 +159,7 @@ def banned_domains_for_misskey
   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)
 
-    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_info + from_domain_block).uniq
   end

diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
@@ -305,7 +305,7 @@ def misskey_software?
     info = instance_info
     return false if info.nil?
 
-    %w(misskey calckey meisskey).include?(info.software)
+    %w(misskey calckey).include?(info.software)
   end
 
   def subscribable_by

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
@@ -426,7 +426,7 @@ namespace :mastodon do
 
       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 'This configuration will be written to .env.production'