Basic backend chat.

This commit is contained in:
Lain Iwakura 2017-12-04 19:10:15 +01:00
parent d08a34e88b
commit 5c40986120
4 changed files with 33 additions and 4 deletions

View file

@ -1,8 +1,11 @@
defmodule Pleroma.Web.UserSocket do defmodule Pleroma.Web.UserSocket do
use Phoenix.Socket use Phoenix.Socket
alias Pleroma.User
alias Comeonin.Pbkdf2
## Channels ## Channels
# channel "room:*", Pleroma.Web.RoomChannel # channel "room:*", Pleroma.Web.RoomChannel
channel "chat:*", Pleroma.Web.ChatChannel
## Transports ## Transports
transport :websocket, Phoenix.Transports.WebSocket transport :websocket, Phoenix.Transports.WebSocket
@ -19,8 +22,13 @@ defmodule Pleroma.Web.UserSocket do
# #
# See `Phoenix.Token` documentation for examples in # See `Phoenix.Token` documentation for examples in
# performing token verification on connect. # performing token verification on connect.
def connect(_params, socket) do def connect(%{"token" => token}, socket) do
{:ok, socket} with {: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, user)}
else
_e -> :error
end
end end
# Socket id's are topics that allow you to identify all sockets for a given user: # Socket id's are topics that allow you to identify all sockets for a given user:

View file

@ -0,0 +1,14 @@
defmodule Pleroma.Web.ChatChannel do
use Phoenix.Channel
def join("chat:public", _message, socket) do
{:ok, socket}
end
def handle_in("new_msg", %{"text" => text}, socket) do
author = socket.assigns[:user]
author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
broadcast! socket, "new_msg", %{text: text, author: author}
{:noreply, socket}
end
end

View file

@ -10,7 +10,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
require Logger require Logger
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
render(conn, UserView, "show.json", %{user: user}) token = Phoenix.Token.sign(conn, "user socket", user.id)
render(conn, UserView, "show.json", %{user: user, token: token})
end end
def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do

View file

@ -25,7 +25,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
user_info = User.get_cached_user_info(user) user_info = User.get_cached_user_info(user)
%{ data = %{
"created_at" => user.inserted_at |> Utils.format_naive_asctime, "created_at" => user.inserted_at |> Utils.format_naive_asctime,
"description" => HtmlSanitizeEx.strip_tags(user.bio), "description" => HtmlSanitizeEx.strip_tags(user.bio),
"favourites_count" => 0, "favourites_count" => 0,
@ -47,6 +47,12 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"cover_photo" => image_url(user.info["banner"]), "cover_photo" => image_url(user.info["banner"]),
"background_image" => image_url(user.info["background"]) "background_image" => image_url(user.info["background"])
} }
if assigns[:token] do
Map.put(data, "token", assigns[:token])
else
data
end
end end
def render("short.json", %{user: %User{ def render("short.json", %{user: %User{