Skip to content

Commit

Permalink
Merge pull request #33 from ytturi/update-excuses
Browse files Browse the repository at this point in the history
Update excuses
  • Loading branch information
ytturi authored Nov 4, 2020
2 parents cc44503 + 0140b8a commit 1b1781a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
*.old
.coverage
build/
mortdegana.cfg
.vscode/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ install:
- pip install -r dev_requirements.txt

script:
- mypy meldebot/bot.py
- mypy meldebot
- python setup.py test
7 changes: 6 additions & 1 deletion meldebot/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@

# Command handlers
MEL_HANDLERS = (
[flute_handler] + TEXT_HANDLERS + GIF_HANDLERS + REPLY_HANDLERS + POLL_HANDLERS + MEME_HANDLERS
[flute_handler]
+ TEXT_HANDLERS
+ GIF_HANDLERS
+ REPLY_HANDLERS
+ POLL_HANDLERS
+ MEME_HANDLERS
)


Expand Down
4 changes: 2 additions & 2 deletions meldebot/mel/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ def get_tenor_api_key() -> Optional[str]:

def get_image_server_auth() -> Dict[str, Optional[str]]:
return {
'user': config.defaults().get("image_server_user", None),
'password': config.defaults().get("image_server_password", None)
"user": config.defaults().get("image_server_user", None),
"password": config.defaults().get("image_server_password", None),
}


Expand Down
3 changes: 1 addition & 2 deletions meldebot/mel/meme.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def get_gisce_meme_url(**params: Dict[str, str]) -> str:
logger.critical("NO AUTH INFO FOR ImageServer!")
exit(-1)

auth = HTTPBasicAuth(auth_info['user'], auth_info['password'])
auth = HTTPBasicAuth(auth_info["user"], auth_info["password"])

base_url = "https://bcclean.tk/ImageServer/api"
if params.get("id"):
Expand Down Expand Up @@ -61,4 +61,3 @@ def cb_gisce_meme_handler(update: Update, context: CallbackContext) -> None:
gisce_meme_handler = CommandHandler("gisce_meme", cb_gisce_meme_handler)

MEME_HANDLERS = [gisce_meme_handler]

4 changes: 4 additions & 0 deletions meldebot/mel/poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
"Esque em guardo dies de vacances",
"Estic esperant la corda i tamboret que m'he demanat a amazon",
"No puc venir pk la dona m'ha dit que anes a la platja de palafrugell i em quedés un parell d'hores sota l'aigua",
"Casum l'olla! Ja tinc un dinar...",
"He quedat per fer una muntanya",
"Jo vindira pero es que se m'ha espatllat el GPS del mòbil",
"No puc venir que he d'afegir excuses de moto al bot",
]


Expand Down

0 comments on commit 1b1781a

Please sign in to comment.