Update, date - Wed 07/20/2022, time - 0:19:57.47

Author: TodoLodo

README.rst

@@ -93,6 +93,8 @@ Below are the available sub classes:
 +-------------------+----------+
 |* `Me`_            | other    |
 +-------------------+----------+
+|* `Shop`_          | other    |
++-------------------+----------+
 |* `Misc`_          | other    |
 +-------------------+----------+
 
@@ -165,6 +167,20 @@ For a detailed description, ``__doc__`` (docstring) of each sub class can be cal
     # print out the docstring
     print(api.Me.__doc__)
 
+.. _`Shop`:
+
+``Shop``:
+
+.. code-block:: python
+
+    from cod_api import API
+
+    api = API()
+
+    # print out the docstring
+    print(api.Shop.__doc__)
+
+
 .. _`Misc`:
 
 ``Misc``:
@@ -418,3 +434,157 @@ Available ``platforms`` are as follows:
     platforms.Uno        # Uno (activision unique id)
 
     platforms.XBOX       # Xbox
+
+User Info
+----------
+
+Using the ``info()`` method in sub class ``Me`` of ``API`` user information can be retrieved of the sso-token logged in
+with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user info
+    userInfo = api.Me.info() # returns data of type dict
+
+    # printing results to console
+    print(userInfo)
+
+User Friend Feed
+----------------
+
+Using the ``friendFeed()`` method in sub class ``Me`` of ``API`` user's friend feed can be retrieved of the sso-token
+logged in with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user friend feed
+    friendFeed = api.Me.friendFeed() # returns data of type dict
+
+    # printing results to console
+    print(friendFeed)
+
+User Event Feed
+----------------
+
+Using the ``eventFeed()`` method in sub class ``Me`` of ``API`` user's event feed can be retrieved of the sso-token
+logged in with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user event feed
+    eventFeed = api.Me.eventFeed() # returns data of type dict
+
+    # printing results to console
+    print(eventFeed)
+
+User Identities
+----------------
+
+Using the ``loggedInIdentities()`` method in sub class ``Me`` of ``API`` user's identities can be retrieved of the
+sso-token logged in with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user identities
+    identities = api.Me.loggedInIdentities() # returns data of type dict
+
+    # printing results to console
+    print(identities)
+
+User COD Points
+----------------
+
+Using the ``codPoints()`` method in sub class ``Me`` of ``API`` user's cod points can be retrieved of the sso-token
+logged in with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user cod points
+    cp = api.Me.codPoints() # returns data of type dict
+
+    # printing results to console
+    print(cp)
+
+User Accounts
+----------------
+
+Using the ``connectedAccounts()`` method in sub class ``Me`` of ``API`` user's connected accounts can be retrieved of
+the sso-token logged in with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user connected accounts
+    accounts = api.Me.codPoints() # returns data of type dict
+
+    # printing results to console
+    print(accounts)
+
+User settings
+----------------
+
+Using the ``settings()`` method in sub class ``Me`` of ``API`` user's settings can be retrieved of the sso-token logged
+in with
+
+.. code-block:: python
+
+    from cod_api import API
+
+    # initiating the API class
+    api = API()
+
+    # loggin in with sso token
+    api.login('your_sso_token')
+
+    # retrieving user settings
+    settings = api.Me.settings() # returns data of type dict
+
+    # printing results to console
+    print(settings)

cod_api/__init__.py

@@ -174,7 +174,8 @@ async def __sendRequest(self, url: str):
                     if respond.status_code == 200:
                         data = respond.json()
                         if data['status'] == 'success':
-                            return data['data']
+                            data = self.__mapping(data['data'])
+                            return data
                         else:
                             sys.exit(StatusError())
                     else:
@@ -209,6 +210,29 @@ def __helper(self, platform, gamertag):
                     gamertag = self.__cleanClientName(gamertag)
             return lookUpType, gamertag
 
