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

2 files changed, 4 insertions, 2 deletions

diff --git a/src/memoserv.cpp b/src/memoserv.cpp
index faaca180b..602db9897 100644
--- a/src/memoserv.cpp
+++ b/src/memoserv.cpp
@@ -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);
 }
diff --git a/src/misc.cpp b/src/misc.cpp
index 9354201b2..5e899effd 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -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];