Use sed instead of patch for char limit

CHANGELOG

@@ -899,36 +899,3 @@
 * Fix filters not being applied to search results in web UI ([#36346](https://github.com/tootsuite/mastodon/issues/36346) by [@ClearlyClaire](https://github.com/ClearlyClaire))
 * Fix remote posts with large media descriptions being rejected ([#39135](https://github.com/tootsuite/mastodon/issues/39135) by [@ClearlyClaire](https://github.com/ClearlyClaire))
 
-[1.18.1]
-* Update mastodon to 4.6.1
-* [Full Changelog](https://github.com/mastodon/mastodon/releases/tag/v4.6.1)
-* Add `avatar_description` and `header_description` to `/api/v1/accounts/update_credentials` ([#39547](https://github.com/tootsuite/mastodon/issues/39547) and [#39574](https://github.com/tootsuite/mastodon/issues/39574) by [@ClearlyClaire](https://github.com/ClearlyClaire) and [@mkljczk](https://github.com/mkljczk))
-* Fix combobox menu not closing after a selection ([#39595](https://github.com/tootsuite/mastodon/issues/39595) by [@diondiondion](https://github.com/diondiondion))
-* Fix Emoji IndexedDB upgrades when multiple tabs are open ([#39576](https://github.com/tootsuite/mastodon/issues/39576) by [@ChaosExAnima](https://github.com/ChaosExAnima))
-* Fix combobox listbox not scrolling up when new suggestions have loaded ([#39588](https://github.com/tootsuite/mastodon/issues/39588) by [@diondiondion](https://github.com/diondiondion))
-* Fix media modal navigation in RTL languages ([#39587](https://github.com/tootsuite/mastodon/issues/39587) by [@diondiondion](https://github.com/diondiondion))
-* Fix accounts not visible in collection editor in advanced web interface ([#39586](https://github.com/tootsuite/mastodon/issues/39586) by [@diondiondion](https://github.com/diondiondion))
-* Fix error on login with certain LDAP configurations ([#39571](https://github.com/tootsuite/mastodon/issues/39571) by [@oneiros](https://github.com/oneiros))
-* Fix simplified layout applying to other pages in web UI ([#39570](https://github.com/tootsuite/mastodon/issues/39570) by [@Gargron](https://github.com/Gargron))
-* Fix emoji database loading in web worker ([#39558](https://github.com/tootsuite/mastodon/issues/39558) and [#39562](https://github.com/tootsuite/mastodon/issues/39562) by [@ChaosExAnima](https://github.com/ChaosExAnima))
-* Fix display name length limit being incorrectly enforced in web UI ([#39499](https://github.com/tootsuite/mastodon/issues/39499) by [@shleeable](https://github.com/shleeable))
-
-[1.18.2]
-* Update mastodon to 4.6.2
-* [Full Changelog](https://github.com/mastodon/mastodon/releases/tag/v4.6.2)
-* Update FFMpeg version used in the container image to fix [CVE-2026-8461](https://github.com/advisories/GHSA-qff7-4q6c-m8h6) (critical severity)
-
-[1.18.3]
-* Update mastodon to 4.6.3
-* [Full Changelog](https://github.com/mastodon/mastodon/releases/tag/v4.6.3)
-* Update dependencies
-* Add "Update available" navigation item at top of navbar when new Mastodon versions are available ([#39705](https://github.com/tootsuite/mastodon/issues/39705) by [@ClearlyClaire](https://github.com/ClearlyClaire))
-* Add rendering of post images in emails ([#39636](https://github.com/tootsuite/mastodon/issues/39636) by [@diondiondion](https://github.com/diondiondion))
-* Fix "view collection" menu item appearing on collection page ([#39694](https://github.com/tootsuite/mastodon/issues/39694) by [@mkljczk](https://github.com/mkljczk))
-* Fix incorrect filter cache key sometimes causing incorrect filters to be applied ([#39698](https://github.com/tootsuite/mastodon/issues/39698) by [@ClearlyClaire](https://github.com/ClearlyClaire))
-* Fix missing `to_json` to publish announcement reaction worker ([#39685](https://github.com/tootsuite/mastodon/issues/39685) by [@mjankowski](https://github.com/mjankowski))
-* Fix duplicate "clear" button shown in main search input in Chrome ([#39679](https://github.com/tootsuite/mastodon/issues/39679) by [@diondiondion](https://github.com/diondiondion))
-* Fix visual glitch with the spoiler button ([#39677](https://github.com/tootsuite/mastodon/issues/39677) by [@ChaosExAnima](https://github.com/ChaosExAnima))
-* Fix invisible username during post highlight animation ([#39659](https://github.com/tootsuite/mastodon/issues/39659) by [@diondiondion](https://github.com/diondiondion))
-* Fix follow button floating on profiles when overview landing page is enabled ([#39650](https://github.com/tootsuite/mastodon/issues/39650) by [@FFederi](https://github.com/FFederi))
-

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Federated social network",
-  "version": "1.18.3",
+  "version": "1.18.0",
-  "upstreamVersion": "4.6.3",
+  "upstreamVersion": "4.6.0",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1610612736,

Dockerfile

@@ -68,7 +68,7 @@ RUN mkdir -p /app/code /app/pkg
 WORKDIR /app/code
 
 # renovate: datasource=github-releases depName=tootsuite/mastodon versioning=semver extractVersion=^v(?<version>.+)$
-ARG MASTODON_VERSION=4.6.3
+ARG MASTODON_VERSION=4.6.0
 
 ENV RAILS_ENV production
 ENV NODE_ENV production
@@ -90,8 +90,14 @@ RUN ldconfig && \
     ffmpeg -version && \
     ffprobe -version
 
-RUN curl -L https://github.com/tootsuite/mastodon/archive/v${MASTODON_VERSION}.tar.gz | tar -xz --strip-components 1 -f - && \
+# Download Mastodon source
-    bundle config --local set deployment 'true' && \
+RUN curl -L https://github.com/tootsuite/mastodon/archive/v${MASTODON_VERSION}.tar.gz | tar -xz --strip-components 1 -f -
+
+RUN sed -i 's/MAX_CHARS = 500/MAX_CHARS = 2500/g' app/validators/status_length_validator.rb && \
+    sed -i "s/max_characters'], 500)/max_characters'], 2500)/g" app/javascript/mastodon/features/compose/containers/compose_form_container.js
+
+# Install Ruby dependencies
+RUN bundle config --local set deployment 'true' && \
     bundle config --local set without 'development test' && \
     bundle config --local set silence_root_warning true && \
     bundle install && \
@@ -100,7 +106,6 @@ RUN curl -L https://github.com/tootsuite/mastodon/archive/v${MASTODON_VERSION}.t
 
 RUN corepack enable && \
     corepack prepare --activate
-
 RUN yarn workspaces focus --production @mastodon/mastodon
 RUN yarn install
 
@@ -134,3 +139,4 @@ RUN ln -fs /app/data/system /app/code/public/system
 COPY start.sh cleanup.sh config.sh env.template cache-env.sh.template /app/pkg/
 
 CMD [ "/app/pkg/start.sh" ]
+