+        # mapping
+        def __mapping(self, data):
+            r = requests.get('https://engineer152.github.io/wz-data/weapon-ids.json')
+            guns = r.json()['All Weapons']
+            r = requests.get('https://engineer152.github.io/wz-data/game-modes.json')
+            modes = r.json()['modes']
+
+            # guns
+            try:
+                for m in data['matches']:
+                    for l in m['player']['loadouts']:
+                        if l['primaryWeapon']['label'] is None:
+                            l['primaryWeapon']['label'] = guns[l['primaryWeapon']['name']]
+
+                        if l['secondaryWeapon']['label'] is None:
+                            l['secondaryWeapon']['label'] = guns[l['secondaryWeapon']['name']]
+            except KeyError:
+                pass
+            except Exception as e:
+                print(e)
+
+            return data
+
         # API Requests
         async def __fullDataReq(self, game, platform, gamertag, type):
             lookUpType, gamertag = self.__helper(platform, gamertag)
@@ -490,37 +514,6 @@ def matchInfo(self, platform, matchId: int):
             data = asyncio.run(self._common__matchInfoReq("vg", platform, "mp", matchId))
             return data
 
-
-    # SHOP
-    class __SHOP(__common):
-        """
-         Shop class: A class to get bundle details and battle pass loot
-             classCatogery: other
-
-         Methods
-         -------
-         purchasableItems(game: games)
-             returns purchasable items for a specific gameId/gameTitle
-
-         bundleInformation(game: games, bundleId: int)
-             returns bundle details for the specific gameId/gameTitle and bundleId
-
-         battlePassLoot(game: games, platform: platforms, season: int)
-             returns battle pass loot for specific game and season on given platform
-         """
-
-        def purchasableItems(self, game: games):
-            data = asyncio.run(self._common__sendRequest(f"/inventory/v1/title/{game}/platform/psn/purchasable/public/en"))
-            return data
-
-        def bundleInformation(self, game: games, bundleId: int):
-            data = asyncio.run(self._common__sendRequest(f"/inventory/v1/title/{game}/bundle/{bundleId}/en"))
-
-        def battlePassLoot(self,game: games, platform: platforms, season: int):
-            data = asyncio.run(self._common__sendRequest(f"/loot/title/{game}/platform/{platform.value}/list/loot_season_{season}/en"))
-            return data
-
-
     # USER
     class __USER(__common):
         def info(self):
@@ -548,7 +541,7 @@ def __priv(self):
             d = self.info()
             return d['identities'][0]['platform'], quote(d['identities'][0]['gamertag'].encode("utf-8"))
 
-        def friendFeed(self, platform, gamertag:str):
+        def friendFeed(self):
             p, g = self.__priv()
             data = asyncio.run(
                 self._common__sendRequest(f"/userfeed/v1/friendFeed/platform/{p}/gamer/{g}/friendFeedEvents/en")
@@ -578,6 +571,37 @@ def settings(self):
             data = asyncio.run(self._common__sendRequest(f"/preferences/v1/platform/{p}/gamer/{g}/list"))
             return data
 
+    # SHOP
+    class __SHOP(__common):
+        """
+         Shop class: A class to get bundle details and battle pass loot
+             classCatogery: other
+
+         Methods
+         -------
+         purchasableItems(game: games)
+             returns purchasable items for a specific gameId/gameTitle
+
+         bundleInformation(game: games, bundleId: int)
+             returns bundle details for the specific gameId/gameTitle and bundleId
+
+         battlePassLoot(game: games, platform: platforms, season: int)
+             returns battle pass loot for specific game and season on given platform
+         """
+
+        def purchasableItems(self, game: games):
+            data = asyncio.run(
+                self._common__sendRequest(f"/inventory/v1/title/{game}/platform/uno/purchasable/public/en"))
+            return data
+
+        def bundleInformation(self, game: games, bundleId: int):
+            data = asyncio.run(self._common__sendRequest(f"/inventory/v1/title/{game}/bundle/{bundleId}/en"))
+
+        def battlePassLoot(self, game: games, platform: platforms, season: int):
+            data = asyncio.run(self._common__sendRequest(
+                f"/loot/title/{game}/platform/{platform.value}/list/loot_season_{season}/en"))
+            return data
+
     # ALT
     class __ALT(__common):