Resolve conflict

FerrisChat · Dec 17, 2021 · 4ac6a9a · 4ac6a9a
2 parents 023ead6 + 0969d32
commit 4ac6a9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ferris/__init__.py b/ferris/__init__.py
@@ -1,10 +1,8 @@
 __author__ = 'Cryptex & jay3332'
-__version__ = '0.0.b1.post1'
+__version__ = '0.0.b1.post2'
 # 0.1.0 for the finished release
 
 
-import urllib.request
-
 from .asset import *
 from .base import *
 from .channel import *
@@ -41,6 +39,8 @@ def create_user(username: str, password: str, email: str) -> PartialUser:
     PartialUser
         The created user.
     """
+    import urllib.request
+
     resp = urllib.request.urlopen(
         urllib.request.Request(
             f'{HTTPClient.API_BASE_URL}/users',

diff --git a/ferris/handler.py b/ferris/handler.py
@@ -112,7 +112,7 @@ async def MemberCreate(self, data):
         if member := guild._members.get(data.get('user_id')):
             member._process_data(data.get('member'))
         else:
-            member = Member(guild, data.get('member'))
+            member = Member(self.connection, data.get('member'))
             guild._members[member.id] = member
         self.dispatch('member_create', member)
 
@@ -121,7 +121,7 @@ async def MemberUpdate(self, data):
         if member := guild._members.get(data.get('user_id')):
             member._process_data(data.get('member'))
         else:
-            member = Member(guild, data.get('user'))
+            member = Member(self.connection, data.get('user'))
             guild._members[member.id] = member
         self.dispatch('member_update', member)
 
@@ -130,7 +130,7 @@ async def MemberDelete(self, data):
         if member := guild._members.get(data.get('user_id')):
             guild._members.pop(member.id, None)
         else:
-            member = Member(guild, data.get('member'))
+            member = Member(self.connection, data.get('member'))
         self.dispatch('member_delete', member)
 
     async def GuildCreate(self, data):