➕ bluesky: switch to FxBluesky, add text only view

Closes #94

Author: Kyrela

README.md

@@ -247,7 +247,6 @@ We're not affiliated with any of these services.
 - [vxreddit](https://github.com/dylanpdx/vxReddit)
 - [BiliFix](https://vxbilibili.com/)
 - [FixThreads](https://github.com/seriaati/fixthreads)
-- [VixBluesky](https://github.com/Lexedia/VixBluesky)
 - [phixiv](https://github.com/thelaao/phixiv)
 - [fixDeviantArt](https://github.com/Tschrock/fixdeviantart)
 - [FxMastodon](https://fx.zillanlabs.tech/)
@@ -483,12 +482,12 @@ _Are you aware of any other fixer that isn't included here? Feel free to open an
   </details>
 
 - <img src="assets/bluesky.webp" alt="Bluesky" height="20"/> Bluesky
-  - [VixBluesky • bskx.app](https://github.com/Lexedia/VixBluesky) *Used by FixTweetBot*
+  - [VixBluesky • bskx.app](https://github.com/Lexedia/VixBluesky)
     - Other official public instances/redirects: `bskyx.app` (deprecated)
     - Other unofficial public instances/redirects: `girlcockbsky.app` (nsfw content)
   - [FixBluesky • bsyy.app](https://github.com/ThornbushHQ/FixBluesky)
   - [xbsky • xbsky.app](https://github.com/colduw/xbsky)
-  - [FxBluesky • fxbsky.app](https://github.com/FxEmbed/FxEmbed)
+  - [FxBluesky • fxbsky.app](https://github.com/FxEmbed/FxEmbed) *Used by FixTweetBot*
   - [vxBsky • vxbsky.app](https://github.com/dylanpdx/vxBsky)
   - [bskye • bskye.app](https://github.com/FerroEduardo/bskye)
   - [cbsky.app • cbsky.app](https://github.com/goeo-/cbsky.app)

database/migrations/2026_03_08_190027_add_bluesky_text_view.py

@@ -0,0 +1,19 @@
+"""AddBlueskyTextView Migration."""
+
+from masoniteorm.migrations import Migration
+
+
+class AddBlueskyTextView(Migration):
+    def up(self):
+        """
+        Run the migrations.
+        """
+        with self.schema.table("guilds") as table:
+            table.enum("bluesky_view", ["normal", "gallery", "text_only", "direct_media"]).default("normal").change()
+
+    def down(self):
+        """
+        Revert the migrations.
+        """
+        with self.schema.table("guilds") as table:
+            table.enum("bluesky_view", ["normal", "gallery", "direct_media"]).default("normal").change()

database/models/Guild.py

@@ -7,7 +7,7 @@
 from masoniteorm.relationships import has_many
 
 
-__all__ = ('Guild', 'OriginalMessage', 'TwitterView', 'InstagramView', 'TiktokView', 'BlueskyView', 'EmbedEzView', 'GettableEnum')
+__all__ = ('Guild', 'OriginalMessage', 'FxEmbedView', 'InstagramView', 'TiktokView', 'EmbedEzView', 'GettableEnum')
 
 from database.models.DiscordRepresentation import DiscordRepresentation
 
@@ -26,7 +26,7 @@ class OriginalMessage(GettableEnum):
     DELETE = 'delete'
 
 
-class TwitterView(GettableEnum):
+class FxEmbedView(GettableEnum):
     NORMAL = 'normal'
     GALLERY = 'gallery'
     TEXT_ONLY = 'text_only'
@@ -42,11 +42,6 @@ class TiktokView(GettableEnum):
     GALLERY = 'gallery'
     DIRECT_MEDIA = 'direct_media'
 
-class BlueskyView(GettableEnum):
-    NORMAL = 'normal'
-    DIRECT_MEDIA = 'direct_media'
-    GALLERY = 'gallery'
-
 class EmbedEzView(GettableEnum):
     NORMAL = 'normal'
     DIRECT_MEDIA = 'direct_media'
@@ -68,9 +63,9 @@ class Guild(DiscordRepresentation):
         'reply_silently': bool,
         'webhooks': bool,
         'original_message': OriginalMessage,
-        'twitter_view': TwitterView,
+        'twitter_view': FxEmbedView,
         'tiktok_view': TiktokView,
-        'bluesky_view': BlueskyView,
+        'bluesky_view': FxEmbedView,
         'instagram_view': InstagramView,
         'snapchat_view': EmbedEzView,
         'ifunny_view': EmbedEzView,

src/settings.py

@@ -133,24 +133,21 @@ class WebsiteBaseSetting(BaseSetting):
     proxies: dict[str, str]
     is_view: bool = False
     is_translation: bool = False
+    view_enum: Type[GettableEnum] | None = None
 
     def __init__(
             self,
             interaction: discore.Interaction,
             view: SettingsView,
-            ctx: DataElements,
-            enum: Type[GettableEnum] = None
+            ctx: DataElements
     ):
         super().__init__(interaction, view, ctx)
         self.state = bool(self.ctx.guild[self.id])
         self.view_state = None
-        self.view_enum = None
         self.translation = None
         if self.is_view:
             self.view_state = self.ctx.guild[f'{self.id}_view']
-            if enum is not None:
-                self.view_enum = enum
-            else:
+            if self.view_enum is None:
                 enum_name = f'{self.id.title()}View'
                 self.view_enum = getattr(__import__('database.models.Guild', fromlist=[enum_name]), enum_name)
         if self.is_translation:
@@ -307,9 +304,7 @@ class EmbedEZBaseSetting(WebsiteBaseSetting):
     proxies = {"EmbedEZ": "https://embedez.com"}
     is_view = True
     is_translation = True
-
-    def __init__(self, interaction: discore.Interaction, view: SettingsView, ctx: DataElements):
-        super().__init__(interaction, view, ctx, enum=EmbedEzView)
+    view_enum = EmbedEzView
 
 
 class ClickerSetting(BaseSetting):
@@ -1246,6 +1241,7 @@ class TwitterSetting(WebsiteBaseSetting):
     proxies = {"FxTwitter": "https://github.com/FxEmbed/FxEmbed"}
     is_translation = True
     is_view = True
+    view_enum = FxEmbedView
 
 
 class InstagramSetting(WebsiteBaseSetting):
@@ -1292,8 +1288,9 @@ class BlueskySetting(WebsiteBaseSetting):
     id = 'bluesky'
     name = 'Bluesky'
     emoji = discore.config.emoji.bluesky
-    proxies = {"VixBluesky": "https://github.com/Lexedia/VixBluesky"}
+    proxies = {"FxBluesky": "https://github.com/FxEmbed/FxEmbed"}
     is_view = True
+    view_enum = FxEmbedView
 
 
 class SnapchatSetting(EmbedEZBaseSetting):

src/websites.py

@@ -371,10 +371,10 @@ class TwitterLink(GenericWebsiteLink):
     fixer_name = "FxTwitter"
     is_translation = True
     subdomains = {
-        TwitterView.NORMAL: '',
-        TwitterView.GALLERY: 'g.',
-        TwitterView.TEXT_ONLY: 't.',
-        TwitterView.DIRECT_MEDIA: 'd.',
+        FxEmbedView.NORMAL: '',
+        FxEmbedView.GALLERY: 'g.',
+        FxEmbedView.TEXT_ONLY: 't.',
+        FxEmbedView.DIRECT_MEDIA: 'd.',
     }
     routes = generate_routes(
         ["twitter.com", "x.com", "nitter.net", "xcancel.com", "nitter.poast.org", "nitter.privacyredirect.com", "lightbrd.com", "nitter.space", "nitter.tiekoetter.com"],
@@ -470,12 +470,13 @@ class BlueskyLink(GenericWebsiteLink):
 
     id = 'bluesky'
     hypertext_label = 'Bluesky'
-    fix_domain = "bskx.app"
-    fixer_name = "VixBluesky"
+    fix_domain = "fxbsky.app"
+    fixer_name = "FxBluesky"
     subdomains = {
-        BlueskyView.NORMAL: '',
-        BlueskyView.DIRECT_MEDIA: 'r.',
-        BlueskyView.GALLERY: 'g.',
+        FxEmbedView.NORMAL: '',
+        FxEmbedView.DIRECT_MEDIA: 'd.',
+        FxEmbedView.GALLERY: 'g.',
+        FxEmbedView.TEXT_ONLY: 't.',
     }
     routes = generate_routes(
         "bsky.app",