about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEmelia Smith <ThisIsMissEm@users.noreply.github.com>2018-04-23 23:52:58 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-04-23 23:52:58 +0200
commit60b871d56c554ddb22b7890d803e4ba6650ed286 (patch)
tree7011103a98c5961650cc748f513e80e89350ce9b /app/models
parent495303d9b86919c72bf1948a714bf8d00b41fa0f (diff)
Implement the ability for instances to define a list of disallowed hashtags (#7176)
The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index ed4bcefca..37f2db562 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -59,6 +59,7 @@ class Status < ApplicationRecord
   validates :uri, uniqueness: true, presence: true, unless: :local?
   validates :text, presence: true, unless: -> { with_media? || reblog? }
   validates_with StatusLengthValidator
+  validates_with DisallowedHashtagsValidator
   validates :reblog, uniqueness: { scope: :account }, if: :reblog?
 
   default_scope { recent }