Upgraded packages to latest

.github/workflows/main.yml

@@ -1,83 +0,0 @@
-name: CI
-on:
-    push:
-        branches:
-            - main
-
-env:
-    REGISTRY: ghcr.io
-    IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-    build:
-        name: Build docker image
-        runs-on: ubuntu-latest
-        timeout-minutes: 5
-        permissions:
-            packages: write
-            contents: read
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - name: Read .nvmrc
-              run: echo "NODE_VERSION=$(awk -F. '{print $1}' .nvmrc)" >> $GITHUB_OUTPUT
-              id: nvm
-
-            - name: Login to container registry
-              uses: docker/login-action@v3
-              with:
-                  registry: ${{ env.REGISTRY }}
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Extract Docker image metadata
-              id: meta
-              uses: docker/metadata-action@v5
-              with:
-                  images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-                  tags: |
-                      type=schedule
-                      type=ref,event=pr
-                      type=semver,pattern={{version}}
-                      type=sha,prefix={{branch}}-,format=short
-                      type=sha,prefix=,format=short
-                      {{branch}}
-
-            - name: Build Docker image
-              uses: docker/build-push-action@v5
-              with:
-                  context: .
-                  labels: ${{ steps.meta.outputs.labels }}
-                  push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-                  build-args: |
-                      NODE_VERSION=${{ steps.nvm.outputs.NODE_VERSION }}
-
-    release:
-        name: Release
-        needs: build
-        if: github.ref == 'refs/heads/main'
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
-            - name: Read .nvmrc
-              run: echo "NODE_VERSION=$(cat .nvmrc)" >> $GITHUB_OUTPUT
-              id: nvm
-
-            - name: Setup Node
-              uses: actions/setup-node@v4
-              with:
-                  node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
-
-            - name: Install
-              run: npm ci --ignore-scripts
-
-            - name: Release
-              env:
-                  GITHUB_TOKEN: ${{ secrets.PAT_SEMANTIC_RELEASE }}
-              run: npx semantic-release

.github/workflows/release.yml

@@ -1,44 +0,0 @@
-name: Release
-on:
-    release:
-        types:
-            - created
-env:
-    IMAGE_NAME: ${{ github.repository }}
-    REGISTRY: ghcr.io
-
-jobs:
-    release:
-        name: Release
-        runs-on: ubuntu-latest
-        timeout-minutes: 5
-
-        permissions:
-            packages: write
-            contents: read
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Login to container registry
-              uses: docker/login-action@v3
-              with:
-                  registry: ${{ env.REGISTRY }}
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Get version
-              id: version
-              uses: battila7/get-version-action@v2
-
-            - name: Add Semantic Version tag to Docker Image
-              uses: shrink/actions-docker-registry-tag@v4
-              with:
-                  registry: ${{ env.REGISTRY }}
-                  repository: ${{ env.IMAGE_NAME }}
-                  target: 'main'
-                  tags: |
-                      ${{ steps.version.outputs.version-without-v }}
-                      ${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}
-                      latest

README.md

@@ -1,4 +1,9 @@
 # Mastodon to Bluesky
