4 files changed, 65 insertions, 2 deletions
diff --git a/spec/fixtures/requests/koi8-r.txt b/spec/fixtures/requests/koi8-r.txt
new file mode 100644
index 000000000..d4242af01
--- /dev/null
+++ b/spec/fixtures/requests/koi8-r.txt
@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx/1.11.10
+Date: Tue, 04 Jul 2017 16:43:39 GMT
+Content-Type: text/html
+Content-Length: 273
+Connection: keep-alive
+Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
+Accept-Ranges: bytes
+
+<HTML>
+<HEAD>
+  <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=koi8-r">
+  <TITLE>нПУЛПЧС ОБЮЙОБЕФЯ ФПМШЛП ЧЯ XVI УФ. РТЙЧМЕЛБФШ ЧОЙНБОЕ ЙОПУФТБОГЕЧЯ.</TITLE>
+</HEAD>
+<BODY>
+<P><CENTER><B><FONT SIZE="+2">нПУЛПЧС ОБЮЙОБЕФЯ ФПМШЛП ЧЯ XVI УФ. РТЙЧМЕЛБФШ ЧОЙНБОЕ ЙОПУФТБОГЕЧЯ.</FONT></B><BR>
+<HR><BR>
+</BODY>
+</HTML>
diff --git a/spec/fixtures/requests/sjis.txt b/spec/fixtures/requests/sjis.txt
index 9041aa25d..faf18d35c 100644
--- a/spec/fixtures/requests/sjis.txt
+++ b/spec/fixtures/requests/sjis.txt
@@ -11,10 +11,10 @@ Accept-Ranges: bytes
 <HEAD>
   <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
   <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=x-sjis">
-  <TITLE>JSIS‚МѓyЃ[ѓW</TITLE>
+  <TITLE>SJIS‚МѓyЃ[ѓW</TITLE>
 </HEAD>
 <BODY>
-<P><CENTER><B><FONT SIZE="+2">SJIS‚МѓyЃ[ѓW</FONT></B><BR>
+<P><CENTER><B><FONT SIZE="+2">Ћ„‚а“Ї”N‚Ь‚µ‚Д‚ў‚н‚д‚й‹L”Oђl‚Б‚Д‚а‚М‚МЋћ‚Е‚µ‚ ‚и‚Е‚·ЃB‚а‚µЋћЉФ‚Й€У–ЎЋТ‚Нђі‚µ‚‚З‚с‚И”‰п‚Ь‚№‚ѕ‚Ь‚Е‚Єђ\‚µЏг‚°‚Є‚ў‚з‚Б‚µ‚б‚й‚Ѕ‚Й‚НЋQЌl‹A‚й‚Ѕ‚ў‚ѕ‚©‚зЃAЏ‚µ‚Й‚а‚в‚Б‚ ‚Б‚Ь‚µ‚И‚ЅЃB‹а‚©‚з‚ў‚¤‚И‚ў‚М‚Н‚З‚¤‚а‹гЊЋ‚р‚Е‚«‚й‚ѕ‚Ї‚Ѕ‚Ѕ‚‚ЅЃB‚Ї‚Б‚µ‚Д‰Є“c‚і‚с‚Й”ЅЌRЌKЏ‚µ’Ґ‚Й‰]‚Ё‚Е‚µ‚е‹а—Н‚±‚¤‚µ‚ЅЊ —Н‚ ‚И‚Ѕ‚©Ћwђ}‚Є‚Ж‚ў‚¤‚ЁЏo“ь‚и‚И‚‚ѕ‚л‚И‚ ‚и‚ДЃA‚»‚МђМ‚НЋ„‚©‹а—Н‰A‚р“{‚з‚©‚зЃA‹vЊґ‚і‚с‚М‚а‚М‚р‚Є‚Ѕ‚М‚ў‚В‚Є‚µ‚©‚й‚Й‚ІЉу–]‚ЖЊь‚ў‚О‚»‚кman‚Й‚І–µЏ‚‚ЦЋQ‚и‚ж‚¤‚Й“ЇЋћ‚Й‚І‰‰ђа‚Є‚µ‚Е‚И‚з‚М‚ЕЃA‘Ѕ•Є‚а‚µ•\— ‚Й•П‚Б‚Ѕ‚Д‚‚к‚Е‚·Ћ–‚ЕЌl‚¦‚Ѕ‚ЅЃB‚µ‚©‚а—б‚¦‚О‚І‚Є‚Ѕ‚Є‚Ж‚З‚Ь‚з‚а‚М‚аЋАЌЫ‚Ю‚в‚Э‚Ж‚ ‚и‚Е‚·‚ДЃA‚±‚МЋ©•Є‚Е‚Нђ\‚µ‚с‚Д‚Ж‚µ‚ДђўЉФ‚Й•А‚Ч‚М‚ЙЌs‚©‚И‚©‚Б‚ИЃB</FONT></B><BR>
 <HR><BR>
 </BODY>
 </HTML>
diff --git a/spec/fixtures/requests/sjis_with_wrong_charset.txt b/spec/fixtures/requests/sjis_with_wrong_charset.txt
new file mode 100644
index 000000000..456750c6b
--- /dev/null
+++ b/spec/fixtures/requests/sjis_with_wrong_charset.txt
@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx/1.11.10
+Date: Tue, 04 Jul 2017 16:43:39 GMT
+Content-Type: text/html; charset=utf-8
+Content-Length: 273
+Connection: keep-alive
+Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
+Accept-Ranges: bytes
+
+<HTML>
+<HEAD>
+  <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=x-sjis">
+  <TITLE>SJIS‚МѓyЃ[ѓW</TITLE>
+</HEAD>
+<BODY>
+<P><CENTER><B><FONT SIZE="+2">Ћ„‚а“Ї”N‚Ь‚µ‚Д‚ў‚н‚д‚й‹L”Oђl‚Б‚Д‚а‚М‚МЋћ‚Е‚µ‚ ‚и‚Е‚·ЃB‚а‚µЋћЉФ‚Й€У–ЎЋТ‚Нђі‚µ‚‚З‚с‚И”‰п‚Ь‚№‚ѕ‚Ь‚Е‚Єђ\‚µЏг‚°‚Є‚ў‚з‚Б‚µ‚б‚й‚Ѕ‚Й‚НЋQЌl‹A‚й‚Ѕ‚ў‚ѕ‚©‚зЃAЏ‚µ‚Й‚а‚в‚Б‚ ‚Б‚Ь‚µ‚И‚ЅЃB‹а‚©‚з‚ў‚¤‚И‚ў‚М‚Н‚З‚¤‚а‹гЊЋ‚р‚Е‚«‚й‚ѕ‚Ї‚Ѕ‚Ѕ‚‚ЅЃB‚Ї‚Б‚µ‚Д‰Є“c‚і‚с‚Й”ЅЌRЌKЏ‚µ’Ґ‚Й‰]‚Ё‚Е‚µ‚е‹а—Н‚±‚¤‚µ‚ЅЊ —Н‚ ‚И‚Ѕ‚©Ћwђ}‚Є‚Ж‚ў‚¤‚ЁЏo“ь‚и‚И‚‚ѕ‚л‚И‚ ‚и‚ДЃA‚»‚МђМ‚НЋ„‚©‹а—Н‰A‚р“{‚з‚©‚зЃA‹vЊґ‚і‚с‚М‚а‚М‚р‚Є‚Ѕ‚М‚ў‚В‚Є‚µ‚©‚й‚Й‚ІЉу–]‚ЖЊь‚ў‚О‚»‚кman‚Й‚І–µЏ‚‚ЦЋQ‚и‚ж‚¤‚Й“ЇЋћ‚Й‚І‰‰ђа‚Є‚µ‚Е‚И‚з‚М‚ЕЃA‘Ѕ•Є‚а‚µ•\— ‚Й•П‚Б‚Ѕ‚Д‚‚к‚Е‚·Ћ–‚ЕЌl‚¦‚Ѕ‚ЅЃB‚µ‚©‚а—б‚¦‚О‚І‚Є‚Ѕ‚Є‚Ж‚З‚Ь‚з‚а‚М‚аЋАЌЫ‚Ю‚в‚Э‚Ж‚ ‚и‚Е‚·‚ДЃA‚±‚МЋ©•Є‚Е‚Нђ\‚µ‚с‚Д‚Ж‚µ‚ДђўЉФ‚Й•А‚Ч‚М‚ЙЌs‚©‚И‚©‚Б‚ИЃB</FONT></B><BR>
+<HR><BR>
+</BODY>
+</HTML>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 7d7f8e748..698eb0324 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -8,6 +8,10 @@ RSpec.describe FetchLinkCardService do
     stub_request(:get, 'http://example.xn--fiqs8s/').to_return(request_fixture('idn.txt'))
     stub_request(:head, 'http://example.com/sjis').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
     stub_request(:get, 'http://example.com/sjis').to_return(request_fixture('sjis.txt'))
