Improve get_names

README.md

@@ -53,7 +53,7 @@ Improvements:
 - [x] `get_uuid` returns the uuid
 - [x] `get_uuids` returns a dict<str, str>
 - [x] `get_status` returns a list of ServiceStatus
-- [ ] `get_names` returns a list of tuple
+- [x] `get_names` returns a sorted list of NameInfo
 
 ### Authentication (mojang.api.auth.*)
 

mojang/api/base.py

@@ -1,21 +1,16 @@
 import base64
 import datetime as dt
 import json
-import typing
 from typing import Dict, Iterable, List, Optional
 
 import requests
 
 from ..exceptions import InvalidName
-from .structures.base import NameInfo, NameInfoList
+from .structures.base import NameInfo, ServiceStatus
 from .structures.profile import UnauthenticatedProfile
 from .structures.session import Cape, Skin
 from .utils import helpers, urls
 
-ServiceStatus = typing.NamedTuple(
-    "ServiceStatus", [("name", str), ("status", str)]
-)
-
 
 def get_status() -> List[ServiceStatus]:
     """Get the status of Mojang's services
@@ -112,36 +107,46 @@ def get_uuids(usernames: Iterable[str]) -> Dict[str, Optional[str]]:
     return ret
 
 
-def get_names(uuid: str) -> Optional[NameInfoList]:
+def get_names(uuid: str) -> List[NameInfo]:
     """Get the user's name history
 
     :param str uuid: The user's uuid
 
     :Example:
 
     >>> import mojang
