Skip to content

Commit 41ce6d8

Browse files
authored
Merge pull request #1 from vjousse/add-missing-keys
Add missing keys from json
2 parents 613e098 + a88aa46 commit 41ce6d8

3 files changed

Lines changed: 33 additions & 1 deletion

File tree

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,22 @@ pip install emoji_data_python
3636
'au': 'EAA5',
3737
'softbank': 'E20C',
3838
'google': 'FEB1A',
39+
'image': '2665.png',
40+
'sheet_x': 1,
41+
'sheet_y': 34,
3942
'short_name': 'hearts',
4043
'short_names': ['hearts'],
4144
'text': None,
4245
'texts': None,
4346
'category': 'Symbols',
4447
'sort_order': 245,
4548
'added_in': '1.1',
49+
'has_img_apple': True,
50+
'has_img_google': True,
51+
'has_img_twitter': True,
52+
'has_img_emojione': True,
53+
'has_img_facebook': True,
54+
'has_img_messenger': True,
4655
'skin_variations': {},
4756
'obsoletes': None,
4857
'obsoleted_by': None

emoji_data_python/emoji_char.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,22 @@ def __init__(self, data_blob: dict) -> None:
2020
'au': 'EAA5',
2121
'softbank': 'E20C',
2222
'google': 'FEB1A',
23+
'image': '2665.png',
24+
'sheet_x': 1,
25+
'sheet_y': 34,
2326
'short_name': 'hearts',
2427
'short_names': ['hearts'],
2528
'text': None,
2629
'texts': None,
2730
'category': 'Symbols',
2831
'sort_order': 245,
2932
'added_in': '1.1',
33+
'has_img_apple': True,
34+
'has_img_google': True,
35+
'has_img_twitter': True,
36+
'has_img_emojione': True,
37+
'has_img_facebook': True,
38+
'has_img_messenger': True,
3039
'skin_variations': {},
3140
'obsoletes': None,
3241
'obsoleted_by': None
@@ -40,17 +49,26 @@ def __init__(self, data_blob: dict) -> None:
4049
self.au = data_blob.get('au') # type: Optional[str]
4150
self.softbank = data_blob.get('softbank') # type: Optional[str]
4251
self.google = data_blob.get('google') # type: Optional[str]
52+
self.image = data_blob.get('image') # type: Optional[str]
53+
self.sheet_x = data_blob.get('sheet_x') # type: int
54+
self.sheet_y = data_blob.get('sheet_y') # type: int
4355

4456
self.short_name = data_blob.get('short_name') # type: Optional[str]
4557
self.short_names = data_blob.get('short_names') # type: List[str]
4658
self.text = data_blob.get('text') # type: Optional[str]
47-
self.text = data_blob.get('text') # type: Optional[str]
4859
self.texts = data_blob.get('texts') # type: List[str]
4960

5061
self.category = data_blob.get('category') # type: Optional[str]
5162
self.sort_order = data_blob.get('sort_order') # type: int
5263
self.added_in = data_blob.get('added_in') # type: str
5364

65+
self.has_img_apple = data_blob.get('has_img_apple') # type: bool
66+
self.has_img_google = data_blob.get('has_img_google') # type: bool
67+
self.has_img_twitter = data_blob.get('has_img_twitter') # type: bool
68+
self.has_img_emojione = data_blob.get('has_img_emojione') # type: bool
69+
self.has_img_facebook = data_blob.get('has_img_facebook') # type: bool
70+
self.has_img_messenger = data_blob.get('has_img_messenger') # type: bool
71+
5472
variations = data_blob.get('skin_variations', {})
5573
self.skin_variations = {
5674
code: EmojiChar(variation) for code, variation in variations.items()

tests/test_emoji_char.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@ def test_init(self):
5757
self.assertEqual("point_up", self.emoji.short_names[0])
5858
self.assertEqual("People", self.emoji.category)
5959
self.assertEqual("1.4", self.emoji.added_in)
60+
self.assertEqual("261d.png", self.emoji.image)
61+
self.assertEqual(1, self.emoji.sheet_x)
62+
self.assertEqual(True, self.emoji.has_img_apple)
63+
self.assertEqual(False, self.emoji.has_img_emojione)
6064

6165
def test_skin_variations(self):
6266
self.assertEqual("261D-1F3FB", self.emoji.skin_variations['1F3FB'].unified)
67+
self.assertEqual(True, self.emoji.skin_variations['1F3FB'].has_img_apple)
6368

6469
def test_char(self):
6570
self.assertEqual('☝', self.emoji.char)

0 commit comments

Comments
 (0)