use tabId to fetch actual current page url - fixes #60

keithjgrant · Mar 21, 2018 · ada3f2f · ada3f2f
1 parent f115507
commit ada3f2f
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 20 deletions.
diff --git a/dist/background.js b/dist/background.js
diff --git a/dist/index.html b/dist/index.html
@@ -4,6 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <title>Omnibear</title>
   <link rel="stylesheet" href="styles.css">
   <script src="index.js"></script>
 </head>

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/background.js b/src/background.js
@@ -15,7 +15,11 @@ function handleMessage(request, sender, sendResponse) {
       handleBeginAuth(request.payload);
       break;
     case 'focus-window':
-      updateFocusedWindow(sender.url, request.payload.selectedEntry);
+      updateFocusedWindow(
+        sender.tab.id,
+        sender.url,
+        request.payload.selectedEntry
+      );
       break;
     case 'select-entry':
       selectEntry(request.payload.url);
@@ -35,8 +39,9 @@ function handleBeginAuth(payload) {
   });
 }
 
-function updateFocusedWindow(url, selectedEntry) {
+function updateFocusedWindow(tabId, url, selectedEntry) {
   localStorage.setItem('pageUrl', cleanUrl(url));
+  localStorage.setItem('pageTabId', tabId);
   if (selectedEntry) {
     selectEntry(selectedEntry);
   } else {

diff --git a/src/components/App.js b/src/components/App.js
@@ -3,11 +3,14 @@ import LoginForm from './LoginForm';
 import NoteForm from './form/NoteForm';
 import Message from './Message';
 import SettingsForm from './settings/SettingsForm';
-import {logout} from '../util/utils';
+import {logout, getPageUrl} from '../util/utils';
 
 export default class App extends Component {
   constructor(props) {
     super(props);
+    this.state = {
+      pageUrl: '',
+    };
     this.setDefaultView();
   }
 
@@ -29,6 +32,7 @@ export default class App extends Component {
             handleLogout={this.handleLogout}
             handleSettings={this.handleSettings}
             userFeedback={this.displayMessage}
+            pageUrl={this.state.pageUrl}
           />
         );
     }
@@ -39,6 +43,7 @@ export default class App extends Component {
       this.setState({
         currentView: 'new-note',
       });
+      this.getPageUrl();
     } else {
       this.setState({
         currentView: 'login',
@@ -53,6 +58,14 @@ export default class App extends Component {
     );
   }
 
+  getPageUrl() {
+    getPageUrl().then(url => {
+      this.setState({
+        pageUrl: url,
+      });
+    });
+  }
+
   displayMessage = (message, status, location) => {
     this.setState({
       currentView: 'feedback',

diff --git a/src/components/form/NoteForm.js b/src/components/form/NoteForm.js
@@ -25,7 +25,7 @@ export default class NoteForm extends Component {
     const draft = getDraft();
     this.state = {
       postType: this.getPostType(settings),
-      url: this.getEntryUrl(),
+      selectedEntry: localStorage.getItem('selectedEntry'),
       userDomain: localStorage.getItem('domain'),
       entry: draft,
       hasSelectedEntry: !!selectedEntry,
@@ -51,19 +51,21 @@ export default class NoteForm extends Component {
     }
   }
 
-  getEntryUrl() {
-    const selectedEntry = localStorage.getItem('selectedEntry');
-    if (selectedEntry) {
-      return selectedEntry;
-    } else {
-      return localStorage.getItem('pageUrl');
+  getCurrentUrl() {
+    switch (this.state.postType) {
+      case NEW_NOTE:
+        return null;
+      case PAGE_REPLY:
+        return this.props.pageUrl;
+      case ITEM_REPLY:
+        return this.state.selectedEntry;
+        break;
     }
   }
 
   render() {
     const {
       postType,
-      url,
       isDisabled,
       isLoading,
       settings,
@@ -83,7 +85,7 @@ export default class NoteForm extends Component {
         />
         <QuickActions
           postType={postType}
-          url={url}
+          url={this.getCurrentUrl()}
           onLike={this.handleLike}
           onRepost={this.handleRepost}
           onReacji={this.handleReacji}
@@ -116,12 +118,13 @@ export default class NoteForm extends Component {
   }
 
   handleLike = () => {
-    if (!this.state.url) {
+    const url = this.getCurrentUrl();
+    if (!url) {
       return;
     }
     this.postEntry({
       h: 'entry',
-      'like-of': this.state.url,
+      'like-of': url,
     })
       .then(location => {
         const type = this.state.postType === ITEM_REPLY ? 'Item' : 'Page';
@@ -134,12 +137,13 @@ export default class NoteForm extends Component {
   };
 
   handleRepost = () => {
-    if (!this.state.url) {
+    const url = this.getCurrentUrl();
+    if (!url) {
       return;
     }
     this.postEntry({
       h: 'entry',
-      'repost-of': this.state.url,
+      'repost-of': url,
     })
       .then(location => {
         const type = this.state.postType === ITEM_REPLY ? 'Item' : 'Page';
@@ -152,13 +156,14 @@ export default class NoteForm extends Component {
   };
 
   handleReacji = emoji => {
-    if (!this.state.url) {
+    const url = this.getCurrentUrl();
+    if (!url) {
       return;
     }
     this.postEntry({
       h: 'entry',
       content: emoji,
-      'in-reply-to': this.state.url,
+      'in-reply-to': url,
     })
       .then(location => {
         const type = this.state.postType === ITEM_REPLY ? 'Item' : 'Page';

diff --git a/src/util/utils.js b/src/util/utils.js
@@ -52,3 +52,12 @@ export function generateSlug(content) {
   const parts = formatted.split('-');
   return parts.splice(0, 6).join('-');
 }
+
+export function getPageUrl() {
+  return new Promise((resolve, reject) => {
+    var tabId = localStorage.getItem('pageTabId');
+    chrome.tabs.get(Number(tabId), tab => {
+      resolve(tab.url);
+    });
+  });
+}