Support UTF-8 Characters in Domains During CSV Import (#20592)
* Support UTF-8 Characters in Domains During Import * Update Changelong
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							9d039209cc
						
					
				
				
					commit
					147d8bd8fc
				
			
							
								
								
									
										1
									
								
								spec/fixtures/files/utf8-followers.txt
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								spec/fixtures/files/utf8-followers.txt
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
@nare@թութ.հայ
 | 
			
		||||
@@ -172,6 +172,29 @@ RSpec.describe ImportService, type: :service do
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  # Based on the bug report 20571 where UTF-8 encoded domains were rejecting import of their users
 | 
			
		||||
  #
 | 
			
		||||
  # https://github.com/mastodon/mastodon/issues/20571
 | 
			
		||||
  context 'utf-8 encoded domains' do
 | 
			
		||||
    subject { ImportService.new }
 | 
			
		||||
 | 
			
		||||
    let!(:nare)     { Fabricate(:account, username: 'nare', domain: 'թութ.հայ', locked: false, protocol: :activitypub, inbox_url: 'https://թութ.հայ/inbox') }
 | 
			
		||||
 | 
			
		||||
    # Make sure to not actually go to the remote server
 | 
			
		||||
    before do
 | 
			
		||||
      stub_request(:post, "https://թութ.հայ/inbox").to_return(status: 200)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    let(:csv) { attachment_fixture('utf8-followers.txt') }
 | 
			
		||||
    let(:import) { Import.create(account: account, type: 'following', data: csv) }
 | 
			
		||||
 | 
			
		||||
    it 'follows the listed account' do
 | 
			
		||||
    expect(account.follow_requests.count).to eq 0
 | 
			
		||||
      subject.call(import)
 | 
			
		||||
      expect(account.follow_requests.count).to eq 1
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'import bookmarks' do
 | 
			
		||||
    subject { ImportService.new }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user