diff options
Diffstat (limited to 'lib/matrix_app_service')
-rw-r--r-- | lib/matrix_app_service/bridge/room.ex | 6 | ||||
-rw-r--r-- | lib/matrix_app_service/bridge/user.ex | 6 | ||||
-rw-r--r-- | lib/matrix_app_service/bridge_config.ex | 16 | ||||
-rw-r--r-- | lib/matrix_app_service/migrations.ex | 21 |
4 files changed, 28 insertions, 21 deletions
diff --git a/lib/matrix_app_service/bridge/room.ex b/lib/matrix_app_service/bridge/room.ex index c40e0ed..73ef1ea 100644 --- a/lib/matrix_app_service/bridge/room.ex +++ b/lib/matrix_app_service/bridge/room.ex @@ -3,9 +3,9 @@ defmodule MatrixAppService.Bridge.Room do import Ecto.Changeset schema "rooms" do - field :data, :map - field :local_id, :string - field :remote_id, :string + field(:data, :map) + field(:local_id, :string) + field(:remote_id, :string) timestamps() end diff --git a/lib/matrix_app_service/bridge/user.ex b/lib/matrix_app_service/bridge/user.ex index aaa3c46..7bf604a 100644 --- a/lib/matrix_app_service/bridge/user.ex +++ b/lib/matrix_app_service/bridge/user.ex @@ -3,9 +3,9 @@ defmodule MatrixAppService.Bridge.User do import Ecto.Changeset schema "users" do - field :data, :map - field :local_id, :string - field :remote_id, :string + field(:data, :map) + field(:local_id, :string) + field(:remote_id, :string) timestamps() end diff --git a/lib/matrix_app_service/bridge_config.ex b/lib/matrix_app_service/bridge_config.ex index 5356caf..68723c6 100644 --- a/lib/matrix_app_service/bridge_config.ex +++ b/lib/matrix_app_service/bridge_config.ex @@ -3,7 +3,7 @@ defmodule MatrixAppService.BridgeConfig do The Bridge config. """ - defmacro __using__([repo: repo]) do + defmacro __using__(repo: repo) do quote bind_quoted: [repo: repo] do @repo repo @@ -41,8 +41,11 @@ defmodule MatrixAppService.BridgeConfig do """ def get_user!(id), do: @repo.get!(User, id) - def get_user_by_local_id(local_id), do: @repo.get_by(User, local_id: local_id) || %User{local_id: local_id} - def get_user_by_remote_id(remote_id), do: @repo.get_by(User, remote_id: remote_id) || %User{remote_id: remote_id} + def get_user_by_local_id(local_id), + do: @repo.get_by(User, local_id: local_id) || %User{local_id: local_id} + + def get_user_by_remote_id(remote_id), + do: @repo.get_by(User, remote_id: remote_id) || %User{remote_id: remote_id} @doc """ Creates a user. @@ -149,8 +152,11 @@ defmodule MatrixAppService.BridgeConfig do """ def get_room!(id), do: @repo.get!(Room, id) - def get_room_by_local_id(local_id), do: @repo.get_by(Room, local_id: local_id) || %Room{local_id: local_id} - def get_room_by_remote_id(remote_id), do: @repo.get_by(Room, remote_id: remote_id) || %Room{remote_id: remote_id} + def get_room_by_local_id(local_id), + do: @repo.get_by(Room, local_id: local_id) || %Room{local_id: local_id} + + def get_room_by_remote_id(remote_id), + do: @repo.get_by(Room, remote_id: remote_id) || %Room{remote_id: remote_id} @doc """ Creates a room. diff --git a/lib/matrix_app_service/migrations.ex b/lib/matrix_app_service/migrations.ex index e6ce469..6ae5344 100644 --- a/lib/matrix_app_service/migrations.ex +++ b/lib/matrix_app_service/migrations.ex @@ -3,24 +3,25 @@ defmodule MatrixAppService.Migrations do def change do create table(:users) do - add :local_id, :string - add :remote_id, :string - add :data, :map + add(:local_id, :string) + add(:remote_id, :string) + add(:data, :map) timestamps() end - create unique_index(:users, [:local_id]) - create unique_index(:users, [:remote_id]) + create(unique_index(:users, [:local_id])) + create(unique_index(:users, [:remote_id])) create table(:rooms) do - add :local_id, :string - add :remote_id, :string - add :data, :map + add(:local_id, :string) + add(:remote_id, :string) + add(:data, :map) timestamps() end - create unique_index(:rooms, [:local_id]) - create unique_index(:rooms, [:remote_id]) + + create(unique_index(:rooms, [:local_id])) + create(unique_index(:rooms, [:remote_id])) end end |