impr: new apiKey mechanism and new object attr "date_time"

JohnnyTheTank · Dec 9, 2015 · 3375d10 · 3375d10
1 parent 22d8ca8
commit 3375d10
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <jonathan.hornung@gmail.com>"
   ],
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "twitter plugin for apiNG",
   "main": "dist/apiNG-plugin-codebird.min.js",
   "moduleType": [],

diff --git a/demo/aping-config.js b/demo/aping-config.js
@@ -2,7 +2,9 @@
 apingApp.config(['$provide', function ($provide) {
 
     $provide.constant("apingApiKeys", {
-        twitter : "AAAAAAAAAAAAAAAAAAAAACs3iwAAAAAA%2BH8LdT7YfKIzk8fvQvqKvoePuxo%3DMKfXX2ojtacGL8aOLAhlBDUrEFpy0DUuiyebet22Wa2YVrX7cc",
+        twitter: [
+            {'bearer_token':"AAAAAAAAAAAAAAAAAAAAACs3iwAAAAAA%2BH8LdT7YfKIzk8fvQvqKvoePuxo%3DMKfXX2ojtacGL8aOLAhlBDUrEFpy0DUuiyebet22Wa2YVrX7cc"}
+        ],
     });
 
     $provide.constant("apingDefaultSettings", {

diff --git a/dist/aping-plugin-codebird.min.js b/dist/aping-plugin-codebird.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aping-plugin-codebird",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "twitter plugin for apiNG",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/aping-codebird-directive.js b/src/aping-codebird-directive.js
@@ -7,7 +7,7 @@
  */
 
 var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
-    .directive('apingCodebird', ['apingApiKeys', 'apingCodebirdHelper', 'apingUtilityHelper', function (apingApiKeys, apingCodebirdHelper, apingUtilityHelper) {
+    .directive('apingCodebird', ['apingCodebirdHelper', 'apingUtilityHelper', function (apingCodebirdHelper, apingUtilityHelper) {
         return {
             require: '?aping',
             restrict: 'A',
@@ -19,7 +19,8 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
                 var requests = apingUtilityHelper.parseJsonFromAttributes(attrs.apingCodebird, apingCodebirdHelper.getThisPlattformString(), appSettings);
 
                 var cb = new Codebird;
-                cb.setBearerToken(apingApiKeys.twitter);
+
+                cb.setBearerToken(apingUtilityHelper.getApiCredentials(apingCodebirdHelper.getThisPlattformString(), "bearer_token"));
 
                 requests.forEach(function (request) {
 

diff --git a/src/aping-codebird-helper.js b/src/aping-codebird-helper.js
@@ -101,6 +101,8 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
             likes: _item.favorite_count,
         });
 
+        socialObject.date_time = new Date(socialObject.timestamp);
+
         if(_item.entities && _item.entities.media && _item.entities.media.length>0) {
             socialObject.source = _item.entities.media;
             socialObject.img_url = this.getImageUrlFromMediaObject(_item.entities.media[0]);
@@ -134,6 +136,8 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
             likes: _item.favorite_count,
         });
 
+        imageObject.date_time = new Date(imageObject.timestamp);
+
         if(_item.entities && _item.entities.media && _item.entities.media.length>0) {
             imageObject.source = _item.entities.media;
             imageObject.img_url = this.getImageUrlFromMediaObject(_item.entities.media[0]);