' + body + '
') -// } else { -// $("#chat-box").append('' + body + '
') -// } - }, - scrollBottom() { -// $("#chat-box").animate({ scrollTop: $('#chat-box').prop("scrollHeight")}, 200) - }, - listenForChats(channel) { - channel.push('send', { body: "HELLO"}); -// $(() => { -// $("#chat-form").on("submit", function(ev) { -// ev.preventDefault() -// -// let userMsg = $('#user-msg').val() -// channel.push('send', {body: userMsg}) -// -// $("#user-msg").val("") -// }) - -// channel.on('shout', function(payload) { -// console.log(payload) -// RoomChat.addMessage(payload.name, payload.body) -// RoomChat.scrollBottom() -// }) - // }) - channel.on('shout', function(payload) { - console.log(payload) - }); - } } export default RoomChat; \ No newline at end of file diff --git a/lib/aggiedit/rooms.ex b/lib/aggiedit/rooms.ex index 41df588..239dd90 100644 --- a/lib/aggiedit/rooms.ex +++ b/lib/aggiedit/rooms.ex @@ -94,7 +94,7 @@ defmodule Aggiedit.Rooms do end def vote_count(post) do - votes = post + post |> Repo.preload(:votes) |> Map.get(:votes) |> Enum.map(fn vote -> if vote.is_up, do: 1, else: -1 end) @@ -105,11 +105,17 @@ defmodule Aggiedit.Rooms do is_up = direction == "upvote" vote = %Vote{is_up: is_up, user: user, post: post} |> Repo.insert(on_conflict: [set: [is_up: is_up]], conflict_target: [:user_id, :post_id]) + post = change_post(post, %{score: vote_count(post)}) |> Repo.update() + broadcast_post_over_room(post, :post_voted) end + def comment_post(%Post{} = post, %User{} = user, comment) do + Repo.insert(%Comment{comment: comment, user: user, post: post}) + end + defp broadcast_post_over_room({:error, _reason}=error, _event), do: error defp broadcast_post_over_room({:ok, post}, event) do PubSub.broadcast(Aggiedit.PubSub, "room:#{post.room_id}:posts", {event, post}) diff --git a/lib/aggiedit/rooms/comment.ex b/lib/aggiedit/rooms/comment.ex index 6747ba3..01f411a 100644 --- a/lib/aggiedit/rooms/comment.ex +++ b/lib/aggiedit/rooms/comment.ex @@ -17,4 +17,8 @@ defmodule Aggiedit.Post.Comment do |> cast(attrs, [:comment]) |> validate_required([:comment]) end + + def serialize(c) do + %{"body" => c.comment, "user" => c.user.username, "id" => c.id, "inserted_at" => c.inserted_at} + end end diff --git a/lib/aggiedit_web/channels/post_channel.ex b/lib/aggiedit_web/channels/post_channel.ex index 308c6de..ea79d76 100644 --- a/lib/aggiedit_web/channels/post_channel.ex +++ b/lib/aggiedit_web/channels/post_channel.ex @@ -2,21 +2,35 @@ defmodule AggieditWeb.PostChannel do use AggieditWeb, :channel alias Aggiedit.Roles + alias Aggiedit.Repo alias Aggiedit.Rooms @impl true def join("post:" <> post_id, _payload, socket) do post = Rooms.get_post!(post_id) if Roles.guard?(socket.assigns.current_user, :show, post) do - {:ok, socket} + send(self(), :after_join) + {:ok, assign(socket, %{:post => post})} else {:error, "You do not have permission to view this post."} end end @impl true - def handle_in("send", body, socket) do - broadcast!(socket, "shout", body) + def handle_info(:after_join, socket) do + comments = socket.assigns.post + |> Repo.preload(comments: [:user]) + |> Map.get(:comments) + |> Enum.map(fn c -> Aggiedit.Post.Comment.serialize(c) end) + push(socket, "initial-comments", %{:comments => comments}) + + {:noreply, socket} + end + + @impl true + def handle_in("send", %{"body" => comment}=body, socket) do + {:ok, comment} = Rooms.comment_post(socket.assigns.post, socket.assigns.current_user, comment) + broadcast!(socket, "shout", Aggiedit.Post.Comment.serialize(comment)) {:reply, :ok, socket} end end \ No newline at end of file diff --git a/lib/aggiedit_web/live/post_live/show.ex b/lib/aggiedit_web/live/post_live/show.ex index 9d8f86c..69cd6c5 100644 --- a/lib/aggiedit_web/live/post_live/show.ex +++ b/lib/aggiedit_web/live/post_live/show.ex @@ -15,10 +15,10 @@ defmodule AggieditWeb.PostLive.Show do post = Rooms.get_post!(id) |> Repo.preload(:upload) if Roles.guard?(socket.assigns.current_user, socket.assigns.live_action, post) do - {:noreply, - socket + socket = (if socket.assigns.live_action == :show, do: push_event(socket, "initial-post", %{:id => post.id}), else: socket) |> assign(:page_title, page_title(socket.assigns.live_action)) - |> assign(:post, post)} + |> assign(:post, post) + {:noreply, socket} else {:noreply, socket |> put_flash(:error, "You don't have permission to do that.") |> redirect(to: Routes.post_show_path(socket, :show, socket.assigns.room, post))} end diff --git a/lib/aggiedit_web/live/post_live/show.html.heex b/lib/aggiedit_web/live/post_live/show.html.heex index 107a3a6..8f91fda 100644 --- a/lib/aggiedit_web/live/post_live/show.html.heex +++ b/lib/aggiedit_web/live/post_live/show.html.heex @@ -1,4 +1,37 @@ -