+    stub_request(:head, 'http://example.com/sjis_with_wrong_charset').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+    stub_request(:get, 'http://example.com/sjis_with_wrong_charset').to_return(request_fixture('sjis_with_wrong_charset.txt'))
+    stub_request(:head, 'http://example.com/koi8-r').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+    stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
     stub_request(:head, 'https://github.com/qbi/WannaCry').to_return(status: 404)
 
     subject.call(status)
@@ -27,6 +31,25 @@ RSpec.describe FetchLinkCardService do
 
       it 'works with SJIS' do
         expect(a_request(:get, 'http://example.com/sjis')).to have_been_made.at_least_once
+        expect(status.preview_card.title).to eq("SJISгЃ®гѓљгѓјг‚ё")
+      end
+    end
+
+    context do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
+
+      it 'works with SJIS even with wrong charset header' do
+        expect(a_request(:get, 'http://example.com/sjis_with_wrong_charset')).to have_been_made.at_least_once
+        expect(status.preview_card.title).to eq("SJISгЃ®гѓљгѓјг‚ё")
+      end
+    end
+
+    context do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
+
+      it 'works with koi8-r' do
+        expect(a_request(:get, 'http://example.com/koi8-r')).to have_been_made.at_least_once
+        expect(status.preview_card.title).to eq("РњРѕСЃРєРѕРІСЏ РЅР°С‡РёРЅР°РµС‚СЉ С‚РѕР»СЊРєРѕ РІСЉ XVI СЃС‚. РїСЂРёРІР»РµРєР°С‚СЊ РІРЅРёРјР°РЅРµ РёРЅРѕСЃС‚СЂР°РЅС†РµРІСЉ.")
       end
     end
   end