提交: b7fe8a4204b069e06ab9bc560e72f95e18f9a484 - sprnkr (git)

electron based twitter client

Commit MetaInfo

• 修订版: b7fe8a4204b069e06ab9bc560e72f95e18f9a484 (tree)
• 时间: 2016-02-10 23:55:11
• 作者: Hiromichi Matsushima <hylom@Hiro...>
• Commiter: Hiromichi Matsushima

Log Message

rewrite models module and move tomodel directory

更改概述

• delete: auth.js
• modified: main.js
• add: model/models.js
• delete: models.js
• modified: view/view.js

差异

--- a/auth.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var OAuth = require('oauth');
-var authInfo = require('./.account.json');
-
-var oauthToken = '';
-var oauthSecret = '';
-
-var oauth = new OAuth.OAuth(
-  'https://api.twitter.com/oauth/request_token',
-  'https://api.twitter.com/oauth/access_token',
-  authInfo.consumer_key,
-  authInfo.consumer_secret,
-  '1.0A',
-  'sprnkr://token',
-  'HMAC-SHA1'
-);
-
-exports.callbackUrl = function callbackUrl (callback) {
-
-  function sendCallback(err, token, secret, results) {
-    oauthToken = token;
-    oauthSecret = secret; 
-
-    var authUrl = 'https://twitter.com/oauth/authenticate?oauth_token=' + token;
-    callback(err, authUrl);
-  };
-
-  oauth.getOAuthRequestToken(sendCallback);
-}
-
-exports.getTokens = function getTokens (token, verifier, callback) {
-  console.log('token: ' + token);
-  console.log('verifier: ' + verifier);
-  oauth.getOAuthAccessToken(token, oauthSecret, verifier, callback);
-};

--- a/main.js
+++ b/main.js
@@ -1,14 +1,18 @@
 
 var electron = require('electron');
-var app = require('app');
+var app = electron.app;
 var BrowserWindow = require('browser-window');
-var auth = require('./auth');
 var url = require('url');
+var authInfo = require('./.account.json');
+var models = require('./model/models.js');
+
 var mainWindow = null;
