diff options
| author |  Sadie Powell | 2019-08-09 03:57:55 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-08-09 04:07:33 +0100 |
| commit | 7c7de81b6d513330984bb328de7599bb1328f989 (patch) | |
| tree | 1cd62b0d3419fcb93c488911f6ef8e5048f4bb99 /src/modules/m_callerid.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
| parent | Fix waitpong referring to registration timeouts as ping timeouts. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_callerid.cpp')
| -rw-r--r-- | src/modules/m_callerid.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 01a0bec04..0a2d7b3c4 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -54,7 +54,7 @@ class callerid_data callerid_data() : lastnotify(0) { } - std::string ToString(SerializeFormat format) const + std::string ToString(bool human) const { std::ostringstream oss; oss << lastnotify; @@ -62,7 +62,7 @@ class callerid_data { User* u = *i; // Encode UIDs. - oss << "," << (format == FORMAT_USER ? u->nick : u->uuid); + oss << "," << (human ? u->nick : u->uuid); } return oss.str(); } @@ -75,22 +75,20 @@ struct CallerIDExtInfo : public ExtensionItem { } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override + std::string ToHuman(const Extensible* container, void* item) const override { - std::string ret; - if (format != FORMAT_NETWORK) - { - callerid_data* dat = static_cast<callerid_data*>(item); - ret = dat->ToString(format); - } - return ret; + callerid_data* dat = static_cast<callerid_data*>(item); + return dat->ToString(true); } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override + std::string ToInternal(const Extensible* container, void* item) const override { - if (format == FORMAT_NETWORK) - return; + callerid_data* dat = static_cast<callerid_data*>(item); + return dat->ToString(false); + } + void FromInternal(Extensible* container, const std::string& value) override + { void* old = get_raw(container); if (old) this->free(NULL, old); |