using twitter name from config for url to tweet message

grundprinzip · Sep 23, 2011 · 4b81ffc · 4b81ffc
1 parent f3ac175
commit 4b81ffc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/mobileapp/lib/press.js b/mobileapp/lib/press.js
@@ -25,11 +25,6 @@ te.subscribe("referee:finalwhistle", function(game) {
       },
       tweet = mustache.to_html(locales[["press.tweet.", game.players.home.concat(game.players.visitors).length, "players"].join("")], data);
 
-  if (!/\bproduction\b/.test(process.env.NODE_ENV)) {
-    console.log("Tweet: " + tweet);
-    return;
-  }
-
   oAuth = new OAuth(
     "http://twitter.com/oauth/request_token",
     "http://twitter.com/oauth/access_token",
@@ -49,7 +44,7 @@ te.subscribe("referee:finalwhistle", function(game) {
         te.publish("press:wrote", "-1");
       } else {
         sys.debug(data);
-        te.publish("press:wrote", JSON.parse(data).id_str);
+        te.publish("press:wrote", "https://twitter.com/#!/" + config.twitter.userId + "/status/" + JSON.parse(data).id_str);
       };
     }
   );

diff --git a/mobileapp/lib/referee.js b/mobileapp/lib/referee.js
@@ -19,7 +19,7 @@ var kickertable = {
       visitors: []
     },
     goals: [],
-    tweetId: "",
+    tweetURL: "",
     feed: []
   }
 },
@@ -91,7 +91,7 @@ var addGoal = function(scorer) {
       te.publish("referee:update", kickertable);
       finalTimeout = setTimeout(function(){
         kickertable.view = "summary";
-        kickertable.game.tweetId = "-2";
+        kickertable.game.tweetURL = "-2";
         kickertable.game.end = new Date().getTime();
         te.publish("referee:finalwhistle", kickertable.game);
       }, 2000);
@@ -109,7 +109,7 @@ var resetGame = function(rematch) {
   kickertable.view = "home";
   kickertable.game.start = 0;
   kickertable.game.end = 0;
-  kickertable.game.tweetId = "0";
+  kickertable.game.tweetURL = "0";
 
   if (rematch) {
     var home = kickertable.game.players.home;
@@ -156,8 +156,8 @@ te.subscribe("press:avatars", function(avatars) {
   te.publish("referee:update", kickertable);
 });
 
-te.subscribe("press:wrote", function(tweetId) {
-  kickertable.game.tweetId = tweetId;
+te.subscribe("press:wrote", function(tweetURL) {
+  kickertable.game.tweetURL = tweetURL;
 
   if (kickertable.view === "summary") {
     te.publish("referee:update", kickertable);

diff --git a/mobileapp/public/extensions/js/df/summary.js b/mobileapp/public/extensions/js/df/summary.js
@@ -16,12 +16,12 @@ df.summary = (function() {
     $duration.html([parseInt(duration / 60, 10), parseInt(duration % 60, 10)].join("'") + "\"");
     $score.html(score.join(":"));
 
-    if(msg.game.tweetId == -1) {
+    if(msg.game.tweetURL == -1) {
       tweetMsg = "Tweet konnte nicht gesendet werden… :-(";
-    } else if(msg.game.tweetId == -2) {
+    } else if(msg.game.tweetURL == -2) {
       tweetMsg = "";
-    } else if(msg.game.tweetId > 0) {
-      tweetMsg = '<a href="https://twitter.com/#!/s2kicker/status/' + msg.game.tweetId + '" class=\"js_target\">Yeah. Tweet wurde gesendet.</a>';
+    } else if(msg.game.tweetURL.length > 5) {
+      tweetMsg = '<a href="' + msg.game.tweetURL + '" class=\"js_target\">Yeah. Tweet wurde gesendet.</a>';
     } else {
       tweetMsg = "Tweet wird gesendet…";
     }