From fc7151a9c4cbd2fb122d717f54de4b30acffea36 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 23 Jun 2020 20:02:53 +0300 Subject: [PATCH] more files renamings --- .../transports/web_socket/raw.ex} | 0 lib/pleroma/{web => }/web.ex | 5 ----- .../{mongooseim => mongoose_im}/mongoose_im_controller.ex | 0 .../o_status_controller.ex} | 0 lib/pleroma/web/plug.ex | 8 ++++++++ lib/pleroma/web/{push => }/push.ex | 0 .../rich_media/parsers/{oembed_parser.ex => o_embed.ex} | 0 lib/pleroma/web/{streamer => }/streamer.ex | 0 .../{twitter_api_controller.ex => controller.ex} | 0 lib/pleroma/web/{web_finger => }/web_finger.ex | 0 lib/pleroma/web/{xml => }/xml.ex | 0 lib/{ => pleroma}/xml_builder.ex | 0 12 files changed, 8 insertions(+), 5 deletions(-) rename lib/{transports.ex => phoenix/transports/web_socket/raw.ex} (100%) rename lib/pleroma/{web => }/web.ex (97%) rename lib/pleroma/web/{mongooseim => mongoose_im}/mongoose_im_controller.ex (100%) rename lib/pleroma/web/{ostatus/ostatus_controller.ex => o_status/o_status_controller.ex} (100%) create mode 100644 lib/pleroma/web/plug.ex rename lib/pleroma/web/{push => }/push.ex (100%) rename lib/pleroma/web/rich_media/parsers/{oembed_parser.ex => o_embed.ex} (100%) rename lib/pleroma/web/{streamer => }/streamer.ex (100%) rename lib/pleroma/web/twitter_api/{twitter_api_controller.ex => controller.ex} (100%) rename lib/pleroma/web/{web_finger => }/web_finger.ex (100%) rename lib/pleroma/web/{xml => }/xml.ex (100%) rename lib/{ => pleroma}/xml_builder.ex (100%) diff --git a/lib/transports.ex b/lib/phoenix/transports/web_socket/raw.ex similarity index 100% rename from lib/transports.ex rename to lib/phoenix/transports/web_socket/raw.ex diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web.ex similarity index 97% rename from lib/pleroma/web/web.ex rename to lib/pleroma/web.ex index 4f9281851..9ca52733d 100644 --- a/lib/pleroma/web/web.ex +++ b/lib/pleroma/web.ex @@ -2,11 +2,6 @@ # Copyright © 2017-2020 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Web.Plug do - # Substitute for `call/2` which is defined with `use Pleroma.Web, :plug` - @callback perform(Plug.Conn.t(), Plug.opts()) :: Plug.Conn.t() -end - defmodule Pleroma.Web do @moduledoc """ A module that keeps using definitions for controllers, diff --git a/lib/pleroma/web/mongooseim/mongoose_im_controller.ex b/lib/pleroma/web/mongoose_im/mongoose_im_controller.ex similarity index 100% rename from lib/pleroma/web/mongooseim/mongoose_im_controller.ex rename to lib/pleroma/web/mongoose_im/mongoose_im_controller.ex diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/o_status/o_status_controller.ex similarity index 100% rename from lib/pleroma/web/ostatus/ostatus_controller.ex rename to lib/pleroma/web/o_status/o_status_controller.ex diff --git a/lib/pleroma/web/plug.ex b/lib/pleroma/web/plug.ex new file mode 100644 index 000000000..840b35072 --- /dev/null +++ b/lib/pleroma/web/plug.ex @@ -0,0 +1,8 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2020 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.Plug do + # Substitute for `call/2` which is defined with `use Pleroma.Web, :plug` + @callback perform(Plug.Conn.t(), Plug.opts()) :: Plug.Conn.t() +end diff --git a/lib/pleroma/web/push/push.ex b/lib/pleroma/web/push.ex similarity index 100% rename from lib/pleroma/web/push/push.ex rename to lib/pleroma/web/push.ex diff --git a/lib/pleroma/web/rich_media/parsers/oembed_parser.ex b/lib/pleroma/web/rich_media/parsers/o_embed.ex similarity index 100% rename from lib/pleroma/web/rich_media/parsers/oembed_parser.ex rename to lib/pleroma/web/rich_media/parsers/o_embed.ex diff --git a/lib/pleroma/web/streamer/streamer.ex b/lib/pleroma/web/streamer.ex similarity index 100% rename from lib/pleroma/web/streamer/streamer.ex rename to lib/pleroma/web/streamer.ex diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/controller.ex similarity index 100% rename from lib/pleroma/web/twitter_api/twitter_api_controller.ex rename to lib/pleroma/web/twitter_api/controller.ex diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger.ex similarity index 100% rename from lib/pleroma/web/web_finger/web_finger.ex rename to lib/pleroma/web/web_finger.ex diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml.ex similarity index 100% rename from lib/pleroma/web/xml/xml.ex rename to lib/pleroma/web/xml.ex diff --git a/lib/xml_builder.ex b/lib/pleroma/xml_builder.ex similarity index 100% rename from lib/xml_builder.ex rename to lib/pleroma/xml_builder.ex -- 2.45.2