-    >>> mojang.get_names('65a8dd127668422e99c2383a07656f7a)
-    (
+    >>> mojang.get_names('65a8dd127668422e99c2383a07656f7a'')
+    [
         NameInfo(name='piewdipie', changed_to_at=None),
         NameInfo(name='KOtMotros', changed_to_at=datetime.datetime(2020, 3, 4, 17, 45, 26))
-    )
+    ]
     """
-    response = requests.get(urls.api_name_history(uuid))
-    code, data = helpers.err_check(response, (400, ValueError))
-
-    if code == 204:
-        return None
 
-    _names = []
-    for item in data:
+    def _parse_item(item: dict):
         changed_to_at = None
         if "changedToAt" in item.keys():
             changed_to_at = dt.datetime.fromtimestamp(
                 item["changedToAt"] / 1000
             )
-        _names.append(NameInfo(name=item["name"], changed_to_at=changed_to_at))
 
-    return NameInfoList(_names)
+        return NameInfo(name=item["name"], changed_to_at=changed_to_at)
+
+    response = requests.get(urls.api_name_history(uuid))
+    code, data = helpers.err_check(response, (400, ValueError))
+
+    if code == 204:
+        return []
+
+    # Names are sorted newer to older
+    _names = [_parse_item(item) for item in data]
+    _tosort = [
+        _names.pop(_names.index(item))
+        for item in _names.copy()
+        if item.changed_to_at is not None
+    ]
+    _tosort.sort(key=lambda i: i.changed_to_at, reverse=True)
+
+    return _tosort + _names
 
 
 def get_profile(uuid: str) -> Optional[UnauthenticatedProfile]:

mojang/api/ext/_profile.py

@@ -6,7 +6,8 @@
 
 from .. import session
 from ..auth import microsoft, security, yggdrasil
-from ..structures.profile import Cape, NameInfoList, Skin
+from ..structures.profile import Cape, Skin
+from ..structures.base import NameInfo
 from ..structures.auth import ChallengeInfo
 
 
@@ -35,7 +36,7 @@ def __init__(self, access_token: str, refresh_token: str) -> None:
         self.__uuid = None
         self.__is_legacy = False
         self.__is_demo = False
-        self.__names = None
+        self.__names: List[NameInfo] = []
         self.__skins = None
         self.__capes = None
 
@@ -72,7 +73,7 @@ def is_demo(self) -> bool:
         return self.__is_demo
 
     @property
-    def names(self) -> Optional[NameInfoList]:
+    def names(self) -> List[NameInfo]:
         return self.__names
 
     @property

mojang/api/structures/base.py

@@ -1,37 +1,12 @@
+import typing
 import datetime as dt
-from typing import NamedTuple, Optional, Tuple, Union
 
 
-# UUID and Name
-class NameInfo(NamedTuple):
-    """
-    :var str name: The player name
-    :var datetime.datetime changed_to_at: When it's was changed to
-    """
+ServiceStatus = typing.NamedTuple(
+    "ServiceStatus", [("name", str), ("status", str)]
+)
 
-    name: str
-    changed_to_at: Optional[dt.datetime]
-
-
-class NameInfoList(Tuple[NameInfo, ...]):
-    @property
-    def current(self) -> NameInfo:
-        """Returns the most recent name"""
-        if len(self) == 1:
-            return self[0]
-
-        _max = self[0]
-        for n in self[1:]:
-            if (n.changed_to_at is not None) and (
-                _max.changed_to_at is None
-                or n.changed_to_at > _max.changed_to_at
-            ):
-                _max = n
-
-        return _max
-
-    @property
-    def first(self) -> NameInfo:
-        """Returns the first name"""
-        first = list(filter(lambda n: n.changed_to_at is None, self))
-        return first[0]
+NameInfo = typing.NamedTuple(
+    "NameInfo",
+    [("name", str), ("changed_to_at", typing.Optional[dt.datetime])],
+)

mojang/api/structures/profile.py

@@ -1,5 +1,5 @@
 from typing import List, Optional
-from .base import NameInfoList
+from .base import NameInfo
 from .session import Skin, Cape
 
 
@@ -18,7 +18,7 @@ def __init__(
         uuid: str,
         is_legacy: bool,
         is_demo: bool,
-        names: Optional[NameInfoList],
+        names: List[NameInfo],
     ) -> None:
         self.__name = name
         self.__uuid = uuid
@@ -33,7 +33,7 @@ def __hash__(self) -> int:
                 self.__uuid,
                 self.__is_legacy,
                 self.__is_demo,
-                self.__names,
+                tuple(self.__names),
             )
         )
 
@@ -60,7 +60,7 @@ def is_demo(self) -> bool:
         return self.__is_demo
 
     @property
-    def names(self) -> Optional[NameInfoList]:
+    def names(self) -> List[NameInfo]:
         return self.__names
 
 
@@ -76,7 +76,7 @@ def __init__(
         uuid: str,
         is_legacy: bool,
         is_demo: bool,
-        names: Optional[NameInfoList],
+        names: List[NameInfo],
         skin: Optional[Skin],
         cape: Optional[Cape],
     ) -> None:
@@ -91,7 +91,7 @@ def __hash__(self) -> int:
                 self.uuid,
                 self.is_legacy,
                 self.is_demo,
-                self.names,
+                tuple(self.names),
                 self.__skin,
                 self.__cape,
             )
@@ -121,7 +121,7 @@ def __init__(
         uuid: str,
         is_legacy: bool,
         is_demo: bool,
-        names: Optional[NameInfoList],
+        names: List[NameInfo],
         skins: List[Skin],
         capes: List[Cape],
     ) -> None:
@@ -136,7 +136,7 @@ def __hash__(self) -> int:
                 self.uuid,
                 self.is_legacy,
                 self.is_demo,
-                self.names,
+                tuple(self.names),
                 self.__skins,
                 self.__capes,
             )

tests/test_mojang_names.py

@@ -1,7 +1,7 @@
 import unittest
 
 import mojang
-from mojang.api.structures.base import NameInfo, NameInfoList
+from mojang.api.structures.base import NameInfo
 from mojang.exceptions import InvalidName
 
 
@@ -13,11 +13,11 @@ def setUp(self) -> None:
         self.unkown = mojang.get_names("069a79f444e94726a5befca90e38aaf6")
 
     def test_existent_names(self):
-        self.assertEqual(self.notch, NameInfoList([NameInfo("Notch", None)]))
-        self.assertEqual(self.jeb_, NameInfoList([NameInfo("jeb_", None)]))
+        self.assertEqual(self.notch, [NameInfo("Notch", None)])
+        self.assertEqual(self.jeb_, [NameInfo("jeb_", None)])
 
     def test_unexistent_names(self):
-        self.assertEqual(self.unkown, None)
+        self.assertEqual(self.unkown, [])
 
     def test_invalid_names(self):
         self.assertRaises(ValueError, mojang.get_names, "thisisnotauuid")

tests/test_mojang_user.py

@@ -1,7 +1,7 @@
 import unittest
 
 import mojang
-from mojang.api.structures.base import NameInfo, NameInfoList
+from mojang.api.base import NameInfo
 from mojang.api.structures.profile import UnauthenticatedProfile
 from mojang.api.structures.session import Cape, Skin
 from mojang.exceptions import InvalidName
@@ -21,7 +21,7 @@ def test_existent_user(self):
                 "069a79f444e94726a5befca90e38aaf5",
                 False,
                 False,
-                NameInfoList([NameInfo("Notch", None)]),
+                [NameInfo("Notch", None)],
                 Skin(
                     "http://textures.minecraft.net/texture/292009a4925b58f02c77dadc3ecef07ea4c7472f64e0fdc32ce5522489362680",
                     "classic",
@@ -37,7 +37,7 @@ def test_existent_user(self):
                 "853c80ef3c3749fdaa49938b674adae6",
                 False,
                 False,
-                NameInfoList([NameInfo("jeb_", None)]),
+                [NameInfo("jeb_", None)],
                 Skin(
                     "http://textures.minecraft.net/texture/7fd9ba42a7c81eeea22f1524271ae85a8e045ce0af5a6ae16c6406ae917e68b5",
                     "classic",