Infra-Mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-10-01 01:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mark as read if viewing link.

Browse Source 
- Fixes #154. #153
This commit is contained in:
Dessalines 2019-05-19 09:15:08 -07:00
parent d1fee01c6a
commit 1b6ddb869c
3 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/components/comment-node.tsx
View File

@ -162,7 +162,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
</>
}
<li className="list-inline-item">
<Link className="text-muted" to={`/post/${node.comment.post_id}/comment/${node.comment.id}`} target="_blank">link</Link>
<Link className="text-muted" to={`/post/${node.comment.post_id}/comment/${node.comment.id}`}>link</Link>
</li>
{this.props.markable &&
<li className="list-inline-item">

14
ui/src/components/navbar.tsx
View File

@ -12,6 +12,7 @@ interface NavbarState {
expanded: boolean;
expandUserDropdown: boolean;
replies: Array<Comment>,
fetchCount: number,
unreadCount: number;
siteName: string;
}
@ -22,6 +23,7 @@ export class Navbar extends Component<any, NavbarState> {
emptyState: NavbarState = {
isLoggedIn: (UserService.Instance.user !== undefined),
unreadCount: 0,
fetchCount: 0,
replies: [],
expanded: false,
expandUserDropdown: false,
@ -158,12 +160,13 @@ export class Navbar extends Component<any, NavbarState> {
return;
} else if (op == UserOperation.GetReplies) {
let res: GetRepliesResponse = msg;
if (res.replies.length > 0 && this.state.replies.length > 0 &&
(JSON.stringify(this.state.replies) !== JSON.stringify(res.replies))) {
this.notify(res.replies);
let unreadReplies = res.replies.filter(r => !r.read);
if (unreadReplies.length > 0 && this.state.fetchCount > 1 &&
(JSON.stringify(this.state.replies) !== JSON.stringify(unreadReplies))) {
this.notify(unreadReplies);
}
this.state.replies = res.replies;
this.state.replies = unreadReplies;
this.sendRepliesCount(res);
} else if (op == UserOperation.GetSite) {
let res: GetSiteResponse = msg;
@ -190,6 +193,7 @@ export class Navbar extends Component<any, NavbarState> {
limit: 9999,
};
WebSocketService.Instance.getReplies(repliesForm);
this.state.fetchCount++;
}
}
@ -222,7 +226,7 @@ export class Navbar extends Component<any, NavbarState> {
else {
var notification = new Notification(`${replies.length} Unread Messages`, {
icon: `${window.location.protocol}//${window.location.host}/static/assets/apple-touch-icon.png`,
body: recentReply.content
body: `${recentReply.creator_name}: ${recentReply.content}`
});
notification.onclick = () => {

26
ui/src/components/post.tsx
View File

@ -1,8 +1,8 @@
import { Component, linkEvent } from 'inferno';
import { Subscription } from "rxjs";
import { retryWhen, delay, take } from 'rxjs/operators';
import { UserOperation, Community, Post as PostI, GetPostResponse, PostResponse, Comment, CommentResponse, CommentSortType, CreatePostLikeResponse, CommunityUser, CommunityResponse, CommentNode as CommentNodeI, BanFromCommunityResponse, BanUserResponse, AddModToCommunityResponse, AddAdminResponse, UserView } from '../interfaces';
import { WebSocketService } from '../services';
import { UserOperation, Community, Post as PostI, GetPostResponse, PostResponse, Comment, CommentForm as CommentFormI, CommentResponse, CommentSortType, CreatePostLikeResponse, CommunityUser, CommunityResponse, CommentNode as CommentNodeI, BanFromCommunityResponse, BanUserResponse, AddModToCommunityResponse, AddAdminResponse, UserView } from '../interfaces';
import { WebSocketService, UserService } from '../services';
import { msgOp, hotRank } from '../utils';
import { PostListing } from './post-listing';
import { Sidebar } from './sidebar';
@ -71,6 +71,27 @@ export class Post extends Component<any, PostState> {
elmnt.scrollIntoView();
elmnt.classList.add("mark-two");
this.state.scrolled = true;
this.markScrolledAsRead(this.state.scrolled_comment_id);
}
}
markScrolledAsRead(commentId: number) {
let found = this.state.comments.find(c => c.id == commentId);
let parent = this.state.comments.find(c => found.parent_id == c.id);
let parent_user_id = parent ? parent.creator_id : this.state.post.creator_id;
if (UserService.Instance.user && UserService.Instance.user.id == parent_user_id) {
let form: CommentFormI = {
content: found.content,
edit_id: found.id,
creator_id: found.creator_id,
post_id: found.post_id,
parent_id: found.parent_id,
read: true,
auth: null
};
WebSocketService.Instance.editComment(form);
}
}
@ -248,6 +269,7 @@ export class Post extends Component<any, PostState> {
found.upvotes = res.comment.upvotes;
found.downvotes = res.comment.downvotes;
found.score = res.comment.score;
found.read = res.comment.read;
this.setState(this.state);
} else if (op == UserOperation.SaveComment) {