Compare commits

..

No commits in common. "0c2777eb12b47cc47f8f836eb5ec209dc6a7b712" and "ecc3953bf1619cefcb8bdefc98fc142e455eb167" have entirely different histories.

2 changed files with 5 additions and 4 deletions

View file

@ -16,11 +16,13 @@ config :nulla, Nulla.Repo,
# The watchers configuration can be used to run external
# watchers to your application. For example, we can use it
# to bundle .js and .css sources.
host = System.get_env("PHX_HOST") || "example.com"
port = String.to_integer(System.get_env("PORT") || "4000")
config :nulla, NullaWeb.Endpoint,
# Binding to loopback ipv4 address prevents access from other machines.
# Change to `ip: {0, 0, 0, 0}` to allow access from other machines.
url: [host: host, port: port],
http: [ip: {127, 0, 0, 1}, port: port],
check_origin: false,
code_reloader: true,

View file

@ -2,7 +2,6 @@ defmodule NullaWeb.ActorController do
use NullaWeb, :controller
alias Nulla.ActivityPub
alias Nulla.Models.Actor
alias Nulla.Models.Relation
alias Nulla.Models.Note
alias Nulla.Models.InstanceSettings
@ -23,17 +22,17 @@ defmodule NullaWeb.ActorController do
|> put_resp_content_type("application/activity+json")
|> send_resp(200, Jason.encode!(ActivityPub.actor(actor)))
else
following = Relation.count_following(actor.id)
followers = Relation.count_followers(actor.id)
notes = Note.get_latest_notes(actor.id)
following = 0
followers = 0
render(
conn,
:show,
actor: actor,
notes: notes,
following: following,
followers: followers,
notes: notes,
layout: false
)
end