Ensure unique id in Twitch feed. Not sure if it matters anywhere though.

stefansundin · Nov 22, 2018 · 8e44688 · 8e44688
1 parent c78e2c0
commit 8e44688
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app.rb b/app.rb
@@ -1031,6 +1031,7 @@
 
 get %r{/twitch/directory/game/(?<id>\d+)/(?<game_name>.+)} do |id, game_name|
   @id = id
+  @type = "game"
 
   type = %w[all upload archive highlight].pick(params[:type]) || "all"
   response = Twitch.get("/videos", query: { game_id: id, type: type })
@@ -1055,6 +1056,7 @@
 
 get %r{/twitch/(?<id>\d+)/(?<user>.+)} do |id, user|
   @id = id
+  @type = "user"
 
   type = %w[all upload archive highlight].pick(params[:type]) || "all"
   response = Twitch.get("/videos", query: { user_id: id, type: type })

diff --git a/views/twitch_feed.erb b/views/twitch_feed.erb
@@ -1,7 +1,7 @@
 <%- content_type :atom -%>
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <id>twitch:<%= @id %></id>
+  <id>twitch:<%= @type %>:<%= @id %></id>
   <title><%= @title.esc %></title>
   <icon>https://www.twitch.tv/favicon.ico</icon>
   <link href="<%= request.original_url.esc %>" rel="self" />