From af2cf5f188a2bf62da97453f0d21e282f7f67985 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 18 Jun 2023 16:48:56 +0200 Subject: renamening: Fix newly added imports to use the new namespace --- plugins/mod_http.lua | 2 +- plugins/mod_mam/mod_mam.lua | 2 +- util/fsm.lua | 2 +- util/session.lua | 2 +- util/startup.lua | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index b52f4b44..3889d62b 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -18,7 +18,7 @@ local url_build = require "socket.url".build; local http_util = require "prosody.util.http"; local normalize_path = http_util.normalize_path; local set = require "prosody.util.set"; -local array = require "util.array"; +local array = require "prosody.util.array"; local ip_util = require "prosody.util.ip"; local new_ip = ip_util.new_ip; diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index ea9de2a7..080eb283 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -37,7 +37,7 @@ local tostring = tostring; local time_now = require "prosody.util.time".now; local m_min = math.min; local timestamp, datestamp = import( "util.datetime", "datetime", "date"); -local parse_duration = require "util.human.io".parse_duration; +local parse_duration = require "prosody.util.human.io".parse_duration; local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50); local strip_tags = module:get_option_set("dont_archive_namespaces", { "http://jabber.org/protocol/chatstates" }); diff --git a/util/fsm.lua b/util/fsm.lua index 94a543d1..0afc2d16 100644 --- a/util/fsm.lua +++ b/util/fsm.lua @@ -1,4 +1,4 @@ -local events = require "util.events"; +local events = require "prosody.util.events"; local fsm_methods = {}; local fsm_mt = { __index = fsm_methods }; diff --git a/util/session.lua b/util/session.lua index 1d03fa54..2d3cbd54 100644 --- a/util/session.lua +++ b/util/session.lua @@ -1,5 +1,5 @@ local initialize_filters = require "prosody.util.filters".initialize; -local time = require "util.time"; +local time = require "prosody.util.time"; local logger = require "prosody.util.logger"; local function new_session(typ) diff --git a/util/startup.lua b/util/startup.lua index 20ecb120..2fd5aee2 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -425,7 +425,7 @@ end function startup.prepare_to_start() log("info", "Prosody is using the %s backend for connection handling", server.get_backend()); -- Signal to modules that we are ready to start - prosody.started = require "util.promise".new(function (resolve) + prosody.started = require "prosody.util.promise".new(function (resolve) prosody.events.add_handler("server-started", function () resolve(); end); @@ -479,7 +479,7 @@ function startup.log_greeting() end function startup.notify_started() - require "util.timer".add_task(0, function () + require "prosody.util.timer".add_task(0, function () prosody.log("debug", "Firing server-started event"); prosody.events.fire_event("server-started"); end); -- cgit v1.2.3