From 485cdb4b312ffe47cff497b45d12845380429205 Mon Sep 17 00:00:00 2001
From: teidesu <alina@tei.su>
Date: Sun, 3 Mar 2024 04:35:40 +0300
Subject: [PATCH] sharkey bump

---
 hosts/koi/containers/sharkey/.config/default.yml    |  8 +++++---
 hosts/koi/containers/sharkey/Dockerfile             |  6 +++---
 hosts/koi/containers/sharkey/patches/software.patch | 11 +++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 hosts/koi/containers/sharkey/patches/software.patch

diff --git a/hosts/koi/containers/sharkey/.config/default.yml b/hosts/koi/containers/sharkey/.config/default.yml
index 0512818..7a752f5 100644
--- a/hosts/koi/containers/sharkey/.config/default.yml
+++ b/hosts/koi/containers/sharkey/.config/default.yml
@@ -31,12 +31,14 @@ clusterLimit: 2
 
 maxNoteLength: 30000
 
+proxy: 'http://10.42.0.2:7891'
 proxyBypassHosts:
   - api.deepl.com
   - api-free.deepl.com
   - www.recaptcha.net
   - hcaptcha.com
   - challenges.cloudflare.com
+  - tei.su
 
 # Media Proxy
 # Reference Implementation: https://github.com/misskey-dev/media-proxy
@@ -46,7 +48,7 @@ proxyBypassHosts:
 
 # Proxy remote files (default: true)
 # Proxy remote files by this instance or mediaProxy to prevent remote files from running in remote domains.
-proxyRemoteFiles: false
+proxyRemoteFiles: true
 
 # Movie Thumbnail Generation URL
 # There is no reference implementation.
@@ -66,7 +68,7 @@ checkActivityPubGetSignature: false
 #  '127.0.0.1/32'
 #]
 
-#customMOTD: ['Hello World', 'The sharks rule all', 'Shonks']
+customMOTD: ['meow']
 
 # Upload or download file size limits (bytes)
-maxFileSize: 262144000
\ No newline at end of file
+maxFileSize: 262144000
diff --git a/hosts/koi/containers/sharkey/Dockerfile b/hosts/koi/containers/sharkey/Dockerfile
index 33716bb..39d5ec1 100644
--- a/hosts/koi/containers/sharkey/Dockerfile
+++ b/hosts/koi/containers/sharkey/Dockerfile
@@ -1,7 +1,7 @@
-FROM git.joinsharkey.org/sharkey/sharkey:develop@sha256:f1af3284adfaca63326394b0a3a585d9c74b43fc6f684236fd8ff83b06f27e57
+FROM registry.activitypub.software/transfem-org/sharkey:develop@sha256:44289651333c9fe6dd11773c42d631bcc3a7e9ba78de5b17b31654e1b731e598
 
 COPY patches /patches
 
 RUN apk add patch && \
-    patch -p0 < /patches/fake-deepl-server.patch && \
-    patch -p0 < /patches/zond.patch
\ No newline at end of file
+    patch -p0 < /patches/zond.patch && \
+    patch -p0 < /patches/software.patch
diff --git a/hosts/koi/containers/sharkey/patches/software.patch b/hosts/koi/containers/sharkey/patches/software.patch
new file mode 100644
index 0000000..ea16675
--- /dev/null
+++ b/hosts/koi/containers/sharkey/patches/software.patch
@@ -0,0 +1,11 @@
+--- packages/backend/built/server/NodeinfoServerService.js
++++ packages/backend/built/server/NodeinfoServerService.js
+@@ -73,7 +73,7 @@
+             // eslint-disable-next-line @typescript-eslint/no-explicit-any
+             const document = {
+                 software: {
+-                    name: 'sharkey',
++                    name: 'fishkey',
+                     version: this.config.version,
+                     homepage: nodeinfo_homepage,
+                     repository: meta.repositoryUrl