From ce03c62c6b573653d546ab289c9718242b3bbaa6 Mon Sep 17 00:00:00 2001
From: NCPlayz <chowdhurynadir0@outlook.com>
Date: Mon, 29 Jun 2020 16:58:19 +0100
Subject: [bugs] stop resolving Object for template/invite; remove dupe methods

---
 discord/utils.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'discord/utils.py')

diff --git a/discord/utils.py b/discord/utils.py
index 9c4bd43a..e42f5679 100644
--- a/discord/utils.py
+++ b/discord/utils.py
@@ -442,8 +442,8 @@ def resolve_invite(invite):
         The invite code.
     """
     from .invite import Invite  # circular import
-    if isinstance(invite, (Invite, Object)):
-        return invite.id
+    if isinstance(invite, Invite):
+        return invite.code
     else:
         rx = r'(?:https?\:\/\/)?discord(?:\.gg|(?:app)?\.com\/invite)\/(.+)'
         m = re.match(rx, invite)
@@ -453,8 +453,8 @@ def resolve_invite(invite):
 
 def resolve_template(code):
     from .template import Template # circular import
-    if isinstance(code, (Template, Object)):
-        return template.id
+    if isinstance(code, Template):
+        return template.code
     else:
         rx = r'(?:https?\:\/\/)?discord(?:\.new|(?:app)?\.com\/template)\/(.+)'
         m = re.match(rx, code)
-- 
cgit v1.2.3