|
|
|
@ -7,6 +7,7 @@ import {Activity} from 'src/app/models/activity';
|
|
|
|
import {BehaviorSubject} from 'rxjs';
|
|
|
|
import {BehaviorSubject} from 'rxjs';
|
|
|
|
import {tap} from 'rxjs/operators';
|
|
|
|
import {tap} from 'rxjs/operators';
|
|
|
|
import {BaseService} from '../base.service';
|
|
|
|
import {BaseService} from '../base.service';
|
|
|
|
|
|
|
|
import {formatDate} from '@angular/common';
|
|
|
|
|
|
|
|
|
|
|
|
const createPostGqlQuery = `mutation($content: String!) {
|
|
|
|
const createPostGqlQuery = `mutation($content: String!) {
|
|
|
|
createPost(content: $content) {
|
|
|
|
createPost(content: $content) {
|
|
|
|
@ -125,6 +126,15 @@ export class FeedService extends BaseService {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Returns if the input date is today
|
|
|
|
|
|
|
|
* @param date
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
private static dateIsToday(date: Date) {
|
|
|
|
|
|
|
|
date = new Date(date);
|
|
|
|
|
|
|
|
return new Date().setHours(0, 0, 0, 0) === date.setHours(0, 0, 0, 0);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Creates a new post
|
|
|
|
* Creates a new post
|
|
|
|
* @param pContent
|
|
|
|
* @param pContent
|
|
|
|
@ -240,8 +250,13 @@ export class FeedService extends BaseService {
|
|
|
|
.pipe(this.retryRated())
|
|
|
|
.pipe(this.retryRated())
|
|
|
|
.subscribe(response => {
|
|
|
|
.subscribe(response => {
|
|
|
|
const posts = this.constructAllPosts(response);
|
|
|
|
const posts = this.constructAllPosts(response);
|
|
|
|
const updatedPostList = this.posts.getValue().concat(posts);
|
|
|
|
const previousPosts = this.posts.getValue();
|
|
|
|
this.posts.next(updatedPostList);
|
|
|
|
for (const post of previousPosts.reverse()) {
|
|
|
|
|
|
|
|
if (!posts.find(p => p.id === post.id)) {
|
|
|
|
|
|
|
|
posts.unshift(post);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
this.posts.next(posts);
|
|
|
|
if (posts.length < this.offsetStep) {
|
|
|
|
if (posts.length < this.offsetStep) {
|
|
|
|
this.postsAvailable.next(false);
|
|
|
|
this.postsAvailable.next(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -257,8 +272,13 @@ export class FeedService extends BaseService {
|
|
|
|
profilePicture = 'assets/images/default-profilepic.svg';
|
|
|
|
profilePicture = 'assets/images/default-profilepic.svg';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture);
|
|
|
|
const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture);
|
|
|
|
const temp = new Date(Number(post.createdAt));
|
|
|
|
const postDate = new Date(Number(post.createdAt));
|
|
|
|
const date = temp.toLocaleString('en-GB');
|
|
|
|
let date: string;
|
|
|
|
|
|
|
|
if (FeedService.dateIsToday(postDate)) {
|
|
|
|
|
|
|
|
date = formatDate(postDate, 'HH:mm', 'en-GB');
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
date = formatDate(postDate, 'dd.MM.yy HH:mm', 'en-GB');
|
|
|
|
|
|
|
|
}
|
|
|
|
let activity: Activity;
|
|
|
|
let activity: Activity;
|
|
|
|
if (post.activity) {
|
|
|
|
if (post.activity) {
|
|
|
|
activity = new Activity(
|
|
|
|
activity = new Activity(
|
|
|
|
@ -293,8 +313,13 @@ export class FeedService extends BaseService {
|
|
|
|
profilePicture = 'assets/images/default-profilepic.svg';
|
|
|
|
profilePicture = 'assets/images/default-profilepic.svg';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture);
|
|
|
|
const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture);
|
|
|
|
const temp = new Date(Number(post.createdAt));
|
|
|
|
const postDate = new Date(Number(post.createdAt));
|
|
|
|
const date = temp.toLocaleString('en-GB');
|
|
|
|
let date: string;
|
|
|
|
|
|
|
|
if (FeedService.dateIsToday(postDate)) {
|
|
|
|
|
|
|
|
date = formatDate(postDate, 'HH:mm', 'en-GB');
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
date = formatDate(postDate, 'dd.MM.yy HH:mm', 'en-GB');
|
|
|
|
|
|
|
|
}
|
|
|
|
let activity: Activity;
|
|
|
|
let activity: Activity;
|
|
|
|
if (post.activity) {
|
|
|
|
if (post.activity) {
|
|
|
|
activity = new Activity(
|
|
|
|
activity = new Activity(
|
|
|
|
|
Max_ES
5 years ago
committed by
Gitea