From 10165410b19848f0aa3f3dd055d3e0f0ae53ef19 Mon Sep 17 00:00:00 2001 From: Amitosh Swain Mahapatra Date: Jun 18 2018 14:16:46 +0000 Subject: Show posts from official Fedora facebook page and Twitter handle --- diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 12ff834..3053836 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -5,14 +5,14 @@ import { Browser } from '../../providers/browser/browser'; import { FacebookProvider } from '../../providers/social/facebook'; import { TwitterProvider } from '../../providers/social/twitter'; import { SocialMediaPost } from '../../providers/social/social'; -import { forkJoin } from 'rxjs/observable/forkJoin'; +import { combineLatest } from 'rxjs/observable/combineLatest'; import { FedoraMagazineService, Post, Image } from '../../providers/fedora-magazine/fedora-magazine'; import { CommunityBlogService } from '../../providers/community-blog/community-blog'; -const HANDLE = { - FB: 'fedoraqa', - TWITTER: 'fedora_qa', -}; +const HANDLE = Object.seal({ + FB: 'TheFedoraProject', + TWITTER: 'fedora', +}); @Component({ selector: 'page-home', @@ -41,7 +41,11 @@ export class HomePage { */ private blogposts: Post[]; - constructor(public navCtrl: NavController, private browser: Browser, private fb: FacebookProvider, private twitter: TwitterProvider, private fedoraMag: FedoraMagazineService, private communityblog: CommunityBlogService) { + constructor(public navCtrl: NavController, private browser: Browser, + private fb: FacebookProvider, + private twitter: TwitterProvider, + private fedoraMag: FedoraMagazineService, + private communityblog: CommunityBlogService) { this.socialposts = []; this.blogposts = []; this.carousel = []; @@ -53,7 +57,7 @@ export class HomePage { * Currently, we fetch posts from Facebook and Twitter */ private updateSocialMedia(): void { - forkJoin(this.fb.getPosts(HANDLE.FB), this.twitter.getPosts(HANDLE.TWITTER)) + combineLatest(this.fb.getPosts(HANDLE.FB), this.twitter.getPosts(HANDLE.TWITTER)) .subscribe(values => { this.socialposts = [...values[0], ...values[1]] as SocialMediaPost[]; }); @@ -103,4 +107,4 @@ export class HomePage { this.navCtrl.push(NotificationsPage, { animate: true, direction: 'forward' }); } -} \ No newline at end of file +} diff --git a/src/providers/social/social.ts b/src/providers/social/social.ts index a8e8c95..e69e753 100644 --- a/src/providers/social/social.ts +++ b/src/providers/social/social.ts @@ -35,8 +35,8 @@ export interface SocialMediaPost { content: string, /** - * Date of the post - */ + * Date of the post + */ date: string, } @@ -65,5 +65,5 @@ export interface SocialProvider { * @param args Extra args for pagination etc. * @returns Observable which emits an array of posts */ - fetchPosts(resID: string, args?:{ offset?: string }): Observable + fetchPosts(resID: string, args?: { offset?: string }): Observable }