impr: added 'image' model

JohnnyTheTank · Nov 26, 2015 · 05d61c5 · 05d61c5
1 parent 28f1f86
commit 05d61c5
Show file tree

Hide file tree

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

diff --git a/demo/index.html b/demo/index.html
@@ -15,6 +15,6 @@
     <script src="../src/aping-codebird-helper.js"></script>
 </head>
 <body ng-app="app">
-    <aping type="social" aping-codebird="[{'user':'ARD_Presse', 'result_type':'recent'}]"></aping>
+    <aping type="image" aping-codebird="[{'search':'zdf', 'result_type':'recent'}]"></aping>
 </body>
 </html>
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.0",
+  "version": "0.1.1",
   "description": "twitter plugin for apiNG",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/aping-codebird-directive.js b/src/aping-codebird-directive.js
@@ -36,7 +36,7 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
                             "search_tweets",
                             params,
                             function (_data) {
-                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, request.type));
+                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, appSettings.type));
                                 apingController.apply();
                             },
                             true
@@ -55,7 +55,7 @@ var jjtApingCodebird = angular.module("jtt_aping_codebird", [])
                             "statuses_userTimeline",
                             params,
                             function (_data, rate, err) {
-                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, request.type));
+                                apingController.concatToResults(apingCodebirdHelper.getObjectByJsonData(_data, appSettings.type));
                                 apingController.apply();
                             },
                             true

diff --git a/src/aping-codebird-helper.js b/src/aping-codebird-helper.js
@@ -49,11 +49,17 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
             if (_data.statuses) {
 
                 angular.forEach(_data.statuses, function (value, key) {
-                    requestResults.push(_this.getItemByJsonData(value, _type));
+                    var tempResult = _this.getItemByJsonData(value, _type);
+                    if(tempResult) {
+                        requestResults.push(tempResult);
+                    }
                 });
             } else if (_data.length > 0) {
                 angular.forEach(_data, function (value, key) {
-                    requestResults.push(_this.getItemByJsonData(value, _type));
+                    var tempResult = _this.getItemByJsonData(value, _type);
+                    if(tempResult) {
+                        requestResults.push(tempResult);
+                    }
                 });
             }
 
@@ -69,6 +75,10 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
                 case "social":
                     returnObject = this.getSocialItemByJsonData(_item);
                     break;
+
+                case "image":
+                    returnObject = this.getImageItemByJsonData(_item);
+                    break;
             }
         }
         return returnObject;
@@ -107,4 +117,34 @@ jjtApingCodebird.service('apingCodebirdHelper', ['apingModels', 'apingTimeHelper
         return socialObject;
     };
 
+    this.getImageItemByJsonData = function (_item) {
+        var imageObject = apingModels.getNew("image", this.getThisPlattformString());
+
+        $.extend(true, imageObject, {
+            blog_name: _item.user.screen_name,
+            blog_id: _item.user.id_str,
+            blog_link: this.getThisPlattformLink() + _item.user.screen_name + "/",
+            intern_id: _item.id_str,
+            timestamp: new Date(Date.parse(_item.created_at.replace(/( \+)/, ' UTC$1'))).getTime(),
+            text: _item.text,
+            shares: _item.retweet_count,
+            likes: _item.favorite_count,
+        });
+
+        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]);
+        }
+
+        if(!imageObject.img_url) {
+            return false;
+        }
+
+        imageObject.post_url = imageObject.blog_link+"status/"+imageObject.intern_id;
+
+        return imageObject;
+    }
+
+
+
 }]);