7 files changed, 126 insertions, 3 deletions

diff --git a/src/app.c b/src/app.c
index eb8eb16a..3daf7c03 100644
--- a/src/app.c
+++ b/src/app.c
@@ -905,6 +905,42 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     return iFalse;
 }
 
+static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
+    iApp *d = &app_;
+    if (equal_Command(cmd, "cancel")) {
+        destroy_Widget(dlg);
+        return iTrue;
+    }
+    if (equal_Command(cmd, "feedcfg.accept")) {
+        int id = argLabel_Command(cmd, "bmid");
+        const iBool headings = isSelected_Widget(findChild_Widget(dlg, "feedcfg.type.headings"));
+        const iString *tags = collectNewFormat_String("subscribed%s", headings ? " headings" : "");
+        if (!id) {
+            const size_t numSubs = numSubscribed_Feeds();
+            const iString *url   = url_DocumentWidget(document_App());
+            add_Bookmarks(d->bookmarks,
+                          url,
+                          bookmarkTitle_DocumentWidget(document_App()),
+                          tags,
+                          siteIcon_GmDocument(document_DocumentWidget(document_App())));
+            if (numSubs == 0) {
+                /* Auto-refresh after first addition. */
+                postCommand_App("feeds.refresh");
+            }
+        }
+        else {
+            iBookmark *bm = get_Bookmarks(d->bookmarks, id);
+            if (bm) {
+                set_String(&bm->tags, tags);
+            }
+        }
+        postCommand_App("bookmarks.changed");
+        destroy_Widget(dlg);
+        return iTrue;
+    }
+    return iFalse;
+}
+
 iBool willUseProxy_App(const iRangecc scheme) {
     return schemeProxy_App(scheme) != NULL;
 }
@@ -1244,7 +1280,46 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("focus.set id:bmed.title");
         return iTrue;
     }
-    else if (equal_Command(cmd, "bookmark.addtag")) {
+    else if (equal_Command(cmd, "feeds.subscribe")) {
+        const iString *url = url_DocumentWidget(document_App());
+        if (isEmpty_String(url)) {
+            return iTrue;
+        }
+        uint32_t         id  = findUrl_Bookmarks(d->bookmarks, url);
+        const iBookmark *bm  = id ? get_Bookmarks(d->bookmarks, id) : NULL;
+        iWidget *        dlg = makeFeedSettings_Widget(id);
+        setText_LabelWidget(findChild_Widget(dlg, "feedcfg.title"),
+                            collectNewFormat_String(
+                                uiHeading_ColorEscape "%s",
+                                bm ? cstr_String(&bm->title)
+                                   : cstr_String(bookmarkTitle_DocumentWidget(document_App()))));
+        setFlags_Widget(findChild_Widget(dlg,
+                                         hasTag_Bookmark(bm, "headings") ? "feedcfg.type.headings"
+                                                                         : "feedcfg.type.gemini"),
+                        selected_WidgetFlag,
+                        iTrue);
+        setCommandHandler_Widget(dlg, handleFeedSettingCommands_);
+        return iTrue;
+#if 0
+        const size_t numSubs = numSubscribed_Feeds();
+        if (!isEmpty_String(url)) {
+            iBool wasCreated = iFalse;
+            uint32_t id = findUrl_Bookmarks(d->bookmarks, url);
+            if (!id) {
+                add_Bookmarks(d->bookmarks,
+                              url,
+                              bookmarkTitle_DocumentWidget(document_App()),
+                              collectNewCStr_String("subscribed"),
+                              siteIcon_GmDocument(document_DocumentWidget(document_App())));
+                wasCreated = iTrue;
+            }
+
+            if (numSubs == 0 && !cmp_String(tag, "subscribed")) {
+                postCommand_App("feeds.refresh");
+            }
+        }
+#endif
+#if 0
         const iString *tag = string_Command(cmd, "tag");
         const iString *url = url_DocumentWidget(document_App());
         const size_t numSubs = numSubscribed_Feeds();
@@ -1263,6 +1338,7 @@ iBool handleCommand_App(const char *cmd) {
             }
         }
         return iTrue;
+#endif
     }
     else if (equal_Command(cmd, "bookmarks.changed")) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 8bde5b8b..54b0407f 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -42,6 +42,7 @@ void deinit_Bookmark(iBookmark *d) {
 }
 
 iBool hasTag_Bookmark(const iBookmark *d, const char *tag) {
+    if (!d) return iFalse;
     iRegExp *pattern = new_RegExp(format_CStr("\\b%s\\b", tag), caseSensitive_RegExpOption);
     iRegExpMatch m;
     init_RegExpMatch(&m);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 1f0e7b4d..bd8b71da 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -330,6 +330,10 @@ void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     updateSize_LabelWidget(d);
 }
 
