1 files changed, 54 insertions, 59 deletions

diff --git a/src/api.c b/src/api.c
index c8b44bc..3e70684 100644
--- a/src/api.c
+++ b/src/api.c
@@ -73,8 +73,6 @@ signed char dc_json_cb (struct lejp_ctx * ctx, char reason) { /* to prevent warn
 		}
 	}
 	if (reason & LEJP_FLAG_CB_IS_VALUE && (path == DC_JSON_ME_USERNAME || path == DC_JSON_ME_ID || path == DC_JSON_ME_DISCRIMINATOR) && (!client->user || !client->user->username || !client->user->id || client->user->status & DC_INCOMPLETE)) { /* if filled, then it's someone else */
-		if (getenv("DC_R")) /* detect user parser */
-			raise(SIGINT);
 		if (!client->user) { /* on first d.user this is our user, subsequent are someone else! */
 			DC_MR(program->users); /* don't need DC_IN_PROGRESS, we have ref in cl */
 			program->users[program->users_length++] = client->user = dc_user_init();
@@ -113,79 +111,57 @@ signed char dc_json_cb (struct lejp_ctx * ctx, char reason) { /* to prevent warn
 		else /* if something goes wrong - if those handlers do not null user, IO_MEMB_GC will */
 			pass->api_io.user->status |= DC_EXPLICIT_NULL; /* but will not free. */
 	} /* user parsing end */
-	if (path == DC_JSON_DM && reason == LEJPCB_OBJECT_START) { /* client->guild[0] always */
-		fprintf(stderr, "new DM start parsing object\n"); /* exists */
-		/* dc_channel_free(pass->api_io.channel); */ /* parser branches must not leave */
-		pass->api_io.channel = dc_channel_init(); /* behind any content in api_io */
+	if ((path == DC_JSON_DM || path == DC_JSON_GUILD_CHANNEL) && reason == LEJPCB_OBJECT_START) {
+		pass->api_io.channel = dc_channel_init();
 		pass->api_io.channel->status |= DC_IN_PROGRESS;
-		pass->api_io.channel->guild = client->guilds[0];
 	}
 	if (path == DC_JSON_DM && reason == LEJPCB_OBJECT_END) {
 		struct dc_channel ** channel = &client->guilds[0]->channel; /* 1. guild = DMs */
 		while (*channel)
 			channel = &(*channel)->next;
-		pass->api_io.channel->status &= ~(DC_IN_PROGRESS);
-		free(pass->api_io.channel->name);
-		pass->api_io.channel->name = strdup("");
+		pass->api_io.channel->guild = client->guilds[0]; /* client->guilds[0] always exists */
+		pass->api_io.channel->status &= ~DC_IN_PROGRESS;
+		free(pass->api_io.channel->topic);
+		pass->api_io.channel->topic = strdup("");
 		for (size_t i = 0; i < pass->api_io.channel->users_length; i++) {
-			pass->api_io.channel->name = realloc(pass->api_io.channel->name, strlen(pass->api_io.channel->name)+strlen(pass->api_io.channel->users[i]->username)+1+2+1+4);
+			pass->api_io.channel->topic = realloc(pass->api_io.channel->topic, strlen(pass->api_io.channel->topic) + strlen(pass->api_io.channel->users[i]->username) + 1 + 2 + 1 + 4);
 			char buf[64];
-			sprintf(buf, "#%d%s", pass->api_io.channel->users[i]->discriminator, i < pass->api_io.channel->users_length ? ", " : "");
-			strcat(pass->api_io.channel->name, pass->api_io.channel->users[i]->username);
-			strcat(pass->api_io.channel->name, buf);
+			snprintf(buf, 63, "#%04d%s", pass->api_io.channel->users[i]->discriminator, i+1 < pass->api_io.channel->users_length ? ", " : "");
+			strcat(pass->api_io.channel->topic, pass->api_io.channel->users[i]->username);
+			strcat(pass->api_io.channel->topic, buf);
 		}
+		if ((struct dc_channel * ch = dc_find_channel(program->channels, program->channels_length, pass->api_io.channel->id)))
+			DC_TRANSFER_CHANNEL(pass->api_io.channel->id, ch);
 		pass->api_io.channel = dc_addr_channel(program, DC_ISAN, pass->api_io.channel, DC_MAY_FREE | DC_REPLACE);
-		fprintf(stderr, "new DM id=%llu (:\n", pass->api_io.channel->id);
-		if ((*channel = dc_find_ll_channel(client->guilds[0]->channel, pass->api_io.channel->id))) {
-			fprintf(stderr, "DM already in LL, id=%llu\n", pass->api_io.channel->id);
-			if (*channel != pass->api_io.channel) {
-				dc_channel_free(*channel, DC_REPLACE);
-				memmove(*channel, pass->api_io.channel, sizeof(**channel));
-			}
+		if (!dc_find_ll_channel(client->guilds[0]->channel, pass->api_io.channel->id)) {
+			fprintf(stderr, "new DM id=%llu (:\n", pass->api_io.channel->id);
+			*channel = pass->api_io.channel;
 		}
 		pass->api_io.channel->guild = client->guilds[0];
 		pass->api_io.channel = NULL; /* we're done, NULL it or PROBLEMS WILL APPEAR!!! */
 	}
-#if 0
-	if (startswith(ctx->path, dc_json_paths[DC_JSON_DM_USER])) { /* we don't DC_REPLACE here bcoz */
-		if (path == DC_JSON_DM_USER && reason == LEJPCB_OBJECT_START) { /* users never update. */
-			pass->api_io.user = dc_user_init();
-			pass->api_io.user->status |= DC_IN_PROGRESS;
-		}
-		if (path == DC_JSON_DM_USER && reason == LEJPCB_OBJECT_END) {
-			fprintf(stderr, "new DM participant (:\n");
-			pass->api_io.user = dc_addr_user(program, DC_ISAE(program->users), pass->api_io.user, DC_MAY_FREE); /* add to program ISA or find existing */
-			pass->api_io.user = dc_addr_user(program, DC_ISAE(pass->api_io.channel->users), pass->api_io.user, DC_UNSET); /* do not free, because it's already in program */
-			pass->api_io.user->status &= ~(DC_IN_PROGRESS); /* somehow invalid 4 byte rw? */
-			pass->api_io.user = NULL; /* we're done, NULL it or PROBLEMS WILL APPEAR!!! */
-		}
-		if (reason & LEJP_FLAG_CB_IS_VALUE && pass->api_io.channel)
-			switch (path) {
-				case DC_JSON_DM_USER_ID:
-					pass->api_io.user->id = strtoull(ctx->buf, NULL, 10);
-					break;
-				case DC_JSON_DM_USER_DISCRIMINATOR:
-					pass->api_io.user->discriminator = atoi(ctx->buf);
-					break;
-				case DC_JSON_DM_USER_NAME:
-					if (!pass->api_io.user->username)
-						pass->api_io.user->username = strdup(ctx->buf);
-					break;
-				default:
-					break;
-			}
+	if (path == DC_JSON_GUILD_CHANNEL && reason == LEJPCB_OBJECT_END) {
+		struct dc_channel ** channel = &pass->api_io.guild->channel;
+		while (*channel)
+			channel = &(*channel)->next;
+		pass->api_io.channel = dc_addr_channel(program, DC_ISAN, pass->api_io.channel, DC_MAY_FREE | DC_REPLACE);
+		pass->api_io.channel = NULL;
 	}
-	if (startswith(ctx->path, dc_json_paths[DC_JSON_GUILD])) {
-		if (path == DC_JSON_GUILD && reason == LEJPCB_OBJECT_START) {
-			/* pass->api_io.guild = dc_guild_init();
-			pass->api_io.guild->status |= DC_IN_PROGRESS; */
-		}
-		if (path == DC_JSON_GUILD && reason == LEJPCB_OBJECT_END) {
-			fprintf(stderr, "new guild");
-			/* pass->api_io.guild = dc_addr_guild(program, DC_ISAE(program->guilds), pass->api_io.guild, DC_MAY_FREE); */
-		}
+	if (path == DC_JSON_GUILD && reason == LEJPCB_OBJECT_START) { /* guild parsing start */
+		pass->api_io.guild = dc_guild_init();
+		pass->api_io.guild->status |= DC_IN_PROGRESS;
 	}
-#endif
+	if (path == DC_JSON_GUILD && reason == LEJPCB_OBJECT_END) {
+		pass->api_io.guild->status &= ~DC_IN_PROGRESS;
+		pass->api_io.guild = dc_addr_guild(program, DC_ISAE(program->guilds), pass->api_io.guild, DC_MAY_FREE | DC_REPLACE); /* when we replace, the new guild's channels' ptrs */
+		struct dc_channel ** channel = &pass->api_io.guild->channel; /* to guild will be inv. */
+		while (*channel) {
+			*(channel)->guild = pass->api_io.guild;
+			channel = &(*channel)->next;
+		}
+		dc_add_guild(program, DC_ISAE(client->guilds), pass->api_io.guild, DC_UNSET);
+		pass->api_io.guild = NULL; /* we're done, NULL it or PROBLEMS WILL APPEAR!!! */
+	} /* guild parsing end */
 	if (reason & LEJP_FLAG_CB_IS_VALUE)
 		switch (path) {
 			case DC_JSON_FRIEND: /* we assume we get users[] before relationships[] */
@@ -214,13 +190,32 @@ signed char dc_json_cb (struct lejp_ctx * ctx, char reason) { /* to prevent warn
 					pass->api_io.user->discriminator = atoi(ctx->buf);
 				break; /* yeah, we don't care about nicknames */
 			case DC_JSON_DM_TYPE:
+			case DC_JSON_GUILD_CHANNEL_TYPE:
 				if (pass->api_io.channel)
 					pass->api_io.channel->type = atoi(ctx->buf);
 				break;
 			case DC_JSON_DM_ID:
+			case DC_JSON_GUILD_CHANNEL_ID:
 				if (pass->api_io.channel)
 					pass->api_io.channel->id = strtoull(ctx->buf, NULL, 10);
 				break;
+			case DC_JSON_DM_NAME:
+			case DC_JSON_GUILD_CHANNEL_NAME:
+				if (pass->api_io.channel)
+					pass->api_io.channel->name = strdup(ctx->buf);
+				break;
+			case DC_JSON_GUILD_NAME:
+				if (pass->api_io.guild)
+					pass->api_io.guild->name = strdup(ctx->buf);
+				break;
+			case DC_JSON_GUILD_ID:
+				if (pass->api_io.guild)
+					pass->api_io.guild->id = strtoull(ctx->buf, NULL, 10);
+				break;
+			case DC_JSON_GUILD_CHANNEL_TOPIC:
+				if (pass->api_io.channel)
+					pass->api_io.channel->topic = strdup(ctx->buf);
+				break;
 			default:
 				break;
 		}