timoreo/matrix-3ds-sdk
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jannson.....

Browse source
This commit is contained in:
Sorunome 2019-10-21 00:22:38 +02:00
parent a5c1f204d2
commit dd3b69cfda
No known key found for this signature in database
GPG key ID: 63E31F7B5993A9C4
1 changed files with 101 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
source/matrixclient.cpp
View file

@ -82,7 +82,12 @@ bool Client::login(std::string username, std::string password) {
json_decref(ret); json_decref(ret);
return false; return false;
} }
token = json_string_value(accessToken); const char* tokenCStr = json_string_value(accessToken);
if (!tokenCStr) {
json_decref(ret);
return false;
}
token = tokenCStr;
json_decref(ret); json_decref(ret);
return true; return true;
} }
@ -107,7 +112,12 @@ std::string Client::getUserId() {
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string userIdStr = json_string_value(userId); const char* userIdCStr = json_string_value(userId);
if (!userIdCStr) {
json_decref(ret);
return "";
}
std::string userIdStr = userIdCStr;
json_decref(ret); json_decref(ret);
userIdCache = std::string(userIdStr); userIdCache = std::string(userIdStr);
return userIdCache; return userIdCache;
@ -126,7 +136,12 @@ std::string Client::resolveRoom(std::string alias) {
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string roomIdStr = json_string_value(roomId); const char* roomIdCStr = json_string_value(roomId);
if (!roomIdCStr) {
json_decref(ret);
return "";
}
std::string roomIdStr = roomIdCStr;
D printf_top("Room ID: %s\n", roomIdStr.c_str()); D printf_top("Room ID: %s\n", roomIdStr.c_str());
json_decref(ret); json_decref(ret);
return roomIdStr; return roomIdStr;
@ -143,7 +158,10 @@ std::vector<std::string> Client::getJoinedRooms() {
size_t index; size_t index;
json_t* value; json_t* value;
json_array_foreach(roomsArr, index, value) { json_array_foreach(roomsArr, index, value) {
rooms.push_back(json_string_value(value)); const char* val = json_string_value(value);
if (val) {
rooms.push_back(val);
}
} }
json_decref(ret); json_decref(ret);
return rooms; return rooms;
@ -170,11 +188,17 @@ UserInfo Client::getUserInfo(std::string userId, std::string roomId) {
json_t* val; json_t* val;
val = json_object_get(ret, "displayname"); val = json_object_get(ret, "displayname");
if (val) { if (val) {
displayname = json_string_value(val); const char* valCStr = json_string_value(val);
if (valCStr) {
displayname = valCStr;
}
} }
val = json_object_get(ret, "avatar_url"); val = json_object_get(ret, "avatar_url");
if (val) { if (val) {
avatarUrl = json_string_value(val); const char* valCStr = json_string_value(val);
if (valCStr) {
avatarUrl = valCStr;
}
} }
json_decref(ret); json_decref(ret);
} }
@ -187,11 +211,17 @@ UserInfo Client::getUserInfo(std::string userId, std::string roomId) {
json_t* val; json_t* val;
val = json_object_get(ret, "displayname"); val = json_object_get(ret, "displayname");
if (val) { if (val) {
displayname = json_string_value(val); const char* valCStr = json_string_value(val);
if (valCStr) {
displayname = valCStr;
}
} }
val = json_object_get(ret, "avatar_url"); val = json_object_get(ret, "avatar_url");
if (val) { if (val) {
avatarUrl = json_string_value(val); const char* valCStr = json_string_value(val);
if (valCStr) {
avatarUrl = valCStr;
}
} }
json_decref(ret); json_decref(ret);
} }
@ -213,7 +243,12 @@ std::string Client::getRoomName(std::string roomId) {
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string nameStr = json_string_value(name); const char* nameCStr = json_string_value(name);
if (!nameCStr) {
json_decref(ret);
return "";
}
std::string nameStr = nameCStr;
json_decref(ret); json_decref(ret);
return nameStr; return nameStr;
} }
@ -228,7 +263,12 @@ std::string Client::getRoomTopic(std::string roomId) {
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string topicStr = json_string_value(topic); const char* topicCStr = json_string_value(topic);
if (!topicCStr) {
json_decref(ret);
return "";
}
std::string topicStr = topicCStr;
json_decref(ret); json_decref(ret);
return topicStr; return topicStr;
} }
@ -243,7 +283,12 @@ std::string Client::getRoomAvatar(std::string roomId) {
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string urlStr = json_string_value(url); const char* urlCStr = json_string_value(url);
if (!urlCStr) {
json_decref(ret);
return "";
}
std::string urlStr = urlCStr;
json_decref(ret); json_decref(ret);
return urlStr; return urlStr;
} }
@ -292,7 +337,12 @@ std::string Client::sendEvent(std::string roomId, std::string eventType, json_t*
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string eventIdStr = json_string_value(eventId); const char* eventIdCStr = json_string_value(eventId);
if (!eventIdCStr) {
json_decref(ret);
return "";
}
std::string eventIdStr = eventIdCStr;
json_decref(ret); json_decref(ret);
return eventIdStr; return eventIdStr;
} }
@ -315,7 +365,12 @@ std::string Client::sendStateEvent(std::string roomId, std::string type, std::st
json_decref(ret); json_decref(ret);
return ""; return "";
} }
std::string eventIdStr = json_string_value(eventId); const char* eventIdCStr = json_string_value(eventId);
if (!eventIdCStr) {
json_decref(ret);
return "";
}
std::string eventIdStr = eventIdCStr;
json_decref(ret); json_decref(ret);
return eventIdStr; return eventIdStr;
} }
@ -338,7 +393,12 @@ std::string Client::redactEvent(std::string roomId, std::string eventId, std::st
json_decref(ret); json_decref(ret);
return ""; return "";
} }
const char* eventIdStr = json_string_value(retEventId); const char* eventIdCStr = json_string_value(retEventId);
if (!eventIdCStr) {
json_decref(ret);
return "";
}
std::string eventIdStr = eventIdCStr;
json_decref(ret); json_decref(ret);
return eventIdStr; return eventIdStr;
} }
@ -511,23 +571,32 @@ void Client::processSync(json_t* sync) {
if (strcmp(typeStr, "m.room.name") == 0) { if (strcmp(typeStr, "m.room.name") == 0) {
json_t* name = json_object_get(content, "name"); json_t* name = json_object_get(content, "name");
if (name) { if (name) {
info.name = json_string_value(name); const char* nameCStr = json_string_value(name);
if (nameCStr) {
info.name = nameCStr;
addedInfo = true; addedInfo = true;
} }
}
} else if (strcmp(typeStr, "m.room.topic") == 0) { } else if (strcmp(typeStr, "m.room.topic") == 0) {
json_t* topic = json_object_get(event, "topic"); json_t* topic = json_object_get(event, "topic");
if (topic) { if (topic) {
info.topic = json_string_value(topic); const char* topicCStr = json_string_value(topic);
if (topicCStr) {
info.topic = topicCStr;
addedInfo = true; addedInfo = true;
} }
}
} else if (strcmp(typeStr, "m.room.avatar") == 0) { } else if (strcmp(typeStr, "m.room.avatar") == 0) {
json_t* url = json_object_get(event, "url"); json_t* url = json_object_get(event, "url");
if (url) { if (url) {
info.avatarUrl = json_string_value(url); const char* urlCStr = json_string_value(url);
if (urlCStr) {
info.avatarUrl = urlCStr;
addedInfo = true; addedInfo = true;
} }
} }
} }
}
if (addedInfo) { if (addedInfo) {
callbacks.roomInfo(roomId, info); callbacks.roomInfo(roomId, info);
} }
@ -611,7 +680,12 @@ void Client::registerFilter() {
json_decref(ret); json_decref(ret);
return; return;
} }
std::string filterIdStr = json_string_value(filterId); const char* filterIdCStr = json_string_value(filterId);
if (!filterIdCStr) {
json_decref(ret);
return;
}
std::string filterIdStr = filterIdCStr;
json_decref(ret); json_decref(ret);
store->setFilterId(filterIdStr); store->setFilterId(filterIdStr);
} }
@ -634,7 +708,12 @@ void Client::syncLoop() {
// set the token for the next batch // set the token for the next batch
json_t* token = json_object_get(ret, "next_batch"); json_t* token = json_object_get(ret, "next_batch");
if (token) { if (token) {
store->setSyncToken(json_string_value(token)); const char* tokenCStr = json_string_value(token);
if (tokenCStr) {
store->setSyncToken(tokenCStr);
} else {
store->setSyncToken("");
}
} else { } else {
store->setSyncToken(""); store->setSyncToken("");
} }