Event page

.formatter.exs

@@ -1,5 +1,5 @@
 [
-  import_deps: [:ecto, :phoenix, :let_me],
+  import_deps: [:ecto, :ecto_sql, :phoenix, :let_me],
   plugins: [TailwindFormatter.MultiFormatter],
   inputs: ["*.{ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{ex,exs,heex}"],
   subdirectories: ["priv/*/migrations"],

config/config.exs

@@ -53,7 +53,7 @@ config :logger, :console,
 config :phoenix, :json_library, Jason
 
 config :tailwind,
-  version: "3.0.24",
+  version: "3.4.1",
   default: [
     args: ~w(
     --config=tailwind.config.js

lib/haj/accounts/user.ex

@@ -22,6 +22,7 @@ defmodule Haj.Accounts.User do
 
     many_to_many :foods, Haj.Foods.Food, join_through: "food_preferences", on_replace: :delete
     has_many :group_memberships, Haj.Spex.GroupMembership
+    has_many :user_tokens, Haj.Accounts.UserToken
 
     field :food_preference_other, :string
 
@@ -65,3 +66,9 @@ defmodule Haj.Accounts.User do
     end)
   end
 end
+
+defimpl Phoenix.HTML.Safe, for: Haj.Accounts.User do
+  def to_iodata(user) do
+    Phoenix.HTML.Engine.html_escape(user.full_name)
+  end
+end

lib/haj/accounts/user_token.ex

@@ -2,6 +2,7 @@ defmodule Haj.Accounts.UserToken do
   use Ecto.Schema
   import Ecto.Query
   alias Haj.Accounts.UserToken
+  alias Haj.Accounts.User
 
   @rand_size 32
   @session_validity_in_days 60
@@ -49,10 +50,11 @@ defmodule Haj.Accounts.UserToken do
   """
   def verify_session_token_query(token) do
     query =
-      from token in token_and_context_query(token, "session"),
-        join: user in assoc(token, :user),
-        where: token.inserted_at > ago(@session_validity_in_days, "day"),
-        select: user
+      from user in User,
+        join: ut in assoc(user, :user_tokens),
+        where: ut.token == ^token,
+        where: ut.context == "session",
+        where: ut.inserted_at > ago(@session_validity_in_days, "day")
 
     {:ok, query}
   end

lib/haj/application.ex

@@ -15,7 +15,9 @@ defmodule Haj.Application do
       # Start the PubSub system
       {Phoenix.PubSub, name: Haj.PubSub},
       # Start the Endpoint (http/https)
-      HajWeb.Endpoint
+      HajWeb.Endpoint,
+      # Start the presence tracker (for online users)
+      Haj.Presence,
       # Start a worker by calling: Haj.Worker.start_link(arg)
       # {Haj.Worker, arg}
     ]