Fix all warnings

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2018-11-12 23:30:47 +01:00
parent a04dfc5293
commit 2939485321
27 changed files with 93 additions and 142 deletions

View File

@@ -17,7 +17,6 @@ defmodule Mobilizon.Actors.Actor do
alias Mobilizon.Actors
alias Mobilizon.Actors.{Actor, User, Follower, Member}
alias Mobilizon.Events.Event
alias Mobilizon.Service.ActivityPub
import Ecto.Query
alias Mobilizon.Repo
@@ -105,7 +104,7 @@ defmodule Mobilizon.Actors.Actor do
end
# TODO : Use me !
@email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
# @email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
def remote_actor_creation(params) do
changes =
%Actor{}
@@ -279,7 +278,7 @@ defmodule Mobilizon.Actors.Actor do
end
end
defp do_follow(%Actor{} = follower, %Actor{} = followed, approved \\ true) do
defp do_follow(%Actor{} = follower, %Actor{} = followed, approved) do
Actors.create_follower(%{
"actor_id" => follower.id,
"target_actor_id" => followed.id,

View File

@@ -7,7 +7,6 @@ defmodule Mobilizon.Actors do
alias Mobilizon.Repo
alias Mobilizon.Actors.{Actor, Bot, Member, Follower, User}
alias Mobilizon.Actors
alias Mobilizon.Service.ActivityPub
@@ -63,13 +62,9 @@ defmodule Mobilizon.Actors do
end
end
@doc """
Returns the first actor found for an user
Useful when the user has not defined default actor
Raises `Ecto.NoResultsError` if no Actor is found for this ID
"""
# Returns the first actor found for an user
# Useful when the user has not defined default actor
# Raises `Ecto.NoResultsError` if no Actor is found for this ID
defp get_first_actor_for_user(%Mobilizon.Actors.User{id: id} = _user) do
Repo.one!(from(a in Actor, where: a.user_id == ^id))
end
@@ -195,9 +190,6 @@ defmodule Mobilizon.Actors do
Repo.all(User)
end
defp blank?(""), do: nil
defp blank?(n), do: n
def insert_or_update_actor(data, preload \\ false) do
cs = Actor.remote_actor_creation(data)
@@ -321,14 +313,13 @@ defmodule Mobilizon.Actors do
end
def get_actor_by_name(name) do
actor =
case String.split(name, "@") do
[name] ->
Repo.one(from(a in Actor, where: a.preferred_username == ^name and is_nil(a.domain)))
case String.split(name, "@") do
[name] ->
Repo.one(from(a in Actor, where: a.preferred_username == ^name and is_nil(a.domain)))
[name, domain] ->
Repo.get_by(Actor, preferred_username: name, domain: domain)
end
[name, domain] ->
Repo.get_by(Actor, preferred_username: name, domain: domain)
end
end
def get_local_actor_by_name(name) do
@@ -404,7 +395,7 @@ defmodule Mobilizon.Actors do
Find actors by their name or displayed name
"""
def find_actors_by_username_or_name(username, page \\ 1, limit \\ 10)
def find_actors_by_username_or_name("", page, limit), do: []
def find_actors_by_username_or_name("", _page, _limit), do: []
def find_actors_by_username_or_name(username, page, limit) do
start = (page - 1) * limit
@@ -421,9 +412,7 @@ defmodule Mobilizon.Actors do
)
end
@doc """
Sanitize the LIKE queries
"""
# Sanitize the LIKE queries
defp like_sanitize(value) do
"%" <> String.replace(value, ~r/([\\%_])/, "\\1") <> "%"
end
@@ -515,7 +504,7 @@ defmodule Mobilizon.Actors do
defp handle_actor_user_changeset(changeset) do
changeset =
Ecto.Changeset.traverse_errors(changeset, fn
{msg, opts} -> msg
{msg, _opts} -> msg
msg -> msg
end)

View File

@@ -4,7 +4,7 @@ defmodule Mobilizon.Actors.Bot do
"""
use Ecto.Schema
import Ecto.Changeset
alias Mobilizon.Actors.{Actor, User, Bot}
alias Mobilizon.Actors.{Actor, User}
schema "bots" do
field(:source, :string)

View File

@@ -23,7 +23,7 @@ defmodule Mobilizon.Actors.Service.ResetPassword do
) do
{:ok, user}
else
err ->
_err ->
{:error, :invalid_token}
end
end

View File

@@ -114,9 +114,7 @@ defmodule Mobilizon.Actors.User do
|> Base.url_encode64()
end
@doc """
Hash password when it's changed
"""
# Hash password when it's changed
defp hash_password(changeset) do
case changeset do
%Ecto.Changeset{valid?: true, changes: %{password: password}} ->

View File

@@ -5,7 +5,7 @@ defmodule Mobilizon.Addresses.Address do
import Ecto.Changeset
alias Mobilizon.Addresses.Address
alias Mobilizon.Events.Event
alias Mobilizon.Groups.Group
# alias Mobilizon.Actors.Actor
schema "addresses" do
field(:addressCountry, :string)
@@ -16,8 +16,8 @@ defmodule Mobilizon.Addresses.Address do
field(:geom, Geo.PostGIS.Geometry)
field(:postalCode, :string)
field(:streetAddress, :string)
has_one(:event, Event)
has_one(:group, Group)
has_one(:event, Event, foreign_key: :physical_address_id)
# has_one(:group, Actor)
timestamps()
end

View File

@@ -5,11 +5,10 @@ defmodule Mobilizon.Addresses do
import Ecto.Query, warn: false
alias Mobilizon.Repo
require Logger
alias Mobilizon.Addresses.Address
import Logger
@geom_types [:point]
@doc """

View File

@@ -215,9 +215,7 @@ defmodule Mobilizon.Events do
Repo.all(query)
end
@doc """
Sanitize the LIKE queries
"""
# Sanitize the LIKE queries
defp like_sanitize(value) do
"%" <> String.replace(value, ~r/([\\%_])/, "\\1") <> "%"
end