Merge pull request #15 from namila007/popupfin

Popupfin

Author: namila007

.gitignore

@@ -0,0 +1,2 @@
+/node_modules
+/.vscode

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Namila Bandara
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,2 +1,4 @@
 # StackZilla
-namila007@gmail.com Namila Bandara namila007 IA1
+
+This is an firefox addon to connect and get notification of inbox and achievements from stackoverflow. To use this user have to add the addon and login through stackoverflow account.
+This will send notification popu if there is a new inbox or achievement unlocked. User also can check the latest inbox via popup

background/inboxInfo.js

@@ -5,31 +5,37 @@ function notifyunread(count) {
       "title": "Inbox",
       "message": "You have "+count+" unread messages"
     })
-  }
+}
 
 
 
 function unreadmessages(token){
-  var url = INBOX_READ+`&access_token=${token}`
-    console.log(url)
+  var url = INBOX_UNREAD+`&access_token=${token}`
 
   return axios.get(url).then(res=>{
     console.log(totunread+" "+res.data.items.length )
     console.log(res.data)
-    if(totunread < res.data.items.length )
+    if(totunread <= res.data.items.length )
     {
       totunread = res.data.items.length
       console.log(totunread+" "+res.data.items.length )
       return Promise.resolve(res.data.items.length)
+    }else{
+      totunread = 0
     }
-    if(totunread == res.data.items.length ){
-      console.log(totunread+" "+res.data.items.length )
-      return Promise.resolve(-1)
-    }
-    throw new Error('Error occured While fetching inbox data') 
+    //throw new Error('Error occured While fetching inbox data') 
   })
 
-   }
+}
 
+function inbox (token) {
+  var url = INBOX+`&access_token=${token}`
 
+  return axios.get(url).then(res=>{
 
+  console.log(res.data.items.length)  
+  console.log("MSGS "+ res.data.items)
+  return Promise.resolve(res.data.items)
+    
+  })
+}

background/main.js

@@ -3,12 +3,21 @@
 var token
 var totunread = 0
 var notiunread = 0
+var interval;
 
-const INBOX_READ =
+const INBOX_UNREAD =
 `https://api.stackexchange.com/2.2/me/inbox/unread?key=${KEY}&site=stackoverflow&filter=!0UscT51V)r-XJhlOHzduuQu)O`
 
+const INBOX =
+`https://api.stackexchange.com/2.2/me/inbox?key=${KEY}&site=stackoverflow&pagesize=5&filter=!8IfPpxGro.Z6_M(hOhkHW`
+
+
 const NOTIFICATIONS = 
-`https://api.stackexchange.com/2.2/me/reputation?site=stackoverflow&key=${KEY}`
+`https://api.stackexchange.com/2.2/me/notifications/unread?site=stackoverflow&key=${KEY}&pagesize=5&filter=!w*yCRQ_T5l9PdmgVXW`
+
+const BADGEUPDATES = 
+`https://api.stackexchange.com/2.2/me/notifications?site=stackoverflow&key=${KEY}&pagesize=5&filter=!w*yCRQ_T5l9PdmgVXW`
+
 
 //error noti
 function notifyerror(error) {
@@ -29,19 +38,38 @@ function logError(error) {
   //notifyerror(error)
 }
 
+async function messageHandle (request, sender, sendResponse) {
+  if(request.command == "getToken"){
+    console.log("CLICKED")
+    token = await getAccessToken()
+    console.log("tok "+token)
+    unreadnotificatons(token).then(notifynotiunread).catch(logError)
+    unreadmessages(token).then(notifyunread).catch(logError)
+    badge()
+    clearInterval(interval)
+    startInterval() 
+    inbox(token).then(res=>{
+      console.log("mmmm "+res)
+      sendResponse({data: res})
+    })
+  }
+  return true
+ 
+  
+}
 
-browser.browserAction.onClicked.addListener(async function() {
-  console.log("CLICKED")
-  token = await getAccessToken()
-  console.log("tok "+token)
-  unreadnotificatons(token).then(notifynotiunread).catch(logError)
-  unreadmessages(token).then(notifyunread).catch(logError)
-  badge()
-  startInterval()
-})
+// browser.browserAction.onClicked.addListener(async function() {
+//   console.log("CLICKED")
+//   token = await getAccessToken()
+//   console.log("tok "+token)
+//   unreadnotificatons(token).then(notifynotiunread).catch(logError)
+//   unreadmessages(token).then(notifyunread).catch(logError)
+//   badge()
+//   startInterval()
+// })
 
 function startInterval(){
-var interval = setInterval(function(){
+ interval = setInterval(function(){
   unreadnotificatons(token)
     .then((val)=>{
       if(val!=-1){notifynotiunread}})
@@ -56,8 +84,10 @@ var interval = setInterval(function(){
 function badge() {
   if((totunread+notiunread)>0)
   {
-    browser.browserAction.setBadgeText({text: (totunread+notiunread).toString()});
+    browser.browserAction.setBadgeText({text: (totunread).toString()});
   }
 }
 
+browser.runtime.onMessage.addListener(messageHandle);
+
 

manifest.json

@@ -22,23 +22,23 @@
     "browser_action": {
         "default_icon": "icons/toolbar.png",
         "default_title": "StackZilla",
-        "browser_style": true
+        "browser_style": true,
+        "default_popup": "popup/index.html"
       },
       "background": {
         "scripts": [
           "background/authorize.js",
           "background/main.js",
           "background/inboxInfo.js",
           "background/notificationInfo.js",
-          "background/axios.js"
-          
+          "background/axios.js"    
         ]
       },
 
     "content_scripts": [
       {
         "matches": ["*://*/*"],
-        "js": ["popup/stackpopup.js"]
+        "js": ["popup/popup.js"]
       }
     ],
     "options_ui": {