+This is forked from https://github.com/mauricerenck/mastodon-to-bluesky. So far I have only added the following:
+
+- Upgraded packages due to issues with conversion to Bluesky.
+- Updated docker-compose to build the Docker image.
+
 #### Crosspost from Mastodon to Bluesky
 
 ![GitHub release](https://img.shields.io/github/release/mauricerenck/mastodon-to-bluesky.svg?maxAge=1800) ![License](https://img.shields.io/github/license/mashape/apistatus.svg)
@@ -18,7 +23,7 @@ You can run the script directly using Node.js or you can use the Docker image.
 Clone this repository and install the dependencies:
 
 ```bash
-git clone https://github.com/mauricerenck/mastodon-to-bluesky.git
+git clone https://code.alexhyett.com/alexhyett/mastodon-to-bluesky.git
 cd mastodon-to-bluesky
 npm install
 ```

package-lock.json

@@ -9,48 +9,50 @@
             "version": "1.0.0",
             "license": "MIT",
             "dependencies": {
-        "@atproto/api": "^0.12.2",
+                "@atproto/api": "^0.13.15",
                 "@semantic-release/changelog": "^6.0.3",
                 "@semantic-release/git": "^10.0.1",
-        "axios": "^1.6.8",
+                "axios": "^1.7.7",
                 "dotenv": "^16.4.5",
                 "mastodon-api": "^1.3.0"
             }
         },
         "node_modules/@atproto/api": {
-      "version": "0.12.2",
+            "version": "0.13.15",
-      "resolved": "https://registry.npmjs.org/@atproto/api/-/api-0.12.2.tgz",
+            "resolved": "https://registry.npmjs.org/@atproto/api/-/api-0.13.15.tgz",
-      "integrity": "sha512-UVzCiDZH2j0wrr/O8nb1edD5cYLVqB5iujueXUCbHS3rAwIxgmyLtA3Hzm2QYsGPo/+xsIg1fNvpq9rNT6KWUA==",
+            "integrity": "sha512-zC8KH+Spcr2HE6vD4hddP5rZpWrGUTWvL8hQmUxa/sAnlsjoFyv/Oja8ZHGXoDsAl6ie5Gd77cPNxaxWH/yIBQ==",
             "dependencies": {
-        "@atproto/common-web": "^0.3.0",
+                "@atproto/common-web": "^0.3.1",
-        "@atproto/lexicon": "^0.4.0",
+                "@atproto/lexicon": "^0.4.2",
                 "@atproto/syntax": "^0.3.0",
-        "@atproto/xrpc": "^0.5.0",
+                "@atproto/xrpc": "^0.6.3",
+                "await-lock": "^2.2.2",
                 "multiformats": "^9.9.0",
-        "tlds": "^1.234.0"
+                "tlds": "^1.234.0",
+                "zod": "^3.23.8"
             }
         },
         "node_modules/@atproto/common-web": {
-      "version": "0.3.0",
+            "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@atproto/common-web/-/common-web-0.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/@atproto/common-web/-/common-web-0.3.1.tgz",
-      "integrity": "sha512-67VnV6JJyX+ZWyjV7xFQMypAgDmjVaR9ZCuU/QW+mqlqI7fex2uL4Fv+7/jHadgzhuJHVd6OHOvNn0wR5WZYtA==",
+            "integrity": "sha512-N7wiTnus5vAr+lT//0y8m/FaHHLJ9LpGuEwkwDAeV3LCiPif4m/FS8x/QOYrx1PdZQwKso95RAPzCGWQBH5j6Q==",
             "dependencies": {
                 "graphemer": "^1.4.0",
                 "multiformats": "^9.9.0",
                 "uint8arrays": "3.0.0",
-        "zod": "^3.21.4"
+                "zod": "^3.23.8"
             }
         },
         "node_modules/@atproto/lexicon": {
-      "version": "0.4.0",
+            "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@atproto/lexicon/-/lexicon-0.4.0.tgz",
+            "resolved": "https://registry.npmjs.org/@atproto/lexicon/-/lexicon-0.4.2.tgz",
-      "integrity": "sha512-RvCBKdSI4M8qWm5uTNz1z3R2yIvIhmOsMuleOj8YR6BwRD+QbtUBy3l+xQ7iXf4M5fdfJFxaUNa6Ty0iRwdKqQ==",
+            "integrity": "sha512-CXoOkhcdF3XVUnR2oNgCs2ljWfo/8zUjxL5RIhJW/UNLp/FSl+KpF8Jm5fbk8Y/XXVPGRAsv9OYfxyU/14N/pw==",
             "dependencies": {
-        "@atproto/common-web": "^0.3.0",
+                "@atproto/common-web": "^0.3.1",
                 "@atproto/syntax": "^0.3.0",
                 "iso-datestring-validator": "^2.2.2",
                 "multiformats": "^9.9.0",
-        "zod": "^3.21.4"
+                "zod": "^3.23.8"
             }
         },
         "node_modules/@atproto/syntax": {
@@ -59,12 +61,12 @@
             "integrity": "sha512-Weq0ZBxffGHDXHl9U7BQc2BFJi/e23AL+k+i5+D9hUq/bzT4yjGsrCejkjq0xt82xXDjmhhvQSZ0LqxyZ5woxA=="
         },
         "node_modules/@atproto/xrpc": {
-      "version": "0.5.0",
+            "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/@atproto/xrpc/-/xrpc-0.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@atproto/xrpc/-/xrpc-0.6.3.tgz",
-      "integrity": "sha512-swu+wyOLvYW4l3n+VAuJbHcPcES+tin2Lsrp8Bw5aIXIICiuFn1YMFlwK9JwVUzTH21Py1s1nHEjr4CJeElJog==",
+            "integrity": "sha512-S3tRvOdA9amPkKLll3rc4vphlDitLrkN5TwWh5Tu/jzk7mnobVVE3akYgICV9XCNHKjWM+IAPxFFI2qi+VW6nQ==",
             "dependencies": {
-        "@atproto/lexicon": "^0.4.0",
+                "@atproto/lexicon": "^0.4.2",
-        "zod": "^3.21.4"
+                "zod": "^3.23.8"
             }
         },
         "node_modules/@babel/code-frame": {
@@ -1138,6 +1140,11 @@
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
             "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
         },
+        "node_modules/await-lock": {
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/await-lock/-/await-lock-2.2.2.tgz",
+            "integrity": "sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw=="
+        },
         "node_modules/aws-sign2": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -1152,9 +1159,9 @@
             "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="
         },
         "node_modules/axios": {
-      "version": "1.6.8",
+            "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
                 "form-data": "^4.0.0",
@@ -9025,9 +9032,9 @@
             }
         },
         "node_modules/zod": {
-      "version": "3.22.4",
+            "version": "3.23.8",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+            "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }

package.json

@@ -9,10 +9,10 @@
     "author": "Maurice Renck <hello@maurice-renck.de>",
     "license": "MIT",
     "dependencies": {
-    "@atproto/api": "^0.12.2",
+        "@atproto/api": "^0.13.15",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
-    "axios": "^1.6.8",
+        "axios": "^1.7.7",
         "dotenv": "^16.4.5",
         "mastodon-api": "^1.3.0"
     }