diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-06 15:36:30 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-06 15:36:30 +0000 |
| commit | 6cb31edd76fd42a0e33bc365d982cd02e3578d6c (patch) | |
| tree | 5de31560895d42820fd17341ef47509dc6212e30 /lib/pleroma | |
| parent | a280be34e36223aefd3d5e26fcddb9faad77310b (diff) | |
| parent | 24599c519f95f27e1fb8120104f13856d2fa3742 (diff) | |
| download | pleroma-6cb31edd76fd42a0e33bc365d982cd02e3578d6c.tar.gz | |
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/application.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/chat_channel.ex | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 9dbd1e26b..57462740c 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -147,8 +147,6 @@ defmodule Pleroma.Application do defp oauth_cleanup_child(_), do: [] - defp chat_child(:test, _), do: [] - defp chat_child(_env, true) do [Pleroma.Web.ChatChannel.ChatChannelState] end diff --git a/lib/pleroma/web/chat_channel.ex b/lib/pleroma/web/chat_channel.ex index 08841a3e8..840414933 100644 --- a/lib/pleroma/web/chat_channel.ex +++ b/lib/pleroma/web/chat_channel.ex @@ -20,7 +20,7 @@ defmodule Pleroma.Web.ChatChannel do def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}} = socket) do text = String.trim(text) - if String.length(text) > 0 do + if String.length(text) in 1..Pleroma.Config.get([:instance, :chat_limit]) do author = User.get_cached_by_nickname(user_name) author = Pleroma.Web.MastodonAPI.AccountView.render("show.json", user: author) message = ChatChannelState.add_message(%{text: text, author: author}) |