Update README.md

README.md

@@ -1,21 +1,23 @@
-# VixBluesky 🛠️ (Inspired by [FixTweet](https://github.com/FixTweet/FixTweet))
+# girlcockbsky Fork of [VixBluesky](https://github.com/Rapougnac/VixBluesky) 🛠️ (Inspired by [FixTweet](https://github.com/FixTweet/FixTweet))
 
 > [!IMPORTANT]
-> This is a fork of [FixBluesky](https://github.com/ThornbushHQ/FixBluesky) by [@ItsRauf](https://www.github.com/ItsRauf).
+> This is a fork of [VixBluesky](https://github.com/Rapougnac/VixBluesky) by [@Lexedia](https://www.github.com/Rapougnac), which is a fork of [FixBluesky](https://github.com/ThornbushHQ/FixBluesky) by [@ItsRauf](https://www.github.com/ItsRauf).
 > All credits go to them for the original idea and implementation.
 
+Converted to nodejs cause serverless design's proprietary-ness annoys me and i wanted to make a funny joke after seeing girlcockx for twitter.
+
 Embed Bluesky links in Discord.
 
 ## How To Use?
 
-#### Simply append `x` at the end of `bsky.app`.
+#### Simply append `girlcock` at the front of `bsky.app`.
 
 ## Direct Links
 
 You want to link to a media directly? You can prepend `r.` to the URL to get a direct link.
-![Direct Link](./.github/README/raw-media.png)
 
 ## Authors
 
 - [@ItsRauf](https://www.github.com/ItsRauf) - Original author
-- [@Lexedia](https://www.github.com/Rapougnac)
+- [@Lexedia](https://www.github.com/Rapougnac) - Also Original author
+- [@juni.pet](https://github.com/Juniteevee) - depraved critter

docker-compose.yaml

@@ -0,0 +1,28 @@
+services:
+  api:
+    build:
+      context: ./pkgs/api/.
+      dockerfile: Dockerfile
+    ports:
+      - "2598:3000"
+    environment:
+      - NODE_ENV=production
+      - PORT=3000
+      - EMPTY_REDIR=https://bsky.app/profile/juni.pet/post/3l3e53fzazy2n
+    restart: unless-stopped
+  app:
+    build:
+      context: ./pkgs/app/.
+      dockerfile: Dockerfile
+    ports:
+      - "2599:3000"
+    environment:
+      - BSKY_SERVICE_URL=https://bsky.social
+      - VIXBLUESKY_APP_DOMAIN=girlcockbsky.app
+      - VIXBLUESKY_API_URL=http://localhost:2598/
+      - BSKY_AUTH_USERNAME=YOUR_OWN_USERNAME
+      - BSKY_AUTH_PASSWORD=YOUR_APP_PASSWORD_SHOULD_COME_FROM_ENV
+      - PORT=3000
+      - EMPTY_REDIR=https://bsky.app/profile/juni.pet/post/3l3e53fzazy2n
+    restart: unless-stopped
+

pkgs/api/src/index.ts

@@ -22,17 +22,18 @@ declare global {
     interface ProcessEnv {
       readonly NODE_ENV: Env;
       readonly PORT: string | undefined;
+      readonly EMPTY_REDIR: string;
     }
   }
 }
 
-const { NODE_ENV: env = "development", PORT } = process.env;
+const { NODE_ENV: env = "development", PORT, EMPTY_REDIR } = process.env;
 
 const app = fastify({ logger: envToLogger[env] });
 
 app.addContentTypeParser("*", (_, __, done) => done(null));
 
-app.get("/", async (_, res) => res.redirect("https://bskyx.app"));
+app.get("/", async (_, res) => res.redirect(EMPTY_REDIR));
 
 // serve 0 bytes favicon so browsers don't spam the server
 app.get("/favicon.ico", (_, res) => res.send(""));

pkgs/app/Dockerfile

@@ -0,0 +1,14 @@
+#FROM node:22-alpine
+FROM node:22.2.0-slim
+
+WORKDIR /app
+
+COPY package*.json ./
+
+RUN npm i -g pnpm && pnpm install
+
+COPY . .
+
+#RUN pnpm run dev
+
+CMD [ "pnpm", "dev" ]

pkgs/app/package.json

@@ -1,17 +1,20 @@
 {
   "scripts": {
-    "dev": "wrangler dev src/index.ts",
+    "dev": "tsx watch src/index.ts"
-    "deploy": "wrangler deploy --minify src/index.ts"
   },
   "dependencies": {
     "@atcute/bluesky": "^1.0.7",
     "@atcute/client": "^2.0.3",
-    "hono": "^4.5.1"
+    "hono": "^4.5.1",
+    "@hono/node-server": "^1.13.2",
+    "node-cache": "^5.1.2"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230628.0",
     "prettier": "^3.3.3",
     "typescript": "^5.1.6",
-    "wrangler": "^3.75.0"
+    "wrangler": "^3.75.0",
+    "@types/node": "^20.11.17",
+    "tsx": "^4.7.1"
   }
 }

pkgs/app/src/globals.d.ts

@@ -1,18 +0,0 @@
-import { XRPC } from '@atcute/client';
-import type { KVNamespace } from '@cloudflare/workers-types';
-
-declare global {
-  interface Env {
-    Bindings: {
-      BSKY_SERVICE_URL: string;
-      BSKY_AUTH_USERNAME: string;
-      BSKY_AUTH_PASSWORD: string;
-      VIXBLUESKY_APP_DOMAIN: string;
-      VIXBLUESKY_API_URL: string;
-      bskyx: KVNamespace;
-    };
-    Variables: {
-      Agent: XRPC;
-    };
-  }
-}

pkgs/app/src/index.ts

@@ -1,3 +1,4 @@
+import { serve } from '@hono/node-server'
 import { Hono } from 'hono';
 import { XRPC, CredentialManager, AtpSessionData } from '@atcute/client';
 import '@atcute/bluesky/lexicons';
@@ -7,32 +8,34 @@ import { getOEmbed } from './routes/getOEmbed';
 import { getProfileData } from './routes/getProfileData';
 import { getProfile } from './routes/getProfile';
 import { HTTPException } from 'hono/http-exception';
+const NodeCache = require( "node-cache" );
 
-const app = new Hono<Env>();
+const app = new Hono();
+const myCache = new NodeCache();
 
 app.use('*', async (c, next) => {
   const creds = new CredentialManager({
-    service: c.env.BSKY_SERVICE_URL,
+    service: process.env.BSKY_SERVICE_URL,
     onRefresh(session) {
-      return c.env.bskyx.put('session', JSON.stringify(session));
+      return myCache.set('session', JSON.stringify(session));
     },
     onExpired(session) {
-      return c.env.bskyx.delete('session');
+      return myCache.del('session');
     },
     onSessionUpdate(session) {
-      return c.env.bskyx.put('session', JSON.stringify(session));
+      return myCache.set('session', JSON.stringify(session));
     },
   });
   const agent = new XRPC({ handler: creds });
   try {
-    const rawSession = await c.env.bskyx.get('session');
+    const rawSession = myCache.get('session');
-    if (rawSession) {
+    if(rawSession) {
       const session = JSON.parse(rawSession) as AtpSessionData;
       await creds.resume(session);
     } else {
       await creds.login({
-        identifier: c.env.BSKY_AUTH_USERNAME,
+        identifier: process.env.BSKY_AUTH_USERNAME,
-        password: c.env.BSKY_AUTH_PASSWORD,
+        password: process.env.BSKY_AUTH_PASSWORD,
       });
     }
     c.set('Agent', agent);
@@ -48,7 +51,7 @@ app.use('*', async (c, next) => {
 });
 
 app.get('/', async (c) => {
-  return c.redirect('https://github.com/Rapougnac/VixBluesky');
+  return c.redirect(process.env.EMPTY_REDIR);
 });
 
 app.get('/profile/:user/post/:post', getPost);
@@ -65,4 +68,7 @@ app.get('/https://bsky.app/profile/:user/json', getProfileData);
 
 app.get('/oembed', getOEmbed);
 
-export default app;
+serve({
+  fetch: app.fetch,
+  port: process.env.PORT,
+})

pkgs/app/src/lib/parseEmbedDescription.ts

@@ -8,7 +8,9 @@ export function parseEmbedDescription(post: AppBskyFeedDefs.PostView): string {
       checkType('app.bsky.embed.recordWithMedia#view', post.embed));
 
   // @ts-expect-error
-  const embed = post.embed.record?.record ?? post.embed.record;
+  let embed;
+  if(isQuote)
+    embed = post.embed.record?.record ?? post.embed.record;
 
   return isQuote
     ? // @ts-expect-error

pkgs/app/src/routes/getOEmbed.ts

@@ -11,8 +11,8 @@ export const getOEmbed: Handler<Env, '/oembed'> = async (c) => {
   const avatar = c.req.query('avatar');
 
   const defaults = {
-    provider_name: 'VixBluesky',
+    provider_name: 'girlcockbsky',
-    provider_url: 'https://bskyx.app/',
+    provider_url: 'https://girlcockbsky.app/',
     thumbnail_width: 1000,
     thumbnail_height: 1000,
   };
@@ -42,7 +42,7 @@ export const getOEmbed: Handler<Env, '/oembed'> = async (c) => {
     const { replies, reposts, likes, description } = c.req.query();
     return c.json({
       ...defaults,
-      provider_name: `VixBluesky\n\n🗨️ ${replies}    ♻️ ${reposts}    💙 ${likes}`,
+      provider_name: `girlcockbsky\n\n🗨️ ${replies}    ♻️ ${reposts}    💙 ${likes}`,
       description,
       title: description,
       author_name: description,

pkgs/app/src/routes/getPost.tsx

@@ -29,7 +29,8 @@ export const getPost: Handler<
   Env,
   '/profile/:user/post/:post' | '/https://bsky.app/profile/:user/post/:post'
 > = async (c) => {
-  const { user, post } = c.req.param();
+  let { user, post } = c.req.param();
+  post = post.replaceAll('|', '');
   const isDirect = c.req.query('direct');
 
   const agent = c.get('Agent');
@@ -67,9 +68,9 @@ export const getPost: Handler<
       <Post
         post={fetchedPost}
         url={c.req.path}
-        appDomain={c.env.VIXBLUESKY_APP_DOMAIN}
+        appDomain={process.env.VIXBLUESKY_APP_DOMAIN}
         videoMetadata={videoMetaData}
-        apiUrl={c.env.VIXBLUESKY_API_URL}
+        apiUrl={process.env.VIXBLUESKY_API_URL}
         images={images}
       />,
     );

pkgs/app/src/routes/getProfile.tsx

@@ -7,7 +7,8 @@ export const getProfile: Handler<
   Env,
   '/profile/:user' | '/https://bsky.app/profile/:user'
 > = async (c) => {
-  const { user } = c.req.param();
+  let { user } = c.req.param();
+  user = user.replaceAll('|', '');
   const agent = c.get('Agent');
   try {
     var { data } = await fetchProfile(agent, { user });
@@ -21,7 +22,7 @@ export const getProfile: Handler<
     <Profile
       profile={data}
       url={c.req.path}
-      appDomain={c.env.VIXBLUESKY_APP_DOMAIN}
+      appDomain={process.env.VIXBLUESKY_APP_DOMAIN}
     />,
   );
 };

pkgs/app/tsconfig.json

@@ -1,13 +1,14 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "ESNext",
+    "module": "NodeNext",
-    "moduleResolution": "Bundler",
-    "esModuleInterop": true,
     "strict": true,
-    "lib": ["esnext"],
+    "verbatimModuleSyntax": true,
-    "types": ["@cloudflare/workers-types"],
+    "skipLibCheck": true,
+    "types": [
+      "node"
+    ],
     "jsx": "react-jsx",
-    "jsxImportSource": "hono/jsx"
+    "jsxImportSource": "hono/jsx",
   }
-}
+}

pkgs/app/wrangler.toml

@@ -1,16 +0,0 @@
-name = "vixbluesky"
-main = "src/index.ts"
-compatibility_date = "2023-01-01"
-
-workers_dev = false
-route = { pattern = "bskyx.app/*", zone_name = "bskyx.app" }
-
-[vars]
-BSKY_SERVICE_URL="https://bsky.social/"
-VIXBLUESKY_APP_DOMAIN="bskyx.app"
-VIXBLUESKY_API_URL="https://api.bskyx.app/"
-
-[[kv_namespaces]]
-binding = "bskyx"
-id = "ee913536e1fb47dcb9fa6275725f5a6f"
-preview_id = "5e180765d24346c9b238be57d9c7001f"

shell.nix

@@ -1,15 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-pkgs.mkShell {
-  buildInputs = [
-    pkgs.nodejs
-    pkgs.python3
-    pkgs.python3Packages.pip
-    pkgs.python3Packages.virtualenv
-    pkgs.sqlite
-    pkgs.gcc
-    pkgs.gnumake
-    pkgs.pnpm
-    pkgs.wrangler
-  ];
-}