Merge pull request #19 from mi3lix9/change-docker-image

Modify docker image to run the bot

.dockerignore

@@ -11,5 +11,10 @@
 node_modules/
 jspm_packages/
 
+# Develolpment directories
+.devcontainer
+.github
+.vscode
+out
 # config file
 config

.env.example

@@ -1,3 +1,3 @@
 BOT_TOKEN=123456789:COPYTHETOKENFROMBOTFATHER
-JELLYSEERR_URL="https://localhost:5055/api/v1"
+JELLYSEERR_URL="https://localhost:5055"
 JELLYSEERR_KEY="COPYTHEAPIKEYFROMJELLYSEERR"

.github/workflows/create-docker-image-by-branch.yml

@@ -0,0 +1,30 @@
+name: Build and Push to GHCR
+
+on:
+ push:
+ branches:
+ - "develop"
+ - "main"
+
+jobs:
+ build_and_push:
+ permissions:
+ packages: write
+ contents: read
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+
+ - name: Build and Push the Image to GHCR
+ run: |
+ docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
+ if [ "${{ github.ref_name }}" == "main" ]; then
+ TAG="latest"
+ else
+ TAG="${{ github.ref_name }}"
+ fi
+ docker build -t ghcr.io/${{ github.repository }}:$TAG .
+ docker push ghcr.io/${{ github.repository }}:$TAG

dockerfile

@@ -2,7 +2,7 @@ FROM oven/bun:debian
 
 # Config Bun
 ENV PATH="~/.bun/bin:${PATH}"
-RUN ln -s /usr/local/bin/bun /usr/local/bin/node
+# RUN ln -s /usr/local/bin/bun /usr/local/bin/node
 
 
 # Set working directory

env.ts

@@ -1,9 +1,11 @@
 import { z } from "zod";
 
 const envSchema = z.object({
+
  BOT_TOKEN: z.string({ message: "BOT_TOKEN is not defined." }),
- JELLYSEERR_URL: z.string({ message: "JELLYSEERR_URL is not defined." }).url(),
+ JELLYSEERR_URL: z.string({ message: "JELLYSEERR_URL is not defined." }).url().transform((url) => url + "/api/v1"),
  JELLYSEERR_KEY: z.string({ message: "JELLYSEERR_KEY is not defined." }),
 });
 
 export default envSchema.parse(process.env);
+

src/index.ts

@@ -2,15 +2,19 @@ import { Bot, session } from "grammy";
 import env from "../env";
 import { conversations, createConversation } from "@grammyjs/conversations";
 import { SearchConversation } from "./conversations/search";
-import type { MyContext } from "./utils/types";
+import type { MyContext, SearchResult } from "./utils/types";
 import { COMMANDS } from "./utils/commands";
-import { fetchFromJellyseerr } from "./utils/fetchFromJellyseerr";
 import { search } from "./jellyseerr";
+import type { InlineQueryResultArticle } from "grammy/types";
+import { createTemplate } from "./utils/createTemplate";
+import { inlineQueryHandler } from "./utils/inlineQueryHandler";
 
 const { BOT_TOKEN } = env;
 
 const bot = new Bot<MyContext>(BOT_TOKEN);
 
+bot.inlineQuery(/.*/, inlineQueryHandler);
+
 // Install the session plugin.
 bot.use(
  session({
@@ -46,16 +50,3 @@ bot.catch(({ ctx, message }) => {
 
  ctx.reply("Something went wrong.");
 });
-
-// const res = await search({ query: "one piece" });
-// console.log(res);
-
-// const json = await fetchFromJellyseerr("/request", {
-// body: {
-// mediaType: "movie",
-// mediaId: 19576,
-// },
-// method: "POST",
-// });
-
-// console.log({ json });

src/jellyseerr.ts

@@ -15,14 +15,16 @@ export async function search(input: SearchInput): Promise<SearchOutput> {
  const results = json.results as SearchResult[];
 
  return SearchOutput.parse(
- results.map((r: SearchResult) => ({
- mediaId: r.id,
- title: r.title || r.name,
- overview: r.overview,
- releaseDate: r.releaseDate ?? r.firstAirDate,
- posterPath: r.posterPath,
- mediaType: r.mediaType,
- }))
+ results
+ .filter((res) => res.mediaType !== "person")
+ .map((r: SearchResult) => ({
+ mediaId: r.id,
+ title: r.title || r.name,
+ overview: r.overview,
+ releaseDate: r.releaseDate ?? r.firstAirDate,
+ posterPath: r.posterPath,
+ mediaType: r.mediaType,
+ }))
  );
 }
 

src/utils/inlineQueryHandler.ts

@@ -0,0 +1,39 @@
+import type { InlineQueryResultArticle } from "grammy/types";
+import { search } from "../jellyseerr";
+import { createTemplate } from "./createTemplate";
+import type { MyContext } from "./types";
+import type { Filter } from "grammy";
+
+export async function inlineQueryHandler(
+ ctx: Filter<MyContext, "inline_query">
+) {
+ const query = ctx.inlineQuery.query.trim();
+
+ if (query === "") {
+ return; // Ignore empty queries
+ }
+
+ const results = await search({ query });
+
+ // Format the results to send as inline query answers
+ const inlineResults: InlineQueryResultArticle[] = results
+ .filter((result) => typeof result.posterPath !== "undefined")
+ .map((result) => ({
+ type: "article",
+ id: String(result.mediaId),
+ title: result.mediaType + ": " + result.title,
+ input_message_content: {
+ message_text: createTemplate({
+ title: result.title,
+ overview: result.overview ?? "",
+ releaseDate: result.releaseDate ?? "",
+ mediaType: result.mediaType,
+ }),
+ },
+ description: result.overview,
+ thumb_url: result.posterPath,
+ }));
+
+ // Answer the inline query
+ await ctx.answerInlineQuery(inlineResults);
+}

src/zodSchema.ts

@@ -15,8 +15,13 @@ export const SearchOutput = z.array(
  tags: z.array(z.string()).optional(),
  posterPath: z
  .string()
+ .or(z.null())
  .optional()
- .transform((val) => "https://image.tmdb.org/t/p/original" + val),
+ .transform((val) =>
+ typeof val === "string"
+ ? "https://image.tmdb.org/t/p/original" + val
+ : undefined
+ ),
  mediaType: z.enum(["movie", "tv"]),
  })
 );