logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://anongit.hacktivis.me/git/pleroma.git/
commit: b6e16877e613342adf6730823a6b245864f3ef89
parent d15f98bdecbca504576feace7137487855f411fc
Author: nicole mikołajczyk <me@mkljczk.pl>
Date:   Sat,  1 Nov 2025 11:24:41 +0100

Merge branch 'local-nickname-regex-fix' into 'develop'

Use end-of-string in regex for local `get_by_nickname`

See merge request pleroma/pleroma!4358

Diffstat:

Achangelog.d/local-nickname-regex.fix1+
Mlib/pleroma/user.ex2+-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.d/local-nickname-regex.fix b/changelog.d/local-nickname-regex.fix @@ -0,0 +1 @@ +Use end-of-string in regex for local `get_by_nickname` diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex @@ -1357,7 +1357,7 @@ defmodule Pleroma.User do @spec get_by_nickname(String.t()) :: User.t() | nil def get_by_nickname(nickname) do Repo.get_by(User, nickname: nickname) || - if Regex.match?(~r(@#{Pleroma.Web.Endpoint.host()})i, nickname) do + if Regex.match?(~r(@#{Pleroma.Web.Endpoint.host()}$)i, nickname) do Repo.get_by(User, nickname: local_nickname(nickname)) end end