mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix account and hashtag regex

pull/6/head
Eugen Rochko 2016-11-07 17:35:25 +01:00
parent c3559d18a3
commit f5c6baf29d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account.rb
View File

@ -1,7 +1,7 @@
class Account < ApplicationRecord class Account < ApplicationRecord
include Targetable 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 IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
# Local users # Local users

2
app/models/tag.rb
View File

@ -1,7 +1,7 @@
class Tag < ApplicationRecord class Tag < ApplicationRecord
has_and_belongs_to_many :statuses has_and_belongs_to_many :statuses
HASHTAG_RE = /[?:^|\s|\.|>]#([[:word:]_]+)/i HASHTAG_RE = /(?:^|[^\/\w])#([[:word:]_]+)/i
validates :name, presence: true, uniqueness: true validates :name, presence: true, uniqueness: true