summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin10/lib/mir_core.libbin47958 -> 47718 bytes
-rw-r--r--bin10/lib/mir_core64.libbin43842 -> 43568 bytes
-rw-r--r--bin11/lib/mir_core.libbin47958 -> 47718 bytes
-rw-r--r--bin11/lib/mir_core64.libbin43842 -> 43568 bytes
-rw-r--r--include/m_json.h20
-rw-r--r--protocols/FacebookRM/src/json.cpp80
-rw-r--r--src/mir_core/commonheaders.h2
-rw-r--r--src/mir_core/json/libJSON.cpp12
8 files changed, 52 insertions, 62 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index cd1176ba70..b316fe8c42 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
Binary files differ
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index 18a2a8f9a2..e234825ab3 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
Binary files differ
diff --git a/bin11/lib/mir_core.lib b/bin11/lib/mir_core.lib
index fa78e2495a..09d09166b8 100644
--- a/bin11/lib/mir_core.lib
+++ b/bin11/lib/mir_core.lib
Binary files differ
diff --git a/bin11/lib/mir_core64.lib b/bin11/lib/mir_core64.lib
index 4ab1a876e9..cbe3f4b8d0 100644
--- a/bin11/lib/mir_core64.lib
+++ b/bin11/lib/mir_core64.lib
Binary files differ
diff --git a/include/m_json.h b/include/m_json.h
index 3d82fe276b..e635814299 100644
--- a/include/m_json.h
+++ b/include/m_json.h
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_core.h>
+#pragma warning(disable:4190)
+
#ifdef __cplusplus
typedef void JSONNODE;
@@ -116,23 +118,11 @@ MIR_CORE_DLL(JSONNODE*) json_pop_back(JSONNODE * node, const char * name);
MIR_CORE_DLL(int) json_equal(JSONNODE * node, JSONNODE * node2);
#ifdef __cplusplus
+#ifdef _XSTRING_
+MIR_CORE_DLL(std::string) json_as_pstring(const JSONNODE * node);
+#endif
}
-class json_ptr
-{
- char *data;
-
-public:
- __inline json_ptr() : data(NULL) {}
- __inline json_ptr(char *_p) : data(_p) {}
- __inline ~json_ptr() { json_free(data); }
- __inline char* operator = (char* _p) { if (data) json_free(data); data = _p; return data; }
- __inline char* operator->() const { return data; }
- __inline operator char*() const { return data; }
-};
-
-#define JSON_AS_STRING(A) ((char*)json_ptr(json_as_string(A)))
-
#endif
#endif // MIM_LIBJSON_H
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp
index 98a4867464..45e1bc0267 100644
--- a/protocols/FacebookRM/src/json.cpp
+++ b/protocols/FacebookRM/src/json.cpp
@@ -71,7 +71,7 @@ int facebook_json_parser::parse_buddy_list(void* data, List::List< facebook_user
if (mobileFriends != NULL) {
for (unsigned int i = 0; i < json_size(mobileFriends); i++) {
JSONNODE *it = json_at(mobileFriends, i);
- std::string id( JSON_AS_STRING(it));
+ std::string id = json_as_pstring(it);
current = buddy_list->find(id);
if (current == NULL) {
@@ -122,9 +122,9 @@ int facebook_json_parser::parse_buddy_list(void* data, List::List< facebook_user
JSONNODE *thumbSrc = json_get(it, "thumbSrc");
if (name != NULL)
- current->real_name = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(JSON_AS_STRING(name)));
+ current->real_name = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(json_as_pstring(name)));
if (thumbSrc != NULL)
- current->image_url = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(JSON_AS_STRING(thumbSrc)));
+ current->image_url = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(json_as_pstring(thumbSrc)));
}
}
@@ -162,9 +162,9 @@ int facebook_json_parser::parse_friends(void* data, std::map< std::string, faceb
fbu->user_id = id;
if (name)
- fbu->real_name = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(JSON_AS_STRING(name)));
+ fbu->real_name = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(json_as_pstring(name)));
if (thumbSrc)
- fbu->image_url = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(JSON_AS_STRING(thumbSrc)));
+ fbu->image_url = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(json_as_pstring(thumbSrc)));
if (gender)
switch (json_as_int(gender)) {
@@ -216,7 +216,7 @@ int facebook_json_parser::parse_notifications(void *data, std::vector< facebook_
if (markup == NULL || unread == NULL || json_as_int(unread) == 0)
continue;
- std::string text = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(JSON_AS_STRING(markup)));
+ std::string text = utils::text::slashu_to_utf8(utils::text::special_expressions_decode(json_as_pstring(markup)));
facebook_notification* notification = new facebook_notification();
@@ -262,12 +262,12 @@ void parseAttachments(FacebookProto *proto, std::string *message_text, JSONNODE
if (attach_type != NULL) {
// Get attachment type - "file" has priority over other types
if (type.empty() || type != "file")
- type = JSON_AS_STRING(attach_type);
+ type = json_as_pstring(attach_type);
}
JSONNODE *name = json_get(itAttachment, "name");
JSONNODE *url = json_get(itAttachment, "url");
if (url != NULL) {
- std::string link = JSON_AS_STRING(url);
+ std::string link = json_as_pstring(url);
if (link.find("/ajax/mercury/attachments/photo/view/") != std::string::npos)
// fix photo url
@@ -281,7 +281,7 @@ void parseAttachments(FacebookProto *proto, std::string *message_text, JSONNODE
if (!link.empty()) {
std::string filename;
if (name != NULL)
- filename = JSON_AS_STRING(name);
+ filename = json_as_pstring(name);
if (filename == "null")
filename.clear();
@@ -298,7 +298,7 @@ void parseAttachments(FacebookProto *proto, std::string *message_text, JSONNODE
// we can use this as offline messages doesn't have it
/* JSONNODE *admin_snippet = json_get(it, "admin_snippet");
if (admin_snippet != NULL) {
- *message_text += JSON_AS_STRING(admin_snippet);
+ *message_text += json_as_pstring(admin_snippet);
} */
std::tstring newText;
@@ -341,7 +341,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (type == NULL)
continue;
- std::string t = JSON_AS_STRING(type);
+ std::string t = json_as_pstring(type);
if (t == "msg" || t == "offline_msg") {
// we use this only for outgoing messages
@@ -361,14 +361,14 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (from == NULL || from_name == NULL || text == NULL || messageId == NULL || time == NULL)
continue;
- std::string from_id = JSON_AS_STRING(from);
+ std::string from_id = json_as_pstring(from);
// ignore incomming messages
if (from_id != proto->facy.self_.user_id)
continue;
- std::string message_id = JSON_AS_STRING(messageId);
- std::string message_text = JSON_AS_STRING(text);
+ std::string message_id = json_as_pstring(messageId);
+ std::string message_text = json_as_pstring(text);
message_text = utils::text::trim(utils::text::special_expressions_decode(utils::text::slashu_to_utf8(message_text)), true);
if (message_text.empty())
@@ -394,9 +394,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
facebook_message* message = new facebook_message();
message->message_text = message_text;
- message->sender_name = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(JSON_AS_STRING(to_name)));
+ message->sender_name = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(json_as_pstring(to_name)));
message->time = utils::time::fix_timestamp(json_as_float(time));
- message->user_id = JSON_AS_STRING(to); // TODO: Check if we have contact with this ID in friendlist and otherwise do something different?
+ message->user_id = json_as_pstring(to); // TODO: Check if we have contact with this ID in friendlist and otherwise do something different?
message->message_id = message_id;
message->isIncoming = false;
@@ -408,7 +408,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (type == NULL)
continue;
- std::string t = JSON_AS_STRING(type);
+ std::string t = json_as_pstring(type);
if (t == "read_receipt") {
// user read message
@@ -419,7 +419,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
continue;
// TODO: add check for chat contacts
- HANDLE hContact = proto->ContactIDToHContact(JSON_AS_STRING(reader));
+ HANDLE hContact = proto->ContactIDToHContact(json_as_pstring(reader));
if (hContact) {
TCHAR ttime[64], tstr[100];
_tcsftime(ttime, SIZEOF(ttime), _T("%X"), utils::conversion::fbtime_to_timeinfo(json_as_float(time)));
@@ -442,9 +442,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (sender_fbid == NULL || sender_name == NULL || body == NULL || mid == NULL || timestamp == NULL)
continue;
- std::string id = JSON_AS_STRING(sender_fbid);
- std::string message_id = JSON_AS_STRING(mid);
- std::string message_text = JSON_AS_STRING(body);
+ std::string id = json_as_pstring(sender_fbid);
+ std::string message_id = json_as_pstring(mid);
+ std::string message_text = json_as_pstring(body);
// Process attachements and stickers
parseAttachments(proto, &message_text, msg);
@@ -463,7 +463,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
facebook_message* message = new facebook_message();
message->message_text = message_text;
- message->sender_name = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(JSON_AS_STRING(sender_name)));
+ message->sender_name = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(json_as_pstring(sender_name)));
message->time = utils::time::fix_timestamp(json_as_float(timestamp));
message->user_id = id; // TODO: Check if we have contact with this ID in friendlist and otherwise do something different?
message->message_id = message_id;
@@ -488,9 +488,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (from_id == NULL || text == NULL || messageId == NULL)
continue;
- std::string id = JSON_AS_STRING(from_id);
- std::string message_id = JSON_AS_STRING(messageId);
- std::string message_text = JSON_AS_STRING(text);
+ std::string id = json_as_pstring(from_id);
+ std::string message_id = json_as_pstring(messageId);
+ std::string message_text = json_as_pstring(text);
// Ignore messages from myself
if (id == proto->facy.self_.user_id)
@@ -504,9 +504,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (message_text.empty())
continue;
- std::string title = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(JSON_AS_STRING(to_name)));
+ std::string title = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(json_as_pstring(to_name)));
std::string url = "/?action=read&sk=inbox&page&query&tid=" + id;
- std::string popup_text = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(JSON_AS_STRING(from_name)));
+ std::string popup_text = utils::text::special_expressions_decode(utils::text::slashu_to_utf8(json_as_pstring(from_name)));
popup_text += ": " + message_text;
proto->Log(" Got multichat message");
@@ -547,9 +547,9 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
proto->facy.last_notification_time_ = timestamp;
facebook_notification* notification = new facebook_notification();
- notification->text = utils::text::slashu_to_utf8(JSON_AS_STRING(text));
- notification->link = utils::text::special_expressions_decode(JSON_AS_STRING(url));
- notification->id = JSON_AS_STRING(alert_id);
+ notification->text = utils::text::slashu_to_utf8(json_as_pstring(text));
+ notification->link = utils::text::special_expressions_decode(json_as_pstring(url));
+ notification->id = json_as_pstring(alert_id);
std::string::size_type pos = notification->id.find(":");
if (pos != std::string::npos)
@@ -566,7 +566,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
continue;
facebook_user fbu;
- fbu.user_id = JSON_AS_STRING(from);
+ fbu.user_id = json_as_pstring(from);
HANDLE hContact = proto->AddToContactList(&fbu, CONTACT_FRIEND);
@@ -587,7 +587,7 @@ int facebook_json_parser::parse_messages(void* data, std::vector< facebook_messa
if (event_type == NULL || event_data == NULL)
continue;
- std::string t = JSON_AS_STRING(event_type);
+ std::string t = json_as_pstring(event_type);
if (t == "visibility_update") {
// change of chat status
JSONNODE *visibility = json_get(event_data, "visibility");
@@ -641,7 +641,7 @@ int facebook_json_parser::parse_unread_threads(void* data, std::vector< std::str
for (unsigned int j = 0; j < json_size(thread_ids); j++) {
JSONNODE *id = json_at(thread_ids, j);
- threads->push_back(JSON_AS_STRING(id));
+ threads->push_back(json_as_pstring(id));
}
}
@@ -680,11 +680,11 @@ int facebook_json_parser::parse_thread_messages(void* data, std::vector< faceboo
if (canonical == NULL || thread_id == NULL)
continue;
- std::string id = JSON_AS_STRING(canonical);
+ std::string id = json_as_pstring(canonical);
if (id == "null")
continue;
- std::string tid = JSON_AS_STRING(thread_id);
+ std::string tid = json_as_pstring(thread_id);
thread_ids.insert(std::make_pair(tid, id));
}
@@ -707,14 +707,14 @@ int facebook_json_parser::parse_thread_messages(void* data, std::vector< faceboo
continue;
// Try to get user id from "threads" array (and simultaneously ignore multi user threads)
- std::map<std::string, std::string>::iterator iter = thread_ids.find(JSON_AS_STRING(tid));
+ std::map<std::string, std::string>::iterator iter = thread_ids.find(json_as_pstring(tid));
if (iter == thread_ids.end())
continue; // not found or ignored multi user thread
std::string user_id = iter->second;
- std::string message_id = JSON_AS_STRING(mid);
- std::string message_text = JSON_AS_STRING(body);
- std::string author_id = JSON_AS_STRING(author);
+ std::string message_id = json_as_pstring(mid);
+ std::string message_text = json_as_pstring(body);
+ std::string author_id = json_as_pstring(author);
std::string::size_type pos = author_id.find(":");
if (pos != std::string::npos)
author_id = author_id.substr(pos+1);
@@ -729,7 +729,7 @@ int facebook_json_parser::parse_thread_messages(void* data, std::vector< faceboo
facebook_message* message = new facebook_message();
message->message_text = message_text;
if (author_email != NULL)
- message->sender_name = JSON_AS_STRING(author_email);
+ message->sender_name = json_as_pstring(author_email);
message->time = utils::time::fix_timestamp(json_as_float(timestamp));
message->user_id = user_id; // TODO: Check if we have contact with this ID in friendlist and otherwise do something different?
message->message_id = message_id;
diff --git a/src/mir_core/commonheaders.h b/src/mir_core/commonheaders.h
index 4a76153e96..26e32aa1c8 100644
--- a/src/mir_core/commonheaders.h
+++ b/src/mir_core/commonheaders.h
@@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <commctrl.h>
#include <vssym32.h>
+#include <string>
+
#include <malloc.h>
#include <stdio.h>
#include <time.h>
diff --git a/src/mir_core/json/libJSON.cpp b/src/mir_core/json/libJSON.cpp
index e3599e8936..c8f7a0e3ff 100644
--- a/src/mir_core/json/libJSON.cpp
+++ b/src/mir_core/json/libJSON.cpp
@@ -152,13 +152,6 @@ MIR_CORE_DLL(json_char*) json_strip_white_space(const json_char * json){
}
#endif
-#ifdef JSON_MEMORY_CALLBACKS
- MIR_CORE_DLL(void) json_register_memory_callbacks(json_malloc_t mal, json_realloc_t real, json_free_t fre){
- JSONMemory::registerMemoryCallbacks(mal, real, fre);
- }
-#endif
-
-
/*
stuff that's in class JSONNode
*/
@@ -283,6 +276,11 @@ MIR_CORE_DLL(json_char*) json_as_string(const JSONNODE * node){
return toCString(((JSONNode*)node) -> as_string());
}
+MIR_CORE_DLL(std::string) json_as_pstring(const JSONNODE * node){
+ JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_string"), return toCString(EMPTY_CSTRING););
+ return ((JSONNode*)node) -> as_string();
+}
+
MIR_CORE_DLL(long) json_as_int(const JSONNODE * node){
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_int"), return 0;);
return ((JSONNode*)node) -> as_int();
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:31:18 +0000