projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad link in likes collection
[akkoma]
/
lib
/
pleroma
/
web
/
channels
/
user_socket.ex
diff --git
a/lib/pleroma/web/channels/user_socket.ex
b/lib/pleroma/web/channels/user_socket.ex
index fd8918a7dfab83900addab182e2d342c57e23c0e..aed8475fd88d34f887b609dd4f1977623584bfba 100644
(file)
--- a/
lib/pleroma/web/channels/user_socket.ex
+++ b/
lib/pleroma/web/channels/user_socket.ex
@@
-1,17
+1,14
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.UserSocket do
use Phoenix.Socket
alias Pleroma.User
defmodule Pleroma.Web.UserSocket do
use Phoenix.Socket
alias Pleroma.User
- alias Comeonin.Pbkdf2
## Channels
# channel "room:*", Pleroma.Web.RoomChannel
## Channels
# channel "room:*", Pleroma.Web.RoomChannel
- if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
- channel("chat:*", Pleroma.Web.ChatChannel)
- end
-
- ## Transports
- transport(:websocket, Phoenix.Transports.WebSocket)
- # transport :longpoll, Phoenix.Transports.LongPoll
+ channel("chat:*", Pleroma.Web.ChatChannel)
# Socket params are passed from the client and can
# be used to verify and authenticate a user. After
# Socket params are passed from the client and can
# be used to verify and authenticate a user. After
@@
-25,7
+22,8
@@
defmodule Pleroma.Web.UserSocket do
# See `Phoenix.Token` documentation for examples in
# performing token verification on connect.
def connect(%{"token" => token}, socket) do
# See `Phoenix.Token` documentation for examples in
# performing token verification on connect.
def connect(%{"token" => token}, socket) do
- with {:ok, user_id} <- Phoenix.Token.verify(socket, "user socket", token, max_age: 84600),
+ with true <- Pleroma.Config.get([:chat, :enabled]),
+ {:ok, user_id} <- Phoenix.Token.verify(socket, "user socket", token, max_age: 84600),
%User{} = user <- Pleroma.Repo.get(User, user_id) do
{:ok, assign(socket, :user_name, user.nickname)}
else
%User{} = user <- Pleroma.Repo.get(User, user_id) do
{:ok, assign(socket, :user_name, user.nickname)}
else