Merge pull request #11 from Katistic/master

Fixes to Avatar favorites and other stuff

Author: Katistic

examples/async/Get avatar.py

@@ -6,10 +6,6 @@ async def main():
     client = vrcpy.AClient()
     await client.login("username", "password")
 
-    # Wait for connecting objects
-    # This can be used when doing client.fetch_me as well.
-    await client.wait_for_cache()
-
     # Get avatar via id
     a = await client.fetch_avatar("avtr_fa5303c6-78d1-451c-a678-faf3eadb5c50")
     author = await a.author() # Get author of the avatar

vrcpy/__init__.py

@@ -1,6 +1,6 @@
 __title__ = "vrcpy"
 __author__ = "Katistic"
-__version__ = "0.6.0"
+__version__ = "0.6.2"
 
 from vrcpy.client import Client
 from vrcpy.client import AClient

vrcpy/aobjects.py

@@ -16,9 +16,13 @@ async def author(self):
         return User(self.client, resp["data"])
 
     async def favorite(self):
-        resp = await self.client.api.call("/favorites", "POST", params={"type": types.FavoriteType.Avatar,\
-            "favoriteId": self.id})
-        return Favorite(resp["data"])
+        resp = await self.client.api.call("/favorites", "POST", json={"type": types.FavoriteType.Avatar,\
+            "favoriteId": self.id, "tags": ["avatars1"]})
+
+        f = Favorite(self.client, resp["data"])
+        await f.cacheTask
+
+        return f
 
 ## User
 
@@ -118,6 +122,9 @@ async def fetch_favorites(self, t):
         for favorite in resp["data"]:
             f.append(Favorite(self.client, favorite))
 
+        for fav in f:
+            await fav.cacheTask
+
         return f
 
     async def favorite(self):
@@ -151,13 +158,12 @@ async def __cinit__(self):
         if hasattr(self, "homeLocation"):
             if self.homeLocation == "": self.homeLocation = None
             else: self.homeLocation = await self.client.fetch_world(self.homeLocation)
+        else: self.homeLocation = None
 
         # Wait for all cacheTasks
         if not self.homeLocation == None:
             await self.homeLocation.cacheTask
 
-        self.client.cacheFull = True
-
 ## World
 
 class LimitedWorld(o.LimitedWorld):
@@ -202,7 +208,7 @@ async def __cinit__(self):
         if self.type == types.FavoriteType.World:
             self.object = await self.client.fetch_world(self.favoriteId)
         elif self.type == types.FavoriteType.Friend:
-            for friend in self.client.me.friends():
+            for friend in self.client.me.friends:
                 if friend.id == self.favoriteId:
                     self.object = friend
                     break

vrcpy/client.py

@@ -538,19 +538,11 @@ async def login(self, username, password):
         self.me = aobjects.CurrentUser(self, resp["data"])
         self.loggedIn = True
 
-    async def wait_for_cache(self):
-        '''
-        Used to stall task and wait for caching to finish
-        Returns void
-        '''
-
-        while not self.cacheFull:
-            await asyncio.sleep(1)
+        await self.me.cacheTask
 
     def __init__(self, verify=True):
         super().__init__()
 
-        self.cacheFull = False
         self.api = ACall(verify=verify)
         self.loggedIn = False
         self.me = None

vrcpy/objects.py

@@ -70,9 +70,9 @@ def favorite(self):
         Returns favorite object
         '''
 
-        resp = self.client.api.call("/favorites", "POST", params={"type": types.FavoriteType.Avatar,\
-            "favoriteId": self.id})
-        return Favorite(resp["data"])
+        resp = self.client.api.call("/favorites", "POST", json={"type": types.FavoriteType.Avatar,\
+            "favoriteId": self.id, "tags": ["avatars1"]})
+        return Favorite(self.client, resp["data"])
 
     def __init__(self, client, obj):
         super().__init__(client)
@@ -299,6 +299,7 @@ def __cinit__(self):
         if hasattr(self, "homeLocation"):
             if self.homeLocation == "": self.homeLocation = None
             else: self.homeLocation = self.client.fetch_world(self.homeLocation)
+        else: self.homeLocation = None
 
     def __init__(self, client, obj):
         super().__init__(client)

vrcpy/request.py

@@ -1,10 +1,14 @@
+import json
 import asyncio
 import aiohttp
 import requests
 
 from vrcpy.errors import *
 
 def raise_for_status(resp):
+    if type(resp["data"]) == bytes:
+        resp["data"] = json.loads(resp["data"].decode())
+
     def handle_400():
         if resp["data"]["error"]["message"] == "These users are not friends":
             raise NotFriendsError("These users are not friends")
@@ -85,7 +89,9 @@ async def call(self, path, method="GET", headers={}, params={}, json={}, no_auth
                 try: json = await resp.json()
                 except: json = None
 
-                return {"status": resp.status, "data": json if not json == None else content}
+                resp = {"status": resp.status, "data": json if not json == None else content}
+                raise_for_status(resp)
+                return resp
 
             json = await resp.json()
             status = resp.status