Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

S3 bucket config #39

Merged
merged 2 commits into from
Apr 15, 2017
Merged

S3 bucket config #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da60f3c
Clean up whitespace.
revdancatt Apr 4, 2017
1b9dc10
Load all s3 settings from config
revdancatt Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"user": "",
"pass": ""
},

"twitter": {
"consumer_key": "",
"consumer_secret": "",
Expand All @@ -29,9 +29,16 @@
"oauth_key": "",
"oauth_secret": ""
},

"mapzen": {
"api_key": ""
},

"s3": {
"access_key_id": "",
"secret_access_key": "",
"bucket": "",
"region": ""
}

}
51 changes: 25 additions & 26 deletions helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ var request = require('request');

exports.getTwitterFriends = function(user_id, twitter_user_id, token_key, token_secret) {
var twitter = new twit({
consumer_key: config.twitter.consumer_key,
consumer_secret: config.twitter.consumer_secret,
access_token: token_key,
consumer_key: config.twitter.consumer_key,
consumer_secret: config.twitter.consumer_secret,
access_token: token_key,
access_token_secret: token_secret
});

// save twitter following list to mysql
twitter.get('friends/ids', { user_id: twitter_user_id }, function (err, data, response) {
if (err) throw err;
Expand All @@ -26,7 +26,7 @@ exports.getTwitterFriends = function(user_id, twitter_user_id, token_key, token_
var friend = rows[i];
post.push([user_id, friend.friend_id, 1]);
}
db.query('INSERT IGNORE INTO following (user_id, friend_id, following_status) VALUES ?', [post], function (err, result) {
db.query('INSERT IGNORE INTO following (user_id, friend_id, following_status) VALUES ?', [post], function (err, result) {
if (err) throw err;
});
}
Expand All @@ -37,22 +37,22 @@ exports.getTwitterFriends = function(user_id, twitter_user_id, token_key, token_

exports.saveAvatar = function(user, token_key, token_secret) {
var twitter = new twit({
consumer_key: config.twitter.consumer_key,
consumer_secret: config.twitter.consumer_secret,
access_token: token_key,
consumer_key: config.twitter.consumer_key,
consumer_secret: config.twitter.consumer_secret,
access_token: token_key,
access_token_secret: token_secret
});

twitter.get('users/show', { user_id: user.twitter_user_id }, function (err, data, response) {
var client = knox.createClient({
key: config.s3.access_key_id,
secret: config.s3.secret_access_key,
bucket: 'upcoming.s3',
region: 'us-west-2'
key: config.s3.access_key_id,
secret: config.s3.secret_access_key,
bucket: config.s3.bucket,
region: config.s3.region
});

var avatar_path = '/avatars/' + user.id + '.png';

http.get(data.profile_image_url, function(res){
var headers = {
'Content-Length': res.headers['content-length'],
Expand All @@ -64,12 +64,12 @@ exports.saveAvatar = function(user, token_key, token_secret) {
if (200 == res.statusCode) {
console.log('saved to %s', res.req.url);
}
db.query('UPDATE user SET avatar_image_url = ? WHERE id = ?', [res.req.url, user.id], function (err, result) {
db.query('UPDATE user SET avatar_image_url = ? WHERE id = ?', [res.req.url, user.id], function (err, result) {
if (err) throw err;
});
});
});
});
});
}

exports.updateFollowing = function(user_id) {
Expand All @@ -82,19 +82,19 @@ exports.updateFollowing = function(user_id) {
for (var i in rows) {
var friend = rows[i];
var post = { user_id: user_id, friend_id: friend.friend_id, following_status: 1 };
db.query('INSERT IGNORE INTO following SET ?', post, function (err, result) {
db.query('INSERT IGNORE INTO following SET ?', post, function (err, result) {
if (err) throw err;
});
}
});
});
}

exports.reverse_geocode = function(venue_id, next) {
db.query("SELECT * FROM venue WHERE venue_id = ?", venue_id, function(err, rows) {
if (err) {
return next(err);
}

if (rows.length > 0) {
var venue = rows[0];
var options = {
Expand All @@ -107,32 +107,31 @@ exports.reverse_geocode = function(venue_id, next) {
},
json: true
};

request(options, function(error, response, body) {
if (!error && response.statusCode === 200) {
if (body.features[0]) {
if (body.features[0]) {
var properties = body.features[0].properties;
var layers = ['neighbourhood', 'borough', 'localadmin', 'locality', 'county', 'macrocounty', 'region', 'macroregion', 'country'];

for (var i=0; i < layers.length; i++) {
var layer = layers[i];
if (layer in properties) {
var layer_gid = layer + '_gid';

var sql = 'INSERT IGNORE INTO venue_gid (venue_id, name, gid, layer, created_at) '
+ 'VALUES (?, ?, ?, ?, NOW())';

db.query(sql, [venue_id, properties[layer], properties[layer_gid], layer], function (err, result) {
if (err) return next(err);
});
}
}
}
}
}
});
} else {
next(null, rows[0]);
}
});
};