From: Dessalines <tyhou13@gmx.com>
Date: Sat, 18 May 2019 23:41:22 +0000 (-0700)
Subject: Adding browser notifications.
X-Git-Url: http://these/git/%22https:/join-lemmy.org/static/%24%7Bargs.pageFn.next%7D?a=commitdiff_plain;h=d1fee01c6a9675ed24b5d37bd1738d5eb770d511;p=lemmy.git

Adding browser notifications.

- Fixes #153
---

diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx
index 84471145..c19c2084 100644
--- a/ui/src/components/navbar.tsx
+++ b/ui/src/components/navbar.tsx
@@ -3,7 +3,7 @@ import { Link } from 'inferno-router';
 import { Subscription } from "rxjs";
 import { retryWhen, delay, take } from 'rxjs/operators';
 import { WebSocketService, UserService } from '../services';
-import { UserOperation, GetRepliesForm, GetRepliesResponse, SortType, GetSiteResponse } from '../interfaces';
+import { UserOperation, GetRepliesForm, GetRepliesResponse, SortType, GetSiteResponse, Comment} from '../interfaces';
 import { msgOp } from '../utils';
 import { version } from '../version';
 
@@ -11,6 +11,7 @@ interface NavbarState {
   isLoggedIn: boolean;
   expanded: boolean;
   expandUserDropdown: boolean;
+  replies: Array<Comment>,
   unreadCount: number;
   siteName: string;
 }
@@ -21,6 +22,7 @@ export class Navbar extends Component<any, NavbarState> {
   emptyState: NavbarState = {
     isLoggedIn: (UserService.Instance.user !== undefined),
     unreadCount: 0,
+    replies: [],
     expanded: false,
     expandUserDropdown: false,
     siteName: undefined
@@ -37,6 +39,7 @@ export class Navbar extends Component<any, NavbarState> {
     this.userSub = UserService.Instance.sub.subscribe(user => {
       this.state.isLoggedIn = user.user !== undefined;
       this.state.unreadCount = user.unreadCount;
+      this.requestNotificationPermission();
       this.setState(this.state);
     });
 
@@ -48,6 +51,10 @@ export class Navbar extends Component<any, NavbarState> {
         () => console.log('complete')
     );
 
+    if (this.state.isLoggedIn) {
+      this.requestNotificationPermission();
+    }
+
     WebSocketService.Instance.getSite();
   }
 
@@ -151,6 +158,12 @@ 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);
+      }
+
+      this.state.replies = res.replies;
       this.sendRepliesCount(res);
     } else if (op == UserOperation.GetSite) {
       let res: GetSiteResponse = msg;
@@ -187,5 +200,35 @@ export class Navbar extends Component<any, NavbarState> {
   sendRepliesCount(res: GetRepliesResponse) {
     UserService.Instance.sub.next({user: UserService.Instance.user, unreadCount: res.replies.filter(r => !r.read).length});
   }
-}
 
+  requestNotificationPermission() {
+    if (UserService.Instance.user) {
+    document.addEventListener('DOMContentLoaded', function () {
+      if (!Notification) {
+        alert('Desktop notifications not available in your browser. Try Chromium.'); 
+        return;
+      }
+
+      if (Notification.permission !== 'granted')
+        Notification.requestPermission();
+    });
+    }
+  }
+
+  notify(replies: Array<Comment>) {
+    let recentReply = replies[0];
+    if (Notification.permission !== 'granted')
+      Notification.requestPermission();
+    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
+      });
+
+      notification.onclick = () => {
+        this.context.router.history.push(`/post/${recentReply.post_id}/comment/${recentReply.id}`);
+      };
+
+    }
+  }
+}
diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx
index 7b2f790e..8fa18fbf 100644
--- a/ui/src/components/post.tsx
+++ b/ui/src/components/post.tsx
@@ -69,7 +69,7 @@ export class Post extends Component<any, PostState> {
     if (this.state.scrolled_comment_id && !this.state.scrolled && lastState.comments.length > 0) {
       var elmnt = document.getElementById(`comment-${this.state.scrolled_comment_id}`);
       elmnt.scrollIntoView(); 
-      elmnt.classList.add("mark");
+      elmnt.classList.add("mark-two");
       this.state.scrolled = true;
     }
   }
diff --git a/ui/src/css/main.css b/ui/src/css/main.css
index c3ff3bda..2a65ca19 100644
--- a/ui/src/css/main.css
+++ b/ui/src/css/main.css
@@ -38,6 +38,10 @@ body, .text-white, .navbar-brand, .badge-light, .btn-secondary {
   background-color: #333;
 }
 
+.mark-two {
+  background-color: #444 !important;
+}
+
 .md-div p {
   margin-bottom: 0px;
 }