pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-26 16:56:39 +02:00
Code Activity

Store flags for memos, fixed the expiring very soon message, fixed /os session view when a session exception is added at a lower limit than th default

Browse Source
This commit is contained in:
Adam
2011-11-04 17:55:14 -04:00
parent 066e5b3fc0
commit a42cafbf69
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/commands/cs_mode.cpp
+9 -1
View File
@@ -88,6 +88,7 @@ class CommandCSMode : public Command
if (!mode_param.empty())
mode_param = " " + mode_param;
source.Reply(_("%c%c%s locked on %s"), adding ? '+' : '-', cm->ModeChar, mode_param.c_str(), ci->name.c_str());
Log(LOG_COMMAND, u, this, ci) << "to lock " << (adding ? '+' : '-') << cm->ModeChar << mode_param;
}
}
}
@@ -117,11 +118,17 @@ class CommandCSMode : public Command
if (adding == -1)
break;
ChannelMode *cm = ModeManager::FindChannelModeByChar(modes[i]);
if (!cm || !cm->CanSet(u))
if (!cm)
{
source.Reply(_("Unknown mode character %c ignored."), modes[i]);
break;
}
else if (!cm->CanSet(u))
{
source.Reply(_("You may not (un)lock mode %c."), modes[i]);
break;
}
Anope::string mode_param;
if (!cm->Type == MODE_REGULAR && !sep.GetToken(mode_param))
source.Reply(_("Missing parameter for mode %c."), cm->ModeChar);
@@ -132,6 +139,7 @@ class CommandCSMode : public Command
if (!mode_param.empty())
mode_param = " " + mode_param;
source.Reply(_("%c%c%s has been unlocked from %s."), adding == 1 ? '+' : '-', cm->ModeChar, mode_param.c_str(), ci->name.c_str());
Log(LOG_COMMAND, u, this, ci) << "to unlock " << (adding ? '+' : '-') << cm->ModeChar << mode_param;
}
else
source.Reply(_("%c is not locked on %s."), cm->ModeChar, ci->name.c_str());
modules/commands/os_session.cpp
+1 -1
View File
@@ -258,7 +258,7 @@ class CommandOSSession : public Command
else
{
Exception *exception = session_service->FindException(param);
source.Reply(_("The host \002%s\002 currently has \002%d\002 sessions with a limit of \002%d\002."), param.c_str(), session->count, exception ? exception-> limit : Config->DefSessionLimit);
source.Reply(_("The host \002%s\002 currently has \002%d\002 sessions with a limit of \002%d\002."), param.c_str(), session->count, exception && exception->limit > Config->DefSessionLimit ? exception->limit : Config->DefSessionLimit);
}
return;
src/memoserv.cpp
+3 -1
View File
@@ -20,9 +20,10 @@ SerializableBase::serialized_data Memo::serialize()
serialized_data data;
data["owner"] << this->owner;
data["time"] << this->time;
data["time"].setType(Serialize::DT_INT) << this->time;
data["sender"] << this->sender;
data["text"] << this->text;
data["flags"] << this->ToString();
return data;
}
@@ -42,6 +43,7 @@ void Memo::unserialize(SerializableBase::serialized_data &data)
data["time"] >> m->time;
data["sender"] >> m->sender;
data["text"] >> m->text;
m->FromString(data["flags"].astr());
mi->memos.push_back(m);
}
src/misc.cpp
+1 -1
View File
@@ -276,7 +276,7 @@ Anope::string expire_left(NickCore *nc, time_t expires)
if (!expires)
return translate(nc, NO_EXPIRE);
else if (expires <= Anope::CurTime)
return translate(nc, _("expires at next database update"));
return translate(nc, _("expires momentarily"));
else
{
char buf[256];