majjo/Twitch-Drops-Miner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Event instead of Color for bet failed and bet general. Skip drop message for telegram and send as unique message

Browse Source
This commit is contained in:
Alessandro Maggio
2021-09-04 12:05:56 +02:00
parent d601b61773
commit 62e0e92058
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
TwitchChannelPointsMiner/classes/Twitch.py
View File

@@ -362,22 +362,26 @@ class Twitch(object):
drop.has_preconditions_met is not False
and drop.is_printable is True
):
logger.info(
drop_messages = [
f"{streamers[index]} is streaming {streamers[index].stream}",
extra={"event": Events.DROP_STATUS},
)
logger.info(
f"Campaign: {campaign}",
extra={"event": Events.DROP_STATUS},
)
logger.info(
f"Drop: {drop}",
extra={"event": Events.DROP_STATUS},
)
logger.info(
f"{drop.progress_bar()}",
extra={"event": Events.DROP_STATUS},
)
]
for msg in drop_messages:
logger.info(
msg,
extra={
"event": Events.DROP_STATUS,
"skip_telegram": True,
},
)
if Settings.logger.telegram is not None:
Settings.logger.telegram.send(
"\n".join(drop_messages),
Events.DROP_STATUS,
)
except requests.exceptions.ConnectionError as e:
logger.error(f"Error while trying to send minute watched: {e}")
@@ -471,7 +475,7 @@ class Twitch(object):
f"Failed to place bet, error: {error_code}",
extra={
"emoji": ":four_leaf_clover:",
"color": Settings.logger.color_palette.BET_FAILED,
"event": Events.BET_FAILED,
},
)
else:
@@ -479,7 +483,7 @@ class Twitch(object):
f"Bet won't be placed as the amount {_millify(decision['amount'])} is less than the minimum required 10",
extra={
"emoji": ":four_leaf_clover:",
"color": Settings.logger.color_palette.BET_GENERAL,
"event": Events.BET_GENERAL,
},
)
else:

8
TwitchChannelPointsMiner/logger.py
View File

@@ -115,7 +115,13 @@ class GlobalFormatter(logging.Formatter):
record.msg = remove_emoji(record.msg)
if hasattr(record, "event"):
if self.settings.telegram is not None:
skip_telegram = (
False
if hasattr(record, "skip_telegram") is False
or hasattr(record, "skip_telegram") is False
else True
)
if self.settings.telegram is not None and skip_telegram is False:
self.settings.telegram.send(record.msg, record.event)
if self.settings.colored is True: