channel_rewards/channelRewards_base.py

@@ -52,5 +52,5 @@ class AbstractChannelRewards(metaclass=ABCMeta):
         return self.isChannelRewardEnabled
 
     @abstractmethod
-    def do_ChannelReward(self, source, user, command, rest, bonusData):
+    def do_ChannelReward(self, source, user, command, rewardPrompt, userInput, bonusData):
         pass

channel_rewards/implemented/ChannelReward_Hydration.py

@@ -13,12 +13,9 @@ class ChannelReward_Hydration_v2(AbstractChannelRewards, metaclass=ABCMeta):
         self.help = ["This is a hydration channel point reward."]
         self.isChannelRewardEnabled = True
 
-    def do_ChannelReward(self, source = AbstractChannelRewards.ChannelRewardsSource.default, user = "User",  rewardName = "", rest = "", bonusData = None):
-        returnString = user + " sent: [ " + rewardName + " ] with: " + rest
-        print(returnString)
-        for x in range(10):
-            print("This is wet")
-        return returnString
+    def do_ChannelReward(self, source = AbstractChannelRewards.ChannelRewardsSource.default, user = "User",  rewardName = "", rewardPrompt = "", userInput = "", bonusData = None):
+
+        return None
 
     def get_help(self):
         return self.help

standalone_channelrewards.py

@@ -36,11 +36,13 @@ def is_reward(reward_name, reward_type) -> bool:
         return False
 
 
-def handle_reward(source, username, reward_name, reward_type, rest, bonusData):
+def handle_reward(source, username, reward_name, reward_type, rewardPrompt, userInput, bonusData):
     #reward:AbstractChannelRewards = loadedRewards[reward_name]
-    reward:AbstractChannelRewards = loadedRewards[reward_type][reward_name]
+    tempType = reward_type.replace('ChannelRewardsType.', '')
+    realTempType = AbstractChannelRewards.ChannelRewardsType.__dict__[tempType]
+    reward:AbstractChannelRewards = loadedRewards[realTempType][reward_name]
     if reward is not None:
-        reward_response = reward.do_ChannelReward(source, username, reward_name, rest, bonusData)
+        reward_response = reward.do_ChannelReward(source, username, reward_name, rewardPrompt, userInput, bonusData)
         return flask.make_response("{\"message\":\"%s\"}" % reward_response, 200, {"Content-Type": "application/json"})
 
     #print("Doing a reward")
@@ -63,8 +65,11 @@ def exec_reward():
         return flask.make_response('{\"text\":"Argument \'reward_name\' not in request"}', 400)
     if 'reward_type' not in request.args:
         return flask.make_response('{\"text\":"Argument \'reward_name\' not in request"}', 400)
-    if 'rest' not in request.args:
-        return flask.make_response('{\"text\":"Argument \'rest\' not in request"}', 400)
+    if 'reward_prompt' not in request.args:
+        return flask.make_response('{\"text\":"Argument \'reward_prompt\' not in request"}', 400)
+    if 'user_input' not in request.args:
+        return flask.make_response('{\"text\":"Argument \'user_input\' not in request"}', 400)
+
 
     if 'reward_source' not in request.args:
         return flask.make_response('{\"text\":"Argument \'reward_source\' not in request"}', 400)
@@ -74,7 +79,14 @@ def exec_reward():
     else:
         username = request.args['user_name']
 
-    return handle_reward(request.args['reward_source'], username, request.args['reward_name'], request.args['reward_type'], request.args['rest'], request.args['bonus_data'])
+    return handle_reward(
+        request.args['reward_source'],
+        username,
+        request.args['reward_name'],
+        request.args['reward_type'],
+        request.args['reward_prompt'],
+        request.args['user_input'],
+        request.args['bonus_data'])
 
 
 if __name__ == '__main__':