Revert all sticker pack changes and add CI pipeline for commit hash manipulation

Co-authored-by: mvolfik <31281386+mvolfik@users.noreply.github.com>

X-Hash-Nonce: 51777

Author: github-actions[bot]

.github/workflows/hash-rewrite.yml

@@ -0,0 +1,128 @@
+name: Commit Hash Rewriter
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  rewrite-hashes:
+    name: Rewrite commit hashes to start with 0d9e
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+      
+      - name: Rewrite commit hashes
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Get the base branch
+          BASE_REF="${{ github.event.pull_request.base.sha }}"
+          
+          # Get list of commits in the PR
+          COMMITS=$(git rev-list --reverse ${BASE_REF}..HEAD)
+          
+          # Check if any commits need rewriting
+          NEEDS_REWRITE=false
+          for commit in $COMMITS; do
+            if [[ ! $commit =~ ^0d9e ]]; then
+              NEEDS_REWRITE=true
+              break
+            fi
+          done
+          
+          if [ "$NEEDS_REWRITE" = false ]; then
+            echo "All commits already start with 0d9e, no rewriting needed"
+            exit 0
+          fi
+          
+          echo "Starting commit hash rewriting process..."
+          
+          # Create a temporary branch for rewriting
+          TEMP_BRANCH="temp-rewrite-$(date +%s)"
+          git checkout -b "$TEMP_BRANCH" "$BASE_REF"
+          
+          # Function to find a hash starting with 0d9e
+          find_0d9e_hash() {
+            local original_commit=$1
+            local commit_msg=$(git log -1 --format=%B "$original_commit")
+            local commit_author=$(git log -1 --format="%an <%ae>" "$original_commit")
+            local commit_date=$(git log -1 --format=%aD "$original_commit")
+            local tree=$(git rev-parse "$original_commit^{tree}")
+            
+            echo "Searching for 0d9e hash for commit: $(echo "$commit_msg" | head -1)"
+            
+            # Try different GPG signature headers to manipulate the hash
+            local nonce=0
+            local max_attempts=100000
+            
+            while [ $nonce -lt $max_attempts ]; do
+              # Create commit with extra GPG header data
+              local extra_header="X-Hash-Nonce: $nonce"
+              
+              # Create the commit with the nonce in a GPG-like header format
+              GIT_AUTHOR_NAME="$commit_author"
+              GIT_AUTHOR_EMAIL="$commit_author"
+              GIT_AUTHOR_DATE="$commit_date"
+              GIT_COMMITTER_NAME="$commit_author"
+              GIT_COMMITTER_EMAIL="$commit_author"
+              GIT_COMMITTER_DATE="$commit_date"
+              
+              # Try with timestamp variation
+              TEST_DATE=$(date -d "$commit_date + $nonce seconds" --rfc-2822 2>/dev/null || date -r $(( $(date -j -f "%a, %d %b %Y %T %z" "$commit_date" "+%s" 2>/dev/null || echo 0) + nonce )) "+%a, %d %b %Y %T %z" 2>/dev/null || echo "$commit_date")
+              
+              export GIT_AUTHOR_DATE="$TEST_DATE"
+              export GIT_COMMITTER_DATE="$TEST_DATE"
+              
+              # Create a test commit
+              local test_commit=$(echo -e "$commit_msg\n\n$extra_header" | git commit-tree "$tree" -p HEAD)
+              local commit_hash=$(echo "$test_commit")
+              
+              # Check if it starts with 0d9e
+              if [[ $commit_hash =~ ^0d9e ]]; then
+                echo "Found hash starting with 0d9e: $commit_hash after $nonce attempts"
+                git reset --hard "$test_commit"
+                return 0
+              fi
+              
+              nonce=$((nonce + 1))
+              
+              # Progress indicator every 10000 attempts
+              if [ $((nonce % 10000)) -eq 0 ]; then
+                echo "Attempt $nonce... (best so far: ${commit_hash:0:4})"
+              fi
+            done
+            
+            echo "Warning: Could not find 0d9e hash after $max_attempts attempts"
+            echo "Using original commit instead"
+            git cherry-pick "$original_commit"
+            return 1
+          }
+          
+          # Rewrite each commit
+          for commit in $COMMITS; do
+            find_0d9e_hash "$commit"
+          done
+          
+          # Force push the rewritten branch
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          git push origin "$TEMP_BRANCH:$BRANCH_NAME" --force
+          
+          echo "Commit hash rewriting complete!"
+          
+          # Add comment to PR
+          gh pr comment ${{ github.event.pull_request.number }} \
+            --body "✅ Commit hashes have been rewritten to comply with company policy (0d9e prefix requirement)"

