Green-Sky/totato
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to rmmi

Browse Source
This commit is contained in:
Green Sky 2024-10-06 11:51:02 +02:00
parent 77fffb744e
commit 1a032ce260
No known key found for this signature in database
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config_commands.cpp
View File

@ -14,7 +14,7 @@ void registerConfigCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm RegistryMessageModelI& rmm
) { ) {
mcd.registerCommand( mcd.registerCommand(
"Config", "conf", "Config", "conf",

2
src/config_commands.hpp
View File

@ -11,6 +11,6 @@ void registerConfigCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm RegistryMessageModelI& rmm
); );

2
src/fun_commands.cpp
View File

@ -13,7 +13,7 @@ void registerFunCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm RegistryMessageModelI& rmm
) { ) {
mcd.registerCommand( mcd.registerCommand(
"fun", "fun", "fun", "fun",

2
src/fun_commands.hpp
View File

@ -11,6 +11,6 @@ void registerFunCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm RegistryMessageModelI& rmm
); );

6
src/main.cpp
View File

@ -1,7 +1,7 @@
#include <solanaceae/object_store/object_store.hpp> #include <solanaceae/object_store/object_store.hpp>
#include <solanaceae/util/simple_config_model.hpp> #include <solanaceae/util/simple_config_model.hpp>
#include <solanaceae/contact/contact_model3.hpp> #include <solanaceae/contact/contact_model3.hpp>
#include <solanaceae/message3/registry_message_model.hpp> #include <solanaceae/message3/registry_message_model_impl.hpp>
#include <solanaceae/message3/message_time_sort.hpp> #include <solanaceae/message3/message_time_sort.hpp>
#include <solanaceae/plugin/plugin_manager.hpp> #include <solanaceae/plugin/plugin_manager.hpp>
#include <solanaceae/toxcore/tox_event_logger.hpp> #include <solanaceae/toxcore/tox_event_logger.hpp>
@ -186,7 +186,7 @@ int main(int argc, char** argv) {
} }
Contact3Registry cr; Contact3Registry cr;
RegistryMessageModel rmm{cr}; RegistryMessageModelImpl rmm{cr};
MessageTimeSort mts{rmm}; MessageTimeSort mts{rmm};
MessageCleanser mc{cr, rmm, conf}; MessageCleanser mc{cr, rmm, conf};
MessageCommandDispatcher mcd{cr, rmm, conf}; MessageCommandDispatcher mcd{cr, rmm, conf};
@ -234,7 +234,7 @@ int main(int argc, char** argv) {
g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf); g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf);
g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr); g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr);
g_provideInstance<RegistryMessageModel>("RegistryMessageModel", "host", &rmm); g_provideInstance<RegistryMessageModelI>("RegistryMessageModelI", "host", &rmm);
g_provideInstance<MessageCommandDispatcher>("MessageCommandDispatcher", "host", &mcd); g_provideInstance<MessageCommandDispatcher>("MessageCommandDispatcher", "host", &mcd);
g_provideInstance<ToxI>("ToxI", "host", &tc); g_provideInstance<ToxI>("ToxI", "host", &tc);

4
src/managment_commands.cpp
View File

@ -54,7 +54,7 @@ static std::string getStatusFromContact(
bool handleContactAddToGroup( bool handleContactAddToGroup(
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
std::string_view params, std::string_view params,
Message3Handle m, Message3Handle m,
@ -113,7 +113,7 @@ void registerManagementCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm RegistryMessageModelI& rmm
) { ) {
mcd.registerCommand( mcd.registerCommand(
"Management", "manage", "Management", "manage",

2
src/managment_commands.hpp
View File

@ -11,6 +11,6 @@ void registerManagementCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm RegistryMessageModelI& rmm
); );

2
src/message_cleanser.cpp
View File

@ -10,7 +10,7 @@
MessageCleanser::MessageCleanser( MessageCleanser::MessageCleanser(
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
ConfigModelI& conf ConfigModelI& conf
) : _cr(cr), _rmm(rmm), _conf(conf) { ) : _cr(cr), _rmm(rmm), _conf(conf) {
if (!_conf.has_int("MessageCleanser", "old_age_minutes")) { if (!_conf.has_int("MessageCleanser", "old_age_minutes")) {

4
src/message_cleanser.hpp
View File

@ -5,7 +5,7 @@
class MessageCleanser { class MessageCleanser {
Contact3Registry& _cr; Contact3Registry& _cr;
RegistryMessageModel& _rmm; RegistryMessageModelI& _rmm;
ConfigModelI& _conf; ConfigModelI& _conf;
static constexpr int64_t _old_age_default{150}; // minutes static constexpr int64_t _old_age_default{150}; // minutes
@ -16,7 +16,7 @@ class MessageCleanser {
public: public:
MessageCleanser( MessageCleanser(
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
ConfigModelI& conf ConfigModelI& conf
); );
~MessageCleanser(void); ~MessageCleanser(void);

2
src/tox_commands.cpp
View File

@ -18,7 +18,7 @@ void registerToxCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
ToxI& t, ToxI& t,
ToxPrivateI& tp ToxPrivateI& tp
) { ) {

2
src/tox_commands.hpp
View File

@ -13,7 +13,7 @@ void registerToxCommands(
MessageCommandDispatcher& mcd, MessageCommandDispatcher& mcd,
ConfigModelI& conf, ConfigModelI& conf,
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModel& rmm, RegistryMessageModelI& rmm,
ToxI& t, ToxI& t,
ToxPrivateI& tp ToxPrivateI& tp
); );