Merge pull request #19 from ShingenPizza/missing_client

Filled missing client arguments and fixed (async) Instance.join().

Author: Katistic

vrcpy/aobjects.py

@@ -61,7 +61,7 @@ async def friend(self):
     async def favorite(self):
         resp = await self.client.api.call("/favorites", "POST", params={"type": types.FavoriteType.Friend,
                                                                         "favoriteId": self.id})
-        return Favorite(resp["data"])
+        return Favorite(self.client, resp["data"])
 
 
 class User(o.User, LimitedUser):
@@ -149,7 +149,7 @@ async def remove_favorite(self, id):
 
     async def fetch_favorite(self, id):
         resp = await self.client.api.call("/favorites/"+id)
-        return Favorite(resp)
+        return Favorite(self.client, resp)
 
     async def __cinit__(self):
         if hasattr(self, "currentAvatar"):
@@ -200,7 +200,7 @@ async def author(self):
     async def favorite(self):
         resp = await self.client.api.call("/favorites", "POST", params={"type": types.FavoriteType.World,
                                                                         "favoriteId": self.id})
-        return Favorite(resp["data"])
+        return Favorite(self.client, resp["data"])
 
 
 class World(o.World, LimitedWorld):
@@ -231,10 +231,10 @@ class Location(o.Location):
 class Instance(o.Instance):
     async def world(self):
         resp = await self.client.api.call("/worlds/"+self.worldId)
-        return World(resp["data"])
+        return World(self.client, resp["data"])
 
     async def join(self):
-        await self.client.api.call("/joins", "PUT", json={"worldId": self.location})
+        await self.client.api.call("/joins", "PUT", json={"worldId": self.location.location})
 
 # unityPackage objects
 

vrcpy/objects.py

@@ -183,7 +183,7 @@ def favorite(self):
 
         resp = self.client.api.call("/favorites", "POST", params={"type": types.FavoriteType.Friend,
                                                                   "favoriteId": self.id})
-        return Favorite(resp["data"])
+        return Favorite(self.client, resp["data"])
 
     def __init__(self, client, obj=None):
         super().__init__(client)
@@ -331,7 +331,7 @@ def get_favorite(self, id):
         '''
 
         resp = self.client.api.call("/favorites/"+id)
-        return Favorite(resp)
+        return Favorite(self.client, resp)
 
     def favorite(self):
         raise AttributeError("'CurrentUser' object has no attribute 'favorite'")
@@ -423,7 +423,7 @@ def favorite(self):
 
         resp = self.client.api.call("/favorites", "POST", params={"type": types.FavoriteType.World,
                                                                   "favoriteId": self.id})
-        return Favorite(resp["data"])
+        return Favorite(self.client, resp["data"])
 
     def __init__(self, client, obj=None):
         super().__init__(client)
@@ -522,7 +522,7 @@ def world(self):
         '''
 
         resp = self.client.api.call("/worlds/"+self.worldId)
-        return World(resp["data"])
+        return World(self.client, resp["data"])
 
     def short_name(self):
         '''