-var models = require('./models');
 
 function createWindow (url) {
   mainWindow = new BrowserWindow({width: 400, height: 800});
+  if (client) {
+    mainWindow.client = client;
+  }
   if (url) {
     mainWindow.loadURL(url);
   } else {
@@ -21,25 +25,23 @@ function createWindow (url) {
 }
 
 app.on('ready', function() {
+  //createWindow();
+  var client = models.createClient(authInfo);
   var protocol = electron.protocol;
   protocol.registerFileProtocol('sprnkr', function (req, callback) {
     // req.url is 'sprnkr://token?oauth_token=***&oauth_verifier=***'
     var u = url.parse(req.url, true);
-    //console.log('token: ' + u.query.oauth_token);
-
-    auth.getTokens(u.query.oauth_token, u.query.oauth_verifier,
-                   function (err, token, secret, results) {
-                     if (err) throw err;
-                     console.log('access token: ', token);
-                     console.log('access secret: ', secret);
-                     models.setTokens(token, secret);
-                     createWindow();
-                   });
+    var token = u.query.oauth_token;
+    var verifier = u.query.oauth_verifier;
+    client.authorize(token, verifier, function (err) {
+      if (err) throw err;
+      app._clients = [client];
+      createWindow();
+    });
   });
 
-  //createWindow();
-  auth.callbackUrl( function (err, url) {
-    createWindow(url);
+  client.getCallbackUrl(function(err, authUrl) {
+    createWindow(authUrl);
   });
 });
 

--- /dev/null
+++ b/model/models.js
@@ -0,0 +1,70 @@
+// client.js
+
+var OAuth = require('oauth');
+var Twitter = require('twitter');
+
+var Client = function () {};
+
+Client.prototype.getCallbackUrl = function getCallbackUrl (callback) {
+  var client = this;
+  function sendCallback(err, token, secret, results) {
+    client.requestToken = token;
+    client.requestSecret = secret; 
+
+    var authUrl = 'https://twitter.com/oauth/authenticate?oauth_token=' + token;
+    callback(err, authUrl);
+  };
+  this.oauth.getOAuthRequestToken(sendCallback);
+};
+
+Client.prototype.authorize = function authorize(token, verifier, callback) {
+  var client = this;
+  function createTwitterClient(err, token, secret, results) {
+    if (err) {
+      callback(err);
+    }
+    client.twitter = new Twitter({
+      consumer_key: client.consumerKey,
+      consumer_secret: client.consumerSecret,
+      access_token_key: token,
+      access_token_secret: secret
+    });
+    callback(false);
+  };
+  client.oauth.getOAuthAccessToken(token, client.requestSecret, verifier, createTwitterClient);
+}
+
+Client.prototype.getHomeTimeline = function getHomeTimeline(callback) {
+  client.twitter.get('statuses/home_timeline', callback);
+};
+
+Client.prototype.stream = function stream(callback) {
+  client.twitter.stream('user', {}, function (stream) {
+    stream.on('data', callback);
+    stream.on('error', function(error) {
+      throw error;
+    });
+  });
+}
+
+function createClient(consumerKey, consumerSecret) {
+  if (consumerSecret === undefined) {
+    consumerSecret = consumerKey.consumer_secret;
+    consumerKey = consumerKey.consumer_key;
+  }
+  client = new Client();
+  client.consumerKey = consumerKey;
+  client.consumerSecret = consumerSecret;
+  client.oauth = new OAuth.OAuth(
+    'https://api.twitter.com/oauth/request_token',
+    'https://api.twitter.com/oauth/access_token',
+    consumerKey,
+    consumerSecret,
+    '1.0A',
+    'sprnkr://token',
+    'HMAC-SHA1'
+  );
+  return client;
+};
+
+exports.createClient = createClient;

--- a/models.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-var Twitter = require('twitter');
-
-// OAuth parameters
-var authInfo = require('./.account.json');
-var client = new Twitter(authInfo);
-var myAuth = {};
-myAuth.consumer_key = authInfo.consumer_key;
-myAuth.consumer_secret = authInfo.consumer_secret;
-myAuth.access_token_key = authInfo.acess_token_key;
-myAuth.access_token_secret = authInfo.access_token_secret;
-
-exports.setTokens = function (token, secret) {
-  myAuth.access_token_key = token;
-  myAuth.access_token_secret = secret;
-  client = new Twitter(myAuth);
-};
-
-exports.getHomeTimeline = function (callback) {
-  client.get('statuses/home_timeline', callback);
-};
-
-exports.stream = function (callback) {
-  client.stream('user', {}, function (stream) {
-    stream.on('data', callback);
-    stream.on('error', function(error) {
-      throw error;
-    });
-  });
-}

--- a/view/view.js
+++ b/view/view.js
@@ -1,49 +1,50 @@
-var util = require('util');
-var $ = require('jquery');
-var ejs = require('ejs');
-var moment = require('moment');
-
-function sprnkrViewMain () {
-  var tweetWriter = {};
-  tweetWriter.put = function write(tweet) {
-    if (tweet.user === undefined) {
-      return;
-    }
-    var tweetData = {
-      name:  tweet.user.name + ' (@' + tweet.user.screen_name + ')',
-      timestamp: moment(tweet.created_at).format('YYYY-MM-DD hh:mm:ss'),
-      text: tweet.text,
-      iconUrl: tweet.user.profile_image_url
-    }
-    var templ = '';
-    templ += '<div class="icon"><img src="<%= iconUrl %>"/></div>';
-    templ += '<div class="header"><span class="username"><%= name %></span><span class="timestamp"><%= timestamp %></span></div>';
-    templ += '<div class="body"><%= text %></div>';
-    var content = ejs.render(templ, tweetData);
-    var elem = $("<li>" + content + "</li>");
-    $("#sprnkr-items").prepend(elem);
-  }
-  tweetWriter.write = function (tweet) {
-    if (util.isArray(tweet)) {
-      tweet.reverse();
-      tweet.forEach(this.put);
-    } else {
-      this.put(tweet);
-    }
-  };
-
-  const remote = require('electron').remote;
-  var models = remote.require('./models');
-  models.getHomeTimeline(initTimeline);
-
-  function initTimeline(err, tweets, resp) {
-    if (err) throw err;
-    tweetWriter.write(tweets);
-    models.stream(function(tweets) {
-      tweetWriter.write(tweets);
-    });
-  };
-
-}
-
-sprnkrViewMain();
+var util = require('util');
+var $ = require('jquery');
+var ejs = require('ejs');
+var moment = require('moment');
+
+function sprnkrViewMain () {
+  var tweetWriter = {};
+  tweetWriter.put = function write(tweet) {
+    if (tweet.user === undefined) {
+      return;
+    }
+    var tweetData = {
+      name:  tweet.user.name + ' (@' + tweet.user.screen_name + ')',
+      timestamp: moment(tweet.created_at).format('YYYY-MM-DD hh:mm:ss'),
+      text: tweet.text,
+      iconUrl: tweet.user.profile_image_url
+    }
+    var templ = '';
+    templ += '<div class="icon"><img src="<%= iconUrl %>"/></div>';
+    templ += '<div class="header"><span class="username"><%= name %></span><span class="timestamp"><%= timestamp %></span></div>';
+    templ += '<div class="body"><%= text %></div>';
+    var content = ejs.render(templ, tweetData);
+    var elem = $("<li>" + content + "</li>");
+    $("#sprnkr-items").prepend(elem);
+  }
+  tweetWriter.write = function (tweet) {
+    if (util.isArray(tweet)) {
+      tweet.reverse();
+      tweet.forEach(this.put);
+    } else {
+      this.put(tweet);
+    }
+  };
+
+  const remote = require('electron').remote;
+  const app = remote.app;
+  var client = app._clients[0];
+  client.getHomeTimeline(initTimeline);
+
+  function initTimeline(err, tweets, resp) {
+    if (err) throw err;
+    tweetWriter.write(tweets);
+    client.stream(function(tweets) {
+      tweetWriter.write(tweets);
+    });
+  };
+
+}
+
+sprnkrViewMain();