mcabber: mcabber/src/jabglue.c comparison

comparison mcabber/src/jabglue.c @ 1377:cd9182f0b5c7

Add /room setopt {print_status,auto_whois} - add the command /room setopt - add option 'muc_auto_whois' The MUC settings auto_whois and print_status can be set on a per-room basis.

author	Mikael Berthe <mikael@lilotux.net>
date	Tue, 27 Nov 2007 23:57:20 +0100
parents	c7e709719c43
children	61fc9eddf763

comparison

equal deleted inserted replaced

-:a0deb5124ebf
+:cd9182f0b5c7
 char *p;
 char *mbuf;
 const char *ournick;
 enum imrole mbrole = role_none;
 enum imaffiliation mbaffil = affil_none;
+enum room_printstatus printstatus;
+enum room_autowhois autowhois;
 const char *mbjid = NULL, *mbnick = NULL;
 const char *actorjid = NULL, *reason = NULL;
 bool new_member = FALSE; // True if somebody else joins the room (not us)
-unsigned int statuscode = 0;
+guint statuscode = 0;
+guint nickchange = 0;
 GSList *room_elt;
 int log_muc_conf;
 guint msgflags;
 log_muc_conf = settings_opt_get_int("log_muc_conf");
 p = xmlnode_get_attrib(y, "code");
 if (p)
 statuscode = atoi(p);
 }
+// Get the room's "print_status" settings
+printstatus = buddy_getprintstatus(room_elt->data);
+if (printstatus == status_default) {
+printstatus = (guint) settings_opt_get_int("muc_print_status");
+if (printstatus > 3)
+printstatus = status_default;
+}
 // Check for nickname change
 if (statuscode == 303 && mbnick) {
 mbuf = g_strdup_printf("%s is now known as %s", rname, mbnick);
 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0);
 g_free(mbuf);
 buddy_resource_setname(room_elt->data, rname, mbnick);
 // Maybe it's _our_ nickname...
 if (ournick && !strcmp(rname, ournick))
 buddy_setnickname(room_elt->data, mbnick);
+nickchange = TRUE;
 }
 // Check for departure/arrival
 if (!mbnick && ust == offline) {
 enum { leave=0, kick, ban } how = leave;
 mbuf = g_strdup_printf("%s has left", rname);
 }
 }
 }
-msgflags = HBB_PREFIX_INFO;
+// Display the mbuf message if we're concerned
-if (!we_left && settings_opt_get_int("muc_flag_joins") != 2)
+// or if the print_status isn't set to none.
-msgflags |= HBB_PREFIX_NOFLAG;
+if (we_left || printstatus != status_none) {
+msgflags = HBB_PREFIX_INFO;
-scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
+if (!we_left && settings_opt_get_int("muc_flag_joins") != 2)
+msgflags |= HBB_PREFIX_NOFLAG;
+scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
+}
 if (log_muc_conf)
 hlog_write_message(roomjid, 0, -1, mbuf);
 if (we_left) {
 scr_WriteIncomingMessage(roomjid, mbuf, 0,
 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0);
 if (log_muc_conf)
 hlog_write_message(roomjid, 0, -1, mbuf);
 g_free(mbuf);
-mbuf = g_strdup_printf("%s has joined", rname);
+if (printstatus != status_none)
+mbuf = g_strdup_printf("%s has joined", rname);
+else
+mbuf = NULL;
 new_member = TRUE;
 }
 } else {
+mbuf = NULL;
 if (strcmp(ournick, rname)) {
-mbuf = g_strdup_printf("%s has joined", rname);
+if (printstatus != status_none)
+mbuf = g_strdup_printf("%s has joined", rname);
 new_member = TRUE;
-} else
+}
-mbuf = NULL;
 }
 if (mbuf) {
 msgflags = HBB_PREFIX_INFO;
 if (!settings_opt_get_int("muc_flag_joins"))
 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
 if (log_muc_conf)
 hlog_write_message(roomjid, 0, -1, mbuf);
 g_free(mbuf);
 }
-}
+} else {
+// This is a simple member status change
+if (printstatus == status_all && !nickchange) {
+mbuf = g_strdup_printf("Member status has changed: %s [%c] %s", rname,
+imstatus2char[ust], ((ustmsg) ? ustmsg : ""));
+scr_WriteIncomingMessage(roomjid, mbuf, usttime, HBB_PREFIX_INFO, 0);
+g_free(mbuf);
+}
+}
+// Sanity check, shouldn't happen...
+if (!rname)
+return;
 // Update room member status
-if (rname) {
+roster_setstatus(roomjid, rname, bpprio, ust, ustmsg, usttime,
-roster_setstatus(roomjid, rname, bpprio, ust, ustmsg, usttime,
+mbrole, mbaffil, mbjid);
-mbrole, mbaffil, mbjid);
-if (new_member && settings_opt_get_int("muc_auto_whois")) {
+autowhois = buddy_getautowhois(room_elt->data);
-// FIXME: This will fail for some UTF-8 nicknames.
+if (autowhois == autowhois_default)
-gchar *joiner_nick = from_utf8(rname);
+autowhois = (settings_opt_get_int("muc_auto_whois") ?
-room_whois(room_elt->data, joiner_nick, FALSE);
+autowhois_on : autowhois_off);
-g_free(joiner_nick);
-}
+if (new_member && autowhois == autowhois_on) {
-} else
+// FIXME: This will fail for some UTF-8 nicknames.
-scr_LogPrint(LPRINT_LOGNORM, "MUC DBG: no rname!"); /* DBG */
+gchar *joiner_nick = from_utf8(rname);
+room_whois(room_elt->data, joiner_nick, FALSE);
+g_free(joiner_nick);
+}
 scr_DrawRoster();
 }
 static void handle_packet_presence(jconn conn, char *type, char *from,

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/jabglue.c @ 1377:cd9182f0b5c7