README.md

@@ -3,9 +3,3 @@
 RCE via Telegram as a service.
 
 Push to master to deploy. What could go wrong.
-
-## Environment Variables
-
-Optional sticker pack configuration:
-- `TOM_SLAMA_STICKER_SET` - Separate sticker pack for Tom Sláma related content
-- `MARIAN_STICKER_SET` - Separate sticker pack for Marian's content (user ID 656461353)

tgbot.deno.ts

@@ -12,9 +12,7 @@ import {
 const token = Deno.env.get("TG_BOT_TOKEN");
 const MAIN_CHAT_ID = parseInt(Deno.env.get("TG_MAIN_CHAT_ID")!);
 const DOMAIN = Deno.env.get("DOMAIN");
-const STICEKR_SET_NAME = Deno.env.get("STICKER_SET_NAME")!;
-const TOM_SLAMA_STICEKR_SET = Deno.env.get("TOM_SLAMA_STICKER_SET")!;
-const MARIAN_STICEKR_SET = Deno.env.get("MARIAN_STICKER_SET")!;
+const STICEKR_SET_NAME = Deno.env.get("STICKER_SET_NAME");
 const STICEKR_SET_OWNER = parseInt(Deno.env.get("STICKER_SET_OWNER")!);
 
 export const webhookPath = "/tg-webhook";
@@ -34,65 +32,6 @@ const webhookUrlToken = genRandomToken(96);
 let lastRequestTime = 0;
 const MIN_REQUEST_INTERVAL = 100; // Minimum 100ms between requests
 
-function getAvailableSticekrSets(): string[] {
-  const sets = [];
-  if (STICEKR_SET_NAME) sets.push(STICEKR_SET_NAME);
-  if (TOM_SLAMA_STICEKR_SET) sets.push(TOM_SLAMA_STICEKR_SET);
-  if (MARIAN_STICEKR_SET) sets.push(MARIAN_STICEKR_SET);
-  return sets;
-}
-
-function editDistance(a: string, b: string): number {
-  const matrix = Array(a.length + 1).fill(null).map(() =>
-    Array(b.length + 1).fill(0)
-  );
-
-  for (let i = 0; i <= a.length; i++) matrix[i][0] = i;
-  for (let j = 0; j <= b.length; j++) matrix[0][j] = j;
-
-  for (let i = 1; i <= a.length; i++) {
-    for (let j = 1; j <= b.length; j++) {
-      if (a[i - 1] === b[j - 1]) {
-        matrix[i][j] = matrix[i - 1][j - 1];
-      } else {
-        matrix[i][j] = Math.min(
-          matrix[i - 1][j] + 1,
-          matrix[i][j - 1] + 1,
-          matrix[i - 1][j - 1] + 1,
-        );
-      }
-    }
-  }
-
-  return matrix[a.length][b.length];
-}
-
-function getSticekrCommand(text: string): string | null {
-  const normalizedText = text.toLowerCase().trim();
-
-  const commands = ["sticker this", "marian this", "tom this"];
-
-  for (const command of commands) {
-    if (editDistance(normalizedText, command) <= 2) {
-      return command;
-    }
-  }
-
-  return null;
-}
-
-function getSticekrSetForCommand(command: string): string {
-  switch (command) {
-    case "marian this":
-      return MARIAN_STICEKR_SET;
-    case "tom this":
-      return TOM_SLAMA_STICEKR_SET;
-    case "sticker this":
-    default:
-      return STICEKR_SET_NAME;
-  }
-}
-
 async function rateLimitedDelay() {
   const now = Date.now();
   const timeSinceLastRequest = now - lastRequestTime;
@@ -200,31 +139,20 @@ async function domeny() {
   }
 
   if (Math.random() < 0.5) {
-    const availableSets = getAvailableSticekrSets();
-    const allSticekrs = [];
-    for (const setName of availableSets) {
-      try {
-        const {
-          result: { stickers: sticekrs },
-        } = await tgCall(
-          {
-            name: setName,
-          },
-          "getStickerSet",
-        );
-        allSticekrs.push(...sticekrs);
-      } catch (error) {
-        console.log(`Failed to get stickers from set ${setName}:`, error);
-      }
-    }
-    
-    if (allSticekrs.length === 0) return;
-    
-    const randomSticekr = allSticekrs[Math.floor(Math.random() * allSticekrs.length)];
+    const {
+      result: { stickers: sticekrs },
+    } = await tgCall(
+      {
+        name: STICEKR_SET_NAME,
+      },
+      "getStickerSet",
+    );
+    const { file_id: sticekr } =
+      sticekrs[Math.floor(Math.random() * sticekrs.length)];
     await tgCall(
       {
         chat_id: MAIN_CHAT_ID,
-        sticker: randomSticekr.file_id,
+        sticker: sticekr,
       },
       "sendSticker",
     );
@@ -320,15 +248,13 @@ export async function init() {
     !DOMAIN ||
     isNaN(MAIN_CHAT_ID) ||
     !STICEKR_SET_NAME ||
-    !TOM_SLAMA_STICEKR_SET ||
-    !MARIAN_STICEKR_SET ||
     isNaN(STICEKR_SET_OWNER)
   ) {
     console.log(
-      `TG_BOT_TOKEN: ${token}, TG_MAIN_CHAT_ID: ${MAIN_CHAT_ID}, DOMAIN: ${DOMAIN}, STICEKR_SET_NAME: ${STICEKR_SET_NAME}, TOM_SLAMA_STICEKR_SET: ${TOM_SLAMA_STICEKR_SET}, MARIAN_STICEKR_SET: ${MARIAN_STICEKR_SET}, STICEKR_SET_OWNER: ${STICEKR_SET_OWNER}`,
+      `TG_BOT_TOKEN: ${token}, TG_MAIN_CHAT_ID: ${MAIN_CHAT_ID}, DOMAIN: ${DOMAIN}, STICEKR_SET_NAME: ${STICEKR_SET_NAME}, STICEKR_SET_OWNER: ${STICEKR_SET_OWNER}`,
     );
     throw new Error(
-      "TG_BOT_TOKEN, TG_MAIN_CHAT_ID, DOMAIN, STICEKR_SET_NAME, TOM_SLAMA_STICEKR_SET, MARIAN_STICEKR_SET or STICEKR_SET_OWNER is not set",
+      "TG_BOT_TOKEN, TG_MAIN_CHAT_ID, DOMAIN, STICEKR_SET_NAME or STICEKR_SET_OWNER is not set",
     );
   }
 
@@ -582,12 +508,11 @@ Be grateful for your abilities and your incredible success and your considerable
     yield* handleLogo(data, text.slice(6));
   }
 
-  const sticekrCommand = getSticekrCommand(text);
   if (
-    sticekrCommand &&
+    text.toLowerCase() === "sticker this" &&
     data.message.chat.id === MAIN_CHAT_ID
   ) {
-    const result = yield* sticekrThis(data.message.reply_to_message, sticekrCommand);
+    const result = yield* sticekrThis(data.message.reply_to_message);
     if (result !== null) {
       yield await tgCall({
         chat_id: data.message.chat.id,
@@ -961,7 +886,7 @@ async function* handleInlineQuery(data: any) {
   }
 }
 
-async function* sticekrThis(orig_msg: any, command: string): AsyncGenerator<any, string | null> {
+async function* sticekrThis(orig_msg: any): Promise<string | null> {
   if (!orig_msg) return "wtf";
   let file;
   if (Array.isArray(orig_msg.photo)) {
@@ -995,11 +920,9 @@ async function* sticekrThis(orig_msg: any, command: string): AsyncGenerator<any,
   if (res.code !== 0) return "imagemagick is a hoe";
   const sticekr = await Deno.readFile(outFileName);
 
-  const targetSticekrSet = getSticekrSetForCommand(command);
-
   const body = new FormData();
   body.append("user_id", STICEKR_SET_OWNER.toString());
-  body.append("name", targetSticekrSet);
+  body.append("name", STICEKR_SET_NAME);
   body.append(
     "sticker",
     JSON.stringify({ sticker: "attach://file", emoji_list: ["🤓"] }),
@@ -1016,12 +939,12 @@ async function* sticekrThis(orig_msg: any, command: string): AsyncGenerator<any,
 
   const data4 = await tgCall(
     {
-      name: targetSticekrSet,
+      name: STICEKR_SET_NAME,
     },
     "getStickerSet",
   );
   if (!data4.ok) {
-    return "i ran out of error message ideas: " + JSON.stringify(data4);
+    return "i ran out of error message ideas: " + JSON.stringify(resp4);
   }
   const sticekrId = data4.result.stickers.at(-1).file_id;
   if (!sticekrId) return "i ran out of error message ideas the most";