Merge commit '70ca3d5ee7042810636f7270ce942ad176a98209' into glitch-soc/merge-4.6

app/controllers/admin/dashboard_controller.rb

@@ -12,7 +12,7 @@ module Admin
       @pending_tags_count    = pending_tags.async_count
       @pending_users_count   = User.pending.async_count
       @system_checks         = Admin::SystemCheck.perform(current_user)
-      @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
+      @time_period           = (29.days.ago.to_date..Time.now.utc.to_date)
     end
 
     private

app/controllers/admin/instances/moderation_notes_controller.rb

@@ -13,7 +13,7 @@ class Admin::Instances::ModerationNotesController < Admin::BaseController
       redirect_to admin_instance_path(@instance.domain, anchor: helpers.dom_id(@instance_moderation_note)), notice: I18n.t('admin.instances.moderation_notes.created_msg')
     else
       @instance_moderation_notes = @instance.moderation_notes.includes(:account).chronological
-      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @time_period = (6.days.ago.to_date..Time.now.utc.to_date)
       @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(5)
 
       render 'admin/instances/show'

app/controllers/admin/instances_controller.rb

@@ -17,7 +17,7 @@ module Admin
 
       @instance_moderation_note = @instance.moderation_notes.new
       @instance_moderation_notes = @instance.moderation_notes.includes(:account).chronological
-      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @time_period = (6.days.ago.to_date..Time.now.utc.to_date)
       @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(LOGS_LIMIT)
     end
 

app/controllers/admin/tags_controller.rb

@@ -38,7 +38,7 @@ module Admin
     end
 
     def report_range
-      (PERIOD_DAYS.ago.to_date...Time.now.utc.to_date)
+      (PERIOD_DAYS.ago.to_date..Time.now.utc.to_date)
     end
 
     def tag_params

app/javascript/mastodon/components/autosuggest/utils.test.ts

@@ -6,6 +6,14 @@ describe('textAtCursorMatchesToken', () => {
       ['#hashtag', 7, ['#']],
       [1, '#hashtag'],
     ],
+    [
+      ['@alice', 6, ['@']],
+      [1, '@alice'],
+    ],
+    [
+      ['＠alice', 6, ['＠']],
+      [1, '＠alice'],
+    ],
     [
       ['#hash tag', 8, ['#']],
       [1, '#hash tag'],
@@ -24,7 +32,35 @@ describe('textAtCursorMatchesToken', () => {
     ],
     [
       ['#ハッシュ タグ', 7, ['#']],
-      [1, '#ハッシュ タグ'],
+      [null, null],
+    ],
+    [
+      ['@alice reply', 12, ['@']],
+      [1, '@alice reply'],
+    ],
+    [
+      ['@alice 这是我输入的回复内容', 17, ['@']],
+      [null, null],
+    ],
+    [
+      ['@alice これは本文', 12, ['@']],
+      [null, null],
+    ],
+    [
+      ['@alice 이것은답변입니다', 15, ['@']],
+      [null, null],
+    ],
+    [
+      ['@alice　これは本文', 12, ['@']],
+      [null, null],
+    ],
+    [
+      ['@алиса', 6, ['@']],
+      [1, '@алиса'],
+    ],
+    [
+      ['@алиса пример', 13, ['@']],
+      [1, '@алиса пример'],
     ],
   ] as const)(
     'textAtCursorMatchesToken(%s) is %o',

app/javascript/mastodon/components/autosuggest/utils.ts

@@ -8,7 +8,7 @@ export const textAtCursorMatchesToken = (
   let word: string;
 
   const regex = new RegExp(
-    `[${searchTokens.join('')}${WORD}+-]+(\\s[${WORD}]+)?$`,
+    `[${searchTokens.join('')}${WORD}+-]+(\\s[\\p{Script=Latin}\\p{Script=Cyrillic}\\p{M}]+)?$`,
     'iu',
   );
   const left = str.slice(0, caretPosition).search(regex);

app/javascript/mastodon/utils/hashtags.ts

@@ -1,5 +1,5 @@
 const HASHTAG_SEPARATORS = '_\\u00b7\\u200c';
-const ALPHA = '\\p{L}\\p{M}';
+export const ALPHA = '\\p{L}\\p{M}';
 export const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
 
 const buildHashtagPatternRegex = () => {

app/lib/activity_tracker.rb

@@ -39,7 +39,7 @@ class ActivityTracker
   end
 
   def sum(start_at, end_at = Time.now.utc)
-    keys = (start_at.to_date...end_at.to_date).flat_map { |date| [key_at(date.to_time(:utc)), legacy_key_at(date)] }.uniq
+    keys = (start_at.to_date..end_at.to_date).flat_map { |date| [key_at(date.to_time(:utc)), legacy_key_at(date)] }.uniq
 
     case @type
     when :basic

app/lib/admin/metrics/measure/base_measure.rb

@@ -97,7 +97,7 @@ class Admin::Metrics::Measure::BaseMeasure
   end
 
   def previous_time_period
-    ((@start_at.to_date - length_of_period)..(@end_at.to_date - length_of_period))
+    ((@start_at.to_date - (length_of_period + 1))..(@end_at.to_date - (length_of_period + 1)))
   end
 
   def length_of_period

app/services/activitypub/process_account_service.rb

@@ -298,6 +298,8 @@ class ActivityPub::ProcessAccountService < BaseService
       next unless value['owner'] == @account.uri
 
       key = value['publicKeyPem']
+      next if key.nil?
+
       { type: :rsa, public_key: key, uri: key_id }
     end
   end