From c1905d4607eeb98cefd8b8c8b6a13a3dd949257d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Wikle=20DUBARD?= <loic97429@gmail.com> Date: Tue, 20 Aug 2019 12:40:33 +0200 Subject: [PATCH] =?UTF-8?q?random=20more=20good=20gn=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- useless/shitpostbot5k.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43986b0..ceca741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## 20 aout 2019 **Ajout:** - shitpostbot5000 latest post every 30' --trigger coucou coucou -> coucoucou +- trigger coucou coucou -> coucoucou +- can send a random image from a insta hashtag page ## 19 aout 2019 **Ajout:** diff --git a/useless/shitpostbot5k.py b/useless/shitpostbot5k.py index 7995bfb..b271167 100755 --- a/useless/shitpostbot5k.py +++ b/useless/shitpostbot5k.py @@ -58,7 +58,11 @@ class Shitpostbot5000(object): return links @classmethod - def random(self, hashtag=random.choice(['shitpostmeme', 'shitpost', 'shitposts', 'memes', 'climbingmemes', 'rockclimbingmemes', 'climbingmemesaredank', 'climbingmemesofinstagram'])): + def random(self, hashtag=''): + if hashtag.strip() == '': + hashtag = random.choice(['shitpostmeme', 'shitpost', 'shitposts', 'memes']) + elif hashtag.strip() == 'climbing': + hashtag = random.choice(['climbingmemes', 'rockclimbingmemes', 'climbingmemesaredank', 'climbingmemesofinstagram']) self.ctx = ssl.create_default_context() self.ctx.check_hostname = False self.ctx.verify_mode = ssl.CERT_NONE -- GitLab