Rename most ext fields names to be consistent with everything else, add accessors for many

5 files changed, 20 insertions, 3 deletions

diff --git a/modules/memoserv/main/memoinfo.cpp b/modules/memoserv/main/memoinfo.cpp
index 6fa8df8b1..aa5ca71e4 100644
--- a/modules/memoserv/main/memoinfo.cpp
+++ b/modules/memoserv/main/memoinfo.cpp
@@ -31,6 +31,7 @@ unsigned MemoInfoImpl::GetIndex(MemoServ::Memo *m)
 	for (unsigned i = 0; i < memos.size(); ++i)
 		if (this->GetMemo(i) == m)
 			return i;
+#warning "-1 unsigned?"
 	return -1; // XXX wtf?
 }
 
@@ -70,6 +71,16 @@ void MemoInfoImpl::SetMemoMax(const int16_t &i)
 	Set(&MemoInfoType::memomax, i);
 }
 
+bool MemoInfoImpl::IsHardMax()
+{
+	return Get(&MemoInfoType::hardmax);
+}
+
+void MemoInfoImpl::SetHardMax(bool hardmax)
+{
+	Set(&MemoInfoType::hardmax, hardmax);
+}
+
 std::vector<MemoServ::Memo *> MemoInfoImpl::GetMemos()
 {
 	return GetRefs<MemoServ::Memo *>();
diff --git a/modules/memoserv/main/memoinfo.h b/modules/memoserv/main/memoinfo.h
index 79deb496b..3232262a3 100644
--- a/modules/memoserv/main/memoinfo.h
+++ b/modules/memoserv/main/memoinfo.h
@@ -25,6 +25,7 @@ class MemoInfoImpl : public MemoServ::MemoInfo
 
 	Serialize::Object *owner = nullptr;
 	int16_t memomax = 0;
+	bool hardmax = false;
 
  public:
 	MemoInfoImpl(Serialize::TypeBase *type) : MemoServ::MemoInfo(type) { }
@@ -41,6 +42,9 @@ class MemoInfoImpl : public MemoServ::MemoInfo
 	int16_t GetMemoMax() override;
 	void SetMemoMax(const int16_t &) override;
 
+	bool IsHardMax() override;
+	void SetHardMax(bool) override;
+
 	std::vector<MemoServ::Memo *> GetMemos() override;
 	std::vector<MemoServ::Ignore *> GetIgnores() override;
 };
diff --git a/modules/memoserv/main/memoinfotype.cpp b/modules/memoserv/main/memoinfotype.cpp
index 3447de5c8..27e3bba75 100644
--- a/modules/memoserv/main/memoinfotype.cpp
+++ b/modules/memoserv/main/memoinfotype.cpp
@@ -23,6 +23,7 @@
 MemoInfoType::MemoInfoType(Module *me) : Serialize::Type<MemoInfoImpl>(me)
 	, owner(this, "owner", &MemoInfoImpl::owner, true)
 	, memomax(this, "memomax", &MemoInfoImpl::memomax)
+	, hardmax(this, "hardmax", &MemoInfoImpl::hardmax)
 {
 
 }
diff --git a/modules/memoserv/main/memoinfotype.h b/modules/memoserv/main/memoinfotype.h
index 97af31917..1a45b361a 100644
--- a/modules/memoserv/main/memoinfotype.h
+++ b/modules/memoserv/main/memoinfotype.h
@@ -24,6 +24,7 @@ class MemoInfoType : public Serialize::Type<MemoInfoImpl>
  public:
 	Serialize::ObjectField<MemoInfoImpl, Serialize::Object *> owner;
 	Serialize::Field<MemoInfoImpl, int16_t> memomax;
+	Serialize::Field<MemoInfoImpl, bool> hardmax;
 
 	MemoInfoType(Module *);
 };
diff --git a/modules/memoserv/main/memoserv.cpp b/modules/memoserv/main/memoserv.cpp
index 4fe747472..3b2b7cd17 100644
--- a/modules/memoserv/main/memoserv.cpp
+++ b/modules/memoserv/main/memoserv.cpp
@@ -133,7 +133,7 @@ class MemoServCore : public Module, public MemoServ::MemoServService
 
 					if (ci->AccessFor(cu->user).HasPriv("MEMO"))
 					{
-						if (cu->user->Account() && cu->user->Account()->HasFieldS("MEMO_RECEIVE"))
+						if (cu->user->Account() && cu->user->Account()->IsMemoReceive())
 							cu->user->SendMessage(*MemoServ, _("There is a new memo on channel \002{0}\002. Type \002{1}{2} READ {3} {4}\002 to read it."), ci->GetName(), Config->StrictPrivmsg, MemoServ->nick, ci->GetName(), mi->GetMemos().size()); // XXX
 					}
 				}
@@ -143,12 +143,12 @@ class MemoServCore : public Module, public MemoServ::MemoServService
 		{
 			NickServ::Account *nc = NickServ::FindNick(target)->GetAccount();
 
-			if (nc->HasFieldS("MEMO_RECEIVE"))
+			if (nc->IsMemoReceive())
 				for (User *u : nc->users)
 					u->SendMessage(*MemoServ, _("You have a new memo from \002{0}\002. Type \002{1}{2} READ {3}\002 to read it."), source, Config->StrictPrivmsg, MemoServ->nick, mi->GetMemos().size());//XXX
 
 			/* let's get out the mail if set in the nickcore - certus */
-			if (nc->HasFieldS("MEMO_MAIL"))
+			if (nc->IsMemoMail())
 				SendMemoMail(nc, mi, m);
 		}