diff --git a/twitch/feeds.py b/twitch/feeds.py index 4c4985a..5a559df 100644 --- a/twitch/feeds.py +++ b/twitch/feeds.py @@ -162,12 +162,11 @@ def _build_channels_html( if channels_all: items: list[SafeString] = [ format_html( - '
  • {}
  • ', - ch.name, - ch.display_name, - ch.display_name, + '
  • {}
  • ', + channel.name, + channel.display_name, ) - for ch in channels_all[:max_links] + for channel in channels_all[:max_links] ] if total > max_links: items.append(format_html("
  • ... and {} more
  • ", total - max_links)) @@ -191,10 +190,8 @@ def _build_channels_html( "Game %s has no Twitch directory URL for channel fallback link", game, ) - if ( - getattr(game, "details_url", "") - == "https://help.twitch.tv/s/article/twitch-chat-badges-guide " - ): + + if "twitch-chat-badges-guide" in getattr(game, "details_url", ""): # TODO(TheLovinator): Improve detection of global emotes # noqa: TD003 return format_html("{}", "") @@ -273,7 +270,7 @@ def _construct_drops_summary( linked_name: SafeString = format_html( '{}', channel_name, - benefit_name, + channel_name, ) if badge_desc: benefit_names.append(( @@ -759,10 +756,6 @@ class GameCampaignFeed(Feed): ), ) - desc_text: str | None = getattr(item, "description", None) - if desc_text: - parts.append(format_html("

    {}

    ", desc_text)) - # Insert start and end date info insert_date_info(item, parts) @@ -783,12 +776,6 @@ class GameCampaignFeed(Feed): if details_url: parts.append(format_html('About', details_url)) - account_link_url: str | None = getattr(item, "account_link_url", None) - if account_link_url: - parts.append( - format_html(' | Link Account', account_link_url), - ) - return SafeText("".join(str(p) for p in parts)) def item_pubdate(self, item: DropCampaign) -> datetime.datetime: