3 files changed, 32 insertions, 1 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index f97ef0c6..0791a207 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -41,6 +41,15 @@ void deinit_Bookmark(iBookmark *d) {
     deinit_String(&d->url);
 }
 
+iBool hasTag_Bookmark(const iBookmark *d, const char *tag) {
+    iRegExp *pattern = new_RegExp(format_CStr("\\b%s\\b", tag), caseSensitive_RegExpOption);
+    iRegExpMatch m;
+    init_RegExpMatch(&m);
+    const iBool found = matchString_RegExp(pattern, &d->tags, &m);
+    iRelease(pattern);
+    return found;
+}
+
 iDefineTypeConstruction(Bookmark)
 
 static int cmpTimeDescending_Bookmark_(const iBookmark **a, const iBookmark **b) {
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 84bdbd68..228c7885 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -41,6 +41,8 @@ struct Impl_Bookmark {
 
 iLocalDef uint32_t  id_Bookmark (const iBookmark *d) { return d->node.key; }
 
+iBool   hasTag_Bookmark     (const iBookmark *d, const char *tag);
+
 iDeclareType(Bookmarks)
 iDeclareTypeConstruction(Bookmarks)
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 7cde5d7b..6f1a7c04 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -202,9 +202,11 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 (iMenuItem[]){ { "Edit Bookmark...", 0, 0, "bookmark.edit" },
                                { "Copy URL", 0, 0, "bookmark.copy" },
                                { "---", 0, 0, NULL },
+                               { "Subscribe", 0, 0, "bookmark.tag tag:subscribed" },
+                               { "Use as Homepage", 0, 0, "bookmark.tag tag:homepage" },
                                { "---", 0, 0, NULL },
                                { uiTextCaution_ColorEscape "Delete Bookmark", 0, 0, "bookmark.delete" } },
-                5);
+               7);
             break;
         }
         case history_SidebarMode: {
@@ -650,6 +652,24 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
+        else if (equal_Command(cmd, "bookmark.tag")) {
+            const iSidebarItem *item = d->menuItem;
+            if (d->mode == bookmarks_SidebarMode && item) {
+                const char *tag = cstr_String(string_Command(cmd, "tag"));
+                iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
+                if (hasTag_Bookmark(bm, tag)) {
+                    size_t pos = indexOfCStr_String(&bm->tags, tag);
+                    remove_Block(&bm->tags.chars, pos, strlen(tag));
+                    trim_String(&bm->tags);
+                }
+                else {
+                    appendChar_String(&bm->tags, ' ');
+                    appendCStr_String(&bm->tags, tag);
+                }
+                postCommand_App("bookmarks.changed");
+            }
+            return iTrue;
+        }
         else if (equal_Command(cmd, "bookmark.delete")) {
             const iSidebarItem *item = d->menuItem;
             if (d->mode == bookmarks_SidebarMode && item && remove_Bookmarks(bookmarks_App(), item->id)) {