Merge pull request #12 from Katistic/master

Avatar object importer key error

Author: Katistic

vrcpy/__init__.py

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

vrcpy/aobjects.py

@@ -201,6 +201,9 @@ async def world(self):
         resp = await self.client.api.call("/worlds/"+self.worldId)
         return World(resp["data"])
 
+    async def join(self):
+        await self.client.api.call("/joins", "PUT", json={"worldId": self.location})
+
 # Misc
 
 class Favorite(o.Favorite):

vrcpy/client.py

@@ -274,10 +274,11 @@ def login(self, username, password):
         self.me = objects.CurrentUser(self, resp["data"])
         self.loggedIn = True
 
-    def __init__(self, verify=True):
+    def __init__(self, verify=True, caching=True):
         self.api = Call(verify)
         self.loggedIn = False
         self.me = None
+        self.caching = caching
 
 class AClient(Client):
     '''
@@ -540,9 +541,10 @@ async def login(self, username, password):
 
         await self.me.cacheTask
 
-    def __init__(self, verify=True):
+    def __init__(self, verify=True, caching=True):
         super().__init__()
 
         self.api = ACall(verify=verify)
         self.loggedIn = False
         self.me = None
+        self.caching = caching

vrcpy/objects.py

@@ -15,6 +15,8 @@ def __init__(self, client):
         self.arrTypes = {} # Dictionary of what keys are arrays with special types
         self.client = client
 
+        self._dict = {} # Dictionary that is assigned
+
         self.cacheTask = None # cacheTask for async objects using __cinit__
 
     def _assign(self, obj):
@@ -31,12 +33,14 @@ def _assign(self, obj):
             else:
                 setattr(self, key, obj[key])
 
-        if hasattr(self, "__cinit__"):
+        if hasattr(self, "__cinit__") and self.client.caching:
             if asyncio.iscoroutinefunction(self.__cinit__):
                 self.cacheTask = asyncio.get_event_loop().create_task(self.__cinit__())
             else:
                 self.__cinit__()
 
+        self._dict = obj
+
     def _objectIntegrety(self, obj):
         if self.only == []:
             for key in self.unique:
@@ -78,8 +82,9 @@ def __init__(self, client, obj):
         super().__init__(client)
         self.unique += [
             "authorId",
-            "imported",
-            "version"
+            "authorName",
+            "version",
+            "name"
         ]
 
         self.arrTypes.update({
@@ -454,6 +459,14 @@ def short_name(self):
 
         return "https://vrchat.com/i/"+self.shortName
 
+    def join(self):
+        '''
+        "Joins" the instance
+        Returns void
+        '''
+
+        self.client.api.call("/joins", "PUT", json={"worldId": self.location.location})
+
     def __init__(self, client, obj):
         super().__init__(client)
         self.unique += [