From ee4b696fc5a03e03f75643fbbbedd55272a5d4ed Mon Sep 17 00:00:00 2001 From: taizan-hokuto <55448286+taizan-hokuto@users.noreply.github.com> Date: Thu, 23 Jul 2020 16:20:12 +0900 Subject: [PATCH] Add colors attribute --- .../processors/default/renderer/legacypaid.py | 2 +- .../processors/default/renderer/paidmessage.py | 15 +++++++++++++++ .../processors/default/renderer/paidsticker.py | 17 +++++++++++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/pytchat/processors/default/renderer/legacypaid.py b/pytchat/processors/default/renderer/legacypaid.py index ee238cf..dc6b2e4 100644 --- a/pytchat/processors/default/renderer/legacypaid.py +++ b/pytchat/processors/default/renderer/legacypaid.py @@ -12,4 +12,4 @@ class LiveChatLegacyPaidMessageRenderer(BaseRenderer): def get_message(self, renderer): message = (renderer["eventText"]["runs"][0]["text"] ) + ' / ' + (renderer["detailText"]["simpleText"]) - return message + return message, [message] diff --git a/pytchat/processors/default/renderer/paidmessage.py b/pytchat/processors/default/renderer/paidmessage.py index 9e69ab4..70bd055 100644 --- a/pytchat/processors/default/renderer/paidmessage.py +++ b/pytchat/processors/default/renderer/paidmessage.py @@ -4,6 +4,10 @@ from .base import BaseRenderer superchat_regex = re.compile(r"^(\D*)(\d{1,3}(,\d{3})*(\.\d*)*\b)$") +class Colors: + pass + + class LiveChatPaidMessageRenderer(BaseRenderer): def __init__(self, item): super().__init__(item, "superChat") @@ -18,6 +22,7 @@ class LiveChatPaidMessageRenderer(BaseRenderer): self.currency = currency.symbols[symbol]["fxtext"] if currency.symbols.get( symbol) else symbol self.bgColor = self.renderer.get("bodyBackgroundColor", 0) + self.colors = self.get_colors() def get_amountdata(self, renderer): amountDisplayString = renderer["purchaseAmountText"]["simpleText"] @@ -29,3 +34,13 @@ class LiveChatPaidMessageRenderer(BaseRenderer): symbol = "" amount = 0.0 return amountDisplayString, symbol, amount + + def get_colors(self): + colors = Colors() + colors.headerBackgroundColor = self.renderer.get("headerBackgroundColor", 0) + colors.headerTextColor = self.renderer.get("headerTextColor", 0) + colors.bodyBackgroundColor = self.renderer.get("bodyBackgroundColor", 0) + colors.bodyTextColor = self.renderer.get("bodyTextColor", 0) + colors.timestampColor = self.renderer.get("timestampColor", 0) + colors.authorNameTextColor = self.renderer.get("authorNameTextColor", 0) + return colors diff --git a/pytchat/processors/default/renderer/paidsticker.py b/pytchat/processors/default/renderer/paidsticker.py index b474e71..723eb88 100644 --- a/pytchat/processors/default/renderer/paidsticker.py +++ b/pytchat/processors/default/renderer/paidsticker.py @@ -4,6 +4,10 @@ from .base import BaseRenderer superchat_regex = re.compile(r"^(\D*)(\d{1,3}(,\d{3})*(\.\d*)*\b)$") +class Colors: + pass + + class LiveChatPaidStickerRenderer(BaseRenderer): def __init__(self, item): super().__init__(item, "superSticker") @@ -18,8 +22,9 @@ class LiveChatPaidStickerRenderer(BaseRenderer): self.currency = currency.symbols[symbol]["fxtext"] if currency.symbols.get( symbol) else symbol self.bgColor = self.renderer.get("moneyChipBackgroundColor", 0) - self.sticker = "https:" + \ - self.renderer["sticker"]["thumbnails"][0]["url"] + self.sticker = "".join(("https:", + self.renderer["sticker"]["thumbnails"][0]["url"])) + self.colors = self.get_colors() def get_amountdata(self, renderer): amountDisplayString = renderer["purchaseAmountText"]["simpleText"] @@ -31,3 +36,11 @@ class LiveChatPaidStickerRenderer(BaseRenderer): symbol = "" amount = 0.0 return amountDisplayString, symbol, amount + + def get_colors(self): + colors = Colors() + colors.moneyChipBackgroundColor = self.renderer.get("moneyChipBackgroundColor", 0) + colors.moneyChipTextColor = self.renderer.get("moneyChipTextColor", 0) + colors.backgroundColor = self.renderer.get("backgroundColor", 0) + colors.authorNameTextColor = self.renderer.get("authorNameTextColor", 0) + return colors