From be5a7a8c4a5bf0d309dc285505ce3d65a6914127 Mon Sep 17 00:00:00 2001 From: dkvasov Date: Wed, 16 May 2018 17:47:12 +0300 Subject: [PATCH] zulip_bots: Clean gyphy bot code. --- zulip_bots/zulip_bots/bots/giphy/giphy.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/zulip_bots/zulip_bots/bots/giphy/giphy.py b/zulip_bots/zulip_bots/bots/giphy/giphy.py index 2f360bc..d64ed6c 100644 --- a/zulip_bots/zulip_bots/bots/giphy/giphy.py +++ b/zulip_bots/zulip_bots/bots/giphy/giphy.py @@ -1,10 +1,6 @@ -from configparser import SafeConfigParser from typing import Dict, Any, Union import requests import logging -import sys -import os -import re from requests.exceptions import HTTPError, ConnectionError from zulip_bots.custom_exceptions import ConfigValidationError @@ -12,14 +8,15 @@ from zulip_bots.custom_exceptions import ConfigValidationError GIPHY_TRANSLATE_API = 'http://api.giphy.com/v1/gifs/translate' GIPHY_RANDOM_API = 'http://api.giphy.com/v1/gifs/random' + class GiphyHandler(object): - ''' + """ This plugin posts a GIF in response to the keywords provided by the user. Images are provided by Giphy, through the public API. The bot looks for messages starting with @mention of the bot and responds with a message with the GIF based on provided keywords. It also responds to private messages. - ''' + """ def usage(self) -> str: return ''' This plugin allows users to post GIFs provided by Giphy. @@ -38,7 +35,7 @@ class GiphyHandler(object): raise ConfigValidationError(str(e)) except HTTPError as e: error_message = str(e) - if (data.status_code == 403): + if data.status_code == 403: error_message += ('This is likely due to an invalid key.\n' 'Follow the instructions in doc.md for setting an API key.') raise ConfigValidationError(error_message) @@ -83,6 +80,7 @@ def get_url_gif_giphy(keyword: str, api_key: str) -> Union[int, str]: raise GiphyNoResultException() return gif_url + def get_bot_giphy_response(message: Dict[str, str], bot_handler: Any, config_info: Dict[str, str]) -> str: # Each exception has a specific reply should "gif_url" return a number. # The bot will post the appropriate message for the error.