Fixed opening heading feed entries in a tab

The heading goto fragment wasn't being stripped appropriately from the URLs.

4 files changed, 18 insertions, 11 deletions

diff --git a/src/feeds.c b/src/feeds.c
index 75173ee1..a40df571 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -57,12 +57,7 @@ void deinit_FeedEntry(iFeedEntry *d) {
 }
 
 const iString *url_FeedEntry(const iFeedEntry *d) {
-    const size_t fragPos = indexOf_String(&d->url, '#');
-    if (fragPos != iInvalidPos) {
-        return collect_String(newRange_String((iRangecc){ constBegin_String(&d->url),
-                                                          constBegin_String(&d->url) + fragPos }));
-    }
-    return &d->url;
+    return urlFragmentStripped_String(&d->url);
 }
 
 iBool isUnread_FeedEntry(const iFeedEntry *d) {
@@ -300,6 +295,7 @@ static iBool updateEntries_Feeds_(iFeeds *d, iPtrArray *incoming) {
         size_t pos;
         if (locate_SortedArray(&d->entries, &entry, &pos)) {
             iFeedEntry *existing = *(iFeedEntry **) at_SortedArray(&d->entries, pos);
+            iAssert(isHeadingEntry_FeedEntry_(existing) == isHeadingEntry_FeedEntry_(entry));
             /* Already known, but update it, maybe the time and label have changed. */
             if (!isHeadingEntry_FeedEntry_(existing)) {
                 iBool changed = iFalse;
diff --git a/src/gmutil.c b/src/gmutil.c
index 69fa6d9f..0f1bc803 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -91,6 +91,15 @@ void stripDefaultUrlPort_String(iString *d) {
     }
 }
 
+const iString *urlFragmentStripped_String(const iString *d) {
+    const size_t fragPos = indexOf_String(d, '#');
+    if (fragPos != iInvalidPos) {
+        return collect_String(newRange_String((iRangecc){ constBegin_String(d),
+                                                          constBegin_String(d) + fragPos }));
+    }
+    return d;
+}
+
 void cleanUrlPath_String(iString *d) {
     iString clean;
     init_String(&clean);
diff --git a/src/gmutil.h b/src/gmutil.h
index 7227a072..3fd1268d 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -105,6 +105,7 @@ iRangecc        urlHost_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 void            punyEncodeUrlHost_String(iString *);
 void            stripDefaultUrlPort_String(iString *);
+const iString * urlFragmentStripped_String(const iString *);
 void            urlDecodePath_String    (iString *);
 void            urlEncodePath_String    (iString *);
 iString *       makeFileUrl_String      (const iString *localFilePath);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 56b8d097..32dcf61f 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -822,7 +822,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (equal_Command(cmd, "feeds.markallread") && d->mode == feeds_SidebarMode) {
             iConstForEach(PtrArray, i, listEntries_Feeds()) {
                 const iFeedEntry *entry = i.ptr;
-                const iString *url = &entry->url;
+                const iString *url = url_FeedEntry(entry);
                 if (!containsUrl_Visited(visited_App(), url)) {
                     visitUrl_Visited(visited_App(), url, transient_VisitedUrlFlag);
                 }
@@ -834,16 +834,17 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             const iSidebarItem *item = d->contextItem;
             if (item) {
                 if (isCommand_Widget(w, ev, "feed.entry.opentab")) {
-                    postCommandf_App("open newtab:1 url:%s", cstr_String(&item->url));
+                    postCommandString_App(feedEntryOpenCommand_String(&item->url, 1));
                     return iTrue;
                 }
                 if (isCommand_Widget(w, ev, "feed.entry.toggleread")) {
                     iVisited *vis = visited_App();
-                    if (containsUrl_Visited(vis, &item->url)) {
-                        removeUrl_Visited(vis, &item->url);
+                    const iString *url = urlFragmentStripped_String(&item->url);
+                    if (containsUrl_Visited(vis, url)) {
+                        removeUrl_Visited(vis, url);
                     }
                     else {
-                        visitUrl_Visited(vis, &item->url, transient_VisitedUrlFlag);
+                        visitUrl_Visited(vis, url, transient_VisitedUrlFlag);
                     }
                     postCommand_App("visited.changed");
                     return iTrue;