+void setCommand_LabelWidget(iLabelWidget *d, const iString *command) {
+    set_String(&d->command, command);
+}
+
 const iString *text_LabelWidget(const iLabelWidget *d) {
     return &d->label;
 }
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 5b2efc42..c91793e5 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -33,6 +33,7 @@ void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setText_LabelWidget         (iLabelWidget *, const iString *text); /* resizes widget */
 void    setTextCStr_LabelWidget     (iLabelWidget *, const char *text);
+void    setCommand_LabelWidget      (iLabelWidget *, const iString *command);
 
 void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
diff --git a/src/ui/util.c b/src/ui/util.c
index 428f9e9d..d5bddda9 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1245,6 +1245,46 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
     return dlg;
 }
 
+iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
+    iWidget *dlg = makeSheet_Widget("feedcfg");
+    setId_Widget(addChildFlags_Widget(
+                     dlg,
+                     iClob(new_LabelWidget(uiHeading_ColorEscape "FEED SETTINGS", NULL)),
+                     frameless_WidgetFlag),
+                 "feedcfg.heading");
+    iWidget *page = new_Widget();
+    addChild_Widget(dlg, iClob(page));
+    setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+    iWidget *headings = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iWidget *values = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    addChild_Widget(headings, iClob(makeHeading_Widget("Feed title:")));
+    setId_Widget(
+        addChildFlags_Widget(values, iClob(new_LabelWidget("", NULL)), frameless_WidgetFlag),
+        "feedcfg.title");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Entry type:")));
+    iWidget *types = new_Widget(); {
+        addRadioButton_(types, "feedcfg.type.gemini", "YYYY-MM-DD", "feedcfg.type arg:0");
+        addRadioButton_(types, "feedcfg.type.headings", "New Headings", "feedcfg.type arg:1");
+    }
+    addChildFlags_Widget(values, iClob(types), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+    iWidget *div = new_Widget(); {
+        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+        addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
+        setId_Widget(addChild_Widget(
+            div,
+            iClob(newKeyMods_LabelWidget(
+                uiTextCaution_ColorEscape "Save Settings", SDLK_RETURN, KMOD_PRIMARY,
+                             format_CStr("feedcfg.accept bmid:%d", bookmarkId)))),
+                     "feedcfg.save");
+    }
+    addChild_Widget(dlg, iClob(div));
+    addChild_Widget(get_Window()->root, iClob(dlg));
+    centerSheet_Widget(dlg);
+    return dlg;
+}
+
 iWidget *makeIdentityCreation_Widget(void) {
     iWidget *dlg = makeSheet_Widget("ident");
     setId_Widget(addChildFlags_Widget(
diff --git a/src/ui/util.h b/src/ui/util.h
index 062ae56a..c9f464ad 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -203,3 +203,4 @@ iWidget *   makePreferences_Widget      (void);
 iWidget *   makeBookmarkEditor_Widget   (void);
 iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *title, iChar icon);
 iWidget *   makeIdentityCreation_Widget (void);
+iWidget *   makeFeedSettings_Widget     (uint32_t bookmarkId);
diff --git a/src/ui/window.c b/src/ui/window.c
index b3843a76..199e35a7 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -105,7 +105,7 @@ static const iMenuItem navMenuItems_[] = {
     { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
     { "---", 0, 0, NULL },
     { "Bookmark Page", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
-    { "Subscribe to Page", subscribeToPage_KeyModifier, "bookmark.addtag tag:subscribed" },
+    { "Subscribe to Page", subscribeToPage_KeyModifier, "feeds.subscribe" },
     { "---", 0, 0, NULL },
     { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
     { "---", 0, 0, NULL },
@@ -160,7 +160,7 @@ static const iMenuItem viewMenuItems_[] = {
 static iMenuItem bookmarksMenuItems_[] = {
     { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
     { "---", 0, 0, NULL },
-    { "Subscribe to This Page", subscribeToPage_KeyModifier, "bookmark.addtag tag:subscribed" },
+    { "Subscribe to This Page", subscribeToPage_KeyModifier, "feeds.subscribe" },
     { "---", 0, 0, NULL },
     { "Show Feed Entries", 0, 0, "open url:about:feeds" },
     { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" },