From: CMDR furrycat <elite@furrycat.net>
Date: Thu, 25 Mar 2021 09:59:42 +0000 (+0100)
Subject: Abstract hiss as intended.
X-Git-Url: http://git.furryclan.net/?a=commitdiff_plain;h=75ee1013cde461084e013603cf2aa46918e1283e;p=furrycat%2Fcatbot.git

Abstract hiss as intended.
---

diff --git a/plugins/role/__init__.py b/plugins/role/__init__.py
index 31cc330..372063f 100644
--- a/plugins/role/__init__.py
+++ b/plugins/role/__init__.py
@@ -450,9 +450,9 @@ class Role(DBConnection):
     candidate = None
     if len(role_args):
       role_name = ' '.join(role_args)
-      candidate, managed_candidate, hiss = await self.find_role(role_name, message = message, command = 'vending')
-      if hiss:
-        await cat.hiss(channel)
+      candidate, managed_candidate, method = await self.find_role(role_name, message = message, command = 'vending')
+      if method:
+        await method(channel)
         return
       elif not candidate:
         log.info("Can't vend specific role: {}".format(role_name))
@@ -525,14 +525,14 @@ class Role(DBConnection):
         log.error('Failed to find server "{}"'.format(server_name))
         return
       member = server.get_member(reaction.user_id)
-    role, managed_role, hiss = await self.find_role(role_name, member = member, server = server)
+    role, managed_role, method = await self.find_role(role_name, member = member, server = server)
     if not role:
       log.error('Failed to find role "{}" on server {}!'.format(role_name, server_name))
       return
     if not managed_role:
       log.error('Role "{}" on server {} is not managed!'.format(role_name, server_name))
       return
-    if hiss:
+    if method:
       return
     if emoji.name == self.YES:
       try: