{"topic":{"id":14012,"title":"记录另类 Discourse 部署","slug":"topic","userId":4668,"categoryId":2,"createdAt":"2024-12-14 09:39:06.373897","bumpedAt":"2025-07-21 03:02:05.937228","views":501,"postsCount":8,"highestPostNumber":8,"likeCount":10,"closed":false,"pinned":false,"pinnedGlobally":false,"pinnedAt":null,"pinnedUntil":null,"isBanner":false,"excerpt":"why Discourse 官方仅支持一种部署方法，即用 dicourse_docker 仓库里的 shell, yaml, ruby 混合的代码里的代码构建容器，导致每次改) 代码都要花 20 分钟重构容器，非常难受。本 thread 将记录我的另类部署方式. 为什么要用官方不支持的方式运行 Discourse? Discourse 唯一的部署方式不允许别人修改源代码的 URL, 导致我想要修改默认运行的方式只能写插件并花…","deletedAt":null,"isAnonymous":false,"isPrivate":false,"isMembersOnly":false,"category":{"id":2,"name":"网站","slug":"website","color":"986a44"},"author":{"id":4668,"username":"IO","name":null,"avatarUrl":null},"realAuthor":{"id":4668,"username":"IO","name":null,"avatarUrl":null},"tags":[]},"posts":[{"id":44591,"postNumber":1,"raw":"## why\nDiscourse 官方仅支持**一种**部署方法，即用 dicourse_docker 仓库里的 shell, yaml, ruby 混合的代码里的代码构建容器，\n导致每次改) 代码都要花 20 分钟重构容器，非常难受。\n\n本 thread 将记录我的另类部署方式.\n\n\n### 为什么要用官方不支持的方式运行 Discourse?\n\nDiscourse 唯一的部署方式不允许别人修改源代码的 URL,\n导致我想要修改默认运行的方式只能写插件并花 20 分钟重建容器，不能 fork 完直接在源代码上面改，迭代周期长，**开发效率低**\n\nDiscourse 是个牛逼的软件，界面也很现代，但是安装部署的方式真的是 10 年前的方法:\n\n创始人 Sam 在十几年前用 ruby 脚本写了个程序 [pups](https://github.com/discourse/pups) 构建容器\n\nBroadcom Bitnami 维护了 [另一种部署方法](https://docs.bitnami.com/general/apps/discourse/),但也没比官方的好到哪里去。\n\n\n原厂的 `Gemfile` 里甚至没有 `rails`, 只有个自家的 `rails_multisite`\n\n导致我想要用 Rubymine 调试程序的时候提示我 rails 没有安装？:grinning_face_with_sweat: 然而我用命令行运行`rail s`却是可以的，害得我以为是 Rubymine 出 bug 或者配置错了或者 rvm 出 bug 了\n\n\n## procedures\n### 以开发模式运行\n开发环境运行 rails 应用的命令:\n```\nALLOW_EMBER_CLI_PROXY_BYPASS=1 DISCOURSE_DEV_LOG_LEVEL=warn DISCOURSE_ENABLE_CORS=true RAILS_DEVELOPMENT_HOSTS=xjtu.app RAILS_ENV=development HOST_URL=xjtu.app DISCOURSE_HOSTNAME=xjtu.app NUM_WEBS=8 rails s\n\n```\n\nrails 区分开发/生产运行模式，使用的配置不一样，例如开发模式缺少 cache 和 asset minimization，所以访问起来性能非常低下，低得夸张：\n\nhttps://pagespeed.web.dev/analysis/https-xjtu-app/g5sfcvavle?form_factor=mobile\n\n### 从 Docker 里复制\n本来我想比较一下 config/environments/development.rb 和 production.rb 的配置选项，但无奈 assets pipeline pre-compilation 不太懂，就不学了。直接开大招，把容器里的 discourse 复制出来，找到启动命令，在容器外面直接运行得了\n\n\n先看看容器的入口 `./launcher start-cmd webxj`\n+ true run --shm-size=512m --link dataxj:dataxj -d --restart=always -e LANG=en_US.UTF-8 -e RAILS_ENV=production ... --name webxj -t -v /var/discourse/shared/webxj:/shared ... local_discourse/webxj /sbin/boot\n\n查看 `/sbin/boot`\n```\nroot@mnz-webxj:/var/www/discourse# cat /sbin/boot\n#!/bin/bash\n# we use this to boot up cause runit will not handle TERM and will not exit when done\n\nshutdown() {\n echo Shutting Down\n /etc/runit/3\n ls /etc/service | SHELL=/bin/sh parallel sv force-stop {}\n kill -HUP $RUNSVDIR\n wait $RUNSVDIR\n\n # give stuff a bit of time to finish\n sleep 0.1\n\n ORPHANS=`ps -eo pid | grep -v PID | tr -d ' ' | grep -v '^1$'`\n SHELL=/bin/bash parallel 'timeout 5 /bin/bash -c \"kill {} && wait {}\" || kill -9 {}' ::: $ORPHANS 2> /dev/null\n exit\n}\n\n/etc/runit/1 || exit $?\n/etc/runit/2&\nRUNSVDIR=$!\necho \"Started runsvdir, PID is $RUNSVDIR\"\ntrap shutdown SIGTERM SIGHUP\nwait $RUNSVDIR\n\nshutdown\n```\n\n容器里面用的 sv 管理进程，查看`cat /etc/service/unicorn/run`\n```\n#!/bin/bash\nexec 2>&1\n# redis\n# postgres\ncd /var/www/discourse\nchown -R discourse:www-data /shared/log/rails\nPRECOMPILE_ON_BOOT=0\nif [[ -z \"$PRECOMPILE_ON_BOOT\" ]]; then\n PRECOMPILE_ON_BOOT=1\nfi\nif [ -f /usr/local/bin/create_db ] && [ \"$CREATE_DB_ON_BOOT\" = \"1\" ]; then /usr/local/bin/create_db; fi;\nif [ \"$MIGRATE_ON_BOOT\" = \"1\" ]; then su discourse -c 'bundle exec rake db:migrate'; fi\nif [ \"$PRECOMPILE_ON_BOOT\" = \"1\" ]; then SKIP_EMBER_CLI_COMPILE=1 su discourse -c 'bundle exec rake assets:precompile'; fi\nLD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec thpoff chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb\n```\n\n参考 https://meta.discourse.org/t/install-discourse-on-ubuntu-or-debian-for-development/14727 安装 ImageMagick, oxipng, jhead\n\n安装 pnpm, rvm 和 ruby\n```\npnpm env use --global lts \nrvm install 3.3 \nrvm use 3.3 --default\n## 看看是否支持 YJIT\nruby --yjit -v \n```\n\n把 redis 和 PG 的数据复制一份，再把 start-cmd 里的环境变量复制到.zshrc，新建数据库用户，配置 `config/discourse.conf`, 复制 bundle 那行启动命令启动`bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb`\n```\n# pnpm\nexport PNPM_HOME=\"/home/discourse/.local/share/pnpm\"\ncase \":$PATH:\" in\n *\":$PNPM_HOME:\"*) ;;\n *) export PATH=\"$PNPM_HOME:$PATH\" ;;\nesac\n# pnpm end\nalias npm='pnpm'\nalias npx='pnpx'\nexport PATH=\"$PATH:$HOME/.rvm/bin\"\n\nexport RAILS_ENV=production\nexport UNICORN_WORKERS=6\nexport UNICORN_SIDEKIQS=1\nexport RUBY_GC_HEAP_GROWTH_MAX_SLOTS=40000\nexport RUBY_GC_HEAP_INIT_SLOTS=400000\nexport RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=1.5\nexport RUBY_YJIT_ENABLE=1\nexport RUBY_CONFIGURE_OPTS=\"--enable-yjit\"\nexport DISCOURSE_HOSTNAME=xjtu.app\n...\n```\n\n\n\n```\napt install postgresql postgresql-client-17 postgresql-common postgresql-contrib postgresql-client-common postgresql-server-dev-17 postgresql-17 postgresql-17-pgvector libpq-dev\nsudo -u postgres createuser -s discourse \nsudo -u postgres createdb discourse \n$sudo -u postgres psql discourse\npsql>\nALTER USER discourse WITH PASSWORD 'xxx';\nCREATE EXTENSION hstore;CREATE EXTENSION pg_trgm;\nCREATE EXTENSION plpgsql;\nCREATE EXTENSION unaccent;\nCREATE EXTENSION vector;\n$ gunzip < dump.sql.gz | psql discourse \n```\n\ndump.sql.gz 是 Discourse 备份解压出来的，容器里是 PG13，导入到新安装的 PG17 竟然无比丝滑\n\n\n\nsystemd file:\n`/etc/systemd/system/dis.service`\n\n```\n[Unit]\nDescription=Discourse Puma Server\nAfter=network.target postgresql.service\nRequires=postgresql.service\n\n[Service]\nType=simple\nUser=discourse\nGroup=discourse\n\n#EnvironmentFile=/home/discourse/.zshrc\n\nWorkingDirectory=/var/www/discourse\n# requires running `rvm 3.3.6 --default` before this service is run\nExecStart=/usr/bin/zsh -lc 'source /home/discourse/.zshrc && /home/discourse/.rvm/gems/ruby-3.3.6/bin/puma -C config/puma.rb'\nExecReload=/usr/bin/zsh -lc 'source /home/discourse/.zshrc && /home/discourse/.rvm/gems/ruby-3.3.6/bin/pumactl restart'\n\n# Restart configuration\nRestart=always\nRestartSec=5s\n\n# Basic security measures\nNoNewPrivileges=true\nProtectSystem=full\nProtectHome=read-only\n\n[Install]\nWantedBy=multi-user.target\n```\n\n再把容器里的 nginx 复制出来，把 cache 和文件目录重新配一下，启动成功\n```\ncd /shared/\nchown discourse:www-data backups tmp uploads\n```\n\n## upgrade\n参考:\nhttps://github.com/discourse/discourse_docker/blob/20e33fbfd98d3b8d9c57f7a111beff8aa51a5b98/templates/web.template.yml#L65\n\n\n```\nchown -R discourse:discourse /var/www/discourse/ \nchown -R discourse:www-data /var/www/discourse/public\nchown discourse:www-data /home/discourse/\nchmod 750 /home/discourse\nsu - discourse\n```\n\n```\ncd /var/www/discourse\ngit stash\ngit pull\ngit checkout tests-passed \nrm lib/tasks/custom.rake db/migrate/20241213085000_add_external_id_to_posts.rb\ngit apply mypatch-20250617v2.patch\n\n\ncd plugins\nfor plugin in *\ndo\n echo \"Processing: $plugin\"\n \n # Only process directories\n if [[ -d \"$plugin\" ]]; then\n cd \"$plugin\"\n \n # Check if it's a git repository\n if [[ -d \".git\" ]]; then\n # Get the remote origin URL\n remote_url=$(git remote get-url origin 2>/dev/null)\n \n if [[ $? -eq 0 ]]; then\n # Check if the remote URL matches the one to skip\n if [[ \"$remote_url\" == \"git@github.com:fokx/discourse\" || \"$remote_url\" == \"git@github.com:fokx/discourse.git\" ]]; then\n echo \" → Skipping git pull (fokx/discourse repository)\"\n else\n echo \" → Pulling from: $remote_url\"\n git pull\n fi\n else\n echo \" → No remote origin found\"\n fi\n else\n echo \" → Not a git repository\"\n fi\n \n cd ..\n else\n echo \" → Skipping (not a directory)\"\n fi\ndone\ncd ../\n\n# may need this when migrate to another system\n# rm plugins/*/gems -r\n# gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,\"\"); print $0 }' Gemfile.lock)\n# find /var/www/discourse/vendor/bundle -name cache -not -path \"*/gems/*\" -type d -exec rm -rf {} +\n# find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +\n# LOAD_PLUGINS=0 bundle exec rake plugin:pull_compatible_all\n# bundle exec rake assets:precompile:build\n# SKIP_EMBER_CLI_COMPILE=1 bundle exec rake themes:update assets:precompile\n\nbundle install --jobs $(($(nproc) - 1)) --retry 3 && pnpm i && bundle exec rake db:migrate && bundle exec rake themes:update assets:precompile && pumactl restart\n#pumactl phased-restart\n```\n\n直接用 pg_dump 备份\n```\ndiscour+ 1142358 0.0 0.0 2384 1408 pts/3 S+ 13:54 0:00 sh -c PGPASSWORD='191549' pg_dump --schema=public -T public.pg_* --file='/var/www/discourse/tmp/backups/default/2024-12-14-135427/dump.sql.gz' --no-owner --no-privileges --verbose --compress=4 --host=localhost --username=discourse discourse 2>&1\ndiscour+ 1142359 94.1 0.1 32240 18388 pts/3 R+ 13:54 0:12 /usr/lib/postgresql/17/bin/pg_dump --schema=public -T public.pg_* --file=/var/www/discourse/tmp/backups/default/2024-12-14-135427/dump.sql.gz --no-owner --no-privileges --verbose --compress=4 --host=localhost --username=discourse discourse\n```\n\n\n官方文档有时候会用到 `discourse` 命令，其实就是`bundle exec script/discourse`。","cooked":"

why

Discourse 官方仅支持一种部署方法，即用 dicourse_docker 仓库里的 shell, yaml, ruby 混合的代码里的代码构建容器，
\n导致每次改) 代码都要花 20 分钟重构容器，非常难受。

本 thread 将记录我的另类部署方式.

为什么要用官方不支持的方式运行 Discourse?

Discourse 唯一的部署方式不允许别人修改源代码的 URL,
\n导致我想要修改默认运行的方式只能写插件并花 20 分钟重建容器，不能 fork 完直接在源代码上面改，迭代周期长，开发效率低

Discourse 是个牛逼的软件，界面也很现代，但是安装部署的方式真的是 10 年前的方法:

创始人 Sam 在十几年前用 ruby 脚本写了个程序 pups 构建容器

Broadcom Bitnami 维护了另一种部署方法,但也没比官方的好到哪里去。

原厂的 Gemfile 里甚至没有 rails, 只有个自家的 rails_multisite

导致我想要用 Rubymine 调试程序的时候提示我 rails 没有安装？😅 然而我用命令行运行rail s却是可以的，害得我以为是 Rubymine 出 bug 或者配置错了或者 rvm 出 bug 了

procedures

以开发模式运行

开发环境运行 rails 应用的命令:

ALLOW_EMBER_CLI_PROXY_BYPASS=1 DISCOURSE_DEV_LOG_LEVEL=warn DISCOURSE_ENABLE_CORS=true RAILS_DEVELOPMENT_HOSTS=xjtu.app RAILS_ENV=development HOST_URL=xjtu.app DISCOURSE_HOSTNAME=xjtu.app NUM_WEBS=8 rails s\n\n

rails 区分开发/生产运行模式，使用的配置不一样，例如开发模式缺少 cache 和 asset minimization，所以访问起来性能非常低下，低得夸张：

\n\n

从 Docker 里复制

本来我想比较一下 config/environments/development.rb 和 production.rb 的配置选项，但无奈 assets pipeline pre-compilation 不太懂，就不学了。直接开大招，把容器里的 discourse 复制出来，找到启动命令，在容器外面直接运行得了

先看看容器的入口 ./launcher start-cmd webxj

true run --shm-size=512m --link dataxj:dataxj -d --restart=always -e LANG=en_US.UTF-8 -e RAILS_ENV=production ... --name webxj -t -v /var/discourse/shared/webxj:/shared ... local_discourse/webxj /sbin/boot

查看 /sbin/boot

root@mnz-webxj:/var/www/discourse# cat /sbin/boot\n#!/bin/bash\n# we use this to boot up cause runit will not handle TERM and will not exit when done\n\nshutdown() {\n  echo Shutting Down\n  /etc/runit/3\n  ls /etc/service | SHELL=/bin/sh parallel sv force-stop {}\n  kill -HUP $RUNSVDIR\n  wait $RUNSVDIR\n\n  # give stuff a bit of time to finish\n  sleep 0.1\n\n  ORPHANS=`ps -eo pid | grep -v PID  | tr -d ' ' | grep -v '^1\n\n容器里面用的 sv 管理进程，查看`cat /etc/service/unicorn/run`\n

#!/bin/bash
\nexec 2>&1

redis

postgres

cd /var/www/discourse
\nchown -R discourse:www-data /shared/log/rails
\nPRECOMPILE_ON_BOOT=0
\nif [[ -z \"$PRECOMPILE_ON_BOOT\" ]]; then
\nPRECOMPILE_ON_BOOT=1
\nfi
\nif [ -f /usr/local/bin/create_db ] && [ \"$CREATE_DB_ON_BOOT\" = \"1\" ]; then /usr/local/bin/create_db; fi;
\nif [ \"$MIGRATE_ON_BOOT\" = \"1\" ]; then su discourse -c 'bundle exec rake db:migrate'; fi
\nif [ \"$PRECOMPILE_ON_BOOT\" = \"1\" ]; then SKIP_EMBER_CLI_COMPILE=1 su discourse -c 'bundle exec rake assets:precompile'; fi
\nLD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec thpoff chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb

\n参考 <a href=\"https://meta.discourse.org/t/install-discourse-on-ubuntu-or-debian-for-development/14727\" class=\"inline-onebox-placeholder\">https://meta.discourse.org/t/install-discourse-on-ubuntu-or-debian-for-development/14727</a> 安装 ImageMagick, oxipng, jhead\n\n安装 pnpm, rvm 和 ruby\n

pnpm env use --global lts
\nrvm install 3.3
\nrvm use 3.3 --default

看看是否支持 YJIT

ruby --yjit -v

\n把 redis 和 PG 的数据复制一份，再把 start-cmd 里的环境变量复制到.zshrc，新建数据库用户，配置 `config/discourse.conf`, 复制 bundle 那行启动命令启动`bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb`\n

pnpm

export PNPM_HOME=\"/home/discourse/.local/share/pnpm\"
\ncase \":$PATH:\" in
\n\":$PNPM_HOME:\") ;;
\n*) export PATH=\" $PNPM_HOME:$ PATH\" ;;
\nesac

pnpm end

alias npm='pnpm'
\nalias npx='pnpx'
\nexport PATH=\" $PATH:$ HOME/.rvm/bin\"

export RAILS_ENV=production
\nexport UNICORN_WORKERS=6
\nexport UNICORN_SIDEKIQS=1
\nexport RUBY_GC_HEAP_GROWTH_MAX_SLOTS=40000
\nexport RUBY_GC_HEAP_INIT_SLOTS=400000
\nexport RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=1.5
\nexport RUBY_YJIT_ENABLE=1
\nexport RUBY_CONFIGURE_OPTS=\"--enable-yjit\"
\nexport DISCOURSE_HOSTNAME=xjtu.app
\n...

\n<https://www.postgresql.org/download/linux/ubuntu/>\n\n

apt install postgresql postgresql-client-17 postgresql-common postgresql-contrib postgresql-client-common postgresql-server-dev-17 postgresql-17 postgresql-17-pgvector libpq-dev
\nsudo -u postgres createuser -s discourse
\nsudo -u postgres createdb discourse
\n$sudo -u postgres psql discourse
\npsql>
\nALTER USER discourse WITH PASSWORD 'xxx';
\nCREATE EXTENSION hstore;CREATE EXTENSION pg_trgm;
\nCREATE EXTENSION plpgsql;
\nCREATE EXTENSION unaccent;
\nCREATE EXTENSION vector;
\n$ gunzip < dump.sql.gz | psql discourse

\ndump.sql.gz 是 Discourse 备份解压出来的，容器里是 PG13，导入到新安装的 PG17 竟然无比丝滑\n\n\n\nsystemd file:\n`/etc/systemd/system/dis.service`\n\n

[Unit]
\nDescription=Discourse Puma Server
\nAfter=network.target postgresql.service
\nRequires=postgresql.service

[Service]
\nType=simple
\nUser=discourse
\nGroup=discourse

#EnvironmentFile=/home/discourse/.zshrc

WorkingDirectory=/var/www/discourse

requires running `rvm 3.3.6 --default` before this service is run

ExecStart=/usr/bin/zsh -lc 'source /home/discourse/.zshrc && /home/discourse/.rvm/gems/ruby-3.3.6/bin/puma -C config/puma.rb'
\nExecReload=/usr/bin/zsh -lc 'source /home/discourse/.zshrc && /home/discourse/.rvm/gems/ruby-3.3.6/bin/pumactl restart'

Restart configuration

Restart=always
\nRestartSec=5s

Basic security measures

NoNewPrivileges=true
\nProtectSystem=full
\nProtectHome=read-only

[Install]
\nWantedBy=multi-user.target

\n再把容器里的 nginx 复制出来，把 cache 和文件目录重新配一下，启动成功\n

cd /shared/
\nchown discourse:www-data backups tmp uploads

\n## upgrade\n参考:\n<div class=\"onebox-placeholder\" data-url=\"https://github.com/discourse/discourse_docker/blob/20e33fbfd98d3b8d9c57f7a111beff8aa51a5b98/templates/web.template.yml#L65\"><a href=\"https://github.com/discourse/discourse_docker/blob/20e33fbfd98d3b8d9c57f7a111beff8aa51a5b98/templates/web.template.yml#L65\">https://github.com/discourse/discourse_docker/blob/20e33fbfd98d3b8d9c57f7a111beff8aa51a5b98/templates/web.template.yml#L65</a></div>\n\n\n

chown -R discourse:discourse /var/www/discourse/
\nchown -R discourse:www-data /var/www/discourse/public
\nchown discourse:www-data /home/discourse/
\nchmod 750 /home/discourse
\nsu - discourse

\n

cd /var/www/discourse
\ngit stash
\ngit pull
\ngit checkout tests-passed
\nrm lib/tasks/custom.rake db/migrate/20241213085000_add_external_id_to_posts.rb
\ngit apply mypatch-20250617v2.patch

cd plugins
\nfor plugin in *
\ndo
\necho \"Processing: $plugin\"

# Only process directories\nif [[ -d \"$plugin\" ]]; then\n    cd \"$plugin\"\n    \n    # Check if it's a git repository\n    if [[ -d \".git\" ]]; then\n        # Get the remote origin URL\n        remote_url=$(git remote get-url origin 2>/dev/null)\n        \n        if [[ $? -eq 0 ]]; then\n            # Check if the remote URL matches the one to skip\n            if [[ \"$remote_url\" == \"git@github.com:fokx/discourse\" || \"$remote_url\" == \"git@github.com:fokx/discourse.git\" ]]; then\n                echo \"  → Skipping git pull (fokx/discourse repository)\"\n            else\n                echo \"  → Pulling from: $remote_url\"\n                git pull\n            fi\n        else\n            echo \"  → No remote origin found\"\n        fi\n    else\n        echo \"  → Not a git repository\"\n    fi\n    \n    cd ..\nelse\n    echo \"  → Skipping (not a directory)\"\nfi\n

done
\ncd ../

may need this when migrate to another system

rm plugins/*/gems -r

gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,\"\"); print $0 }' Gemfile.lock)

find /var/www/discourse/vendor/bundle -name cache -not -path \"/gems/\" -type d -exec rm -rf {} +

find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +

LOAD_PLUGINS=0 bundle exec rake plugin:pull_compatible_all

bundle exec rake assets:precompile:build

SKIP_EMBER_CLI_COMPILE=1 bundle exec rake themes:update assets:precompile

bundle install --jobs $(($ (nproc) - 1)) --retry 3 && pnpm i && bundle exec rake db:migrate && bundle exec rake themes:update assets:precompile && pumactl restart
\n#pumactl phased-restart

\n直接用 pg_dump 备份\n

discour+ 1142358 0.0 0.0 2384 1408 pts/3 S+ 13:54 0:00 sh -c PGPASSWORD='191549' pg_dump --schema=public -T public.pg_* --file='/var/www/discourse/tmp/backups/default/2024-12-14-135427/dump.sql.gz' --no-owner --no-privileges --verbose --compress=4 --host=localhost --username=discourse discourse 2>&1
\ndiscour+ 1142359 94.1 0.1 32240 18388 pts/3 R+ 13:54 0:12 /usr/lib/postgresql/17/bin/pg_dump --schema=public -T public.pg_* --file=/var/www/discourse/tmp/backups/default/2024-12-14-135427/dump.sql.gz --no-owner --no-privileges --verbose --compress=4 --host=localhost --username=discourse discourse

\n\n官方文档有时候会用到 `discourse` 命令，其实就是`bundle exec script/discourse`。`\n  SHELL=/bin/bash parallel 'timeout 5 /bin/bash -c \"kill {} && wait {}\" || kill -9 {}' ::: $ORPHANS 2> /dev/null\n  exit\n}\n\n/etc/runit/1 || exit $?\n/etc/runit/2&\nRUNSVDIR=$!\necho \"Started runsvdir, PID is $RUNSVDIR\"\ntrap shutdown SIGTERM SIGHUP\nwait $RUNSVDIR\n\nshutdown\n

容器里面用的 sv 管理进程，查看cat /etc/service/unicorn/run

#!/bin/bash\nexec 2>&1\n# redis\n# postgres\ncd /var/www/discourse\nchown -R discourse:www-data /shared/log/rails\nPRECOMPILE_ON_BOOT=0\nif [[ -z \"$PRECOMPILE_ON_BOOT\" ]]; then\n  PRECOMPILE_ON_BOOT=1\nfi\nif [ -f /usr/local/bin/create_db ] && [ \"$CREATE_DB_ON_BOOT\" = \"1\" ]; then /usr/local/bin/create_db; fi;\nif [ \"$MIGRATE_ON_BOOT\" = \"1\" ]; then su discourse -c 'bundle exec rake db:migrate'; fi\nif [ \"$PRECOMPILE_ON_BOOT\" = \"1\" ]; then SKIP_EMBER_CLI_COMPILE=1 su discourse -c 'bundle exec rake assets:precompile'; fi\nLD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec thpoff chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb\n

参考 Install Discourse on Ubuntu or Debian for Development 安装 ImageMagick, oxipng, jhead

安装 pnpm, rvm 和 ruby

pnpm env use --global lts                                                   \nrvm install 3.3      \nrvm use 3.3 --default\n## 看看是否支持 YJIT\nruby --yjit -v                                                              \n

把 redis 和 PG 的数据复制一份，再把 start-cmd 里的环境变量复制到.zshrc，新建数据库用户，配置 config/discourse.conf, 复制 bundle 那行启动命令启动bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb

# pnpm\nexport PNPM_HOME=\"/home/discourse/.local/share/pnpm\"\ncase \":$PATH:\" in\n  *\":$PNPM_HOME:\"*) ;;\n  *) export PATH=\"$PNPM_HOME:$PATH\" ;;\nesac\n# pnpm end\nalias npm='pnpm'\nalias npx='pnpx'\nexport PATH=\"$PATH:$HOME/.rvm/bin\"\n\nexport RAILS_ENV=production\nexport UNICORN_WORKERS=6\nexport UNICORN_SIDEKIQS=1\nexport RUBY_GC_HEAP_GROWTH_MAX_SLOTS=40000\nexport RUBY_GC_HEAP_INIT_SLOTS=400000\nexport RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=1.5\nexport RUBY_YJIT_ENABLE=1\nexport RUBY_CONFIGURE_OPTS=\"--enable-yjit\"\nexport DISCOURSE_HOSTNAME=xjtu.app\n...\n

https://www.postgresql.org/download/linux/ubuntu/

apt install postgresql postgresql-client-17 postgresql-common  postgresql-contrib postgresql-client-common postgresql-server-dev-17 postgresql-17 postgresql-17-pgvector libpq-dev\nsudo -u postgres createuser -s discourse                                                   \nsudo -u postgres createdb discourse \n$sudo -u postgres psql discourse\npsql>\nALTER USER discourse WITH PASSWORD 'xxx';\nCREATE EXTENSION hstore;CREATE EXTENSION pg_trgm;\nCREATE EXTENSION plpgsql;\nCREATE EXTENSION unaccent;\nCREATE EXTENSION vector;\n$ gunzip < dump.sql.gz | psql discourse      \n

dump.sql.gz 是 Discourse 备份解压出来的，容器里是 PG13，导入到新安装的 PG17 竟然无比丝滑

systemd file:
\n/etc/systemd/system/dis.service

[Unit]\nDescription=Discourse Puma Server\nAfter=network.target postgresql.service\nRequires=postgresql.service\n\n[Service]\nType=simple\nUser=discourse\nGroup=discourse\n\n#EnvironmentFile=/home/discourse/.zshrc\n\nWorkingDirectory=/var/www/discourse\n# requires running `rvm 3.3.6 --default` before this service is run\nExecStart=/usr/bin/zsh -lc 'source /home/discourse/.zshrc && /home/discourse/.rvm/gems/ruby-3.3.6/bin/puma -C config/puma.rb'\nExecReload=/usr/bin/zsh -lc 'source /home/discourse/.zshrc && /home/discourse/.rvm/gems/ruby-3.3.6/bin/pumactl restart'\n\n# Restart configuration\nRestart=always\nRestartSec=5s\n\n# Basic security measures\nNoNewPrivileges=true\nProtectSystem=full\nProtectHome=read-only\n\n[Install]\nWantedBy=multi-user.target\n

再把容器里的 nginx 复制出来，把 cache 和文件目录重新配一下，启动成功

cd /shared/\nchown discourse:www-data backups tmp uploads\n

upgrade

参考:

\n\n

chown -R discourse:discourse /var/www/discourse/     \nchown -R discourse:www-data /var/www/discourse/public\nchown discourse:www-data /home/discourse/\nchmod 750 /home/discourse\nsu - discourse\n

cd /var/www/discourse\ngit stash\ngit pull\ngit checkout tests-passed \nrm lib/tasks/custom.rake db/migrate/20241213085000_add_external_id_to_posts.rb\ngit apply mypatch-20250617v2.patch\n\n\ncd plugins\nfor plugin in *\ndo\n    echo \"Processing: $plugin\"\n    \n    # Only process directories\n    if [[ -d \"$plugin\" ]]; then\n        cd \"$plugin\"\n        \n        # Check if it's a git repository\n        if [[ -d \".git\" ]]; then\n            # Get the remote origin URL\n            remote_url=$(git remote get-url origin 2>/dev/null)\n            \n            if [[ $? -eq 0 ]]; then\n                # Check if the remote URL matches the one to skip\n                if [[ \"$remote_url\" == \"git@github.com:fokx/discourse\" || \"$remote_url\" == \"git@github.com:fokx/discourse.git\" ]]; then\n                    echo \"  → Skipping git pull (fokx/discourse repository)\"\n                else\n                    echo \"  → Pulling from: $remote_url\"\n                    git pull\n                fi\n            else\n                echo \"  → No remote origin found\"\n            fi\n        else\n            echo \"  → Not a git repository\"\n        fi\n        \n        cd ..\n    else\n        echo \"  → Skipping (not a directory)\"\n    fi\ndone\ncd ../\n\n# may need this when migrate to another system\n# rm plugins/*/gems -r\n# gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,\"\"); print $0 }' Gemfile.lock)\n# find /var/www/discourse/vendor/bundle -name cache -not -path \"*/gems/*\" -type d -exec rm -rf {} +\n# find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +\n# LOAD_PLUGINS=0 bundle exec rake plugin:pull_compatible_all\n# bundle exec rake assets:precompile:build\n# SKIP_EMBER_CLI_COMPILE=1 bundle exec rake themes:update assets:precompile\n\nbundle install --jobs $(($(nproc) - 1)) --retry 3 && pnpm i && bundle exec rake db:migrate  && bundle exec rake themes:update assets:precompile && pumactl restart\n#pumactl phased-restart\n

直接用 pg_dump 备份

discour+ 1142358  0.0  0.0   2384  1408 pts/3    S+   13:54   0:00 sh -c PGPASSWORD='191549' pg_dump --schema=public -T public.pg_* --file='/var/www/discourse/tmp/backups/default/2024-12-14-135427/dump.sql.gz' --no-owner --no-privileges --verbose --compress=4 --host=localhost  --username=discourse discourse 2>&1\ndiscour+ 1142359 94.1  0.1  32240 18388 pts/3    R+   13:54   0:12 /usr/lib/postgresql/17/bin/pg_dump --schema=public -T public.pg_* --file=/var/www/discourse/tmp/backups/default/2024-12-14-135427/dump.sql.gz --no-owner --no-privileges --verbose --compress=4 --host=localhost --username=discourse discourse\n

官方文档有时候会用到 discourse 命令，其实就是bundle exec script/discourse。

\n","createdAt":"2024-12-14 09:39:06.607993","updatedAt":"2025-08-20 08:15:10.557594","replyToPostNumber":null,"replyCount":0,"likeCount":6,"wordCount":1410,"liked":false,"bookmarked":false,"polls":[],"reactions":[{"reaction":"❤️","count":6,"users":[{"id":299,"username":"sola","name":null},{"id":346,"username":"hoist","name":null},{"id":1929,"username":"Quit","name":"Qwen"},{"id":1941,"username":"john","name":"John"},{"id":5151,"username":"Soyo34325","name":"Soyo34325"},{"id":5905,"username":"PipaQinse233","name":"PipaQinse233"}],"hasReacted":false}],"wiki":false,"version":31,"publicVersion":31,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}},{"id":44702,"postNumber":2,"raw":"爆得有点频繁啊 😨","cooked":"

爆得有点频繁啊 😨

\n","createdAt":"2024-12-17 09:07:31.037826","updatedAt":"2024-12-17 09:07:31.037826","replyToPostNumber":null,"replyCount":0,"likeCount":0,"wordCount":8,"liked":false,"bookmarked":false,"polls":[],"reactions":[],"wiki":false,"version":1,"publicVersion":1,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":6205,"username":"uika_winwing","name":null,"avatarUrl":"/uploads/image/76/3b/763b1e5ad8a424c4450bb26cea5ae532e7b1cd9da926ac5d99215d7123bf6002.avif","admin":false,"moderator":false,"signatureRaw":null,"signatureCooked":null}},{"id":44703,"postNumber":3,"raw":"## 不稳定 & unicorn 换 puma\n最近不定期出现访问不了的诡异情况，检查 unicorn log:\n\n```\n==> ./log/unicorn.stdout.log <==\nI, [2024-12-17T09:45:52.927751 #3990911] INFO -- : worker=4 ready\nI, [2024-12-17T09:45:54.856311 #3991183] INFO -- : worker=5 ready\nE, [2024-12-17T09:48:57.888043 #3989435] ERROR -- : Kill self supervisor is gone\nI, [2024-12-17T09:48:57.924044 #3989435] INFO -- : reaped # worker=0\nI, [2024-12-17T09:48:57.924329 #3989435] INFO -- : reaped # worker=1\nI, [2024-12-17T09:48:57.924473 #3989435] INFO -- : reaped # worker=2\nI, [2024-12-17T09:48:57.924616 #3989435] INFO -- : reaped # worker=3\nI, [2024-12-17T09:48:57.924773 #3989435] INFO -- : reaped # worker=4\nI, [2024-12-17T09:48:57.924926 #3989435] INFO -- : reaped # worker=5\nI, [2024-12-17T09:48:57.925019 #3989435] INFO -- : master complete\n```\n\n```\n==> ./log/unicorn.stderr.log <==\nunknown OID 556291: failed to recognize type of 'embeddings'. It will be treated as String.\nunknown OID 556178: failed to recognize type of 'embedding'. It will be treated as String.\nunknown OID 556291: failed to recognize type of 'embeddings'. It will be treated as String.\n```\n\n然而\n`bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb`\n却还活着\n\n诡异在什么地方？\n* 如果是我 patch 的代码质量差导致的崩溃，时间应该不会那么不规律：有时候一整天都没挂，有时候一小时内频繁出现几次\n* 内存和负载都正常\n\n\n```\nfree -h\n total used free shared buff/cache available\nMem: 15Gi 7.9Gi 4.5Gi 584Mi 3.9Gi 7.7Gi\nSwap: 8.0Gi 6.5Gi 1.5Gi\n```\n\n我决定把 unicorn 换成 [puma](https://puma.io/), 这也是 Heroku 推荐的 Rails webserver.\n\n问题来了，Discourse 官方没有使用 puma 的文档，看看 unicorn 的两个配置/脚本文件也是一头雾水：`config/unicorn_launcher` 和 `config/unicorn.conf.rb`\n\n我决定硬干，先从 Heroku 推荐的最简单的 puma 配置文件开始\n```rb\n# frozen_string_literal: true\n\nif ENV[\"RAILS_ENV\"] == \"production\"\n # First, you need to change these below to your situation.\n APP_ROOT = ENV[\"APP_ROOT\"] || \"/var/www/discourse\"\n num_workers = ENV[\"NUM_WEBS\"].to_i > 0 ? ENV[\"NUM_WEBS\"].to_i : 8\n\n # Second, you can choose how many threads that you are going to run at same time.\n workers \"#{num_workers}\"\n threads 8, 32\n\n # Unless you know what you are changing, do not change them.\n # bind \"unix://#{APP_ROOT}/tmp/sockets/puma.sock\"\n\n stdout_redirect \"#{APP_ROOT}/log/puma.log\", \"#{APP_ROOT}/log/puma.err.log\"\n pidfile \"#{APP_ROOT}/tmp/pids/puma.pid\"\n state_path \"#{APP_ROOT}/tmp/pids/puma.state\"\n preload_app!\n\n port(ENV['PORT'] || 3000, \"::\")\n # Turn off keepalive support for better long tails response time with Router 2.0\n # Remove this line when https://github.com/puma/puma/issues/3487 is closed, and the fix is released\n enable_keep_alives(false) if respond_to?(:enable_keep_alives)\n\n rackup DefaultRackup if defined?(DefaultRackup)\n environment ENV['RAILS_ENV'] || 'development'\n\n on_worker_boot do\n # Worker-specific setup for Rails 4.1 to 5.2, after 5.2 it's not needed\n # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot\n ActiveRecord::Base.establish_connection\n end\nend\n```\n\n`bundle exec puma -C config/puma.rb`\n或者直接\n`puma -C config/puma.rb`\n\n奇迹般地能运行\n\n后续继续 [观察稳定性](https://status.xjtu.app/)\n\n目前可能的不稳定性来源:\n1. 虽然我从 Docker 里面复制了全部文件皆数据库和各种环境变量，配置，但可能存在遗漏\n2. Discourse 官方只支持 Postgres 13, 我一下子升级到了 17\n3. ruby 启用了 YJIT\n4. arm64 机器","cooked":"

不稳定 & unicorn 换 puma

最近不定期出现访问不了的诡异情况，检查 unicorn log:

==> ./log/unicorn.stdout.log <==\nI, [2024-12-17T09:45:52.927751 #3990911]  INFO -- : worker=4 ready\nI, [2024-12-17T09:45:54.856311 #3991183]  INFO -- : worker=5 ready\nE, [2024-12-17T09:48:57.888043 #3989435] ERROR -- : Kill self supervisor is gone\nI, [2024-12-17T09:48:57.924044 #3989435]  INFO -- : reaped #<Process::Status: pid 3990359 exit 0> worker=0\nI, [2024-12-17T09:48:57.924329 #3989435]  INFO -- : reaped #<Process::Status: pid 3990445 exit 0> worker=1\nI, [2024-12-17T09:48:57.924473 #3989435]  INFO -- : reaped #<Process::Status: pid 3990574 exit 0> worker=2\nI, [2024-12-17T09:48:57.924616 #3989435]  INFO -- : reaped #<Process::Status: pid 3990736 exit 0> worker=3\nI, [2024-12-17T09:48:57.924773 #3989435]  INFO -- : reaped #<Process::Status: pid 3990911 exit 0> worker=4\nI, [2024-12-17T09:48:57.924926 #3989435]  INFO -- : reaped #<Process::Status: pid 3991183 exit 0> worker=5\nI, [2024-12-17T09:48:57.925019 #3989435]  INFO -- : master complete\n

==> ./log/unicorn.stderr.log <==\nunknown OID 556291: failed to recognize type of 'embeddings'. It will be treated as String.\nunknown OID 556178: failed to recognize type of 'embedding'. It will be treated as String.\nunknown OID 556291: failed to recognize type of 'embeddings'. It will be treated as String.\n

然而
\nbundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
\n却还活着

诡异在什么地方？

如果是我 patch 的代码质量差导致的崩溃，时间应该不会那么不规律：有时候一整天都没挂，有时候一小时内频繁出现几次
内存和负载都正常

free -h\n               total        used        free      shared  buff/cache   available\nMem:            15Gi       7.9Gi       4.5Gi       584Mi       3.9Gi       7.7Gi\nSwap:          8.0Gi       6.5Gi       1.5Gi\n

我决定把 unicorn 换成 puma, 这也是 Heroku 推荐的 Rails webserver.

问题来了，Discourse 官方没有使用 puma 的文档，看看 unicorn 的两个配置/脚本文件也是一头雾水：config/unicorn_launcher 和 config/unicorn.conf.rb

我决定硬干，先从 Heroku 推荐的最简单的 puma 配置文件开始

# frozen_string_literal: true\n\nif ENV[\"RAILS_ENV\"] == \"production\"\n  # First, you need to change these below to your situation.\n  APP_ROOT = ENV[\"APP_ROOT\"] || \"/var/www/discourse\"\n  num_workers = ENV[\"NUM_WEBS\"].to_i > 0 ? ENV[\"NUM_WEBS\"].to_i : 8\n\n  # Second, you can choose how many threads that you are going to run at same time.\n  workers \"#{num_workers}\"\n  threads 8, 32\n\n  # Unless you know what you are changing, do not change them.\n  # bind \"unix://#{APP_ROOT}/tmp/sockets/puma.sock\"\n\n  stdout_redirect \"#{APP_ROOT}/log/puma.log\", \"#{APP_ROOT}/log/puma.err.log\"\n  pidfile \"#{APP_ROOT}/tmp/pids/puma.pid\"\n  state_path \"#{APP_ROOT}/tmp/pids/puma.state\"\n  preload_app!\n\n  port(ENV['PORT'] || 3000, \"::\")\n  # Turn off keepalive support for better long tails response time with Router 2.0\n  # Remove this line when https://github.com/puma/puma/issues/3487 is closed, and the fix is released\n  enable_keep_alives(false) if respond_to?(:enable_keep_alives)\n\n  rackup      DefaultRackup if defined?(DefaultRackup)\n  environment ENV['RAILS_ENV'] || 'development'\n\n  on_worker_boot do\n    # Worker-specific setup for Rails 4.1 to 5.2, after 5.2 it's not needed\n    # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot\n    ActiveRecord::Base.establish_connection\n  end\nend\n

bundle exec puma -C config/puma.rb
\n或者直接
\npuma -C config/puma.rb

奇迹般地能运行

后续继续观察稳定性

目前可能的不稳定性来源:

虽然我从 Docker 里面复制了全部文件皆数据库和各种环境变量，配置，但可能存在遗漏
Discourse 官方只支持 Postgres 13, 我一下子升级到了 17
ruby 启用了 YJIT
arm64 机器

\n","createdAt":"2024-12-17 09:14:11.099996","updatedAt":"2025-01-27 03:21:08.331081","replyToPostNumber":null,"replyCount":0,"likeCount":0,"wordCount":628,"liked":false,"bookmarked":false,"polls":[],"reactions":[],"wiki":false,"version":4,"publicVersion":4,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}},{"id":44785,"postNumber":4,"raw":"https://github.com/puma/puma/blob/master/docs/restart.md\n\n发现了一个好玩的，puma 支持两种无缝重启的方式\n我感觉后续升级 discourse 时可以做到真正 0-downtime\n\n\n**Search Labs |** **AI Overview**\n\nThe main difference between a phased restart and a hot restart in Puma is how they handle connections and when they finish:\n\n* **Phased restart**\n\nPuma keeps processing requests with old workers while sending new requests to new workers. This results in zero downtime and no hanging requests. However, phased restarts can't be used to upgrade gems loaded by the Puma master process.\n\n* **Hot restart**\n\nPuma tries to finish current requests and then restart itself with new workers. This results in no lost requests, but there may be some extra latency for new requests while the process restarts.\n\nHere are some other differences between phased and hot restarts:\n\n* **Speed**: Hot restarts often complete more quickly than phased restarts.\n\n* **Database schema upgrades**: Phased restarts require backwards-compatible database schema upgrades.\n* **Mode**: Hot restarts work in a single mode, while phased restarts work in cluster mode.\n\nor\n\nhttps://nts.strzibny.name/puma-graceful-restarts/","cooked":"\n

发现了一个好玩的，puma 支持两种无缝重启的方式
\n我感觉后续升级 discourse 时可以做到真正 0-downtime

Search Labs | AI Overview

The main difference between a phased restart and a hot restart in Puma is how they handle connections and when they finish:

Phased restart

Puma keeps processing requests with old workers while sending new requests to new workers. This results in zero downtime and no hanging requests. However, phased restarts can't be used to upgrade gems loaded by the Puma master process.

Hot restart

Puma tries to finish current requests and then restart itself with new workers. This results in no lost requests, but there may be some extra latency for new requests while the process restarts.

Here are some other differences between phased and hot restarts:

\n
Speed: Hot restarts often complete more quickly than phased restarts.
\n
\n
Database schema upgrades: Phased restarts require backwards-compatible database schema upgrades.
\n
\n
Mode: Hot restarts work in a single mode, while phased restarts work in cluster mode.
\n

\n","createdAt":"2024-12-19 08:25:24.074601","updatedAt":"2025-01-04 13:24:13.524734","replyToPostNumber":null,"replyCount":0,"likeCount":0,"wordCount":191,"liked":false,"bookmarked":false,"polls":[],"reactions":[],"wiki":false,"version":3,"publicVersion":3,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}},{"id":44840,"postNumber":5,"raw":"今天让 Claude 把 Discourse 的 `config/unicorn.rb` 转成 `config/puma.rb` 了\n\nAI 真牛逼\n\n```rb\n# frozen_string_literal: true\n\nrequire \"fileutils\"\nrequire 'puma/acme'\n\ndiscourse_path = File.expand_path(File.expand_path(File.dirname(__FILE__)) + \"/../\")\n\nenable_logstash_logger = ENV[\"ENABLE_LOGSTASH_LOGGER\"] == \"1\"\npuma_stderr_path = \"#{discourse_path}/log/puma.stderr.log\"\npuma_stdout_path = \"#{discourse_path}/log/puma.stdout.log\"\n\n# Load logstash logger if enabled\nif enable_logstash_logger\n require_relative \"../lib/discourse_logstash_logger\"\n FileUtils.touch(puma_stderr_path) if !File.exist?(puma_stderr_path)\n # Note: You may need to adapt the logger initialization for Puma\n log_formatter = proc do |severity, time, progname, msg|\n event = {\n \"@timestamp\" => Time.now.utc,\n \"message\" => msg,\n \"severity\" => severity,\n \"type\" => \"puma\"\n }\n \"#{event.to_json}\\n\"\n end\nelse\n stdout_redirect puma_stdout_path, puma_stderr_path, true\nend\n\n# Number of workers (processes)\nworkers ENV.fetch(\"PUMA_WORKERS\", 8).to_i\n\n# Set the directory\ndirectory discourse_path\n\n# Bind to the specified address and port\nbind ENV.fetch(\"PUMA_BIND\", \"tcp://#{ENV['PUMA_BIND_ALL'] ? '' : '127.0.0.1:'}#{ENV.fetch('PUMA_PORT', 3000)}\")\n\n# or, use puma without reverse proxy\n# require listening to privileged port\n# `setcap 'cap_net_bind_service=ep' /home/discourse/.rvm/rubies/ruby-3.3.6/bin/ruby`\n\n#bind 'tcp://0.0.0.0:80'\n#plugin :acme\n#acme_server_name 'xjtu.app'\n#acme_tos_agreed true\n#bind 'acme://0.0.0.0:443'\n\n# PID file location\nFileUtils.mkdir_p(\"#{discourse_path}/tmp/pids\")\npidfile ENV.fetch(\"PUMA_PID_PATH\", \"#{discourse_path}/tmp/pids/puma.pid\")\n\n# State file - used by pumactl\nstate_path \"#{discourse_path}/tmp/pids/puma.state\"\n\n# Environment-specific configuration\nif ENV[\"RAILS_ENV\"] == \"production\"\n # Production timeout\n worker_timeout 30\nelse\n # Development timeout\n worker_timeout ENV.fetch(\"PUMA_TIMEOUT\", 60).to_i\nend\n\n# Preload application\npreload_app!\n\n# Handle worker boot and shutdown\nbefore_fork do\n Discourse.preload_rails!\n Discourse.before_fork\n\n # Supervisor check\n supervisor_pid = ENV[\"PUMA_SUPERVISOR_PID\"].to_i\n if supervisor_pid > 0\n Thread.new do\n loop do\n unless File.exist?(\"/proc/#{supervisor_pid}\")\n puts \"Kill self supervisor is gone\"\n Process.kill \"TERM\", Process.pid\n end\n sleep 2\n end\n end\n end\n\n # Sidekiq workers\n sidekiqs = ENV[\"PUMA_SIDEKIQS\"].to_i\n if sidekiqs > 0\n puts \"starting #{sidekiqs} supervised sidekiqs\"\n\n require \"demon/sidekiq\"\n Demon::Sidekiq.after_fork { DiscourseEvent.trigger(:sidekiq_fork_started) }\n Demon::Sidekiq.start(sidekiqs)\n\n if Discourse.enable_sidekiq_logging?\n Signal.trap(\"USR1\") do\n # Delay Sidekiq log reopening\n sleep 1\n Demon::Sidekiq.kill(\"USR2\")\n end\n end\n end\n\n # Email sync demon\n if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n puts \"starting up EmailSync demon\"\n Demon::EmailSync.start(1)\n end\n\n # Plugin demons\n DiscoursePluginRegistry.demon_processes.each do |demon_class|\n puts \"starting #{demon_class.prefix} demon\"\n demon_class.start(1)\n end\n\n # Demon monitoring thread\n Thread.new do\n loop do\n begin\n sleep 60\n\n if sidekiqs > 0\n Demon::Sidekiq.ensure_running\n Demon::Sidekiq.heartbeat_check\n Demon::Sidekiq.rss_memory_check\n end\n\n if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n Demon::EmailSync.ensure_running\n Demon::EmailSync.check_email_sync_heartbeat\n end\n\n DiscoursePluginRegistry.demon_processes.each(&:ensure_running)\n rescue => e\n Rails.logger.warn(\"Error in demon processes heartbeat check: #{e}\\n#{e.backtrace.join(\"\\n\")}\")\n end\n end\n end\n\n # Close Redis connection\n Discourse.redis.close\nend\n\non_worker_boot do\n DiscourseEvent.trigger(:web_fork_started)\n Discourse.after_fork\nend\n\n# Worker timeout handling\nworker_timeout 30\n\n# Low-level worker options\nthreads 8, 32\n```\n\n改完之后，在线状态的显示正常了\n另外，记录一个好玩的命令:\n```rb\nUser.all.each do |u| PresenceChannel.new(DiscourseWhosOnline::CHANNEL_NAME).present(user_id: u.id, client_id: \"seen\") end\n```\n清空:\n```\nPresenceChannel.clear_all!\n```\n\n另外发现 Last IP 也正常了，不再是 `::ffff:127.0.0.1`","cooked":"

今天让 Claude 把 Discourse 的 config/unicorn.rb 转成 config/puma.rb 了

AI 真牛逼

# frozen_string_literal: true\n\nrequire \"fileutils\"\nrequire 'puma/acme'\n\ndiscourse_path = File.expand_path(File.expand_path(File.dirname(__FILE__)) + \"/../\")\n\nenable_logstash_logger = ENV[\"ENABLE_LOGSTASH_LOGGER\"] == \"1\"\npuma_stderr_path = \"#{discourse_path}/log/puma.stderr.log\"\npuma_stdout_path = \"#{discourse_path}/log/puma.stdout.log\"\n\n# Load logstash logger if enabled\nif enable_logstash_logger\n  require_relative \"../lib/discourse_logstash_logger\"\n  FileUtils.touch(puma_stderr_path) if !File.exist?(puma_stderr_path)\n  # Note: You may need to adapt the logger initialization for Puma\n  log_formatter = proc do |severity, time, progname, msg|\n    event = {\n      \"@timestamp\" => Time.now.utc,\n      \"message\" => msg,\n      \"severity\" => severity,\n      \"type\" => \"puma\"\n    }\n    \"#{event.to_json}\\n\"\n  end\nelse\n  stdout_redirect puma_stdout_path, puma_stderr_path, true\nend\n\n# Number of workers (processes)\nworkers ENV.fetch(\"PUMA_WORKERS\", 8).to_i\n\n# Set the directory\ndirectory discourse_path\n\n# Bind to the specified address and port\nbind ENV.fetch(\"PUMA_BIND\", \"tcp://#{ENV['PUMA_BIND_ALL'] ? '' : '127.0.0.1:'}#{ENV.fetch('PUMA_PORT', 3000)}\")\n\n# or, use puma without reverse proxy\n# require listening to privileged port\n# `setcap 'cap_net_bind_service=ep' /home/discourse/.rvm/rubies/ruby-3.3.6/bin/ruby`\n\n#bind 'tcp://0.0.0.0:80'\n#plugin :acme\n#acme_server_name 'xjtu.app'\n#acme_tos_agreed true\n#bind 'acme://0.0.0.0:443'\n\n# PID file location\nFileUtils.mkdir_p(\"#{discourse_path}/tmp/pids\")\npidfile ENV.fetch(\"PUMA_PID_PATH\", \"#{discourse_path}/tmp/pids/puma.pid\")\n\n# State file - used by pumactl\nstate_path \"#{discourse_path}/tmp/pids/puma.state\"\n\n# Environment-specific configuration\nif ENV[\"RAILS_ENV\"] == \"production\"\n  # Production timeout\n  worker_timeout 30\nelse\n  # Development timeout\n  worker_timeout ENV.fetch(\"PUMA_TIMEOUT\", 60).to_i\nend\n\n# Preload application\npreload_app!\n\n# Handle worker boot and shutdown\nbefore_fork do\n  Discourse.preload_rails!\n  Discourse.before_fork\n\n  # Supervisor check\n  supervisor_pid = ENV[\"PUMA_SUPERVISOR_PID\"].to_i\n  if supervisor_pid > 0\n    Thread.new do\n      loop do\n        unless File.exist?(\"/proc/#{supervisor_pid}\")\n          puts \"Kill self supervisor is gone\"\n          Process.kill \"TERM\", Process.pid\n        end\n        sleep 2\n      end\n    end\n  end\n\n  # Sidekiq workers\n  sidekiqs = ENV[\"PUMA_SIDEKIQS\"].to_i\n  if sidekiqs > 0\n    puts \"starting #{sidekiqs} supervised sidekiqs\"\n\n    require \"demon/sidekiq\"\n    Demon::Sidekiq.after_fork { DiscourseEvent.trigger(:sidekiq_fork_started) }\n    Demon::Sidekiq.start(sidekiqs)\n\n    if Discourse.enable_sidekiq_logging?\n      Signal.trap(\"USR1\") do\n        # Delay Sidekiq log reopening\n        sleep 1\n        Demon::Sidekiq.kill(\"USR2\")\n      end\n    end\n  end\n\n  # Email sync demon\n  if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n    puts \"starting up EmailSync demon\"\n    Demon::EmailSync.start(1)\n  end\n\n  # Plugin demons\n  DiscoursePluginRegistry.demon_processes.each do |demon_class|\n    puts \"starting #{demon_class.prefix} demon\"\n    demon_class.start(1)\n  end\n\n  # Demon monitoring thread\n  Thread.new do\n    loop do\n      begin\n        sleep 60\n\n        if sidekiqs > 0\n          Demon::Sidekiq.ensure_running\n          Demon::Sidekiq.heartbeat_check\n          Demon::Sidekiq.rss_memory_check\n        end\n\n        if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n          Demon::EmailSync.ensure_running\n          Demon::EmailSync.check_email_sync_heartbeat\n        end\n\n        DiscoursePluginRegistry.demon_processes.each(&:ensure_running)\n      rescue => e\n        Rails.logger.warn(\"Error in demon processes heartbeat check: #{e}\\n#{e.backtrace.join(\"\\n\")}\")\n      end\n    end\n  end\n\n  # Close Redis connection\n  Discourse.redis.close\nend\n\non_worker_boot do\n  DiscourseEvent.trigger(:web_fork_started)\n  Discourse.after_fork\nend\n\n# Worker timeout handling\nworker_timeout 30\n\n# Low-level worker options\nthreads 8, 32\n

改完之后，在线状态的显示正常了
\n另外，记录一个好玩的命令:

User.all.each do |u| PresenceChannel.new(DiscourseWhosOnline::CHANNEL_NAME).present(user_id: u.id, client_id: \"seen\") end\n

清空:

PresenceChannel.clear_all!\n

另外发现 Last IP 也正常了，不再是 ::ffff:127.0.0.1

\n","createdAt":"2024-12-20 16:43:01.519862","updatedAt":"2024-12-22 15:09:21.470587","replyToPostNumber":null,"replyCount":0,"likeCount":2,"wordCount":424,"liked":false,"bookmarked":false,"polls":[],"reactions":[{"reaction":"❤️","count":2,"users":[{"id":4668,"username":"IO","name":null},{"id":5151,"username":"Soyo34325","name":"Soyo34325"}],"hasReacted":false}],"wiki":false,"version":3,"publicVersion":3,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}},{"id":45836,"postNumber":6,"raw":"运行多个 Discourse 实例：把 `/var/www/discourse`复制一份，在`config/puma.rb`里面改一下端口，在`config/discourse.conf` 改一下数据库名称`db_name = 'disxj'`，在 nginx 里改一下端口和冲突的配置，可以节省为不同数据库运行不同 PG 进程的内存。\n\n目前还没找到用同一套 puma workers 运行多个实例的方法，我猜测 https://github.com/discourse/rails_multisite 可以干这个事情。","cooked":"

运行多个 Discourse 实例：把 /var/www/discourse复制一份，在config/puma.rb里面改一下端口，在config/discourse.conf 改一下数据库名称db_name = 'disxj'，在 nginx 里改一下端口和冲突的配置，可以节省为不同数据库运行不同 PG 进程的内存。

目前还没找到用同一套 puma workers 运行多个实例的方法，我猜测 GitHub - discourse/rails_multisite: Multi tenancy for Rails applications 可以干这个事情。

\n","createdAt":"2025-01-27 03:02:52.983892","updatedAt":"2025-01-27 03:02:52.983892","replyToPostNumber":null,"replyCount":0,"likeCount":0,"wordCount":108,"liked":false,"bookmarked":false,"polls":[],"reactions":[],"wiki":false,"version":1,"publicVersion":1,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}},{"id":47042,"postNumber":7,"raw":"```\ndiff --git a/Gemfile b/Gemfile\nindex bdb7e1134d..69b0b24d81 100644\n--- a/Gemfile\n+++ b/Gemfile\n@@ -3,9 +3,10 @@\n source \"https://rubygems.org\"\n # if there is a super emergency and rubygems is playing up, try\n #source 'http://production.cf.rubygems.org'\n-\n gem \"bootsnap\", require: false, platform: :mri\n-\n+gem \"rspec\"\n+gem \"listen\"\n+gem \"puma-acme\"\n gem \"actionmailer\", \"~> 7.2.0\"\n gem \"actionpack\", \"~> 7.2.0\"\n gem \"actionview\", \"~> 7.2.0\"\n@@ -55,6 +56,7 @@ gem \"discourse-fonts\", require: \"discourse_fonts\"\n\n gem \"message_bus\"\n\n+gem \"rails\"\n gem \"rails_multisite\"\n\n gem \"fastimage\"\n@@ -135,8 +137,6 @@ group :test do\n end\n\n group :test, :development do\n- gem \"rspec\"\n- gem \"listen\", require: false\n gem \"certified\", require: false\n gem \"fabrication\", require: false\n gem \"mocha\", require: false\ndiff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb\nindex d1ac78ecf1..bdb1414ff6 100644\n--- a/app/controllers/posts_controller.rb\n+++ b/app/controllers/posts_controller.rb\n@@ -293,6 +293,11 @@ class PostsController < ApplicationController\n render_json_dump(result)\n end\n\n+ def by_external_id\n+ post = Post.find_by(external_id: params[:external_id])\n+ display_post(post)\n+ end\n+\n def show\n post = find_post_from_params\n display_post(post)\ndiff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb\nindex 07de153891..ede1b8d174 100644\n--- a/app/controllers/topics_controller.rb\n+++ b/app/controllers/topics_controller.rb\n@@ -43,13 +43,19 @@ class TopicsController < ApplicationController\n render json: { slug: topic.slug, topic_id: topic.id, url: topic.url }\n end\n\n- def show_by_external_id\n+ def external_id_json\n topic = Topic.find_by(external_id: params[:external_id])\n raise Discourse::NotFound unless topic\n guardian.ensure_can_see!(topic)\n redirect_to_correct_topic(topic, params[:post_number])\n end\n\n+ def external_id_redir\n+ topic = Topic.find_by(external_id: params[:external_id])\n+ raise Discourse::NotFound unless topic\n+ redirect_to_correct_topic(topic, params[:post_number], true)\n+ end\n+\n def show\n if params[:id].is_a?(Array) || params[:id].is_a?(ActionController::Parameters)\n raise Discourse::InvalidParameters.new(\"Show only accepts a single ID\")\n@@ -1263,7 +1269,7 @@ class TopicsController < ApplicationController\n end\n end\n\n- def redirect_to_correct_topic(topic, post_number = nil)\n+ def redirect_to_correct_topic(topic, post_number = nil, nojson = false)\n begin\n guardian.ensure_can_see!(topic)\n rescue Discourse::InvalidAccess => ex\n@@ -1287,7 +1293,9 @@ class TopicsController < ApplicationController\n\n url = topic.relative_url\n url << \"/#{post_number}\" if post_number.to_i > 0\n- url << \".json\" if request.format.json?\n+ unless nojson\n+ url << \".json\" if request.format.json?\n+ end\n\n opts.each do |k, v|\n s = url.include?(\"?\") ? \"&\" : \"?\"\ndiff --git a/app/models/post.rb b/app/models/post.rb\nindex 832e427e0f..febf96b489 100644\n--- a/app/models/post.rb\n+++ b/app/models/post.rb\n@@ -10,6 +10,8 @@ class Post < ActiveRecord::Base\n include HasCustomFields\n include LimitedEdit\n\n+ EXTERNAL_ID_MAX_LENGTH = 64\n+\n self.ignored_columns = [\n \"avg_time\", # TODO: Remove when 20240212034010_drop_deprecated_columns has been promoted to pre-deploy\n \"image_url\", # TODO: Remove when 20240212034010_drop_deprecated_columns has been promoted to pre-deploy\n@@ -505,7 +507,8 @@ class Post < ActiveRecord::Base\n end\n\n def external_id\n- \"#{topic_id}/#{post_number}\"\n+ self[:external_id]\n+ # \"#{topic_id}/#{post_number}\"\n end\n\n def reply_to_post\ndiff --git a/app/models/topic.rb b/app/models/topic.rb\nindex 40e22fb82a..f3a72008fe 100644\n--- a/app/models/topic.rb\n+++ b/app/models/topic.rb\n@@ -13,7 +13,7 @@ class Topic < ActiveRecord::Base\n include LimitedEdit\n extend Forwardable\n\n- EXTERNAL_ID_MAX_LENGTH = 50\n+ EXTERNAL_ID_MAX_LENGTH = 64\n\n self.ignored_columns = [\n \"avg_time\", # TODO: Remove when 20240212034010_drop_deprecated_columns has been promoted to pre-deploy\ndiff --git a/app/models/user_action.rb b/app/models/user_action.rb\nindex b17740e80a..10be47019b 100644\n--- a/app/models/user_action.rb\n+++ b/app/models/user_action.rb\n@@ -208,7 +208,7 @@ class UserAction < ActiveRecord::Base\n t.title, a.action_type, a.created_at, t.id topic_id,\n t.closed AS topic_closed, t.archived AS topic_archived,\n a.user_id AS target_user_id, au.name AS target_name, au.username AS target_username,\n- coalesce(p.post_number, 1) post_number, p.id as post_id,\n+ coalesce(p.post_number, 1) post_number, p.id as post_id, p.external_id,\n p.reply_to_post_number,\n pu.username, pu.name, pu.id user_id,\n pu.uploaded_avatar_id,\n@@ -221,11 +221,13 @@ class UserAction < ActiveRecord::Base\n pc.value AS action_code_who,\n pc2.value AS action_code_path,\n p.edit_reason,\n- t.category_id\n+ t.category_id,\n+ p3.external_id as reply_to_post_external_id\n FROM user_actions as a\n JOIN topics t on t.id = a.target_topic_id\n LEFT JOIN posts p on p.id = a.target_post_id\n JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1\n+ JOIN posts p3 on p3.topic_id = a.target_topic_id and p3.post_number = p.reply_to_post_number\n JOIN users u on u.id = a.acting_user_id\n JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id)\n JOIN users au on au.id = a.user_id\ndiff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb\nindex 029b04bdbf..c1082e188c 100644\n--- a/app/serializers/basic_post_serializer.rb\n+++ b/app/serializers/basic_post_serializer.rb\n@@ -2,7 +2,7 @@\n\n # The most basic attributes of a topic that we need to create a link for it.\n class BasicPostSerializer < ApplicationSerializer\n- attributes :id, :name, :username, :avatar_template, :created_at, :cooked, :cooked_hidden\n+ attributes :id, :name, :username, :avatar_template, :created_at, :cooked, :cooked_hidden, :external_id\n\n attr_accessor :topic_view\n\n@@ -26,6 +26,10 @@ class BasicPostSerializer < ApplicationSerializer\n cooked_hidden\n end\n\n+ def include_external_id?\n+ external_id\n+ end\n+\n def cooked\n if cooked_hidden\n if scope.current_user && object.user_id == scope.current_user.id\ndiff --git a/app/serializers/basic_topic_serializer.rb b/app/serializers/basic_topic_serializer.rb\nindex 52cfbe3e0b..f3698f14b9 100644\n--- a/app/serializers/basic_topic_serializer.rb\n+++ b/app/serializers/basic_topic_serializer.rb\n@@ -2,7 +2,7 @@\n\n # The most basic attributes of a topic that we need to create a link for it.\n class BasicTopicSerializer < ApplicationSerializer\n- attributes :id, :title, :fancy_title, :slug, :posts_count\n+ attributes :id, :title, :fancy_title, :slug, :posts_count, :external_id\n\n def fancy_title\n f = object.fancy_title\ndiff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb\nindex 4370366bcb..be810e7c79 100644\n--- a/app/serializers/topic_view_serializer.rb\n+++ b/app/serializers/topic_view_serializer.rb\n@@ -79,6 +79,7 @@ class TopicViewSerializer < ApplicationSerializer\n :is_shared_draft,\n :slow_mode_enabled_until,\n :has_localized_content,\n+ :external_id,\n )\n\n has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects\n@@ -339,4 +340,8 @@ class TopicViewSerializer < ApplicationSerializer\n def include_has_localized_content?\n SiteSetting.experimental_content_localization\n end\n+\n+ def external_id\n+ object.topic.external_id\n+ end\n end\ndiff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb\nindex 0958de3d9d..e5416c643d 100644\n--- a/app/serializers/user_action_serializer.rb\n+++ b/app/serializers/user_action_serializer.rb\n@@ -33,7 +33,9 @@ class UserActionSerializer < ApplicationSerializer\n :edit_reason,\n :category_id,\n :closed,\n- :archived\n+ :archived,\n+ :external_id,\n+ :reply_to_post_external_id\n\n def avatar_template\n User.avatar_template(object.username, object.uploaded_avatar_id)\n@@ -71,6 +73,10 @@ class UserActionSerializer < ApplicationSerializer\n object.action_type == UserAction::REPLY\n end\n\n+ def include_reply_to_post_external_id?\n+ object.action_type == UserAction::REPLY\n+ end\n+\n def include_edit_reason?\n object.action_type == UserAction::EDIT\n end\n@@ -83,6 +89,14 @@ class UserActionSerializer < ApplicationSerializer\n object.topic_archived\n end\n\n+ def external_id\n+ object&.external_id\n+ end\n+\n+ def reply_to_post_external_id\n+ object&.reply_to_post_external_id\n+ end\n+\n def include_action_code_who?\n action_code_who.present?\n end\ndiff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb\nindex f9d23ec771..3618e2a685 100644\n--- a/config/initializers/008-rack-cors.rb\n+++ b/config/initializers/008-rack-cors.rb\n@@ -45,7 +45,7 @@ class Discourse::Cors\n headers[\"Access-Control-Allow-Origin\"] = origin || cors_origins[0]\n headers[\n \"Access-Control-Allow-Headers\"\n- ] = \"Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization\"\n+ ] = \"Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization, Api-Username, Api-Key\"\n headers[\"Access-Control-Allow-Credentials\"] = \"true\"\n headers[\"Access-Control-Allow-Methods\"] = \"POST, PUT, GET, OPTIONS, DELETE\"\n headers[\"Access-Control-Max-Age\"] = \"7200\"\ndiff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb\nindex 9db88e1e1c..e3fa5ac1d3 100644\n--- a/config/initializers/012-web_hook_events.rb\n+++ b/config/initializers/012-web_hook_events.rb\n@@ -32,6 +32,20 @@ DiscourseEvent.on(:post_edited) do |post, topic_changed|\n end\n end\n\n+# after_initialize do\n+# DiscourseEvent.on(:post_created) do |post, opts, user|\n+# external_id = opts[:external_id].presence || SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+# post.update_column(:external_id, external_id)\n+# end\n+# end\n+#\n+# after_initialize do\n+# DiscourseEvent.on(:topic_created) do |topic, opts, user|\n+# external_id = opts[:external_id].presence || SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+# topic.update_column(:external_id, external_id)\n+# end\n+# end\n+\n %i[\n user_logged_out\n user_created\ndiff --git a/config/puma.rb b/config/puma.rb\nindex c349148f57..0e936565da 100644\n--- a/config/puma.rb\n+++ b/config/puma.rb\n@@ -1,18 +1,150 @@\n # frozen_string_literal: true\n\n+require \"fileutils\"\n+#require 'puma/acme'\n+\n+discourse_path = File.expand_path(File.expand_path(File.dirname(__FILE__)) + \"/../\")\n+\n+enable_logstash_logger = ENV[\"ENABLE_LOGSTASH_LOGGER\"] == \"1\"\n+puma_stderr_path = \"#{discourse_path}/log/puma.stderr.log\"\n+puma_stdout_path = \"#{discourse_path}/log/puma.stdout.log\"\n+\n+# Load logstash logger if enabled\n+if enable_logstash_logger\n+ require_relative \"../lib/discourse_logstash_logger\"\n+ FileUtils.touch(puma_stderr_path) if !File.exist?(puma_stderr_path)\n+ # Note: You may need to adapt the logger initialization for Puma\n+ log_formatter = proc do |severity, time, progname, msg|\n+ event = {\n+ \"@timestamp\" => Time.now.utc,\n+ \"message\" => msg,\n+ \"severity\" => severity,\n+ \"type\" => \"puma\"\n+ }\n+ \"#{event.to_json}\\n\"\n+ end\n+else\n+ stdout_redirect puma_stdout_path, puma_stderr_path, true\n+end\n+\n+# Number of workers (processes)\n+workers ENV.fetch(\"PUMA_WORKERS\", 8).to_i\n+\n+# Set the directory\n+directory discourse_path\n+\n+# Bind to the specified address and port\n+bind ENV.fetch(\"PUMA_BIND\", \"tcp://#{ENV['PUMA_BIND_ALL'] ? '' : '127.0.0.1:'}#{ENV.fetch('PUMA_PORT', 3000)}\")\n+#bind 'tcp://0.0.0.0:80'\n+#plugin :acme\n+#acme_server_name 'xjtu.app'\n+#acme_tos_agreed true\n+#bind 'acme://0.0.0.0:443'\n+\n+# PID file location\n+FileUtils.mkdir_p(\"#{discourse_path}/tmp/pids\")\n+pidfile ENV.fetch(\"PUMA_PID_PATH\", \"#{discourse_path}/tmp/pids/puma.pid\")\n+\n+# State file - used by pumactl\n+state_path \"#{discourse_path}/tmp/pids/puma.state\"\n+\n+# Environment-specific configuration\n if ENV[\"RAILS_ENV\"] == \"production\"\n- # First, you need to change these below to your situation.\n- APP_ROOT = ENV[\"APP_ROOT\"] || \"/home/discourse/discourse\"\n- num_workers = ENV[\"NUM_WEBS\"].to_i > 0 ? ENV[\"NUM_WEBS\"].to_i : 4\n-\n- # Second, you can choose how many threads that you are going to run at same time.\n- workers \"#{num_workers}\"\n- threads 8, 32\n-\n- # Unless you know what you are changing, do not change them.\n- bind \"unix://#{APP_ROOT}/tmp/sockets/puma.sock\"\n- stdout_redirect \"#{APP_ROOT}/log/puma.log\", \"#{APP_ROOT}/log/puma.err.log\"\n- pidfile \"#{APP_ROOT}/tmp/pids/puma.pid\"\n- state_path \"#{APP_ROOT}/tmp/pids/puma.state\"\n- preload_app!\n+ # Production timeout\n+ worker_timeout 30\n+else\n+ # Development timeout\n+ worker_timeout ENV.fetch(\"PUMA_TIMEOUT\", 60).to_i\n end\n+\n+# Preload application\n+preload_app!\n+\n+# Handle worker boot and shutdown\n+before_fork do\n+ Discourse.preload_rails!\n+ Discourse.before_fork\n+\n+ # Supervisor check\n+ supervisor_pid = ENV[\"PUMA_SUPERVISOR_PID\"].to_i\n+ if supervisor_pid > 0\n+ Thread.new do\n+ loop do\n+ unless File.exist?(\"/proc/#{supervisor_pid}\")\n+ puts \"Kill self supervisor is gone\"\n+ Process.kill \"TERM\", Process.pid\n+ end\n+ sleep 2\n+ end\n+ end\n+ end\n+\n+ # Sidekiq workers\n+ sidekiqs = ENV[\"PUMA_SIDEKIQS\"].to_i\n+ if sidekiqs > 0\n+ puts \"starting #{sidekiqs} supervised sidekiqs\"\n+\n+ require \"demon/sidekiq\"\n+ Demon::Sidekiq.after_fork { DiscourseEvent.trigger(:sidekiq_fork_started) }\n+ Demon::Sidekiq.start(sidekiqs)\n+\n+ if Discourse.enable_sidekiq_logging?\n+ Signal.trap(\"USR1\") do\n+ # Delay Sidekiq log reopening\n+ sleep 1\n+ Demon::Sidekiq.kill(\"USR2\")\n+ end\n+ end\n+ end\n+\n+ # Email sync demon\n+ if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n+ puts \"starting up EmailSync demon\"\n+ Demon::EmailSync.start(1)\n+ end\n+\n+ # Plugin demons\n+ DiscoursePluginRegistry.demon_processes.each do |demon_class|\n+ puts \"starting #{demon_class.prefix} demon\"\n+ demon_class.start(1)\n+ end\n+\n+ # Demon monitoring thread\n+ Thread.new do\n+ loop do\n+ begin\n+ sleep 60\n+\n+ if sidekiqs > 0\n+ Demon::Sidekiq.ensure_running\n+ Demon::Sidekiq.heartbeat_check\n+ Demon::Sidekiq.rss_memory_check\n+ end\n+\n+ if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n+ Demon::EmailSync.ensure_running\n+ Demon::EmailSync.check_email_sync_heartbeat\n+ end\n+\n+ DiscoursePluginRegistry.demon_processes.each(&:ensure_running)\n+ rescue => e\n+ Rails.logger.warn(\"Error in demon processes heartbeat check: #{e}\\n#{e.backtrace.join(\"\\n\")}\")\n+ end\n+ end\n+ end\n+\n+ # Close Redis connection\n+ Discourse.redis.close\n+end\n+\n+on_worker_boot do\n+ DiscourseEvent.trigger(:web_fork_started)\n+ Discourse.after_fork\n+end\n+\n+# Worker timeout handling\n+worker_timeout 30\n+\n+# Low-level worker options\n+threads 8, 32\n+\ndiff --git a/config/routes.rb b/config/routes.rb\nindex ea34bf4be6..3a7d67a861 100644\n--- a/config/routes.rb\n+++ b/config/routes.rb\n@@ -8,16 +8,17 @@ USERNAME_ROUTE_FORMAT = /[%\\w.\\-]+?/ unless defined?(USERNAME_ROUTE_FORMAT)\n BACKUP_ROUTE_FORMAT = /.+\\.(sql\\.gz|tar\\.gz|tgz)/i unless defined?(BACKUP_ROUTE_FORMAT)\n\n Discourse::Application.routes.draw do\n- def patch(*)\n- end # Disable PATCH requests\n+ def patch(*) end\n+\n+ # Disable PATCH requests\n\n scope path: nil, constraints: { format: %r{(json|html|\\*/\\*)} } do\n relative_url_root =\n (\n if (\n- defined?(Rails.configuration.relative_url_root) &&\n- Rails.configuration.relative_url_root\n- )\n+ defined?(Rails.configuration.relative_url_root) &&\n+ Rails.configuration.relative_url_root\n+ )\n Rails.configuration.relative_url_root + \"/\"\n else\n \"/\"\n@@ -1056,6 +1057,7 @@ Discourse::Application.routes.draw do\n :constraints => {\n format: /(json|rss)/,\n }\n+ get \"posts/by_external_id/:external_id\" => \"posts#by_external_id\", format: :json, constrains: { external_id: /\\A[\\w-]+\\z/ }\n get \"posts/by_number/:topic_id/:post_number\" => \"posts#by_number\"\n get \"posts/by-date/:topic_id/:date\" => \"posts#by_date\"\n get \"posts/:id/reply-history\" => \"posts#reply_history\"\n@@ -1366,7 +1368,11 @@ Discourse::Application.routes.draw do\n\n # Topic routes\n get \"t/id_for/:slug\" => \"topics#id_for_slug\"\n- get \"t/external_id/:external_id\" => \"topics#show_by_external_id\",\n+ get \"t_external_id_redir/:external_id\" => \"topics#external_id_redir\",\n+ :constraints => {\n+ external_id: /[\\w-]+/,\n+ }\n+ get \"t_external_id/:external_id\" => \"topics#external_id_json\",\n :format => :json,\n :constraints => {\n external_id: /[\\w-]+/,\n@@ -1470,7 +1476,6 @@ Discourse::Application.routes.draw do\n :constraints => {\n topic_id: /\\d+/,\n }\n-\n get \"p/:post_id(/:user_id)\" => \"posts#short_link\"\n get \"/posts/:id/cooked\" => \"posts#cooked\"\n get \"/posts/:id/expand-embed\" => \"posts#expand_embed\"\ndiff --git a/config/site_settings.yml b/config/site_settings.yml\nindex bd5184931e..99b06eef93 100644\n--- a/config/site_settings.yml\n+++ b/config/site_settings.yml\n@@ -39,6 +39,9 @@\n # type: file_size_restriction - A file size restriction in bytes.\n #\n required:\n+ external_id_length:\n+ client: true\n+ default: 16\n title:\n client: true\n default: \"Discourse\"\ndiff --git a/db/migrate/20241213085000_add_external_id_to_posts.rb b/db/migrate/20241213085000_add_external_id_to_posts.rb\nnew file mode 100644\nindex 0000000000..e32104e1b9\n--- /dev/null\n+++ b/db/migrate/20241213085000_add_external_id_to_posts.rb\n@@ -0,0 +1,8 @@\n+# frozen_string_literal: true\n+\n+class AddExternalIdToPosts < ActiveRecord::Migration[7.2]\n+ def change\n+ add_column :posts, :external_id, :string, null: true\n+ add_index :posts, :external_id, unique: true, where: \"external_id IS NOT NULL\"\n+ end\n+end\ndiff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb\nindex ba461a74fd..385ec2858a 100644\n--- a/lib/auth/default_current_user_provider.rb\n+++ b/lib/auth/default_current_user_provider.rb\n@@ -78,14 +78,14 @@ class Auth::DefaultCurrentUserProvider\n return env[DECRYPTED_AUTH_COOKIE] if env.key?(DECRYPTED_AUTH_COOKIE)\n\n env[DECRYPTED_AUTH_COOKIE] = begin\n- request = ActionDispatch::Request.new(env)\n- cookie = request.cookies[TOKEN_COOKIE]\n-\n- # don't even initialize a cookie jar if we don't have a cookie at all\n- if cookie&.valid_encoding? && cookie.present?\n- request.cookie_jar.encrypted[TOKEN_COOKIE]&.with_indifferent_access\n- end\n- end\n+ request = ActionDispatch::Request.new(env)\n+ cookie = request.cookies[TOKEN_COOKIE]\n+\n+ # don't even initialize a cookie jar if we don't have a cookie at all\n+ if cookie&.valid_encoding? && cookie.present?\n+ request.cookie_jar.encrypted[TOKEN_COOKIE]&.with_indifferent_access\n+ end\n+ end\n end\n\n # do all current user initialization here\n@@ -160,10 +160,10 @@ class Auth::DefaultCurrentUserProvider\n current_user = lookup_api_user(api_key, request)\n if !current_user\n raise Discourse::InvalidAccess.new(\n- I18n.t(\"invalid_api_credentials\"),\n- nil,\n- custom_message: \"invalid_api_credentials\",\n- )\n+ I18n.t(\"invalid_api_credentials\"),\n+ nil,\n+ custom_message: \"invalid_api_credentials\",\n+ )\n end\n raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active\n\n@@ -246,10 +246,10 @@ class Auth::DefaultCurrentUserProvider\n\n if needs_rotation\n if @user_token.rotate!(\n- user_agent: @env[\"HTTP_USER_AGENT\"],\n- client_ip: @request.ip,\n- path: @env[\"REQUEST_PATH\"],\n- )\n+ user_agent: @env[\"HTTP_USER_AGENT\"],\n+ client_ip: @request.ip,\n+ path: @env[\"REQUEST_PATH\"],\n+ )\n set_auth_cookie!(@user_token.unhashed_auth_token, user, cookie_jar)\n DiscourseEvent.trigger(:user_session_refreshed, user)\n end\n@@ -309,7 +309,7 @@ class Auth::DefaultCurrentUserProvider\n # DISCOURSE_DEVELOPER_EMAILS for self-hosters.\n def make_developer_admin(user)\n if user.active? && !user.admin && Rails.configuration.respond_to?(:developer_emails) &&\n- Rails.configuration.developer_emails.include?(user.email)\n+ Rails.configuration.developer_emails.include?(user.email)\n user.admin = true\n user.save\n Group.refresh_automatic_groups!(:staff, :admins)\n@@ -382,13 +382,13 @@ class Auth::DefaultCurrentUserProvider\n\n user =\n if api_key.user\n- api_key.user if !api_username || (api_key.user.username_lower == api_username.downcase)\n+ api_key.user if !api_username || (api_key.user.username_lower == api_username.downcase) || (URI.encode_uri_component(api_key.user.username_lower) == api_username)\n elsif api_username\n User.find_by(username_lower: api_username.downcase)\n elsif user_id = header_api_key? ? @env[HEADER_API_USER_ID] : request[\"api_user_id\"]\n User.find_by(id: user_id.to_i)\n elsif external_id =\n- header_api_key? ? @env[HEADER_API_USER_EXTERNAL_ID] : request[\"api_user_external_id\"]\n+ header_api_key? ? @env[HEADER_API_USER_EXTERNAL_ID] : request[\"api_user_external_id\"]\n SingleSignOnRecord.find_by(external_id: external_id.to_s).try(:user)\n end\n\ndiff --git a/app/assets/javascripts/discourse/app/components/d-editor.gjs b/app/assets/javascripts/discourse/app/components/d-editor.gjs\nindex b2973444ec..857dd9cb89 100644\n--- a/app/assets/javascripts/discourse/app/components/d-editor.gjs\n+++ b/app/assets/javascripts/discourse/app/components/d-editor.gjs\n@@ -548,6 +548,8 @@ export default class DEditor extends Component {\n addText: (text) => this.textManipulation.addText(selected, text),\n getText: () => this.value,\n toggleDirection: () => this.textManipulation.toggleDirection(),\n+ copyLine: () => this.textManipulation.copyLine(),\n+ cutLine: () => this.textManipulation.cutLine(),\n replaceText: (oldVal, newVal, opts) =>\n this.textManipulation.replaceText(oldVal, newVal, opts),\n };\ndiff --git a/app/assets/javascripts/discourse/app/lib/composer/toolbar.js b/app/assets/javascripts/discourse/app/lib/composer/toolbar.js\nindex b5966bbf69..056f29ab30 100644\n--- a/app/assets/javascripts/discourse/app/lib/composer/toolbar.js\n+++ b/app/assets/javascripts/discourse/app/lib/composer/toolbar.js\n@@ -183,6 +183,28 @@ export default class Toolbar extends ToolbarBase {\n \"list_item\"\n ),\n });\n+\n+ this.addButton({\n+ id: \"copyline\",\n+ group: \"fontStyles\",\n+ icon: \"copy\",\n+ rawlabel: \"Copy\",\n+ shortcut: \"C\",\n+ preventFocus: true,\n+ trimLeading: true,\n+ perform: (e) => e.copyLine(),\n+ });\n+\n+ this.addButton({\n+ id: \"cutline\",\n+ group: \"fontStyles\",\n+ icon: \"scissors\",\n+ rawlabel: \"Cut\",\n+ shortcut: \"X\",\n+ preventFocus: true,\n+ trimLeading: true,\n+ perform: (e) => e.cutLine(),\n+ });\n }\n\n if (this.siteSettings.support_mixed_text_direction) {\ndiff --git a/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js\nindex 900382d218..36eba0d7fa 100644\n--- a/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js\n+++ b/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js\n@@ -13,6 +13,7 @@ import { siteDir } from \"discourse/lib/text-direction\";\n import toMarkdown from \"discourse/lib/to-markdown\";\n import {\n caretPosition,\n+ clipboardCopy,\n clipboardHelpers,\n determinePostReplaceSelection,\n inCodeBlock,\n@@ -54,6 +55,16 @@ function getHead(head, prev) {\n }\n }\n\n+function lengthAfterLastLF(str) {\n+ const L = str.length;\n+ for (let i = 0; i < L; i++) {\n+ if (str[L - 1 - i] === \"\\n\") {\n+ return i;\n+ }\n+ }\n+ return L;\n+}\n+\n /** @implements {TextManipulation} */\n export default class TextareaTextManipulation {\n @service appEvents;\n@@ -764,6 +775,35 @@ export default class TextareaTextManipulation {\n this.$textarea.attr(\"dir\", newDir).focus();\n }\n\n+ @bind\n+ copyLine() {\n+ const sel = this.getSelected(\"\", { lineVal: true });\n+ if (sel.start === sel.end) {\n+ clipboardCopy(sel.lineVal);\n+ setCaretPosition(this.textarea, sel.start - lengthAfterLastLF(sel.pre));\n+ } else {\n+ clipboardCopy(sel.value);\n+ }\n+ }\n+\n+ @bind\n+ cutLine() {\n+ const sel = this.getSelected(\"\", { lineVal: true });\n+ if (sel.start === sel.end) {\n+ clipboardCopy(sel.lineVal);\n+ let beforeChars = lengthAfterLastLF(sel.pre);\n+ insertAtTextarea(\n+ this.textarea,\n+ sel.start - beforeChars,\n+ sel.end + sel.lineVal.length - beforeChars,\n+ \"\"\n+ );\n+ } else {\n+ clipboardCopy(sel.value);\n+ insertAtTextarea(this.textarea, sel.start, sel.end, \"\");\n+ }\n+ }\n+\n @bind\n applyList(sel, head, exampleKey, opts) {\n if (sel.value.includes(\"\\n\")) {\ndiff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb\nindex db6f23e1fb..a38ecfa3b7 100644\n--- a/lib/svg_sprite.rb\n+++ b/lib/svg_sprite.rb\n@@ -3,6 +3,7 @@ module SvgSprite\n SVG_ICONS =\n Set.new(\n %w[\n+ scissors\n a\n address-book\n address-card\ndiff --git a/lib/tasks/custom.rake b/lib/tasks/custom.rake\nnew file mode 100644\nindex 0000000000..a9c02343da\n--- /dev/null\n+++ b/lib/tasks/custom.rake\n@@ -0,0 +1,301 @@\n+# frozen_string_literal: true\n+desc 'add external_id for all topics and posts'\n+task 'custom:add-external-id', [:override_existing] => :environment do |task, args|\n+ # use `rake 'custom:add-external-id[1]'` to override topics and posts' existing external_id\n+ # ensure the first post inside topic has the same external_id with the topic\n+ require 'parallel'\n+ require 'securerandom'\n+ Parallel.each(Post.all, progress: \"Posts\") do |post|\n+ if args[:override_existing].present? || post.external_id.blank?\n+ post.update_column(:external_id, SecureRandom.alphanumeric(SiteSetting.external_id_length))\n+ if post.post_number == 1\n+ topic = Topic.find(post.topic_id)\n+ topic.update_column(:external_id, post.external_id)\n+ end\n+ end\n+ end\n+end\n+\n+# rake custom:export-users > users.json\n+# rake custom:export-users > /home/discourse/public-export/users.json\n+desc \"Export all users without sensitive data\"\n+task \"custom:export-users\" => :environment do\n+ require 'json'\n+\n+ a = []\n+ User.find_each(batch_size: 100_000) do |user|\n+ payload = { id: user.id, username: user.username, name: user.name,\n+ admin:user.admin, moderator:user.moderator, trust_level: user.trust_level,\n+ avatar_template: user.avatar_template, title: user.title,\n+ groups: user.groups.map{|i| i.name}, locale: user.locale,\n+ silenced_till: user.silenced_till , staged: user.staged, active: user.active,\n+ created_at:user.created_at.to_i, updated_at:user.updated_at.to_i }\n+ a.push payload\n+ end\n+ puts a.to_json\n+end\n+\n+# rake \"custom:export-posts[0,/home/discourse/public-export/posts.json]\"\n+desc \"Export posts data from non-restricted categories\"\n+task \"custom:export-posts\", [:min_id, :output_file] => :environment do |_, args|\n+ require 'json'\n+\n+ min_id = (args[:min_id] || 0).to_i\n+ output_file = args[:output_file]\n+\n+ puts \"Exporting posts with ID > #{min_id}...\"\n+\n+ base_scope = Post.joins(:topic)\n+ .joins(\"JOIN categories c ON c.id = topics.category_id\")\n+ .where(\"NOT c.read_restricted\")\n+ .where(\"topics.deleted_at IS NULL\")\n+ .where(\"posts.deleted_at IS NULL\")\n+ .where(post_type: 1)\n+ .where(hidden: false)\n+ .where(\"posts.id > ?\", min_id)\n+\n+ # Count without the selected columns\n+ total = base_scope.count\n+ puts \"Found #{total} posts to export\"\n+\n+ posts_data = []\n+\n+ # Now add the select and order for the actual data retrieval\n+ scope = base_scope.select(\"posts.id, posts.raw, posts.cooked, posts.post_number,\n+ posts.topic_id, posts.user_id, posts.created_at,\n+ posts.updated_at, posts.reply_to_post_number,\n+ posts.reply_to_user_id, posts.reply_count,\n+ topics.like_count, topics.word_count\")\n+ .order(\"posts.id ASC\")\n+\n+ progress = 0\n+\n+ scope.find_each(batch_size: 1000) do |post|\n+ posts_data << {\n+ id: post.id,\n+ raw: post.raw,\n+ cooked: post.cooked,\n+ post_number: post.post_number,\n+ topic_id: post.topic_id,\n+ user_id: post.user_id,\n+ created_at: post.created_at,\n+ updated_at: post.updated_at,\n+ reply_to_post_number: post.reply_to_post_number,\n+ reply_to_user_id: post.reply_to_user_id,\n+ reply_count: post.reply_count,\n+ like_count: post.like_count,\n+ word_count: post.word_count\n+ }\n+\n+ progress += 1\n+ if progress % 1000 == 0\n+ puts \"Processed #{progress}/#{total} posts\"\n+ end\n+ end\n+\n+ result = posts_data.to_json\n+\n+ if output_file\n+ File.write(output_file, result)\n+ puts \"Exported data to #{output_file}\"\n+ else\n+ puts result\n+ end\n+\n+ puts \"Export completed. Total posts: #{posts_data.size}\"\n+end\n+\n+\n+# rake \"custom:export-likes[0,/home/discourse/public-export/likes.json]\"\n+desc \"Export post likes data from non-restricted categories\"\n+task \"custom:export-likes\", [:min_id, :output_file] => :environment do |_, args|\n+ require 'json'\n+\n+ min_id = (args[:min_id] || 0).to_i\n+ output_file = args[:output_file]\n+\n+ puts \"Exporting post likes with ID > #{min_id}...\"\n+\n+ # First, get the qualifying post IDs\n+ qualifying_posts = Post.joins(:topic)\n+ .joins(\"JOIN categories c ON c.id = topics.category_id\")\n+ .where(\"NOT c.read_restricted\")\n+ .where(\"topics.deleted_at IS NULL\")\n+ .where(\"posts.deleted_at IS NULL\")\n+ .where(post_type: 1)\n+ .where(hidden: false)\n+ .pluck(:id)\n+\n+ puts \"Found #{qualifying_posts.size} qualifying posts\"\n+\n+ # Now get the likes for these posts\n+ base_scope = PostAction\n+ .where(post_action_type_id: 2) # 2 is the 'like' action type\n+ .where(deleted_at: nil)\n+ .where(\"id > ?\", min_id)\n+ .where(post_id: qualifying_posts)\n+\n+ # Count total likes that match criteria\n+ total = base_scope.count\n+ puts \"Found #{total} likes to export\"\n+\n+ # Exit early if nothing to export\n+ if total == 0\n+ puts \"No likes to export.\"\n+ return\n+ end\n+\n+ # Get the data with ordering\n+ likes_scope = base_scope\n+ .select(:id, :post_id, :user_id, :created_at)\n+ .order(id: :asc)\n+\n+ likes_data = []\n+ progress = 0\n+\n+ # Process in batches to avoid memory issues\n+ likes_scope.find_each(batch_size: 1000) do |like|\n+ likes_data << {\n+ post_id: like.post_id,\n+ user_id: like.user_id,\n+ created_at: like.created_at\n+ }\n+\n+ progress += 1\n+ if progress % 1000 == 0\n+ puts \"Processed #{progress}/#{total} likes\"\n+ end\n+ end\n+\n+ result = likes_data.to_json\n+\n+ if output_file\n+ File.write(output_file, result)\n+ puts \"Exported data to #{output_file}\"\n+ else\n+ puts result\n+ end\n+\n+ puts \"Export completed. Total likes: #{likes_data.size}\"\n+end\n+\n+\n+# rake \"custom:export-topics[0,/home/discourse/public-export/topics.json]\"\n+desc \"Export topics data from non-restricted categories\"\n+task \"custom:export-topics\", [:min_id, :output_file] => :environment do |_, args|\n+ require 'json'\n+\n+ min_id = (args[:min_id] || 0).to_i\n+ output_file = args[:output_file]\n+\n+ puts \"Exporting topics with ID > #{min_id}...\"\n+\n+ # Create base scope for the query\n+ base_scope = Topic.joins(:category)\n+ .where(\"NOT categories.read_restricted\")\n+ .where(\"topics.deleted_at IS NULL\")\n+ .where(archetype: 'regular')\n+ .where(\"topics.id > ?\", min_id)\n+\n+ # Count records without including all the selected fields\n+ total = base_scope.count\n+ puts \"Found #{total} topics to export\"\n+\n+ # Exit early if nothing to export\n+ if total == 0\n+ puts \"No topics to export.\"\n+ return\n+ end\n+\n+ topics_data = []\n+ progress = 0\n+\n+ # Process in batches to avoid memory issues\n+ base_scope.includes(:tags)\n+ .order(id: :asc)\n+ .find_each(batch_size: 1000) do |topic|\n+ # Get tags as a comma-separated string\n+ topics_data << {\n+ id: topic.id,\n+ category_name: topic.category.name,\n+ category_id: topic.category_id,\n+ title: topic.title,\n+ excerpt: topic.excerpt,\n+ created_at: topic.created_at,\n+ last_posted_at: topic.last_posted_at,\n+ updated_at: topic.updated_at,\n+ views: topic.views,\n+ posts_count: topic.posts_count,\n+ like_count: topic.like_count,\n+ user_id: topic.user_id,\n+ last_post_user_id: topic.last_post_user_id,\n+ tags: topic.tags.map{|i| i.name},\n+ }\n+\n+ progress += 1\n+ if progress % 1000 == 0\n+ puts \"Processed #{progress}/#{total} topics\"\n+ end\n+ end\n+\n+ result = topics_data.to_json\n+\n+ if output_file\n+ File.write(output_file, result)\n+ puts \"Exported data to #{output_file}\"\n+ else\n+ puts result\n+ end\n+\n+ puts \"Export completed. Total topics: #{topics_data.size}\"\n+end\n+\n+# rake \"custom:export-all[0,/home/discourse/public-export]\"\n+desc \"Export all data (topics, posts, likes, users) from non-restricted categories\"\n+task \"custom:export-all\", [:min_id, :output_dir] => :environment do |_, args|\n+ min_id = args[:min_id] || 0\n+ output_dir = args[:output_dir] || \"/home/discourse/public-export\"\n+\n+ # Ensure output directory exists\n+ FileUtils.mkdir_p(output_dir) unless Dir.exist?(output_dir)\n+\n+ # Define output file paths\n+ topics_file = File.join(output_dir, \"topics.json\")\n+ posts_file = File.join(output_dir, \"posts.json\")\n+ likes_file = File.join(output_dir, \"likes.json\")\n+ users_file = File.join(output_dir, \"users.json\")\n+\n+ puts \"Beginning export of all data to #{output_dir}...\"\n+\n+ # Export topics\n+ puts \"\\n=== Exporting Topics ===\"\n+ Rake::Task[\"custom:export-topics\"].invoke(min_id, topics_file)\n+ Rake::Task[\"custom:export-topics\"].reenable\n+\n+ # Export posts\n+ puts \"\\n=== Exporting Posts ===\"\n+ Rake::Task[\"custom:export-posts\"].invoke(min_id, posts_file)\n+ Rake::Task[\"custom:export-posts\"].reenable\n+\n+ # Export likes\n+ puts \"\\n=== Exporting Likes ===\"\n+ Rake::Task[\"custom:export-likes\"].invoke(min_id, likes_file)\n+ Rake::Task[\"custom:export-likes\"].reenable\n+\n+ # Export users\n+ puts \"\\n=== Exporting Users ===\"\n+ # Redirect stdout to file since the users task prints to stdout\n+ original_stdout = $stdout\n+ File.open(users_file, 'w') do |f|\n+ $stdout = f\n+ Rake::Task[\"custom:export-users\"].invoke\n+ Rake::Task[\"custom:export-users\"].reenable\n+ end\n+ $stdout = original_stdout\n+\n+ puts \"\\n=== Export Complete ===\"\n+ puts \"Topics exported to: #{topics_file}\"\n+ puts \"Posts exported to: #{posts_file}\"\n+ puts \"Likes exported to: #{likes_file}\"\n+ puts \"Users exported to: #{users_file}\"\n+end\ndiff --git a/lib/post_creator.rb b/lib/post_creator.rb\nindex 2150322ccc..d6de29ec7a 100644\n--- a/lib/post_creator.rb\n+++ b/lib/post_creator.rb\n@@ -489,6 +489,13 @@ class PostCreator\n return if @topic\n begin\n opts = @opts[:topic_opts] ? @opts.merge(@opts[:topic_opts]) : @opts\n+ if @opts[:external_id].present?\n+ opts[:external_id] = @opts[:external_id]\n+ else\n+ external_id = SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+ @opts[:external_id] = external_id\n+ opts[:external_id] = external_id\n+ end\n topic_creator = TopicCreator.new(@user, guardian, opts)\n @topic = topic_creator.create\n rescue ActiveRecord::Rollback\n@@ -556,6 +563,7 @@ class PostCreator\n raw_email\n action_code\n locale\n+ external_id\n ].each { |a| post.public_send(\"#{a}=\", @opts[a]) if @opts[a].present? }\n \n post.extract_quoted_post_numbers\n@@ -577,6 +585,14 @@ class PostCreator\n post.hidden_reason_id = @opts[:hidden_reason_id]\n end\n \n+ if @opts[:external_id].present?\n+ post.external_id = @opts[:external_id]\n+ else\n+ external_id = SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+ @opts[:external_id] = external_id\n+ post.external_id = external_id\n+ end\n+\n @post = post\n end\n\ndiff --git a/lib/auth/result.rb b/lib/auth/result.rb\nindex 12e0906d5c..31b4a725a7 100644\n--- a/lib/auth/result.rb\n+++ b/lib/auth/result.rb\n@@ -25,6 +25,7 @@ class Auth::Result\n overrides_email\n overrides_username\n overrides_name\n+ user_global_api_key\n ]\n \n attr_accessor *ATTRIBUTES\ndiff --git a/lib/discourse_connect_base.rb b/lib/discourse_connect_base.rb\nindex 1e91ecd652..ece7c02283 100644\n--- a/lib/discourse_connect_base.rb\n+++ b/lib/discourse_connect_base.rb\n@@ -40,6 +40,7 @@ class DiscourseConnectBase\n title\n username\n website\n+ user_global_api_key\n ]\n \n FIXNUMS = []\n@@ -89,9 +90,9 @@ class DiscourseConnectBase\n \n raise PayloadParseError.new(<<~MSG) if parsed[\"sso\"] =~ %r{[^a-zA-Z0-9=\\r\\n/+]}m\n The SSO field should be Base64 encoded, using only A-Z, a-z, 0-9, +, /, and = characters.\n- \n+\n Your input contains characters we don't understand as Base64, see http://en.wikipedia.org/wiki/Base64.\n- \n+\n sso: #{parsed[\"sso\"]}\n MSG\n \n@@ -102,9 +103,9 @@ class DiscourseConnectBase\n Bad signature for payload\n \n sso: #{parsed[\"sso\"]}\n- \n+\n sig: #{parsed[\"sig\"]}\n- \n+\n expected sig: #{sso.sign(parsed[\"sso\"])}\n MSG\n \ndiff --git a/lib/second_factor/actions/discourse_connect_provider.rb b/lib/second_factor/actions/discourse_connect_provider.rb\nindex a99be09452..80a613cf59 100644\n--- a/lib/second_factor/actions/discourse_connect_provider.rb\n+++ b/lib/second_factor/actions/discourse_connect_provider.rb\n@@ -72,6 +72,29 @@ module SecondFactor::Actions\n end\n \n def populate_user_data(sso)\n+ current_user_global_api_keys =\n+ ApiKey\n+ .where(hidden: false)\n+ .where(description: 'user-global-api-key')\n+ .where(user_id: current_user.id)\n+ .includes(:user)\n+ .includes(:created_by)\n+ .order(\"revoked_at DESC NULLS FIRST, created_at DESC\")\n+ if current_user_global_api_keys.length > 0\n+ current_user_global_api_keys.destroy_all\n+ end\n+ api_key = ApiKey.new( {\"description\"=>'user-global-api-key'})\n+ api_key_str = \"\"\n+ ApiKey.transaction do\n+ api_key.created_by = current_user\n+ api_key.api_key_scopes = []\n+ api_key.scope_mode = \"global\"\n+ api_key.user = current_user\n+ api_key.save!\n+ api_key_str = api_key.key\n+ StaffActionLogger.new(current_user).log_api_key(api_key, UserHistory.actions[:api_key_create], changes: api_key.saved_changes)\n+ end\n+ sso.user_global_api_key = api_key_str\n sso.name = current_user.name\n sso.username = current_user.username\n sso.email = current_user.email\ndiff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb\nindex db6f23e1fb..40ca73c2ae 100644\n--- a/lib/svg_sprite.rb\n+++ b/lib/svg_sprite.rb\n@@ -218,6 +218,7 @@ module SvgSprite\n robot\n rocket\n rotate\n+ scissors\n screwdriver-wrench\n scroll\n share\n \n```","cooked":"

diff --git a/Gemfile b/Gemfile\nindex bdb7e1134d..69b0b24d81 100644\n--- a/Gemfile\n+++ b/Gemfile\n@@ -3,9 +3,10 @@\n source \"https://rubygems.org\"\n # if there is a super emergency and rubygems is playing up, try\n #source 'http://production.cf.rubygems.org'\n-\n gem \"bootsnap\", require: false, platform: :mri\n-\n+gem \"rspec\"\n+gem \"listen\"\n+gem \"puma-acme\"\n gem \"actionmailer\", \"~> 7.2.0\"\n gem \"actionpack\", \"~> 7.2.0\"\n gem \"actionview\", \"~> 7.2.0\"\n@@ -55,6 +56,7 @@ gem \"discourse-fonts\", require: \"discourse_fonts\"\n\n gem \"message_bus\"\n\n+gem \"rails\"\n gem \"rails_multisite\"\n\n gem \"fastimage\"\n@@ -135,8 +137,6 @@ group :test do\n end\n\n group :test, :development do\n-  gem \"rspec\"\n-  gem \"listen\", require: false\n   gem \"certified\", require: false\n   gem \"fabrication\", require: false\n   gem \"mocha\", require: false\ndiff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb\nindex d1ac78ecf1..bdb1414ff6 100644\n--- a/app/controllers/posts_controller.rb\n+++ b/app/controllers/posts_controller.rb\n@@ -293,6 +293,11 @@ class PostsController < ApplicationController\n     render_json_dump(result)\n   end\n\n+  def by_external_id\n+    post = Post.find_by(external_id: params[:external_id])\n+    display_post(post)\n+  end\n+\n   def show\n     post = find_post_from_params\n     display_post(post)\ndiff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb\nindex 07de153891..ede1b8d174 100644\n--- a/app/controllers/topics_controller.rb\n+++ b/app/controllers/topics_controller.rb\n@@ -43,13 +43,19 @@ class TopicsController < ApplicationController\n     render json: { slug: topic.slug, topic_id: topic.id, url: topic.url }\n   end\n\n-  def show_by_external_id\n+  def external_id_json\n     topic = Topic.find_by(external_id: params[:external_id])\n     raise Discourse::NotFound unless topic\n     guardian.ensure_can_see!(topic)\n     redirect_to_correct_topic(topic, params[:post_number])\n   end\n\n+  def external_id_redir\n+    topic = Topic.find_by(external_id: params[:external_id])\n+    raise Discourse::NotFound unless topic\n+    redirect_to_correct_topic(topic, params[:post_number], true)\n+  end\n+\n   def show\n     if params[:id].is_a?(Array) || params[:id].is_a?(ActionController::Parameters)\n       raise Discourse::InvalidParameters.new(\"Show only accepts a single ID\")\n@@ -1263,7 +1269,7 @@ class TopicsController < ApplicationController\n     end\n   end\n\n-  def redirect_to_correct_topic(topic, post_number = nil)\n+  def redirect_to_correct_topic(topic, post_number = nil, nojson = false)\n     begin\n       guardian.ensure_can_see!(topic)\n     rescue Discourse::InvalidAccess => ex\n@@ -1287,7 +1293,9 @@ class TopicsController < ApplicationController\n\n     url = topic.relative_url\n     url << \"/#{post_number}\" if post_number.to_i > 0\n-    url << \".json\" if request.format.json?\n+    unless nojson\n+      url << \".json\" if request.format.json?\n+    end\n\n     opts.each do |k, v|\n       s = url.include?(\"?\") ? \"&\" : \"?\"\ndiff --git a/app/models/post.rb b/app/models/post.rb\nindex 832e427e0f..febf96b489 100644\n--- a/app/models/post.rb\n+++ b/app/models/post.rb\n@@ -10,6 +10,8 @@ class Post < ActiveRecord::Base\n   include HasCustomFields\n   include LimitedEdit\n\n+  EXTERNAL_ID_MAX_LENGTH = 64\n+\n   self.ignored_columns = [\n     \"avg_time\", # TODO: Remove when 20240212034010_drop_deprecated_columns has been promoted to pre-deploy\n     \"image_url\", # TODO: Remove when 20240212034010_drop_deprecated_columns has been promoted to pre-deploy\n@@ -505,7 +507,8 @@ class Post < ActiveRecord::Base\n   end\n\n   def external_id\n-    \"#{topic_id}/#{post_number}\"\n+    self[:external_id]\n+    # \"#{topic_id}/#{post_number}\"\n   end\n\n   def reply_to_post\ndiff --git a/app/models/topic.rb b/app/models/topic.rb\nindex 40e22fb82a..f3a72008fe 100644\n--- a/app/models/topic.rb\n+++ b/app/models/topic.rb\n@@ -13,7 +13,7 @@ class Topic < ActiveRecord::Base\n   include LimitedEdit\n   extend Forwardable\n\n-  EXTERNAL_ID_MAX_LENGTH = 50\n+  EXTERNAL_ID_MAX_LENGTH = 64\n\n   self.ignored_columns = [\n     \"avg_time\", # TODO: Remove when 20240212034010_drop_deprecated_columns has been promoted to pre-deploy\ndiff --git a/app/models/user_action.rb b/app/models/user_action.rb\nindex b17740e80a..10be47019b 100644\n--- a/app/models/user_action.rb\n+++ b/app/models/user_action.rb\n@@ -208,7 +208,7 @@ class UserAction < ActiveRecord::Base\n         t.title, a.action_type, a.created_at, t.id topic_id,\n         t.closed AS topic_closed, t.archived AS topic_archived,\n         a.user_id AS target_user_id, au.name AS target_name, au.username AS target_username,\n-        coalesce(p.post_number, 1) post_number, p.id as post_id,\n+        coalesce(p.post_number, 1) post_number, p.id as post_id, p.external_id,\n         p.reply_to_post_number,\n         pu.username, pu.name, pu.id user_id,\n         pu.uploaded_avatar_id,\n@@ -221,11 +221,13 @@ class UserAction < ActiveRecord::Base\n         pc.value AS action_code_who,\n         pc2.value AS action_code_path,\n         p.edit_reason,\n-        t.category_id\n+        t.category_id,\n+        p3.external_id as reply_to_post_external_id\n       FROM user_actions as a\n       JOIN topics t on t.id = a.target_topic_id\n       LEFT JOIN posts p on p.id = a.target_post_id\n       JOIN posts p2 on p2.topic_id = a.target_topic_id and p2.post_number = 1\n+      JOIN posts p3 on p3.topic_id = a.target_topic_id and p3.post_number = p.reply_to_post_number\n       JOIN users u on u.id = a.acting_user_id\n       JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id)\n       JOIN users au on au.id = a.user_id\ndiff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb\nindex 029b04bdbf..c1082e188c 100644\n--- a/app/serializers/basic_post_serializer.rb\n+++ b/app/serializers/basic_post_serializer.rb\n@@ -2,7 +2,7 @@\n\n # The most basic attributes of a topic that we need to create a link for it.\n class BasicPostSerializer < ApplicationSerializer\n-  attributes :id, :name, :username, :avatar_template, :created_at, :cooked, :cooked_hidden\n+  attributes :id, :name, :username, :avatar_template, :created_at, :cooked, :cooked_hidden, :external_id\n\n   attr_accessor :topic_view\n\n@@ -26,6 +26,10 @@ class BasicPostSerializer < ApplicationSerializer\n     cooked_hidden\n   end\n\n+  def include_external_id?\n+    external_id\n+  end\n+\n   def cooked\n     if cooked_hidden\n       if scope.current_user && object.user_id == scope.current_user.id\ndiff --git a/app/serializers/basic_topic_serializer.rb b/app/serializers/basic_topic_serializer.rb\nindex 52cfbe3e0b..f3698f14b9 100644\n--- a/app/serializers/basic_topic_serializer.rb\n+++ b/app/serializers/basic_topic_serializer.rb\n@@ -2,7 +2,7 @@\n\n # The most basic attributes of a topic that we need to create a link for it.\n class BasicTopicSerializer < ApplicationSerializer\n-  attributes :id, :title, :fancy_title, :slug, :posts_count\n+  attributes :id, :title, :fancy_title, :slug, :posts_count, :external_id\n\n   def fancy_title\n     f = object.fancy_title\ndiff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb\nindex 4370366bcb..be810e7c79 100644\n--- a/app/serializers/topic_view_serializer.rb\n+++ b/app/serializers/topic_view_serializer.rb\n@@ -79,6 +79,7 @@ class TopicViewSerializer < ApplicationSerializer\n     :is_shared_draft,\n     :slow_mode_enabled_until,\n     :has_localized_content,\n+    :external_id,\n   )\n\n   has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects\n@@ -339,4 +340,8 @@ class TopicViewSerializer < ApplicationSerializer\n   def include_has_localized_content?\n     SiteSetting.experimental_content_localization\n   end\n+\n+  def external_id\n+    object.topic.external_id\n+  end\n end\ndiff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb\nindex 0958de3d9d..e5416c643d 100644\n--- a/app/serializers/user_action_serializer.rb\n+++ b/app/serializers/user_action_serializer.rb\n@@ -33,7 +33,9 @@ class UserActionSerializer < ApplicationSerializer\n              :edit_reason,\n              :category_id,\n              :closed,\n-             :archived\n+             :archived,\n+             :external_id,\n+             :reply_to_post_external_id\n\n   def avatar_template\n     User.avatar_template(object.username, object.uploaded_avatar_id)\n@@ -71,6 +73,10 @@ class UserActionSerializer < ApplicationSerializer\n     object.action_type == UserAction::REPLY\n   end\n\n+  def include_reply_to_post_external_id?\n+    object.action_type == UserAction::REPLY\n+  end\n+\n   def include_edit_reason?\n     object.action_type == UserAction::EDIT\n   end\n@@ -83,6 +89,14 @@ class UserActionSerializer < ApplicationSerializer\n     object.topic_archived\n   end\n\n+  def external_id\n+    object&.external_id\n+  end\n+\n+  def reply_to_post_external_id\n+    object&.reply_to_post_external_id\n+  end\n+\n   def include_action_code_who?\n     action_code_who.present?\n   end\ndiff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb\nindex f9d23ec771..3618e2a685 100644\n--- a/config/initializers/008-rack-cors.rb\n+++ b/config/initializers/008-rack-cors.rb\n@@ -45,7 +45,7 @@ class Discourse::Cors\n       headers[\"Access-Control-Allow-Origin\"] = origin || cors_origins[0]\n       headers[\n         \"Access-Control-Allow-Headers\"\n-      ] = \"Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization\"\n+      ] = \"Content-Type, Cache-Control, X-Requested-With, X-CSRF-Token, Discourse-Present, User-Api-Key, User-Api-Client-Id, Authorization, Api-Username, Api-Key\"\n       headers[\"Access-Control-Allow-Credentials\"] = \"true\"\n       headers[\"Access-Control-Allow-Methods\"] = \"POST, PUT, GET, OPTIONS, DELETE\"\n       headers[\"Access-Control-Max-Age\"] = \"7200\"\ndiff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb\nindex 9db88e1e1c..e3fa5ac1d3 100644\n--- a/config/initializers/012-web_hook_events.rb\n+++ b/config/initializers/012-web_hook_events.rb\n@@ -32,6 +32,20 @@ DiscourseEvent.on(:post_edited) do |post, topic_changed|\n   end\n end\n\n+# after_initialize do\n+#   DiscourseEvent.on(:post_created) do |post, opts, user|\n+#     external_id = opts[:external_id].presence || SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+#     post.update_column(:external_id, external_id)\n+#   end\n+# end\n+#\n+# after_initialize do\n+#   DiscourseEvent.on(:topic_created) do |topic, opts, user|\n+#     external_id = opts[:external_id].presence || SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+#     topic.update_column(:external_id, external_id)\n+#   end\n+# end\n+\n %i[\n   user_logged_out\n   user_created\ndiff --git a/config/puma.rb b/config/puma.rb\nindex c349148f57..0e936565da 100644\n--- a/config/puma.rb\n+++ b/config/puma.rb\n@@ -1,18 +1,150 @@\n # frozen_string_literal: true\n\n+require \"fileutils\"\n+#require 'puma/acme'\n+\n+discourse_path = File.expand_path(File.expand_path(File.dirname(__FILE__)) + \"/../\")\n+\n+enable_logstash_logger = ENV[\"ENABLE_LOGSTASH_LOGGER\"] == \"1\"\n+puma_stderr_path = \"#{discourse_path}/log/puma.stderr.log\"\n+puma_stdout_path = \"#{discourse_path}/log/puma.stdout.log\"\n+\n+# Load logstash logger if enabled\n+if enable_logstash_logger\n+  require_relative \"../lib/discourse_logstash_logger\"\n+  FileUtils.touch(puma_stderr_path) if !File.exist?(puma_stderr_path)\n+  # Note: You may need to adapt the logger initialization for Puma\n+  log_formatter = proc do |severity, time, progname, msg|\n+    event = {\n+      \"@timestamp\" => Time.now.utc,\n+      \"message\" => msg,\n+      \"severity\" => severity,\n+      \"type\" => \"puma\"\n+    }\n+    \"#{event.to_json}\\n\"\n+  end\n+else\n+  stdout_redirect puma_stdout_path, puma_stderr_path, true\n+end\n+\n+# Number of workers (processes)\n+workers ENV.fetch(\"PUMA_WORKERS\", 8).to_i\n+\n+# Set the directory\n+directory discourse_path\n+\n+# Bind to the specified address and port\n+bind ENV.fetch(\"PUMA_BIND\", \"tcp://#{ENV['PUMA_BIND_ALL'] ? '' : '127.0.0.1:'}#{ENV.fetch('PUMA_PORT', 3000)}\")\n+#bind 'tcp://0.0.0.0:80'\n+#plugin :acme\n+#acme_server_name 'xjtu.app'\n+#acme_tos_agreed true\n+#bind 'acme://0.0.0.0:443'\n+\n+# PID file location\n+FileUtils.mkdir_p(\"#{discourse_path}/tmp/pids\")\n+pidfile ENV.fetch(\"PUMA_PID_PATH\", \"#{discourse_path}/tmp/pids/puma.pid\")\n+\n+# State file - used by pumactl\n+state_path \"#{discourse_path}/tmp/pids/puma.state\"\n+\n+# Environment-specific configuration\n if ENV[\"RAILS_ENV\"] == \"production\"\n-  # First, you need to change these below to your situation.\n-  APP_ROOT = ENV[\"APP_ROOT\"] || \"/home/discourse/discourse\"\n-  num_workers = ENV[\"NUM_WEBS\"].to_i > 0 ? ENV[\"NUM_WEBS\"].to_i : 4\n-\n-  # Second, you can choose how many threads that you are going to run at same time.\n-  workers \"#{num_workers}\"\n-  threads 8, 32\n-\n-  # Unless you know what you are changing, do not change them.\n-  bind \"unix://#{APP_ROOT}/tmp/sockets/puma.sock\"\n-  stdout_redirect \"#{APP_ROOT}/log/puma.log\", \"#{APP_ROOT}/log/puma.err.log\"\n-  pidfile \"#{APP_ROOT}/tmp/pids/puma.pid\"\n-  state_path \"#{APP_ROOT}/tmp/pids/puma.state\"\n-  preload_app!\n+  # Production timeout\n+  worker_timeout 30\n+else\n+  # Development timeout\n+  worker_timeout ENV.fetch(\"PUMA_TIMEOUT\", 60).to_i\n end\n+\n+# Preload application\n+preload_app!\n+\n+# Handle worker boot and shutdown\n+before_fork do\n+  Discourse.preload_rails!\n+  Discourse.before_fork\n+\n+  # Supervisor check\n+  supervisor_pid = ENV[\"PUMA_SUPERVISOR_PID\"].to_i\n+  if supervisor_pid > 0\n+    Thread.new do\n+      loop do\n+        unless File.exist?(\"/proc/#{supervisor_pid}\")\n+          puts \"Kill self supervisor is gone\"\n+          Process.kill \"TERM\", Process.pid\n+        end\n+        sleep 2\n+      end\n+    end\n+  end\n+\n+  # Sidekiq workers\n+  sidekiqs = ENV[\"PUMA_SIDEKIQS\"].to_i\n+  if sidekiqs > 0\n+    puts \"starting #{sidekiqs} supervised sidekiqs\"\n+\n+    require \"demon/sidekiq\"\n+    Demon::Sidekiq.after_fork { DiscourseEvent.trigger(:sidekiq_fork_started) }\n+    Demon::Sidekiq.start(sidekiqs)\n+\n+    if Discourse.enable_sidekiq_logging?\n+      Signal.trap(\"USR1\") do\n+        # Delay Sidekiq log reopening\n+        sleep 1\n+        Demon::Sidekiq.kill(\"USR2\")\n+      end\n+    end\n+  end\n+\n+  # Email sync demon\n+  if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n+    puts \"starting up EmailSync demon\"\n+    Demon::EmailSync.start(1)\n+  end\n+\n+  # Plugin demons\n+  DiscoursePluginRegistry.demon_processes.each do |demon_class|\n+    puts \"starting #{demon_class.prefix} demon\"\n+    demon_class.start(1)\n+  end\n+\n+  # Demon monitoring thread\n+  Thread.new do\n+    loop do\n+      begin\n+        sleep 60\n+\n+        if sidekiqs > 0\n+          Demon::Sidekiq.ensure_running\n+          Demon::Sidekiq.heartbeat_check\n+          Demon::Sidekiq.rss_memory_check\n+        end\n+\n+        if ENV[\"DISCOURSE_ENABLE_EMAIL_SYNC_DEMON\"] == \"true\"\n+          Demon::EmailSync.ensure_running\n+          Demon::EmailSync.check_email_sync_heartbeat\n+        end\n+\n+        DiscoursePluginRegistry.demon_processes.each(&:ensure_running)\n+      rescue => e\n+        Rails.logger.warn(\"Error in demon processes heartbeat check: #{e}\\n#{e.backtrace.join(\"\\n\")}\")\n+      end\n+    end\n+  end\n+\n+  # Close Redis connection\n+  Discourse.redis.close\n+end\n+\n+on_worker_boot do\n+  DiscourseEvent.trigger(:web_fork_started)\n+  Discourse.after_fork\n+end\n+\n+# Worker timeout handling\n+worker_timeout 30\n+\n+# Low-level worker options\n+threads 8, 32\n+\ndiff --git a/config/routes.rb b/config/routes.rb\nindex ea34bf4be6..3a7d67a861 100644\n--- a/config/routes.rb\n+++ b/config/routes.rb\n@@ -8,16 +8,17 @@ USERNAME_ROUTE_FORMAT = /[%\\w.\\-]+?/ unless defined?(USERNAME_ROUTE_FORMAT)\n BACKUP_ROUTE_FORMAT = /.+\\.(sql\\.gz|tar\\.gz|tgz)/i unless defined?(BACKUP_ROUTE_FORMAT)\n\n Discourse::Application.routes.draw do\n-  def patch(*)\n-  end # Disable PATCH requests\n+  def patch(*) end\n+\n+  # Disable PATCH requests\n\n   scope path: nil, constraints: { format: %r{(json|html|\\*/\\*)} } do\n     relative_url_root =\n       (\n         if (\n-             defined?(Rails.configuration.relative_url_root) &&\n-               Rails.configuration.relative_url_root\n-           )\n+          defined?(Rails.configuration.relative_url_root) &&\n+            Rails.configuration.relative_url_root\n+        )\n           Rails.configuration.relative_url_root + \"/\"\n         else\n           \"/\"\n@@ -1056,6 +1057,7 @@ Discourse::Application.routes.draw do\n         :constraints => {\n           format: /(json|rss)/,\n         }\n+    get \"posts/by_external_id/:external_id\" => \"posts#by_external_id\", format: :json, constrains: { external_id: /\\A[\\w-]+\\z/ }\n     get \"posts/by_number/:topic_id/:post_number\" => \"posts#by_number\"\n     get \"posts/by-date/:topic_id/:date\" => \"posts#by_date\"\n     get \"posts/:id/reply-history\" => \"posts#reply_history\"\n@@ -1366,7 +1368,11 @@ Discourse::Application.routes.draw do\n\n     # Topic routes\n     get \"t/id_for/:slug\" => \"topics#id_for_slug\"\n-    get \"t/external_id/:external_id\" => \"topics#show_by_external_id\",\n+    get \"t_external_id_redir/:external_id\" => \"topics#external_id_redir\",\n+        :constraints => {\n+          external_id: /[\\w-]+/,\n+        }\n+    get \"t_external_id/:external_id\" => \"topics#external_id_json\",\n         :format => :json,\n         :constraints => {\n           external_id: /[\\w-]+/,\n@@ -1470,7 +1476,6 @@ Discourse::Application.routes.draw do\n          :constraints => {\n            topic_id: /\\d+/,\n          }\n-\n     get \"p/:post_id(/:user_id)\" => \"posts#short_link\"\n     get \"/posts/:id/cooked\" => \"posts#cooked\"\n     get \"/posts/:id/expand-embed\" => \"posts#expand_embed\"\ndiff --git a/config/site_settings.yml b/config/site_settings.yml\nindex bd5184931e..99b06eef93 100644\n--- a/config/site_settings.yml\n+++ b/config/site_settings.yml\n@@ -39,6 +39,9 @@\n # type: file_size_restriction - A file size restriction in bytes.\n #\n required:\n+  external_id_length:\n+    client: true\n+    default: 16\n   title:\n     client: true\n     default: \"Discourse\"\ndiff --git a/db/migrate/20241213085000_add_external_id_to_posts.rb b/db/migrate/20241213085000_add_external_id_to_posts.rb\nnew file mode 100644\nindex 0000000000..e32104e1b9\n--- /dev/null\n+++ b/db/migrate/20241213085000_add_external_id_to_posts.rb\n@@ -0,0 +1,8 @@\n+# frozen_string_literal: true\n+\n+class AddExternalIdToPosts < ActiveRecord::Migration[7.2]\n+  def change\n+    add_column :posts, :external_id, :string, null: true\n+    add_index :posts, :external_id, unique: true, where: \"external_id IS NOT NULL\"\n+  end\n+end\ndiff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb\nindex ba461a74fd..385ec2858a 100644\n--- a/lib/auth/default_current_user_provider.rb\n+++ b/lib/auth/default_current_user_provider.rb\n@@ -78,14 +78,14 @@ class Auth::DefaultCurrentUserProvider\n     return env[DECRYPTED_AUTH_COOKIE] if env.key?(DECRYPTED_AUTH_COOKIE)\n\n     env[DECRYPTED_AUTH_COOKIE] = begin\n-      request = ActionDispatch::Request.new(env)\n-      cookie = request.cookies[TOKEN_COOKIE]\n-\n-      # don't even initialize a cookie jar if we don't have a cookie at all\n-      if cookie&.valid_encoding? && cookie.present?\n-        request.cookie_jar.encrypted[TOKEN_COOKIE]&.with_indifferent_access\n-      end\n-    end\n+                                   request = ActionDispatch::Request.new(env)\n+                                   cookie = request.cookies[TOKEN_COOKIE]\n+\n+                                   # don't even initialize a cookie jar if we don't have a cookie at all\n+                                   if cookie&.valid_encoding? && cookie.present?\n+                                     request.cookie_jar.encrypted[TOKEN_COOKIE]&.with_indifferent_access\n+                                   end\n+                                 end\n   end\n\n   # do all current user initialization here\n@@ -160,10 +160,10 @@ class Auth::DefaultCurrentUserProvider\n       current_user = lookup_api_user(api_key, request)\n       if !current_user\n         raise Discourse::InvalidAccess.new(\n-                I18n.t(\"invalid_api_credentials\"),\n-                nil,\n-                custom_message: \"invalid_api_credentials\",\n-              )\n+          I18n.t(\"invalid_api_credentials\"),\n+          nil,\n+          custom_message: \"invalid_api_credentials\",\n+        )\n       end\n       raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active\n\n@@ -246,10 +246,10 @@ class Auth::DefaultCurrentUserProvider\n\n       if needs_rotation\n         if @user_token.rotate!(\n-             user_agent: @env[\"HTTP_USER_AGENT\"],\n-             client_ip: @request.ip,\n-             path: @env[\"REQUEST_PATH\"],\n-           )\n+          user_agent: @env[\"HTTP_USER_AGENT\"],\n+          client_ip: @request.ip,\n+          path: @env[\"REQUEST_PATH\"],\n+        )\n           set_auth_cookie!(@user_token.unhashed_auth_token, user, cookie_jar)\n           DiscourseEvent.trigger(:user_session_refreshed, user)\n         end\n@@ -309,7 +309,7 @@ class Auth::DefaultCurrentUserProvider\n   # DISCOURSE_DEVELOPER_EMAILS for self-hosters.\n   def make_developer_admin(user)\n     if user.active? && !user.admin && Rails.configuration.respond_to?(:developer_emails) &&\n-         Rails.configuration.developer_emails.include?(user.email)\n+      Rails.configuration.developer_emails.include?(user.email)\n       user.admin = true\n       user.save\n       Group.refresh_automatic_groups!(:staff, :admins)\n@@ -382,13 +382,13 @@ class Auth::DefaultCurrentUserProvider\n\n       user =\n         if api_key.user\n-          api_key.user if !api_username || (api_key.user.username_lower == api_username.downcase)\n+          api_key.user if !api_username || (api_key.user.username_lower == api_username.downcase) || (URI.encode_uri_component(api_key.user.username_lower) == api_username)\n         elsif api_username\n           User.find_by(username_lower: api_username.downcase)\n         elsif user_id = header_api_key? ? @env[HEADER_API_USER_ID] : request[\"api_user_id\"]\n           User.find_by(id: user_id.to_i)\n         elsif external_id =\n-              header_api_key? ? @env[HEADER_API_USER_EXTERNAL_ID] : request[\"api_user_external_id\"]\n+          header_api_key? ? @env[HEADER_API_USER_EXTERNAL_ID] : request[\"api_user_external_id\"]\n           SingleSignOnRecord.find_by(external_id: external_id.to_s).try(:user)\n         end\n\ndiff --git a/app/assets/javascripts/discourse/app/components/d-editor.gjs b/app/assets/javascripts/discourse/app/components/d-editor.gjs\nindex b2973444ec..857dd9cb89 100644\n--- a/app/assets/javascripts/discourse/app/components/d-editor.gjs\n+++ b/app/assets/javascripts/discourse/app/components/d-editor.gjs\n@@ -548,6 +548,8 @@ export default class DEditor extends Component {\n       addText: (text) => this.textManipulation.addText(selected, text),\n       getText: () => this.value,\n       toggleDirection: () => this.textManipulation.toggleDirection(),\n+      copyLine: () => this.textManipulation.copyLine(),\n+      cutLine: () => this.textManipulation.cutLine(),\n       replaceText: (oldVal, newVal, opts) =>\n         this.textManipulation.replaceText(oldVal, newVal, opts),\n     };\ndiff --git a/app/assets/javascripts/discourse/app/lib/composer/toolbar.js b/app/assets/javascripts/discourse/app/lib/composer/toolbar.js\nindex b5966bbf69..056f29ab30 100644\n--- a/app/assets/javascripts/discourse/app/lib/composer/toolbar.js\n+++ b/app/assets/javascripts/discourse/app/lib/composer/toolbar.js\n@@ -183,6 +183,28 @@ export default class Toolbar extends ToolbarBase {\n             \"list_item\"\n           ),\n       });\n+\n+      this.addButton({\n+        id: \"copyline\",\n+        group: \"fontStyles\",\n+        icon: \"copy\",\n+        rawlabel: \"Copy\",\n+        shortcut: \"C\",\n+        preventFocus: true,\n+        trimLeading: true,\n+        perform: (e) => e.copyLine(),\n+      });\n+\n+      this.addButton({\n+        id: \"cutline\",\n+        group: \"fontStyles\",\n+        icon: \"scissors\",\n+        rawlabel: \"Cut\",\n+        shortcut: \"X\",\n+        preventFocus: true,\n+        trimLeading: true,\n+        perform: (e) => e.cutLine(),\n+      });\n     }\n\n     if (this.siteSettings.support_mixed_text_direction) {\ndiff --git a/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js\nindex 900382d218..36eba0d7fa 100644\n--- a/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js\n+++ b/app/assets/javascripts/discourse/app/lib/textarea-text-manipulation.js\n@@ -13,6 +13,7 @@ import { siteDir } from \"discourse/lib/text-direction\";\n import toMarkdown from \"discourse/lib/to-markdown\";\n import {\n   caretPosition,\n+  clipboardCopy,\n   clipboardHelpers,\n   determinePostReplaceSelection,\n   inCodeBlock,\n@@ -54,6 +55,16 @@ function getHead(head, prev) {\n   }\n }\n\n+function lengthAfterLastLF(str) {\n+  const L = str.length;\n+  for (let i = 0; i < L; i++) {\n+    if (str[L - 1 - i] === \"\\n\") {\n+      return i;\n+    }\n+  }\n+  return L;\n+}\n+\n /** @implements {TextManipulation} */\n export default class TextareaTextManipulation {\n   @service appEvents;\n@@ -764,6 +775,35 @@ export default class TextareaTextManipulation {\n     this.$textarea.attr(\"dir\", newDir).focus();\n   }\n\n+  @bind\n+  copyLine() {\n+    const sel = this.getSelected(\"\", { lineVal: true });\n+    if (sel.start === sel.end) {\n+      clipboardCopy(sel.lineVal);\n+      setCaretPosition(this.textarea, sel.start - lengthAfterLastLF(sel.pre));\n+    } else {\n+      clipboardCopy(sel.value);\n+    }\n+  }\n+\n+  @bind\n+  cutLine() {\n+    const sel = this.getSelected(\"\", { lineVal: true });\n+    if (sel.start === sel.end) {\n+      clipboardCopy(sel.lineVal);\n+      let beforeChars = lengthAfterLastLF(sel.pre);\n+      insertAtTextarea(\n+        this.textarea,\n+        sel.start - beforeChars,\n+        sel.end + sel.lineVal.length - beforeChars,\n+        \"\"\n+      );\n+    } else {\n+      clipboardCopy(sel.value);\n+      insertAtTextarea(this.textarea, sel.start, sel.end, \"\");\n+    }\n+  }\n+\n   @bind\n   applyList(sel, head, exampleKey, opts) {\n     if (sel.value.includes(\"\\n\")) {\ndiff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb\nindex db6f23e1fb..a38ecfa3b7 100644\n--- a/lib/svg_sprite.rb\n+++ b/lib/svg_sprite.rb\n@@ -3,6 +3,7 @@ module SvgSprite\n   SVG_ICONS =\n     Set.new(\n       %w[\n+        scissors\n         a\n         address-book\n         address-card\ndiff --git a/lib/tasks/custom.rake b/lib/tasks/custom.rake\nnew file mode 100644\nindex 0000000000..a9c02343da\n--- /dev/null\n+++ b/lib/tasks/custom.rake\n@@ -0,0 +1,301 @@\n+# frozen_string_literal: true\n+desc 'add external_id for all topics and posts'\n+task 'custom:add-external-id', [:override_existing] => :environment do |task, args|\n+  # use `rake 'custom:add-external-id[1]'` to override topics and posts' existing external_id\n+  # ensure the first post inside topic has the same external_id with the topic\n+  require 'parallel'\n+  require 'securerandom'\n+  Parallel.each(Post.all, progress: \"Posts\") do |post|\n+    if args[:override_existing].present? || post.external_id.blank?\n+      post.update_column(:external_id, SecureRandom.alphanumeric(SiteSetting.external_id_length))\n+      if post.post_number == 1\n+        topic = Topic.find(post.topic_id)\n+        topic.update_column(:external_id, post.external_id)\n+      end\n+    end\n+  end\n+end\n+\n+# rake custom:export-users > users.json\n+# rake custom:export-users > /home/discourse/public-export/users.json\n+desc \"Export all users without sensitive data\"\n+task \"custom:export-users\" => :environment do\n+  require 'json'\n+\n+  a = []\n+  User.find_each(batch_size: 100_000)  do |user|\n+    payload = {  id: user.id, username: user.username, name: user.name,\n+                 admin:user.admin, moderator:user.moderator, trust_level: user.trust_level,\n+                 avatar_template: user.avatar_template, title: user.title,\n+                 groups: user.groups.map{|i| i.name}, locale: user.locale,\n+                 silenced_till: user.silenced_till , staged: user.staged, active: user.active,\n+                 created_at:user.created_at.to_i, updated_at:user.updated_at.to_i }\n+    a.push payload\n+  end\n+  puts a.to_json\n+end\n+\n+# rake \"custom:export-posts[0,/home/discourse/public-export/posts.json]\"\n+desc \"Export posts data from non-restricted categories\"\n+task \"custom:export-posts\", [:min_id, :output_file] => :environment do |_, args|\n+  require 'json'\n+\n+  min_id = (args[:min_id] || 0).to_i\n+  output_file = args[:output_file]\n+\n+  puts \"Exporting posts with ID > #{min_id}...\"\n+\n+  base_scope = Post.joins(:topic)\n+                   .joins(\"JOIN categories c ON c.id = topics.category_id\")\n+                   .where(\"NOT c.read_restricted\")\n+                   .where(\"topics.deleted_at IS NULL\")\n+                   .where(\"posts.deleted_at IS NULL\")\n+                   .where(post_type: 1)\n+                   .where(hidden: false)\n+                   .where(\"posts.id > ?\", min_id)\n+\n+  # Count without the selected columns\n+  total = base_scope.count\n+  puts \"Found #{total} posts to export\"\n+\n+  posts_data = []\n+\n+  # Now add the select and order for the actual data retrieval\n+  scope = base_scope.select(\"posts.id, posts.raw, posts.cooked, posts.post_number,\n+                  posts.topic_id, posts.user_id, posts.created_at,\n+                  posts.updated_at, posts.reply_to_post_number,\n+                  posts.reply_to_user_id, posts.reply_count,\n+                  topics.like_count, topics.word_count\")\n+                    .order(\"posts.id ASC\")\n+\n+  progress = 0\n+\n+  scope.find_each(batch_size: 1000) do |post|\n+    posts_data << {\n+      id: post.id,\n+      raw: post.raw,\n+      cooked: post.cooked,\n+      post_number: post.post_number,\n+      topic_id: post.topic_id,\n+      user_id: post.user_id,\n+      created_at: post.created_at,\n+      updated_at: post.updated_at,\n+      reply_to_post_number: post.reply_to_post_number,\n+      reply_to_user_id: post.reply_to_user_id,\n+      reply_count: post.reply_count,\n+      like_count: post.like_count,\n+      word_count: post.word_count\n+    }\n+\n+    progress += 1\n+    if progress % 1000 == 0\n+      puts \"Processed #{progress}/#{total} posts\"\n+    end\n+  end\n+\n+  result = posts_data.to_json\n+\n+  if output_file\n+    File.write(output_file, result)\n+    puts \"Exported data to #{output_file}\"\n+  else\n+    puts result\n+  end\n+\n+  puts \"Export completed. Total posts: #{posts_data.size}\"\n+end\n+\n+\n+# rake \"custom:export-likes[0,/home/discourse/public-export/likes.json]\"\n+desc \"Export post likes data from non-restricted categories\"\n+task \"custom:export-likes\", [:min_id, :output_file] => :environment do |_, args|\n+  require 'json'\n+\n+  min_id = (args[:min_id] || 0).to_i\n+  output_file = args[:output_file]\n+\n+  puts \"Exporting post likes with ID > #{min_id}...\"\n+\n+  # First, get the qualifying post IDs\n+  qualifying_posts = Post.joins(:topic)\n+                         .joins(\"JOIN categories c ON c.id = topics.category_id\")\n+                         .where(\"NOT c.read_restricted\")\n+                         .where(\"topics.deleted_at IS NULL\")\n+                         .where(\"posts.deleted_at IS NULL\")\n+                         .where(post_type: 1)\n+                         .where(hidden: false)\n+                         .pluck(:id)\n+\n+  puts \"Found #{qualifying_posts.size} qualifying posts\"\n+\n+  # Now get the likes for these posts\n+  base_scope = PostAction\n+                 .where(post_action_type_id: 2) # 2 is the 'like' action type\n+                 .where(deleted_at: nil)\n+                 .where(\"id > ?\", min_id)\n+                 .where(post_id: qualifying_posts)\n+\n+  # Count total likes that match criteria\n+  total = base_scope.count\n+  puts \"Found #{total} likes to export\"\n+\n+  # Exit early if nothing to export\n+  if total == 0\n+    puts \"No likes to export.\"\n+    return\n+  end\n+\n+  # Get the data with ordering\n+  likes_scope = base_scope\n+                  .select(:id, :post_id, :user_id, :created_at)\n+                  .order(id: :asc)\n+\n+  likes_data = []\n+  progress = 0\n+\n+  # Process in batches to avoid memory issues\n+  likes_scope.find_each(batch_size: 1000) do |like|\n+    likes_data << {\n+      post_id: like.post_id,\n+      user_id: like.user_id,\n+      created_at: like.created_at\n+    }\n+\n+    progress += 1\n+    if progress % 1000 == 0\n+      puts \"Processed #{progress}/#{total} likes\"\n+    end\n+  end\n+\n+  result = likes_data.to_json\n+\n+  if output_file\n+    File.write(output_file, result)\n+    puts \"Exported data to #{output_file}\"\n+  else\n+    puts result\n+  end\n+\n+  puts \"Export completed. Total likes: #{likes_data.size}\"\n+end\n+\n+\n+# rake \"custom:export-topics[0,/home/discourse/public-export/topics.json]\"\n+desc \"Export topics data from non-restricted categories\"\n+task \"custom:export-topics\", [:min_id, :output_file] => :environment do |_, args|\n+  require 'json'\n+\n+  min_id = (args[:min_id] || 0).to_i\n+  output_file = args[:output_file]\n+\n+  puts \"Exporting topics with ID > #{min_id}...\"\n+\n+  # Create base scope for the query\n+  base_scope = Topic.joins(:category)\n+                    .where(\"NOT categories.read_restricted\")\n+                    .where(\"topics.deleted_at IS NULL\")\n+                    .where(archetype: 'regular')\n+                    .where(\"topics.id > ?\", min_id)\n+\n+  # Count records without including all the selected fields\n+  total = base_scope.count\n+  puts \"Found #{total} topics to export\"\n+\n+  # Exit early if nothing to export\n+  if total == 0\n+    puts \"No topics to export.\"\n+    return\n+  end\n+\n+  topics_data = []\n+  progress = 0\n+\n+  # Process in batches to avoid memory issues\n+  base_scope.includes(:tags)\n+            .order(id: :asc)\n+            .find_each(batch_size: 1000) do |topic|\n+    # Get tags as a comma-separated string\n+    topics_data << {\n+      id: topic.id,\n+      category_name: topic.category.name,\n+      category_id: topic.category_id,\n+      title: topic.title,\n+      excerpt: topic.excerpt,\n+      created_at: topic.created_at,\n+      last_posted_at: topic.last_posted_at,\n+      updated_at: topic.updated_at,\n+      views: topic.views,\n+      posts_count: topic.posts_count,\n+      like_count: topic.like_count,\n+      user_id: topic.user_id,\n+      last_post_user_id: topic.last_post_user_id,\n+      tags: topic.tags.map{|i| i.name},\n+    }\n+\n+    progress += 1\n+    if progress % 1000 == 0\n+      puts \"Processed #{progress}/#{total} topics\"\n+    end\n+  end\n+\n+  result = topics_data.to_json\n+\n+  if output_file\n+    File.write(output_file, result)\n+    puts \"Exported data to #{output_file}\"\n+  else\n+    puts result\n+  end\n+\n+  puts \"Export completed. Total topics: #{topics_data.size}\"\n+end\n+\n+# rake \"custom:export-all[0,/home/discourse/public-export]\"\n+desc \"Export all data (topics, posts, likes, users) from non-restricted categories\"\n+task \"custom:export-all\", [:min_id, :output_dir] => :environment do |_, args|\n+  min_id = args[:min_id] || 0\n+  output_dir = args[:output_dir] || \"/home/discourse/public-export\"\n+\n+  # Ensure output directory exists\n+  FileUtils.mkdir_p(output_dir) unless Dir.exist?(output_dir)\n+\n+  # Define output file paths\n+  topics_file = File.join(output_dir, \"topics.json\")\n+  posts_file = File.join(output_dir, \"posts.json\")\n+  likes_file = File.join(output_dir, \"likes.json\")\n+  users_file = File.join(output_dir, \"users.json\")\n+\n+  puts \"Beginning export of all data to #{output_dir}...\"\n+\n+  # Export topics\n+  puts \"\\n=== Exporting Topics ===\"\n+  Rake::Task[\"custom:export-topics\"].invoke(min_id, topics_file)\n+  Rake::Task[\"custom:export-topics\"].reenable\n+\n+  # Export posts\n+  puts \"\\n=== Exporting Posts ===\"\n+  Rake::Task[\"custom:export-posts\"].invoke(min_id, posts_file)\n+  Rake::Task[\"custom:export-posts\"].reenable\n+\n+  # Export likes\n+  puts \"\\n=== Exporting Likes ===\"\n+  Rake::Task[\"custom:export-likes\"].invoke(min_id, likes_file)\n+  Rake::Task[\"custom:export-likes\"].reenable\n+\n+  # Export users\n+  puts \"\\n=== Exporting Users ===\"\n+  # Redirect stdout to file since the users task prints to stdout\n+  original_stdout = $stdout\n+  File.open(users_file, 'w') do |f|\n+    $stdout = f\n+    Rake::Task[\"custom:export-users\"].invoke\n+    Rake::Task[\"custom:export-users\"].reenable\n+  end\n+  $stdout = original_stdout\n+\n+  puts \"\\n=== Export Complete ===\"\n+  puts \"Topics exported to: #{topics_file}\"\n+  puts \"Posts exported to: #{posts_file}\"\n+  puts \"Likes exported to: #{likes_file}\"\n+  puts \"Users exported to: #{users_file}\"\n+end\ndiff --git a/lib/post_creator.rb b/lib/post_creator.rb\nindex 2150322ccc..d6de29ec7a 100644\n--- a/lib/post_creator.rb\n+++ b/lib/post_creator.rb\n@@ -489,6 +489,13 @@ class PostCreator\n     return if @topic\n     begin\n       opts = @opts[:topic_opts] ? @opts.merge(@opts[:topic_opts]) : @opts\n+      if @opts[:external_id].present?\n+        opts[:external_id] = @opts[:external_id]\n+      else\n+        external_id = SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+        @opts[:external_id] = external_id\n+        opts[:external_id] = external_id\n+      end\n       topic_creator = TopicCreator.new(@user, guardian, opts)\n       @topic = topic_creator.create\n     rescue ActiveRecord::Rollback\n@@ -556,6 +563,7 @@ class PostCreator\n       raw_email\n       action_code\n       locale\n+      external_id\n     ].each { |a| post.public_send(\"#{a}=\", @opts[a]) if @opts[a].present? }\n \n     post.extract_quoted_post_numbers\n@@ -577,6 +585,14 @@ class PostCreator\n       post.hidden_reason_id = @opts[:hidden_reason_id]\n     end\n \n+    if @opts[:external_id].present?\n+      post.external_id = @opts[:external_id]\n+    else\n+      external_id = SecureRandom.alphanumeric(SiteSetting.external_id_length)\n+      @opts[:external_id] = external_id\n+      post.external_id = external_id\n+    end\n+\n     @post = post\n   end\n\ndiff --git a/lib/auth/result.rb b/lib/auth/result.rb\nindex 12e0906d5c..31b4a725a7 100644\n--- a/lib/auth/result.rb\n+++ b/lib/auth/result.rb\n@@ -25,6 +25,7 @@ class Auth::Result\n     overrides_email\n     overrides_username\n     overrides_name\n+    user_global_api_key\n   ]\n \n   attr_accessor *ATTRIBUTES\ndiff --git a/lib/discourse_connect_base.rb b/lib/discourse_connect_base.rb\nindex 1e91ecd652..ece7c02283 100644\n--- a/lib/discourse_connect_base.rb\n+++ b/lib/discourse_connect_base.rb\n@@ -40,6 +40,7 @@ class DiscourseConnectBase\n     title\n     username\n     website\n+    user_global_api_key\n   ]\n \n   FIXNUMS = []\n@@ -89,9 +90,9 @@ class DiscourseConnectBase\n \n     raise PayloadParseError.new(<<~MSG) if parsed[\"sso\"] =~ %r{[^a-zA-Z0-9=\\r\\n/+]}m\n         The SSO field should be Base64 encoded, using only A-Z, a-z, 0-9, +, /, and = characters.\n-        \n+\n         Your input contains characters we don't understand as Base64, see http://en.wikipedia.org/wiki/Base64.\n-        \n+\n         sso: #{parsed[\"sso\"]}\n       MSG\n \n@@ -102,9 +103,9 @@ class DiscourseConnectBase\n         Bad signature for payload\n \n         sso: #{parsed[\"sso\"]}\n-        \n+\n         sig: #{parsed[\"sig\"]}\n-        \n+\n         expected sig: #{sso.sign(parsed[\"sso\"])}\n         MSG\n \ndiff --git a/lib/second_factor/actions/discourse_connect_provider.rb b/lib/second_factor/actions/discourse_connect_provider.rb\nindex a99be09452..80a613cf59 100644\n--- a/lib/second_factor/actions/discourse_connect_provider.rb\n+++ b/lib/second_factor/actions/discourse_connect_provider.rb\n@@ -72,6 +72,29 @@ module SecondFactor::Actions\n     end\n \n     def populate_user_data(sso)\n+      current_user_global_api_keys =\n+        ApiKey\n+          .where(hidden: false)\n+          .where(description: 'user-global-api-key')\n+          .where(user_id: current_user.id)\n+          .includes(:user)\n+          .includes(:created_by)\n+          .order(\"revoked_at DESC NULLS FIRST, created_at DESC\")\n+      if current_user_global_api_keys.length > 0\n+        current_user_global_api_keys.destroy_all\n+      end\n+      api_key = ApiKey.new( {\"description\"=>'user-global-api-key'})\n+      api_key_str = \"\"\n+      ApiKey.transaction do\n+        api_key.created_by = current_user\n+        api_key.api_key_scopes = []\n+        api_key.scope_mode = \"global\"\n+        api_key.user = current_user\n+        api_key.save!\n+        api_key_str = api_key.key\n+        StaffActionLogger.new(current_user).log_api_key(api_key, UserHistory.actions[:api_key_create], changes: api_key.saved_changes)\n+      end\n+      sso.user_global_api_key = api_key_str\n       sso.name = current_user.name\n       sso.username = current_user.username\n       sso.email = current_user.email\ndiff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb\nindex db6f23e1fb..40ca73c2ae 100644\n--- a/lib/svg_sprite.rb\n+++ b/lib/svg_sprite.rb\n@@ -218,6 +218,7 @@ module SvgSprite\n         robot\n         rocket\n         rotate\n+        scissors\n         screwdriver-wrench\n         scroll\n         share\n \n

\n","createdAt":"2025-03-10 15:20:05.233052","updatedAt":"2025-06-17 13:47:14.371658","replyToPostNumber":null,"replyCount":0,"likeCount":2,"wordCount":4022,"liked":false,"bookmarked":false,"polls":[],"reactions":[{"reaction":"👍️","count":1,"users":[{"id":5905,"username":"PipaQinse233","name":"PipaQinse233"}],"hasReacted":false},{"reaction":"❤️","count":1,"users":[{"id":5905,"username":"PipaQinse233","name":"PipaQinse233"}],"hasReacted":false}],"wiki":false,"version":1,"publicVersion":1,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}},{"id":61790,"postNumber":8,"raw":"最近发现这种 patch 的方式可能因为 Discourse 不巧的文件修改导致 patch 失败，所以改成了 fork+rebase 的方式\n\n```\ngit fetch upstream\ngit rebase upstream/main\n```","cooked":"

最近发现这种 patch 的方式可能因为 Discourse 不巧的文件修改导致 patch 失败，所以改成了 fork+rebase 的方式

git fetch upstream\ngit rebase upstream/main\n

\n","createdAt":"2025-07-21 03:02:05.937228","updatedAt":"2025-07-21 03:02:05.937228","replyToPostNumber":null,"replyCount":0,"likeCount":0,"wordCount":45,"liked":false,"bookmarked":false,"polls":[],"reactions":[],"wiki":false,"version":1,"publicVersion":1,"deletedAt":null,"foldedAt":null,"isAnonymous":false,"isOwner":false,"user":{"id":4668,"username":"IO","name":null,"avatarUrl":null,"admin":true,"moderator":false,"signatureRaw":"","signatureCooked":null}}],"hasMore":false,"lastReadPostNumber":1,"hasUrlPostNumber":false}