diff options
author | Dessalines <happydooby@gmail.com> | 2019-05-19 09:15:08 -0700 |
---|---|---|
committer | Dessalines <happydooby@gmail.com> | 2019-05-19 09:15:08 -0700 |
commit | 8a5b7258d6ea2255bc30e96a651d870b43c4c983 (patch) | |
tree | a5675c6f81dd4728fdfcd8bf228ac2336859d4ce | |
parent | 9ae4909e91e7583bb6e7a578d3ec6a573753da9f (diff) |
Mark as read if viewing link.
- Fixes #154. #153
-rw-r--r-- | ui/src/components/comment-node.tsx | 2 | ||||
-rw-r--r-- | ui/src/components/navbar.tsx | 14 | ||||
-rw-r--r-- | ui/src/components/post.tsx | 26 |
3 files changed, 34 insertions, 8 deletions
diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx index 76e8e64e..126966a7 100644 --- a/ui/src/components/comment-node.tsx +++ b/ui/src/components/comment-node.tsx @@ -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"> diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index c19c2084..68e486c1 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -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 = () => { diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx index 8fa18fbf..3e2e07b3 100644 --- a/ui/src/components/post.tsx +++ b/ui/src/components/post.tsx @@ -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) { |