feed update; other

This commit is contained in:
tmshv committed 2016-03-24 23:52:04 +03:00
1 parent 70707a2244
commit 6655a5fca8
8 files changed
+146 -66

No files matched your search

+57 -48
View File
@@ -1,33 +1,58 @@
import template from '../../templates/components/timeline.html';
function personByInstagram(list, instagram){
list = list.filter(function (member) {
try {
return member.contacts.instagram === instagram;
} catch (error) {
return false;
}
});
import {createInstance} from '../../models/TimelinePostInstagram';
if(list.length){
return list[0].id;
}else{
return null;
}
}
// function personByInstagram(list, instagram){
// list = list.filter(function (member) {
// try {
// return member.contacts.instagram === instagram;
// } catch (error) {
// return false;
// }
// });
//
// if(list.length){
// return list[0].id;
// }else{
// return null;
// }
// }
function postText(post){
try{
return post.data.caption.text.replace(/#[\w_]+/, '')
}catch(error){
return "";
}
}
// function postText(post){
// try{
// return post.data.caption.text.replace(/#[\w_]+/, '')
// }catch(error){
// return "";
// }
// }
export default function(app) {
// function toInstagram(post){
// //var author_id = personByInstagram(team.team, post.data.author);
// //var name = author_id ? team.short(author_id) : post.data.author;
// let name = 'hudozka';
//
// return {
// date: post.date,
// image: post.data.image.standard_resolution.url,
// url: post.data.url,
// username: name,
// userpic: 'https://igcdn-photos-a-a.akamaihd.net/hphotos-ak-xaf1/t51.2885-19/11357496_464997000344800_2124591831_a.jpg',
// text: post.body,
// //text: postText(post),
// type: post.type
// };
// }
const createPost = post => [createInstance]
.reduce((post, map) => {
let result = map(post);
return result ? result : post
}, post);
export default function (app) {
app.component('timeline', {
template: template,
controller: function($timeout, usSpinnerService, api, io){
controller: function ($timeout, usSpinnerService, api, io) {
let skip = 0;
let limit = 10;
this.feed = [];
@@ -35,23 +60,6 @@ export default function(app) {
this.timelineUpdating = false;
usSpinnerService.stop('timelineMore');
function toInstagram(post){
//var author_id = personByInstagram(team.team, post.data.author);
//var name = author_id ? team.short(author_id) : post.data.author;
let name = 'hudozka';
return {
date: post.date,
image: post.data.image.standard_resolution.url,
url: post.data.url,
username: name,
userpic: 'https://igcdn-photos-a-a.akamaihd.net/hphotos-ak-xaf1/t51.2885-19/11357496_464997000344800_2124591831_a.jpg',
text: post.body,
//text: postText(post),
type: post.type
};
}
this.loadNext = () => {
this.timelineUpdating = true;
usSpinnerService.spin('timelineMore');
@@ -62,13 +70,14 @@ export default function(app) {
this.timelineUpdating = false;
usSpinnerService.stop('timelineMore');
let feed2 = feed.map(post => {
if(post.type == 'instagram') return toInstagram(post);
else return post;
});
// let feed2 = feed.map(post => {
// if (post.type == 'instagram') return toInstagram(post);
// else return post;
// });
feed = feed.map(createPost);
skip += limit;
this.feed = this.feed.concat(feed2);
this.feed = this.feed.concat(feed);
this.showFooter = this.feed && this.feed.length;
});
};
@@ -76,12 +85,12 @@ export default function(app) {
this.loadNext();
io.on('feed', feed => {
// console.log(feed);
console.log(feed);
feed = feed instanceof Array ? feed : [feed];
feed = feed.map(i => i.type === 'instagram' ? toInstagram(i) : i);
feed = feed.map(createPost);
$timeout(()=>{
$timeout(()=> {
this.feed = feed.concat(this.feed);
}, 0);
});