mcabber: mcabber/src/commands.c comparison

comparison mcabber/src/commands.c @ 447:03bb57383cea

Initial Multi-User Chat support This patch adds basic MUC support. We now can: - join an existing room; - create and unlock a room using the /rawxml command; - set our nickname; - send/receive chatgroup messages; - see the members of the room; - leave the room. Chatroom logging is currently disabled, as it could do some unexpected things.

author	Mikael Berthe <mikael@lilotux.net>
date	Sun, 25 Sep 2005 01:01:44 +0200
parents	9f4e9e9aaf08
children	39a28cb59af3

comparison

equal deleted inserted replaced

-:9f4e9e9aaf08
+:03bb57383cea
 static void do_alias(char *arg);
 static void do_bind(char *arg);
 static void do_connect(char *arg);
 static void do_disconnect(char *arg);
 static void do_rawxml(char *arg);
+static void do_room(char *arg);
 // Global variable for the commands list
 static GSList *Commands;
 cmd_add("info", "Show basic infos on current buddy", 0, 0, &do_info);
 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME,
 0, &do_move);
 cmd_add("msay", "Send a multi-lines message to the selected buddy",
 COMPL_MULTILINE, 0, &do_msay);
-//cmd_add("nick");
+cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room);
 cmd_add("quit", "Exit the software", 0, 0, NULL);
 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml);
 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename);
 //cmd_add("request_auth");
 cmd_add("roster", "Manipulate the roster/buddylist", COMPL_ROSTER, 0,
 // Multi-line (msay) category
 compl_add_category_word(COMPL_MULTILINE, "abort");
 compl_add_category_word(COMPL_MULTILINE, "begin");
 compl_add_category_word(COMPL_MULTILINE, "send");
 compl_add_category_word(COMPL_MULTILINE, "verbatim");
+// Room category
+compl_add_category_word(COMPL_ROOM, "join");
+compl_add_category_word(COMPL_ROOM, "leave");
+compl_add_category_word(COMPL_ROOM, "names");
 }
 //  expandalias(line)
 // If there is one, expand the alias in line and returns a new allocated line
 // If no alias is found, returns line
 if (!jid) {
 scr_LogPrint(LPRINT_NORMAL, "No buddy currently selected.");
 return;
 }
-// local part (UI, logging, etc.)
+if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) {
-hk_message_out(jid, 0, msg);
+// local part (UI, logging, etc.)
+hk_message_out(jid, 0, msg);
+}
 // Network part
-jb_send_msg(jid, msg);
+jb_send_msg(jid, msg, buddy_gettype(BUDDATA(current_buddy)));
 }
 //  process_command(line)
 // Process a command line.
 // Return 255 if this is the /quit command, and 0 for the other commands.
 scr_LogPrint(LPRINT_NORMAL, "Who are you talking to??");
 return;
 }
 bud = BUDDATA(current_buddy);
-if (!(buddy_gettype(bud) & ROSTER_TYPE_USER)) {
+if (!(buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_ROOM))) {
 scr_LogPrint(LPRINT_NORMAL, "This is not a user");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 scr_LogPrint(LPRINT_NORMAL, "Who are you talking to??");
 return;
 }
 bud = BUDDATA(current_buddy);
-if (!(buddy_gettype(bud) & ROSTER_TYPE_USER)) {
+if (!(buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_ROOM))) {
 scr_LogPrint(LPRINT_NORMAL, "This is not a user");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 snprintf(buffer, 127, "Name: %s", name);
 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
 }
 if (type == ROSTER_TYPE_USER)       typestr = "user";
+else if (type == ROSTER_TYPE_ROOM)  typestr = "chatroom";
 else if (type == ROSTER_TYPE_AGENT) typestr = "agent";
 snprintf(buffer, 127, "Type: %s", typestr);
 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
 resources = buddy_getresources(bud);
 scr_LogPrint(LPRINT_NORMAL, "Please read the manual page"
 " before using /rawxml :-)");
 }
 }
+static void do_room(char *arg)
+{
+gpointer bud;
+if (!arg || (!*arg)) {
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter");
+return;
+}
+bud = BUDDATA(current_buddy);
+if (!strncasecmp(arg, "join", 4))  {
+GSList *roster_usr;
+char *roomname, *nick, *roomid;
+arg += 4;
+if (*arg++ != ' ') {
+scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter");
+return;
+}
+for (; *arg && *arg == ' '; arg++)
+;
+roomname = g_strdup(arg);
+nick = strchr(roomname, ' ');
+if (!nick) {
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)");
+g_free(roomname);
+return;
+}
+*nick++ = 0;
+while (*nick && *nick == ' ')
+nick++;
+if (!*nick) {
+scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)");
+g_free(roomname);
+return;
+}
+// room syntax: "room@server/nick"
+// FIXME: check roomid is a jid
+roomid = g_strdup_printf("%s/%s", roomname, nick);
+jb_room_join(roomid);
+roster_usr = roster_add_user(roomname, NULL, NULL, ROSTER_TYPE_ROOM);
+if (roster_usr)
+buddy_setnickname(roster_usr->data, nick);
+g_free(roomname);
+g_free(roomid);
+buddylist_build();
+update_roster = TRUE;
+} else if (!strncasecmp(arg, "leave", 5))  {
+char *roomid;
+arg += 5;
+for (; *arg && *arg == ' '; arg++)
+;
+if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) {
+scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom");
+return;
+}
+roomid = g_strdup_printf("%s/%s", buddy_getjid(bud),
+buddy_getnickname(bud));
+jb_setstatus(offline, roomid, arg);
+g_free(roomid);
+buddy_setnickname(bud, NULL);
+buddy_del_all_resources(bud);
+scr_LogPrint(LPRINT_NORMAL, "You have left %s", buddy_getjid(bud));
+} else if (!strcasecmp(arg, "names"))  {
+if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) {
+scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom");
+return;
+}
+do_info(NULL);
+} else {
+scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
+}
+}
 static void do_connect(char *arg)
 {
 mcabber_connect();
 }

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/commands.c @ 447:03bb57383cea