diff --git a/config.template b/config.template index 484efb7..6ccb6e6 100644 --- a/config.template +++ b/config.template @@ -36,6 +36,7 @@ welcome_message = MeshBot, here for you like a friend who is not. Try sending: p whoami = True # enable or disable the Joke module DadJokes = True +DadJokesEmoji = False # enable or disable the Solar module spaceWeather = True # enable or disable the wikipedia search module diff --git a/modules/games/joke.py b/modules/games/joke.py index 2e70f36..c838779 100644 --- a/modules/games/joke.py +++ b/modules/games/joke.py @@ -117,6 +117,10 @@ def sendWithEmoji(message): def tell_joke(nodeID=0): dadjoke = Dadjoke() - renderedLaugh = sendWithEmoji(dadjoke.joke) + + if dad_jokes_emojiJokes: + renderedLaugh = sendWithEmoji(dadjoke.joke) + else: + renderedLaugh = dadjoke.joke return renderedLaugh diff --git a/modules/settings.py b/modules/settings.py index 12c57c9..4e7afc1 100644 --- a/modules/settings.py +++ b/modules/settings.py @@ -115,6 +115,7 @@ try: lheardCmdIgnoreNode = config['general'].get('lheardCmdIgnoreNode', '').split(',') whoami_enabled = config['general'].getboolean('whoami', True) dad_jokes_enabled = config['general'].getboolean('DadJokes', False) + dad_jokes_emojiJokes = config['general'].getboolean('DadJokesEmoji', False) solar_conditions_enabled = config['general'].getboolean('spaceWeather', True) wikipedia_enabled = config['general'].getboolean('wikipedia', False) llm_enabled = config['general'].getboolean('ollama', False) # https://ollama.com