diff --git a/templates/base.html b/templates/base.html index 0492591..0f1bbaa 100644 --- a/templates/base.html +++ b/templates/base.html @@ -207,7 +207,7 @@ RSS | Debug | Dataset | - Report issue | + Issues | Donate | GitHub | API Docs | @@ -272,10 +272,6 @@ and SunkwiBOT/twitch-drops-api.
Data fetched at :01, :16, :31, and :46. -
- Prefer structured data? Use the API - or download datasets - instead of scraping. diff --git a/templates/chzzk/campaign_detail.html b/templates/chzzk/campaign_detail.html index e6fa5ac..7a5d8e7 100644 --- a/templates/chzzk/campaign_detail.html +++ b/templates/chzzk/campaign_detail.html @@ -117,15 +117,16 @@ style="margin-top: 0.5rem; border-top: 1px solid color-mix(in srgb, CanvasText 20%, transparent 80%); padding-top: 0.5rem"> -
+
- External -
+ letter-spacing: 0.05em">External
{% if campaign.pc_link_url %}[details]{% endif %} {% if campaign.account_link_url %}[connect]{% endif %} @@ -138,11 +139,12 @@ text-transform: uppercase; letter-spacing: 0.05em"> Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
-
Campaigns: +
+ Campaigns: [rss] twitch-drops-api (the API that powers some of these tools)
  • Twitch Drops by Fenris Apps
  • twitchdrops.app
    • -
    -
  • Drop Hunter (paid)
    • +
  • Drop Hunter (paid, $3/mo)

    • Contact

    Found a bug, have a suggestion, or just want to say hi? Reach out any way you like:

    diff --git a/templates/core/dashboard.html b/templates/core/dashboard.html index 9e723f8..1e62548 100644 --- a/templates/core/dashboard.html +++ b/templates/core/dashboard.html @@ -50,15 +50,47 @@

    Twitch Campaigns

    - [rss] - [atom] - [discord-flavored] - [api] - [explain] +
    {% if campaigns_by_game %} @@ -194,15 +226,47 @@ Open Reward Campaigns
    - [rss] - [atom] - [discord-flavored] - [api] - [explain] +

    Reward Campaigns are limited-time offers from brands that you can unlock by @@ -275,15 +339,49 @@

    Kick Campaigns

    - [rss] - [atom] - [discord-flavored] - [api] - [explain] +
    {% if kick_campaigns_by_game %} diff --git a/templates/kick/campaign_detail.html b/templates/kick/campaign_detail.html index fceb6d7..ca43ab0 100644 --- a/templates/kick/campaign_detail.html +++ b/templates/kick/campaign_detail.html @@ -153,15 +153,16 @@ style="margin-top: 0.5rem; border-top: 1px solid color-mix(in srgb, CanvasText 20%, transparent 80%); padding-top: 0.5rem"> -
    +
    - External -
    + letter-spacing: 0.05em">External
    {% if campaign.connect_url %} Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    -
    Campaigns: +
    + Campaigns: [rss] -

    List of

    Kick drops +

    List of Kick drops

    Kick > Campaigns
    @@ -29,7 +29,10 @@ style="margin-top: 0.5rem; border-top: 1px solid color-mix(in srgb, CanvasText 20%, transparent 80%); padding-top: 0.5rem"> -
    +
    Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    + Campaigns: [rss] -
    +
    Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    -
    Campaigns: +
    + Campaigns: [rss] -
    +
    Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    - [rss] + Campaigns: + [rss] [atom]

    Active Kick Drops

    -
    -
    +
    Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    diff --git a/templates/kick/org_list.html b/templates/kick/org_list.html index 29ba488..048aaf9 100644 --- a/templates/kick/org_list.html +++ b/templates/kick/org_list.html @@ -26,7 +26,10 @@ style="margin-top: 0.5rem; border-top: 1px solid color-mix(in srgb, CanvasText 20%, transparent 80%); padding-top: 0.5rem"> -
    +
    Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    + Campaigns: [rss] -
    +
    - External -
    + letter-spacing: 0.05em">External
    {% if campaign.details_url %}[details]{% endif %} {% if campaign.account_link_url %}[connect]{% endif %} @@ -135,11 +136,12 @@ text-transform: uppercase; letter-spacing: 0.05em"> Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    -
    [api] diff --git a/templates/twitch/campaign_list.html b/templates/twitch/campaign_list.html index e6ebd37..ee8fcf4 100644 --- a/templates/twitch/campaign_list.html +++ b/templates/twitch/campaign_list.html @@ -25,22 +25,60 @@
    Dashboard > Drops
    - - +
    +
    {% if campaigns_by_game %} {% for game_id, game_data in campaigns_by_game.items %} diff --git a/templates/twitch/game_detail.html b/templates/twitch/game_detail.html index c9d4e07..3c7602e 100644 --- a/templates/twitch/game_detail.html +++ b/templates/twitch/game_detail.html @@ -46,19 +46,13 @@ -
    {{ total_campaigns }} campaign{{ total_campaigns|pluralize }} - {% if total_rewards %} · {{ total_rewards }} reward{{ total_rewards|pluralize }}{% endif %} + {% if total_rewards %}· {{ total_rewards }} reward{{ total_rewards|pluralize }}{% endif %} {% if first_campaign_date and last_campaign_date %} - · + · - @@ -102,7 +96,21 @@ style="margin-top: 0.5rem; border-top: 1px solid color-mix(in srgb, CanvasText 20%, transparent 80%); padding-top: 0.5rem"> -
    +
    +
    +
    External
    + +
    Subscribe (?) + title="RSS feed documentation" + style="color: inherit; + text-decoration: none">(?)
    -
    Campaigns: +
    + Campaigns: [rss] [discord-flavored]
    -
    Rewards: +
    +
    +
    Developer
    +
    + [api] +
    +
    @@ -297,7 +318,7 @@ About / Redeem {% else %} {% if reward.about_url %}About{% endif %} - {% if reward.external_url %} · Redeem{% endif %} + {% if reward.external_url %}· Redeem{% endif %} {% endif %} @@ -335,7 +356,7 @@ About / Redeem {% else %} {% if reward.about_url %}About{% endif %} - {% if reward.external_url %} · Redeem{% endif %} + {% if reward.external_url %}· Redeem{% endif %} {% endif %} diff --git a/templates/twitch/game_less_rewards.html b/templates/twitch/game_less_rewards.html index 82707e1..6012efd 100644 --- a/templates/twitch/game_less_rewards.html +++ b/templates/twitch/game_less_rewards.html @@ -27,15 +27,36 @@

    Reward campaigns not tied to a specific Twitch game.

    - + {% if active_campaigns %}
    diff --git a/templates/twitch/games_grid.html b/templates/twitch/games_grid.html index eaf53df..ff35d8c 100644 --- a/templates/twitch/games_grid.html +++ b/templates/twitch/games_grid.html @@ -25,20 +25,61 @@
    Twitch > Games
    + {% if games_by_org %} diff --git a/templates/twitch/games_list.html b/templates/twitch/games_list.html index bca88ac..d843d9b 100644 --- a/templates/twitch/games_list.html +++ b/templates/twitch/games_list.html @@ -23,20 +23,61 @@
    Twitch > Games
    + {% if games_by_org %} {% for organization, games in games_by_org.items %} diff --git a/templates/twitch/org_list.html b/templates/twitch/org_list.html index d0d890f..88693bc 100644 --- a/templates/twitch/org_list.html +++ b/templates/twitch/org_list.html @@ -8,21 +8,60 @@
    Twitch > Organizations
    - + {% if orgs %}
      {% for organization in orgs %} diff --git a/templates/twitch/organization_detail.html b/templates/twitch/organization_detail.html index 03d4c94..6432d78 100644 --- a/templates/twitch/organization_detail.html +++ b/templates/twitch/organization_detail.html @@ -31,10 +31,13 @@ color: color-mix(in srgb, CanvasText 60%, transparent 40%); margin-top: 0.25rem"> {{ games_count }} game{{ games_count|pluralize }} - {% if total_campaigns %} · {{ total_campaigns }} campaign{{ total_campaigns|pluralize }}{% endif %} + {% if total_campaigns %}· {{ total_campaigns }} campaign{{ total_campaigns|pluralize }}{% endif %}
    -
    +
    Organization ID
    {{ organization.twitch_id }} @@ -51,7 +54,10 @@
    {% if campaign_stats %} -
    +
    {% if campaign_stats.active_campaigns %}
    Active @@ -88,15 +94,16 @@ style="margin-top: 0.5rem; border-top: 1px solid color-mix(in srgb, CanvasText 20%, transparent 80%); padding-top: 0.5rem"> -
    +
    - External -
    + letter-spacing: 0.05em">External
    [fenrisapps] @@ -119,18 +126,19 @@
    + style="flex-shrink: 0; + line-height: 0"> {% if game.box_art_best_url %} {% picture game.box_art_best_url alt=game.get_game_name width=120 %} {% endif %}
    {{ game.display_name }} + style="font-weight: 600">{{ game.display_name }} {% if game.slug %}
    + color: color-mix(in srgb, CanvasText 55%, transparent 45%)"> {{ game.slug }} {% endif %} diff --git a/templates/twitch/reward_campaign_detail.html b/templates/twitch/reward_campaign_detail.html index 93c58fb..3207bfc 100644 --- a/templates/twitch/reward_campaign_detail.html +++ b/templates/twitch/reward_campaign_detail.html @@ -115,26 +115,63 @@
    {% if reward_campaign.instructions %}{{ reward_campaign.instructions|linebreaksbr }}{% endif %}
    - -
    - [rss] - [atom] - [discord-flavored] - [api] - [explain] - {% if reward_campaign.external_url %} - [external] - {% endif %} - {% if reward_campaign.about_url %} - [about] - {% endif %} -
    +
    {% endblock content %} diff --git a/templates/twitch/reward_campaign_list.html b/templates/twitch/reward_campaign_list.html index f694728..dd17cd9 100644 --- a/templates/twitch/reward_campaign_list.html +++ b/templates/twitch/reward_campaign_list.html @@ -27,21 +27,47 @@ target="_blank" rel="noopener">SunkwiBOT/twitch-drops-api every 15 minutes.

    -
    - -
    - [rss] - [atom] - [discord-flavored] +
    + {% if reward_campaigns %} {% with sorted_campaigns=reward_campaigns|dictsortreversed:"ends_at" %} {# Active campaigns #} diff --git a/templates/twitch/sitewide_rewards.html b/templates/twitch/sitewide_rewards.html index 8f2ed6d..788bb39 100644 --- a/templates/twitch/sitewide_rewards.html +++ b/templates/twitch/sitewide_rewards.html @@ -43,17 +43,40 @@ rel="noopener">SunkwiBOT/twitch-drops-api every 15 minutes.

    - + {% if active_campaigns %}