Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tweeking

  • Loading branch information...
commit 9b6dee9ada23d36e38936e79847af33a12fe1f3c 1 parent 8d4e8d2
@chrismatthieu authored
Showing with 5 additions and 4 deletions.
  1. +4 −3 lib/tss_web_server.rb
  2. +1 −1  views/search.erubis
View
7 lib/tss_web_server.rb
@@ -80,11 +80,12 @@ class TSSWebServer < Sinatra::Base
end
get("/ustream") do
+ # key=339100083E900F21974AE0A065A54BF2
channel = params[:channel]
info = JSON.load(
- open("http://api.ustream.tv/json/channel/%s/getInfo" % CGI.escape(channel)){ |f| f.read() })
- @channel_id = info["results"]["id"]
- query = info["results"]["socialStream"]["hashtag"]
+ open("http://api.ustream.tv/json/channel/%s/getInfo?key=339100083E900F21974AE0A065A54BF2" % CGI.escape(channel)){ |f| f.read() })
+ @channel_id = info["results"]["id"] rescue "cnn"
+ query = info["results"]["socialStream"]["hashtag"] rescue "cnn"
return search(query, :ustream, false)
end
View
2  views/search.erubis
@@ -33,7 +33,7 @@
function onLoad() {
initialize();
// supress left column
-onCloseLeftButtonClick();
+// onCloseLeftButtonClick();
}
</script>
Please sign in to comment.
Something went wrong with that request. Please try again.