diff --git a/include/ircd/m/breadcrumb_rooms.h b/include/ircd/m/breadcrumbs.h similarity index 77% rename from include/ircd/m/breadcrumb_rooms.h rename to include/ircd/m/breadcrumbs.h index a39f6caa9..ee0eec628 100644 --- a/include/ircd/m/breadcrumb_rooms.h +++ b/include/ircd/m/breadcrumbs.h @@ -1,7 +1,7 @@ -// Matrix Construct +// The Construct // -// Copyright (C) Matrix Construct Developers, Authors & Contributors -// Copyright (C) 2016-2019 Jason Volk +// Copyright (C) The Construct Developers, Authors & Contributors +// Copyright (C) 2016-2020 Jason Volk // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -9,14 +9,14 @@ // full license for this software is available in the LICENSE file. #pragma once -#define HAVE_IRCD_M_BREADCRUMB_ROOMS_H +#define HAVE_IRCD_M_BREADCRUMBS_H namespace ircd::m { - struct breadcrumb_rooms; + struct breadcrumbs; } -struct ircd::m::breadcrumb_rooms +struct ircd::m::breadcrumbs { using closure = std::function; using closure_bool = std::function; @@ -35,7 +35,7 @@ struct ircd::m::breadcrumb_rooms event::id::buf add(const string_view &) const; event::id::buf del(const string_view &) const; - breadcrumb_rooms(const m::user &user) + breadcrumbs(const m::user &user) :account_data{user} {} }; diff --git a/include/ircd/m/m.h b/include/ircd/m/m.h index 3beb83d13..508ed33e5 100644 --- a/include/ircd/m/m.h +++ b/include/ircd/m/m.h @@ -92,7 +92,7 @@ namespace ircd #include "bridge.h" #include "sync/sync.h" #include "fetch.h" -#include "breadcrumb_rooms.h" +#include "breadcrumbs.h" #include "media.h" #include "search.h" #include "gossip.h" diff --git a/matrix/Makefile.am b/matrix/Makefile.am index 20ab89e0c..3989abed6 100644 --- a/matrix/Makefile.am +++ b/matrix/Makefile.am @@ -134,7 +134,7 @@ libircd_matrix_la_SOURCES += user_rooms.cc libircd_matrix_la_SOURCES += user_tokens.cc libircd_matrix_la_SOURCES += acquire.cc libircd_matrix_la_SOURCES += bridge.cc -libircd_matrix_la_SOURCES += breadcrumb_rooms.cc +libircd_matrix_la_SOURCES += breadcrumbs.cc libircd_matrix_la_SOURCES += burst.cc libircd_matrix_la_SOURCES += display_name.cc libircd_matrix_la_SOURCES += event_append.cc diff --git a/matrix/breadcrumb_rooms.cc b/matrix/breadcrumbs.cc similarity index 57% rename from matrix/breadcrumb_rooms.cc rename to matrix/breadcrumbs.cc index 43451fbf8..8ca6fb386 100644 --- a/matrix/breadcrumb_rooms.cc +++ b/matrix/breadcrumbs.cc @@ -1,7 +1,7 @@ -// Matrix Construct +// The Construct // -// Copyright (C) Matrix Construct Developers, Authors & Contributors -// Copyright (C) 2016-2019 Jason Volk +// Copyright (C) The Construct Developers, Authors & Contributors +// Copyright (C) 2016-2020 Jason Volk // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -9,7 +9,7 @@ // full license for this software is available in the LICENSE file. ircd::m::event::id::buf -ircd::m::breadcrumb_rooms::set(const json::array &rooms) +ircd::m::breadcrumbs::set(const json::array &rooms) const { const json::strung object @@ -20,11 +20,11 @@ const } }; - return account_data.set("im.vector.riot.breadcrumb_rooms", object); + return account_data.set("im.vector.setting.breadcrumbs", object); } bool -ircd::m::breadcrumb_rooms::for_each(const closure_bool &closure) +ircd::m::breadcrumbs::for_each(const closure_bool &closure) const { bool ret{true}; @@ -43,22 +43,22 @@ const } void -ircd::m::breadcrumb_rooms::get(const closure &closure) +ircd::m::breadcrumbs::get(const closure &closure) const { if(!get(std::nothrow, closure)) throw m::NOT_FOUND { - "User has no breadcrumb_rooms set in their account_data." + "User has no breadcrumbs set in their account_data." }; } bool -ircd::m::breadcrumb_rooms::get(std::nothrow_t, - const closure &closure) +ircd::m::breadcrumbs::get(std::nothrow_t, + const closure &closure) const { - return account_data.get(std::nothrow, "im.vector.riot.breadcrumb_rooms", [&closure] + return account_data.get(std::nothrow, "im.vector.setting.breadcrumbs", [&closure] (const string_view &key, const json::object &object) { const json::array &rooms diff --git a/matrix/matrix.cc b/matrix/matrix.cc index c5fb8c67e..cece0c02e 100644 --- a/matrix/matrix.cc +++ b/matrix/matrix.cc @@ -57,7 +57,7 @@ ircd::m::matrix::module_names "identity_v1", "m_noop", - "m_breadcrumb_rooms", + "m_breadcrumbs", "m_bridge", "m_command", "m_control", diff --git a/modules/Makefile.am b/modules/Makefile.am index 13cca8e11..41d9b3f7d 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -88,7 +88,7 @@ endif IMAGEMAGICK m_moduledir = @moduledir@ -m_breadcrumb_rooms_la_SOURCES = m_breadcrumb_rooms.cc +m_breadcrumbs_la_SOURCES = m_breadcrumbs.cc m_bridge_la_SOURCES = m_bridge.cc m_command_la_SOURCES = m_command.cc m_control_la_SOURCES = m_control.cc @@ -119,7 +119,7 @@ m_room_third_party_invite_la_SOURCES = m_room_third_party_invite.cc m_vm_fetch_la_SOURCES = m_vm_fetch.cc m_module_LTLIBRARIES = \ - m_breadcrumb_rooms.la \ + m_breadcrumbs.la \ m_bridge.la \ m_command.la \ m_control.la \ diff --git a/modules/console.cc b/modules/console.cc index 885f02885..2238e6675 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -12809,7 +12809,7 @@ console_cmd__user__ignores(opt &out, const string_view &line) } bool -console_cmd__user__breadcrumb_rooms(opt &out, const string_view &line) +console_cmd__user__breadcrumbs(opt &out, const string_view &line) { const params param{line, " ", { @@ -12821,12 +12821,12 @@ console_cmd__user__breadcrumb_rooms(opt &out, const string_view &line) param.at("user_id") }; - const m::breadcrumb_rooms breadcrumb_rooms + const m::breadcrumbs breadcrumbs { user_id }; - breadcrumb_rooms.for_each([&out] + breadcrumbs.for_each([&out] (const string_view &room_id) { out << room_id << std::endl; diff --git a/modules/m_breadcrumb_rooms.cc b/modules/m_breadcrumbs.cc similarity index 57% rename from modules/m_breadcrumb_rooms.cc rename to modules/m_breadcrumbs.cc index e799d2e84..ed85be550 100644 --- a/modules/m_breadcrumb_rooms.cc +++ b/modules/m_breadcrumbs.cc @@ -10,10 +10,10 @@ namespace ircd::m { - static void handle_breadcrumb_rooms_focus_out(const event &, vm::eval &, const json::array &); - static void handle_breadcrumb_rooms_focus_in(const event &, vm::eval &, const json::array &); - static void handle_breadcrumb_rooms(const event &, vm::eval &); - extern hookfn hook_breadcrumb_rooms; + static void handle_breadcrumbs_focus_out(const event &, vm::eval &, const json::array &); + static void handle_breadcrumbs_focus_in(const event &, vm::eval &, const json::array &); + static void handle_breadcrumbs(const event &, vm::eval &); + extern hookfn hook_breadcrumbs; } ircd::mapi::header @@ -22,20 +22,20 @@ IRCD_MODULE "Matrix Breadcrumb Rooms" }; -decltype(ircd::m::hook_breadcrumb_rooms) -ircd::m::hook_breadcrumb_rooms +decltype(ircd::m::hook_breadcrumbs) +ircd::m::hook_breadcrumbs { - handle_breadcrumb_rooms, + handle_breadcrumbs, { - { "_site", "vm.effect" }, - { "type", "ircd.account_data" }, - { "state_key", "im.vector.riot.breadcrumb_rooms" }, + { "_site", "vm.effect" }, + { "type", "ircd.account_data" }, + { "state_key", "im.vector.setting.breadcrumbs" }, }, }; void -ircd::m::handle_breadcrumb_rooms(const event &event, - vm::eval &eval) +ircd::m::handle_breadcrumbs(const event &event, + vm::eval &eval) try { const m::user::id &sender @@ -59,11 +59,11 @@ try const json::array &rooms { - content.get("rooms") + content.get("recent_rooms") }; - handle_breadcrumb_rooms_focus_out(event, eval, rooms); - handle_breadcrumb_rooms_focus_in(event, eval, rooms); + handle_breadcrumbs_focus_out(event, eval, rooms); + handle_breadcrumbs_focus_in(event, eval, rooms); } catch(const ctx::interrupted &) { @@ -73,15 +73,15 @@ catch(const std::exception &e) { log::error { - m::log, "breadcrumb_rooms hook :%s", + m::log, "breadcrumbs hook :%s", e.what(), }; } void -ircd::m::handle_breadcrumb_rooms_focus_in(const event &event, - vm::eval &eval, - const json::array &rooms) +ircd::m::handle_breadcrumbs_focus_in(const event &event, + vm::eval &eval, + const json::array &rooms) { const room::id &focus_in { @@ -108,9 +108,9 @@ ircd::m::handle_breadcrumb_rooms_focus_in(const event &event, } void -ircd::m::handle_breadcrumb_rooms_focus_out(const event &event, - vm::eval &eval, - const json::array &rooms) +ircd::m::handle_breadcrumbs_focus_out(const event &event, + vm::eval &eval, + const json::array &rooms) { const room::id &focus_out {