Browse Source

Improve @mention regex

closed-social-glitch-2
Eugen Rochko 7 years ago
parent
commit
7bb28bf780
3 changed files with 6 additions and 2 deletions
  1. +1
    -1
      app/models/account.rb
  2. +1
    -1
      app/services/process_hashtags_service.rb
  3. +4
    -0
      spec/controllers/tags_controller_spec.rb

+ 1
- 1
app/models/account.rb View File

@ -1,7 +1,7 @@
class Account < ApplicationRecord
include Targetable
MENTION_RE = /(?:^|\s|\.|>)@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i
MENTION_RE = /(?:^|[\s\.>*+])@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
# Local users

+ 1
- 1
app/services/process_hashtags_service.rb View File

@ -4,7 +4,7 @@ class ProcessHashtagsService < BaseService
tags = status.text.scan(Tag::HASHTAG_RE).map(&:first)
end
tags.map(&:downcase).each do |tag|
tags.map(&:downcase).uniq.each do |tag|
status.tags << Tag.where(name: tag).first_or_initialize(name: tag)
end
end

+ 4
- 0
spec/controllers/tags_controller_spec.rb View File

@ -3,6 +3,10 @@ require 'rails_helper'
RSpec.describe TagsController, type: :controller do
describe 'GET #show' do
before do
Fabricate(:tag, name: 'test')
end
it 'returns http success' do
get :show, params: { id: 'test' }
expect(response).to have_http_status(:success)

Loading…
Cancel
Save