TheLovinator/ttvdrops
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dashboard

Browse source
This commit is contained in:
Joakim Hellsén 2026-01-08 19:41:05 +01:00
commit 0060f4d8f6
No known key found for this signature in database
2 changed files with 113 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

210
templates/twitch/dashboard.html
View file

@ -7,7 +7,7 @@
<main> <main>
<h1 id="page-title">Twitch Drops</h1> <h1 id="page-title">Twitch Drops</h1>
<pre> <pre>
Drops are sorted alphabetically by organization and game. Click on a campaign or game title to see more details. Latest drops are shown first within each game. Click on a campaign or game title to see more details.
Hover over the end time to see the exact date and time. Hover over the end time to see the exact date and time.
</pre> </pre>
<!-- RSS Feeds --> <!-- RSS Feeds -->
@ -18,99 +18,90 @@ Hover over the end time to see the exact date and time.
</div> </div>
{% if campaigns_by_org_game %} {% if campaigns_by_org_game %}
{% for org_id, org_data in campaigns_by_org_game.items %} {% for org_id, org_data in campaigns_by_org_game.items %}
<section id="org-section-{{ org_id }}"> {% for game_id, game_data in org_data.games.items %}
<h2> <article id="game-article-{{ game_id }}" style="margin-bottom: 2rem;">
{% if org_data.name %} <header style="margin-bottom: 1rem;">
{{ org_data.name }} <h2 style="margin: 0 0 0.5rem 0;">
{% else %} <a href="{% url 'twitch:game_detail' game_id %}">{{ game_data.name }}</a>
Organization {{ org_id }} </h2>
{% endif %} </header>
</h2> <div style="display: flex; gap: 1rem;">
{% for game_id, game_data in org_data.games.items %} <div style="flex-shrink: 0;">
<article id="game-article-{{ game_id }}"> <img src="{{ game_data.box_art }}"
<header style="margin-bottom: 1rem;"> alt="Box art for {{ game_data.name }}"
<h3 style="margin: 0 0 0.5rem 0;"> width="200"
<a href="{% url 'twitch:game_detail' game_id %}">{{ game_data.name }}</a> height="267"
</h3> style="border-radius: 8px" />
</header> </div>
<div style="display: flex; gap: 1rem;"> <div style="flex: 1; overflow-x: auto;">
<div style="flex-shrink: 0;"> <div style="display: flex; gap: 1rem; min-width: max-content;">
<img src="{{ game_data.box_art }}" {% for campaign in game_data.campaigns %}
alt="Box art for {{ game_data.name }}" <article id="campaign-article-{{ campaign.twitch_id }}"
width="200" style="display: flex;
height="267" flex-direction: column;
style="border-radius: 8px" /> align-items: center;
</div> padding: 0.5rem;
<div style="flex: 1; overflow-x: auto;"> flex-shrink: 0">
<div style="display: flex; gap: 1rem; min-width: max-content;"> <div>
{% for campaign in game_data.campaigns %} <a href="{% url 'twitch:campaign_detail' campaign.twitch_id %}">
<article id="campaign-article-{{ campaign.twitch_id }}" <img src="{{ campaign.image_url }}"
style="display: flex; alt="Image for {{ campaign.name }}"
flex-direction: column; width="120"
align-items: center; height="120"
padding: 0.5rem; style="border-radius: 4px" />
flex-shrink: 0"> <h4 style="margin: 0.5rem 0; text-align: left;">{{ campaign.clean_name }}</h4>
<div> </a>
<a href="{% url 'twitch:campaign_detail' campaign.twitch_id %}"> <time datetime="{{ campaign.end_at|date:'c' }}"
<img src="{{ campaign.image_url }}" title="{{ campaign.end_at|date:'DATETIME_FORMAT' }}"
alt="Image for {{ campaign.name }}" style="font-size: 0.9rem;
width="120" display: block;
height="120" text-align: left">
style="border-radius: 4px" /> Ends in {{ campaign.end_at|timeuntil }}
<h4 style="margin: 0.5rem 0; text-align: left;">{{ campaign.clean_name }}</h4> </time>
</a> <time datetime="{{ campaign.start_at|date:'c' }}"
<time datetime="{{ campaign.end_at|date:'c' }}" title="{{ campaign.start_at|date:'DATETIME_FORMAT' }}"
title="{{ campaign.end_at|date:'DATETIME_FORMAT' }}" style="font-size: 0.9rem;
style="font-size: 0.9rem; display: block;
display: block; text-align: left">
text-align: left"> Started {{ campaign.start_at|timesince }} ago
Ends in {{ campaign.end_at|timeuntil }} </time>
</time> <time datetime="{{ campaign.added_at|date:'c' }}"
<time datetime="{{ campaign.start_at|date:'c' }}" title="{{ campaign.added_at|date:'DATETIME_FORMAT' }}"
title="{{ campaign.start_at|date:'DATETIME_FORMAT' }}" style="font-size: 0.9rem;
style="font-size: 0.9rem; display: block;
display: block; text-align: left">
text-align: left"> Scraped {{ campaign.added_at|timesince }} ago
Started {{ campaign.start_at|timesince }} ago </time>
</time> <time datetime="{{ campaign.start_at|date:'c' }} to {{ campaign.end_at|date:'c' }}"
<time datetime="{{ campaign.added_at|date:'c' }}" title="{{ campaign.start_at|date:'DATETIME_FORMAT' }} to {{ campaign.end_at|date:'DATETIME_FORMAT' }}"
title="{{ campaign.added_at|date:'DATETIME_FORMAT' }}" style="font-size: 0.9rem;
style="font-size: 0.9rem; display: block;
display: block; text-align: left">
text-align: left"> Duration: {{ campaign.start_at|timesince:campaign.end_at }}
Scraped {{ campaign.added_at|timesince }} ago </time>
</time> <div style="margin-top: 0.5rem; font-size: 0.8rem; ">
<time datetime="{{ campaign.start_at|date:'c' }} to {{ campaign.end_at|date:'c' }}" <strong>Channels:</strong>
title="{{ campaign.start_at|date:'DATETIME_FORMAT' }} to {{ campaign.end_at|date:'DATETIME_FORMAT' }}" <ul style="margin: 0.25rem 0 0 0;
style="font-size: 0.9rem; padding-left: 1rem;
display: block; list-style-type: none">
text-align: left"> {% if campaign.allow_is_enabled %}
Duration: {{ campaign.start_at|timesince:campaign.end_at }} {% if campaign.allow_channels.all %}
</time> {% for channel in campaign.allow_channels.all %}
<div style="margin-top: 0.5rem; font-size: 0.8rem; "> {% if forloop.counter <= 5 %}
<strong>Channels:</strong> <li style="margin-bottom: 0.1rem;">
<ul style="margin: 0.25rem 0 0 0; <a href="https://twitch.tv/{{ channel.name }}"
padding-left: 1rem; target="_blank"
list-style-type: none"> rel="noopener noreferrer"
{% if campaign.allow_is_enabled %} title="Watch {{ channel.display_name }} on Twitch">
{% if campaign.allow_channels.all %} {{ channel.display_name }}
{% for channel in campaign.allow_channels.all %} </a>
{% if forloop.counter <= 5 %}
<li style="margin-bottom: 0.1rem;">
<a href="https://twitch.tv/{{ channel.name }}"
target="_blank"
rel="noopener noreferrer"
title="Watch {{ channel.display_name }} on Twitch">
{{ channel.display_name }}
</a>
</li>
{% endif %}
{% endfor %}
{% if campaign.allow_channels.all|length > 5 %}
<li style="margin-bottom: 0.1rem; color: #666; font-style: italic;">
... and {{ campaign.allow_channels.all|length|add:"-5" }} more
</li> </li>
{% endif %} {% endif %}
{% endfor %}
{% if campaign.allow_channels.all|length > 5 %}
<li style="margin-bottom: 0.1rem; color: #666; font-style: italic;">
... and {{ campaign.allow_channels.all|length|add:"-5" }} more
</li>
{% endif %} {% endif %}
{% else %} {% else %}
{% if campaign.game.twitch_directory_url %} {% if campaign.game.twitch_directory_url %}
@ -118,25 +109,38 @@ Hover over the end time to see the exact date and time.
<a href="{{ campaign.game.twitch_directory_url }}" <a href="{{ campaign.game.twitch_directory_url }}"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
title="Find streamers playing {{ campaign.game.display_name }} with drops enabled"> title="Open Twitch category page for {{ campaign.game.display_name }} with Drops filter">
Go to a participating live channel Browse {{ campaign.game.display_name }} category
</a> </a>
</li> </li>
{% else %} {% else %}
<li>Failed to get Twitch directory URL :(</li> <li>Failed to get Twitch category URL :(</li>
{% endif %} {% endif %}
{% endif %} {% endif %}
</ul> {% else %}
</div> {% if campaign.game.twitch_directory_url %}
<li>
<a href="{{ campaign.game.twitch_directory_url }}"
target="_blank"
rel="noopener noreferrer"
title="Find streamers playing {{ campaign.game.display_name }} with drops enabled">
Go to a participating live channel
</a>
</li>
{% else %}
<li>Failed to get Twitch directory URL :(</li>
{% endif %}
{% endif %}
</ul>
</div> </div>
</article> </div>
{% endfor %} </article>
</div> {% endfor %}
</div> </div>
</div> </div>
</article> </div>
{% endfor %} </article>
</section> {% endfor %}
{% endfor %} {% endfor %}
{% else %} {% else %}
<p>No active campaigns at the moment.</p> <p>No active campaigns at the moment.</p>

29
twitch/views.py
View file

@ -641,9 +641,11 @@ def dashboard(request: HttpRequest) -> HttpResponse:
.prefetch_related( .prefetch_related(
"allow_channels", "allow_channels",
) )
.order_by("-start_at")
) )
campaigns_by_org_game: dict[str, Any] = {} # Use OrderedDict to preserve insertion order (newest campaigns first)
campaigns_by_org_game: OrderedDict[str, Any] = OrderedDict()
for campaign in active_campaigns: for campaign in active_campaigns:
owner: Organization | None = campaign.game.owner owner: Organization | None = campaign.game.owner
@ -654,7 +656,7 @@ def dashboard(request: HttpRequest) -> HttpResponse:
game_name: str = campaign.game.display_name game_name: str = campaign.game.display_name
if org_id not in campaigns_by_org_game: if org_id not in campaigns_by_org_game:
campaigns_by_org_game[org_id] = {"name": org_name, "games": {}} campaigns_by_org_game[org_id] = {"name": org_name, "games": OrderedDict()}
if game_id not in campaigns_by_org_game[org_id]["games"]: if game_id not in campaigns_by_org_game[org_id]["games"]:
campaigns_by_org_game[org_id]["games"][game_id] = { campaigns_by_org_game[org_id]["games"][game_id] = {
@ -663,33 +665,14 @@ def dashboard(request: HttpRequest) -> HttpResponse:
"campaigns": [], "campaigns": [],
} }
campaigns_by_org_game[org_id]["games"][game_id]["campaigns"].append( campaigns_by_org_game[org_id]["games"][game_id]["campaigns"].append(campaign)
campaign,
)
sorted_campaigns_by_org_game: dict[str, Any] = {
org_id: campaigns_by_org_game[org_id]
for org_id in sorted(
campaigns_by_org_game.keys(),
key=lambda k: campaigns_by_org_game[k]["name"],
)
}
for org_data in sorted_campaigns_by_org_game.values():
org_data["games"] = {
game_id: org_data["games"][game_id]
for game_id in sorted(
org_data["games"].keys(),
key=lambda k: org_data["games"][k]["name"],
)
}
return render( return render(
request, request,
"twitch/dashboard.html", "twitch/dashboard.html",
{ {
"active_campaigns": active_campaigns, "active_campaigns": active_campaigns,
"campaigns_by_org_game": sorted_campaigns_by_org_game, "campaigns_by_org_game": campaigns_by_org_game,
"now": now, "now": now,
}, },
) )