feat: 增加了 Flag 识别字段

surgioproject · Oct 10, 2019 · 86c1489 · 86c1489
1 parent 057269d
commit 86c1489
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/lib/utils/flag.ts b/lib/utils/flag.ts
@@ -17,7 +17,7 @@ Object.keys(flag).forEach(emoji => {
 
 export const prependFlag = (str: string): string => {
  for (const key in flagMap) {
- if (flagMap.hasOwnProperty(key) && str.includes(key)) {
+ if (flagMap.hasOwnProperty(key) && str.toUpperCase().includes(key)) {
  return `${flagMap[key]} ${str}`;
  }
  }

diff --git a/static/flag_cn.json5 b/static/flag_cn.json5
@@ -25,6 +25,7 @@
  "圣保罗"
  ],
  "🇨🇦": [
+ "CAN",
  "加拿大",
  "蒙特利尔",
  "温哥华"
@@ -34,6 +35,8 @@
  "苏黎世"
  ],
  "🇨🇳": [
+ "TW",
+ "回国",
  "中国",
  "江苏",
  "北京",
@@ -60,19 +63,18 @@
  "赫尔辛基"
  ],
  "🇫🇷": [
+ "FR",
  "法国",
  "巴黎"
  ],
  "🇬🇧": [
+ "UK",
  "英国",
  "伦敦"
  ],
  "🇭🇰": [
  "HK",
- "香港",
- "深港",
- "沪港",
- "呼港"
+ "港",
  ],
  "🇮🇩": [
  "印尼",
@@ -92,6 +94,7 @@
  "米兰"
  ],
  "🇯🇵": [
+ "JP",
  "日本",
  "东京",
  "大阪",
@@ -130,6 +133,7 @@
  "新西伯利亚"
  ],
  "🇸🇬": [
+ "SG",
  "新加坡",
  "狮城"
  ],
@@ -143,7 +147,7 @@
  ],
  "🇺🇲": [
  "US",
- "美国",
+ "美",
  "波特兰",
  "达拉斯",
  "俄勒冈",
@@ -155,8 +159,7 @@
  "圣何塞",
  "圣克拉拉",
  "西雅图",
- "芝加哥",
- "沪美"
+ "芝加哥"
  ],
  "🇻🇳": [
  "越南"

diff --git a/test/flag.test.ts b/test/flag.test.ts
@@ -4,4 +4,6 @@ import { prependFlag } from '../lib/utils/flag';
 test('addFlag', t => {
  t.is(prependFlag('美国'), '🇺🇲 美国');
  t.is(prependFlag('阿联酋'), '阿联酋');
+ t.is(prependFlag('US'), '🇺🇲 US');
+ t.is(prependFlag('us'), '🇺🇲 us');
 });