docs: update roadmap

README.md

@@ -58,14 +58,11 @@ BE SURE TO USE A [BLUESKY APP PASSWORD](https://blueskyfeeds.com/faq-app-passwor
 - [x] undo likes
 - [x] undo reposts
 - [x] delete quotes
-- [ ] unfollow accounts
+- [x] unfollow accounts
-- [ ] remove bookmarks
+- [x] remove bookmarks
-- [ ] make `all` run the other commands
+- [x] make `all` run the other commands
 - [ ] add simple progress and logging
-- [ ] add safeguards like confirmations and clear dry-run info
+- [ ] add safeguards (confirmation, dry-run flag)
-
-Once it's done, we'll think:
-
 - [ ] decent code architecture
 - [ ] installation and run process
 

skywipe/bookmarks.py

@@ -0,0 +1,75 @@
+"""Bookmark deletion module for Skywipe"""
+
+import time
+from atproto import models
+from .auth import Auth
+from .configure import Configuration
+
+
+def delete_bookmarks():
+    auth = Auth()
+    client = auth.login()
+    config = Configuration()
+    config_data = config.load()
+
+    batch_size = config_data.get("batch_size", 10)
+    delay = config_data.get("delay", 1)
+    verbose = config_data.get("verbose", False)
+
+    if verbose:
+        print(
+            f"Starting bookmark deletion with batch_size={batch_size}, delay={delay}s")
+
+    cursor = None
+    total_deleted = 0
+
+    while True:
+        get_params = models.AppBskyBookmarkGetBookmarks.Params(
+            limit=batch_size,
+            cursor=cursor
+        )
+
+        response = client.app.bsky.bookmark.get_bookmarks(params=get_params)
+
+        bookmarks = response.bookmarks
+        if not bookmarks:
+            break
+
+        for bookmark in bookmarks:
+            try:
+                bookmark_uri = None
+                if hasattr(bookmark, "uri"):
+                    bookmark_uri = bookmark.uri
+                else:
+                    for attr_name in ("subject", "record", "post", "item"):
+                        if hasattr(bookmark, attr_name):
+                            nested = getattr(bookmark, attr_name)
+                            if hasattr(nested, "uri"):
+                                bookmark_uri = nested.uri
+                                break
+
+                if not bookmark_uri:
+                    if verbose:
+                        print(f"Skipping bookmark: unable to find uri")
+                    continue
+
+                delete_data = models.AppBskyBookmarkDeleteBookmark.Data(
+                    uri=bookmark_uri
+                )
+                client.app.bsky.bookmark.delete_bookmark(data=delete_data)
+                total_deleted += 1
+                if verbose:
+                    print(f"Deleted bookmark: {bookmark_uri}")
+            except Exception as e:
+                bookmark_uri = getattr(bookmark, "uri", "unknown")
+                if verbose:
+                    print(f"Error deleting bookmark {bookmark_uri}: {e}")
+
+        cursor = response.cursor
+        if not cursor:
+            break
+
+        if delay > 0:
+            time.sleep(delay)
+
+    print(f"Deleted {total_deleted} bookmarks.")

skywipe/commands.py

@@ -2,11 +2,13 @@
 
 from typing import Callable, Dict, Optional
 from .configure import Configuration
-from .posts import delete_posts
+from .posts import delete_all_posts
 from .medias import delete_posts_with_medias
 from .likes import undo_likes
 from .reposts import undo_reposts
-from .quotes import delete_quotes
+from .quotes import delete_quotes_posts
+from .follows import unfollow_all
+from .bookmarks import delete_bookmarks
 
 
 CommandHandler = Callable[[], None]
@@ -58,7 +60,7 @@ def run_configure():
 
 
 def run_posts():
-    delete_posts()
+    delete_all_posts()
 
 
 def run_medias():
@@ -74,25 +76,26 @@ def run_reposts():
 
 
 def run_quotes():
-    delete_quotes()
+    delete_quotes_posts()
 
 
 def run_follows():
-    print("Command 'follows' is not yet implemented.")
+    unfollow_all()
 
 
 def run_bookmarks():
-    print("Command 'bookmarks' is not yet implemented")
+    delete_bookmarks()
 
 
 def run_all():
-    registry.execute("posts")
+    commands = ["posts", "likes", "reposts", "follows", "bookmarks"]
-    registry.execute("medias")
+
-    registry.execute("likes")
+    for cmd in commands:
-    registry.execute("reposts")
+        try:
-    registry.execute("quotes")
+            registry.execute(cmd)
-    registry.execute("follows")
+        except Exception as e:
-    registry.execute("bookmarks")
+            print(f"Error running '{cmd}': {e}")
+            continue
 
 
 registry.register("configure", run_configure,
@@ -103,5 +106,5 @@ registry.register("likes", run_likes, "only likes")
 registry.register("reposts", run_reposts, "only reposts")
 registry.register("quotes", run_quotes, "only quotes")
 registry.register("follows", run_follows, "only follows")
-registry.register("bookmarks", run_follows, "only bookmarks")
+registry.register("bookmarks", run_bookmarks, "only bookmarks")
 registry.register("all", run_all, "target everything")

skywipe/follows.py

@@ -0,0 +1,69 @@
+"""Follow undoing module for Skywipe"""
+
+import time
+from atproto import models
+from .auth import Auth
+from .configure import Configuration
+
+
+FOLLOW_COLLECTION = "app.bsky.graph.follow"
+
+
+def unfollow_all():
+    auth = Auth()
+    client = auth.login()
+    config = Configuration()
+    config_data = config.load()
+
+    batch_size = config_data.get("batch_size", 10)
+    delay = config_data.get("delay", 1)
+    verbose = config_data.get("verbose", False)
+
+    if verbose:
+        print(
+            f"Starting unfollow operation with batch_size={batch_size}, delay={delay}s")
+
+    did = client.me.did
+    cursor = None
+    total_unfollowed = 0
+
+    while True:
+        list_params = models.ComAtprotoRepoListRecords.Params(
+            repo=did,
+            collection=FOLLOW_COLLECTION,
+            limit=batch_size,
+            cursor=cursor
+        )
+
+        response = client.com.atproto.repo.list_records(params=list_params)
+
+        records = response.records
+        if not records:
+            break
+
+        for record in records:
+            try:
+                record_uri = record.uri
+                rkey = record_uri.rsplit("/", 1)[-1]
+                delete_data = {
+                    "repo": did,
+                    "collection": FOLLOW_COLLECTION,
+                    "rkey": rkey
+                }
+                client.com.atproto.repo.delete_record(data=delete_data)
+                total_unfollowed += 1
+                if verbose:
+                    print(f"Unfollowed: {record_uri}")
+            except Exception as e:
+                record_uri = getattr(record, "uri", "unknown")
+                if verbose:
+                    print(f"Error unfollowing {record_uri}: {e}")
+
+        cursor = response.cursor
+        if not cursor:
+            break
+
+        if delay > 0:
+            time.sleep(delay)
+
+    print(f"Unfollowed {total_unfollowed} accounts.")

skywipe/medias.py

@@ -5,41 +5,6 @@ from .auth import Auth
 from .configure import Configuration
 
 
-def has_media_embed(post_record):
-    embed = getattr(post_record, 'embed', None)
-    if not embed:
-        return False
-
-    embed_type = getattr(embed, 'py_type', None)
-    media_types = {
-        'app.bsky.embed.images',
-        'app.bsky.embed.video',
-        'app.bsky.embed.external'
-    }
-
-    if embed_type:
-        embed_type_base = embed_type.split('#')[0]
-
-        if embed_type_base in media_types:
-            return True
-
-        if embed_type_base in ('app.bsky.embed.recordWithMedia', 'app.bsky.embed.record_with_media'):
-            media = getattr(embed, 'media', None)
-            if media:
-                media_type = getattr(media, 'py_type', None)
-                if media_type:
-                    media_type_base = media_type.split('#')[0]
-                    if media_type_base in media_types:
-                        return True
-
-    for attr in ('images', 'video', 'external'):
-        if hasattr(embed, attr):
-            return True
-        if isinstance(embed, dict) and embed.get(attr):
-            return True
-    return False
-
-
 def delete_posts_with_medias():
     auth = Auth()
     client = auth.login()
@@ -59,11 +24,8 @@ def delete_posts_with_medias():
     total_deleted = 0
 
     while True:
-        if cursor:
         response = client.get_author_feed(
             actor=did, limit=batch_size, cursor=cursor)
-        else:
-            response = client.get_author_feed(actor=did, limit=batch_size)
 
         posts = response.feed
         if not posts:
@@ -72,7 +34,41 @@ def delete_posts_with_medias():
         for post in posts:
             post_record = post.post
 
-            if not has_media_embed(post_record):
+            embed = getattr(post_record, 'embed', None)
+            has_media = False
+            if embed:
+                embed_type = getattr(embed, 'py_type', None)
+                media_types = {
+                    'app.bsky.embed.images',
+                    'app.bsky.embed.video',
+                    'app.bsky.embed.external'
+                }
+
+                if embed_type:
+                    embed_type_base = embed_type.split('#')[0]
+
+                    if embed_type_base in media_types:
+                        has_media = True
+
+                    if not has_media and embed_type_base in ('app.bsky.embed.recordWithMedia', 'app.bsky.embed.record_with_media'):
+                        media = getattr(embed, 'media', None)
+                        if media:
+                            media_type = getattr(media, 'py_type', None)
+                            if media_type:
+                                media_type_base = media_type.split('#')[0]
+                                if media_type_base in media_types:
+                                    has_media = True
+
+                if not has_media:
+                    for attr in ('images', 'video', 'external'):
+                        if hasattr(embed, attr):
+                            has_media = True
+                            break
+                        if isinstance(embed, dict) and embed.get(attr):
+                            has_media = True
+                            break
+
+            if not has_media:
                 if verbose:
                     print(f"Skipping post without media: {post_record.uri}")
                 continue

skywipe/posts.py

@@ -5,7 +5,7 @@ from .auth import Auth
 from .configure import Configuration
 
 
-def delete_posts():
+def delete_all_posts():
     auth = Auth()
     client = auth.login()
     config = Configuration()

skywipe/quotes.py

@@ -5,29 +5,7 @@ from .auth import Auth
 from .configure import Configuration
 
 
-def has_quote_embed(post_record):
+def delete_quotes_posts():
-    embed = getattr(post_record, 'embed', None)
-    if not embed:
-        return False
-
-    embed_type = getattr(embed, 'py_type', None)
-    if embed_type:
-        embed_type_base = embed_type.split('#')[0]
-        quote_types = {
-            'app.bsky.embed.record',
-            'app.bsky.embed.recordWithMedia',
-            'app.bsky.embed.record_with_media'
-        }
-        if embed_type_base in quote_types:
-            return True
-
-    if hasattr(embed, 'record') or (isinstance(embed, dict) and embed.get('record')):
-        return True
-
-    return False
-
-
-def delete_quotes():
     auth = Auth()
     client = auth.login()
     config = Configuration()
@@ -56,7 +34,24 @@ def delete_quotes():
         for post in posts:
             post_record = post.post
 
-            if not has_quote_embed(post_record):
+            embed = getattr(post_record, 'embed', None)
+            has_quote = False
+            if embed:
+                embed_type = getattr(embed, 'py_type', None)
+                if embed_type:
+                    embed_type_base = embed_type.split('#')[0]
+                    quote_types = {
+                        'app.bsky.embed.record',
+                        'app.bsky.embed.recordWithMedia',
+                        'app.bsky.embed.record_with_media'
+                    }
+                    if embed_type_base in quote_types:
+                        has_quote = True
+                
+                if not has_quote and (hasattr(embed, 'record') or (isinstance(embed, dict) and embed.get('record'))):
+                    has_quote = True
+
+            if not has_quote:
                 if verbose:
                     print(f"Skipping post without quote: {post_record.uri}")
                 continue