don't send spammy mentions

avoids issues with model caching being incompatible across versions

app/javascript/styles/mastodon/containers.scss

@@ -298,6 +298,12 @@
       min-height: 1px;
     }
 
+    h2 {
+      font-size: 1rem;
+      align-items: center;
+      display: flex;
+    }
+
     .nav-left {
       display: flex;
       align-items: stretch;

app/lib/activitypub/activity.rb

@@ -90,7 +90,7 @@ class ActivityPub::Activity
     crawl_links(status)
 
     notify_about_reblog(status) if reblog_of_local_account?(status)
-    notify_about_mentions(status)
+    notify_about_mentions(status) unless spammy_mentions?(status)
 
     # Only continue if the status is supposed to have arrived in real-time.
     # Note that if @options[:override_timestamps] isn't set, the status
@@ -105,6 +105,11 @@ class ActivityPub::Activity
     status.reblog? && status.reblog.account.local?
   end
 
+  def spammy_mentions?(status)
+    status.has_non_mention_links? &&
+    @account.followers.local.count == 0
+  end
+
   def notify_about_reblog(status)
     NotifyService.new.call(status.reblog.account, status)
   end

app/models/status.rb

@@ -398,6 +398,14 @@ class Status < ApplicationRecord
     super || build_status_stat
   end
 
+  def has_non_mention_links?
+    if local?
+      text.match? %r{https?://\w}
+    else
+      Nokogiri::HTML.fragment(text).css('a:not(.mention)').present?
+    end
+  end
+
   private
 
   def update_status_stat!(attrs)

app/views/accounts/show.html.haml

@@ -21,6 +21,11 @@
 
 = render 'header', account: @account, with_bio: true
 
+- if @account.user&.disabled?
+  .header
+    .nav-center
+      %h2 This user's account has been locked by a moderator.
+
 .grid
   .column-0
     .h-feed

lib/mastodon/redis_config.rb

@@ -22,7 +22,7 @@ setup_redis_env_url
 setup_redis_env_url(:cache, false)
 
 namespace       = ENV.fetch('REDIS_NAMESPACE') { nil }
-cache_namespace = namespace ? namespace + '_cache' : 'cache'
+cache_namespace = [namespace, 'cache', `git rev-parse --short HEAD`.strip].compact.join('_')
 
 REDIS_CACHE_PARAMS = {
   expires_in: 10.minutes,