forked from cybrespace/mastodon
		
	Fix account and hashtag regex
This commit is contained in:
		
							parent
							
								
									c3559d18a3
								
							
						
					
					
						commit
						f5c6baf29d
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
class Account < ApplicationRecord
 | 
			
		||||
  include Targetable
 | 
			
		||||
 | 
			
		||||
  MENTION_RE = /(?:^|[\s\.>*+])@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i
 | 
			
		||||
  MENTION_RE = /(?:^|[^\/\w])@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i
 | 
			
		||||
  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
 | 
			
		||||
 | 
			
		||||
  # Local users
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
class Tag < ApplicationRecord
 | 
			
		||||
  has_and_belongs_to_many :statuses
 | 
			
		||||
 | 
			
		||||
  HASHTAG_RE = /[?:^|\s|\.|>]#([[:word:]_]+)/i
 | 
			
		||||
  HASHTAG_RE = /(?:^|[^\/\w])#([[:word:]_]+)/i
 | 
			
		||||
 | 
			
		||||
  validates :name, presence: true, uniqueness: true
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue