mcabber: mcabber/src/commands.c comparison

comparison mcabber/src/commands.c @ 1598:a087125d8fc8

Replace libjabber with loudmouth

author	franky
date	Sun, 11 Oct 2009 15:38:32 +0200
parents	1802b926e3fa
children	dcd5d4c75199

comparison

equal deleted inserted replaced

-:4f59a414217e
+:a087125d8fc8
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 * USA
 */
 #include <string.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include "commands.h"
 #include "help.h"
-#include "jabglue.h"
 #include "roster.h"
 #include "screen.h"
 #include "compl.h"
 #include "hooks.h"
 #include "hbuf.h"
 #include "utils.h"
 #include "settings.h"
 #include "events.h"
 #include "otr.h"
 #include "utf8.h"
+#include "xmpp.h"
 #define IMSTATUS_AWAY           "away"
 #define IMSTATUS_ONLINE         "online"
 #define IMSTATUS_OFFLINE        "offline"
 #define IMSTATUS_FREE4CHAT      "free"
 }
 static void display_all_annotations(void)
 {
 GSList *notes;
-notes = jb_get_all_storage_rosternotes();
+notes = xmpp_get_all_storage_rosternotes();
 if (!notes)
 return;
 // Call display_and_free_note() for each note,
 msg = to_utf8(arg);
 if (!strcmp(msg, "-"))
 notetxt = NULL; // delete note
 else
 notetxt = msg;
-jb_set_storage_rosternotes(bjid, notetxt);
+xmpp_set_storage_rosternotes(bjid, notetxt);
 g_free(msg);
 } else {      // Display a note
-struct annotation *note = jb_get_storage_rosternotes(bjid, FALSE);
+struct annotation *note = xmpp_get_storage_rosternotes(bjid, FALSE);
 if (note) {
 display_and_free_note(note, bjid);
 } else {
 scr_WriteIncomingMessage(bjid, "This item doesn't have a note.", 0,
 HBB_PREFIX_INFO, 0);
 char **paramlst;
 char *status;
 char *msg;
 enum imstatus st;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 // It makes sense to reset autoaway before changing the status
 // We want a message.  If there's none, we give up.
 scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
 free_arg_lst(paramlst);
 return;
 }
-st = jb_getstatus();  // Preserve current status
+st = xmpp_getstatus();  // Preserve current status
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized status!");
 free_arg_lst(paramlst);
 return;
 }
 // If a recipient is specified, let's don't use default status messages
 if (recipient && !msg)
 msg = "";
-jb_setstatus(st, recipient, msg, FALSE);
+xmpp_setstatus(st, recipient, msg, FALSE);
 free_arg_lst(paramlst);
 }
 static void do_status(char *arg)
 {
 if (!*arg) {
-const char *sm = jb_getstatusmsg();
+const char *sm = xmpp_getstatusmsg();
 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s",
-imstatus2char[jb_getstatus()],
+imstatus2char[xmpp_getstatus()],
 (sm ? sm : ""));
 return;
 }
 arg = to_utf8(arg);
 cmd_setstatus(NULL, arg);
 {
 char **paramlst;
 char *id, *nick;
 char *jid_utf8 = NULL;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 0); // jid, [nickname]
 if (nick)
 nick = to_utf8(nick);
 if (id) {
 // 2nd parameter = optional nickname
-jb_addbuddy(id, nick, NULL);
+xmpp_addbuddy(id, nick, NULL);
 scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
 id);
 }
 g_free(jid_utf8);
 // Close the buffer
 scr_BufferPurge(1, NULL);
 scr_LogPrint(LPRINT_LOGNORM, "Removing <%s>...", bjid);
-jb_delbuddy(bjid);
+xmpp_delbuddy(bjid);
 scr_UpdateBuddyWindow();
 }
 static void do_group(char *arg)
 {
 do_group_return:
 free_arg_lst(paramlst);
 }
 static int send_message_to(const char *fjid, const char *msg, const char *subj,
-const char *type_overwrite, bool quiet)
+LmMessageSubType type_overwrite, bool quiet)
 {
 char *bare_jid, *rp;
 char *hmsg;
 gint crypted;
 gint retval = 0;
 int isroom;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return 1;
 }
 if (!fjid || !*fjid) {
 scr_LogPrint(LPRINT_NORMAL, "You must specify a Jabber ID.");
 hmsg = g_strdup_printf("[%s]\n%s", subj, msg);
 else
 hmsg = (char*)msg;
 // Network part
-jb_send_msg(fjid, msg, (isroom ? ROSTER_TYPE_ROOM : ROSTER_TYPE_USER),
+xmpp_send_msg(fjid, msg, (isroom ? ROSTER_TYPE_ROOM : ROSTER_TYPE_USER),
-subj, NULL, &crypted, type_overwrite);
+subj, FALSE, &crypted, type_overwrite);
 if (crypted == -1) {
 scr_LogPrint(LPRINT_LOGNORM, "Encryption error.  Message was not sent.");
 retval = 1;
 goto send_message_to_return;
 //  send_message(msg, subj, type_overwrite)
 // Write the message in the buddy's window and send the message on
 // the network.
 static void send_message(const char *msg, const char *subj,
-const char *type_overwrite)
+LmMessageSubType type_overwrite)
 {
 const char *bjid;
 if (!current_buddy) {
 scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
 }
 send_message_to(bjid, msg, subj, type_overwrite, FALSE);
 }
-static const char *scan_mtype(char **arg)
+static LmMessageSubType scan_mtype(char **arg)
 {
 //Try splitting it
 char **parlist = split_arg(*arg, 2, 1);
-const char *result = NULL;
+LmMessageSubType result = LM_MESSAGE_SUB_TYPE_NOT_SET;
 //Is it any good parameter?
 if (parlist && *parlist) {
 if (!strcmp("-n", *parlist)) {
-result = TMSG_NORMAL;
+result = LM_MESSAGE_SUB_TYPE_NORMAL;
 } else if (!strcmp("-h", *parlist)) {
-result = TMSG_HEADLINE;
+result = LM_MESSAGE_SUB_TYPE_HEADLINE;
 }
-if (result || (!strcmp("--", *parlist)))
+if (result != LM_MESSAGE_SUB_TYPE_NOT_SET || (!strcmp("--", *parlist)))
 *arg += strlen(*arg) - (parlist[1] ? strlen(parlist[1]) : 0);
 }
 //Anything found? -> skip it
 free_arg_lst(parlist);
 return result;
 }
 static void do_say_internal(char *arg, int parse_flags)
 {
 gpointer bud;
-const char *msgtype = NULL;
+LmMessageSubType msgtype = LM_MESSAGE_SUB_TYPE_NOT_SET;
 scr_set_chatmode(TRUE);
 scr_ShowBuddyWindow();
 if (!current_buddy) {
 scr_ShowBuddyWindow();
 if (!strcasecmp(subcmd, "send_to")) {
 int err = FALSE;
 gchar *msg_utf8;
-const char *msg_type = scan_mtype(&arg);
+LmMessageSubType msg_type = scan_mtype(&arg);
 // Let's send to the specified JID.  We leave now if there
 // has been an error (so we don't leave multi-line mode).
 arg = to_utf8(arg);
 msg_utf8 = to_utf8(scr_get_multiline());
 if (msg_utf8) {
 static void do_say_to(char *arg)
 {
 char **paramlst;
 char *fjid, *msg;
 char *file = NULL;
-const char *msg_type = NULL;
+LmMessageSubType msg_type = LM_MESSAGE_SUB_TYPE_NOT_SET;
 bool quiet = FALSE;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 msg_type = scan_mtype(&arg);
 // Tell the user if this item has an annotation.
 if (type == ROSTER_TYPE_USER ||
 type == ROSTER_TYPE_ROOM ||
 type == ROSTER_TYPE_AGENT) {
-struct annotation *note = jb_get_storage_rosternotes(bjid, TRUE);
+struct annotation *note = xmpp_get_storage_rosternotes(bjid, TRUE);
 if (note) {
 // We do not display the note, we just tell the user.
 g_free(note->text);
 g_free(note->jid);
 g_free(note);
 groupname = (char *)groupnamedata;
 bjid = buddy_getjid(bud);
 name = buddy_getname(bud);
-jb_updatebuddy(bjid, name, *groupname ? groupname : NULL);
+xmpp_updatebuddy(bjid, name, *groupname ? groupname : NULL);
 }
 static void do_rename(char *arg)
 {
 gpointer bud;
 if (!(type & ROSTER_TYPE_GROUP) && !on_srv) {
 scr_LogPrint(LPRINT_NORMAL,
 "Note: this item will be added to your server roster.");
 // If this is a MUC room w/o bookmark, let's give a small hint...
-if (!jb_is_bookmarked(bjid)) {
+if (!xmpp_is_bookmarked(bjid)) {
 scr_LogPrint(LPRINT_NORMAL,
 "You should add a room bookmark or it will not be "
 "recognized as a MUC room next time you run mcabber.");
 }
 }
 // Rename a single buddy
 guint del_name = 0;
 if (!*newname || !strcmp(arg, "-"))
 del_name = TRUE;
 buddy_setname(bud, (del_name ? (char*)bjid : name_utf8));
-jb_updatebuddy(bjid, (del_name ? NULL : name_utf8), group);
+xmpp_updatebuddy(bjid, (del_name ? NULL : name_utf8), group);
 }
 g_free(name_utf8);
 g_free(newname);
 update_roster = TRUE;
 group_utf8 = to_utf8(newgroupname);
 if (strcmp(oldgroupname, group_utf8)) {
 guint msgflag;
-jb_updatebuddy(bjid, name, *group_utf8 ? group_utf8 : NULL);
+xmpp_updatebuddy(bjid, name, *group_utf8 ? group_utf8 : NULL);
 scr_RosterUpDown(-1, 1);
 // If the buddy has a pending message flag,
 // we remove it temporarily in order to reset the global group
 // flag.  We set it back once the buddy is in the new group,
 static void do_rawxml(char *arg)
 {
 char **paramlst;
 char *subcmd;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 1); // subcmd, arg
 // the user to escape quotes in a XML stream...
 buffer = to_utf8(arg);
 if (buffer) {
 scr_LogPrint(LPRINT_NORMAL, "Sending XML string");
-jb_send_raw(buffer);
+lm_connection_send_raw(lconnection, buffer, NULL);
 g_free(buffer);
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string.");
 }
 } else {
 return;
 }
 pass_utf8 = to_utf8(pass);
-jb_room_join(roomname, nick, pass_utf8);
+xmpp_room_join(roomname, nick, pass_utf8);
 scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname);
 g_free(roomname_tmp);
 g_free(nick);
 return;
 }
 roomname = buddy_getjid(bud);
 reason_utf8 = to_utf8(arg);
-jb_room_invite(roomname, fjid, reason_utf8);
+xmpp_room_invite(roomname, fjid, reason_utf8);
 scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>.", fjid);
 g_free(reason_utf8);
 free_arg_lst(paramlst);
 }
 if (ra.val.affil < imaffiliation_size) {
 gchar *jid_utf8, *reason_utf8;
 jid_utf8 = to_utf8(fjid);
 reason_utf8 = to_utf8(arg);
-jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
+xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
 g_free(jid_utf8);
 g_free(reason_utf8);
 } else
 scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter.");
 if (ra.val.role < imrole_size) {
 gchar *jid_utf8, *reason_utf8;
 jid_utf8 = to_utf8(fjid);
 reason_utf8 = to_utf8(arg);
-jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
+xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8);
 g_free(jid_utf8);
 g_free(reason_utf8);
 } else
 scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter.");
 banjid = jid_utf8;
 scr_LogPrint(LPRINT_NORMAL, "Requesting a ban for %s", banjid);
 reason_utf8 = to_utf8(arg);
-jb_room_setattrib(roomid, banjid, NULL, ra, reason_utf8);
+xmpp_room_setattrib(roomid, banjid, NULL, ra, reason_utf8);
 g_free(reason_utf8);
 room_ban_return:
 g_free(bjid);
 g_free(jid_utf8);
 ra.type = type_affil;
 ra.val.affil = affil_none;
 jid_utf8 = to_utf8(fjid);
-jb_room_setattrib(roomid, jid_utf8, NULL, ra, NULL);
+xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, NULL);
 g_free(jid_utf8);
 }
 // The expected argument is a nickname
 static void room_kick(gpointer bud, char *arg)
 ra.type = type_role;
 ra.val.affil = role_none;
 nick_utf8 = to_utf8(nick);
 reason_utf8 = to_utf8(arg);
-jb_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8);
+xmpp_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8);
 g_free(nick_utf8);
 g_free(reason_utf8);
 free_arg_lst(paramlst);
 }
 return;
 }
 roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), nickname);
 desc = to_utf8(arg);
-jb_setstatus(offline, roomid, desc, TRUE);
+xmpp_setstatus(offline, roomid, desc, TRUE);
 g_free(desc);
 g_free(roomid);
 }
 static void room_nick(gpointer bud, char *arg)
 g_free(roomname_tmp);
 nick = to_utf8(arg);
 strip_arg_special_chars(nick);
-jb_room_join(roomname, nick, NULL);
+xmpp_room_join(roomname, nick, NULL);
 g_free(roomname);
 g_free(nick);
 }
 }
 }
 fjid = g_strdup_printf("%s/%s", buddy_getjid(bud), nick);
 fjid_utf8 = to_utf8(fjid);
 msg = to_utf8(arg);
-send_message_to(fjid_utf8, msg, NULL, NULL, FALSE);
+send_message_to(fjid_utf8, msg, NULL, LM_MESSAGE_SUB_TYPE_NOT_SET, FALSE);
 g_free(fjid);
 g_free(fjid_utf8);
 g_free(msg);
 free_arg_lst(paramlst);
 }
 if (!strcmp(arg, "-"))
 arg = NULL;
 arg = to_utf8(arg);
 // Set the topic
-jb_send_msg(buddy_getjid(bud), NULL, ROSTER_TYPE_ROOM, arg ? arg : "",
+xmpp_send_msg(buddy_getjid(bud), NULL, ROSTER_TYPE_ROOM, arg ? arg : "",
-NULL, NULL, NULL);
+FALSE, NULL, LM_MESSAGE_SUB_TYPE_NOT_SET);
 g_free(arg);
 }
 static void room_destroy(gpointer bud, char *arg)
 {
 if (arg && *arg)
 msg = to_utf8(arg);
 else
 msg = NULL;
-jb_room_destroy(buddy_getjid(bud), NULL, msg);
+xmpp_room_destroy(buddy_getjid(bud), NULL, msg);
 g_free(msg);
 }
 static void room_unlock(gpointer bud, char *arg)
 {
 if (*arg) {
 scr_LogPrint(LPRINT_NORMAL, "Unknown parameter.");
 return;
 }
-jb_room_unlock(buddy_getjid(bud));
+xmpp_room_unlock(buddy_getjid(bud));
 }
 static void room_setopt(gpointer bud, char *arg)
 {
 char **paramlst;
 nick = buddy_getnickname(bud);
 printstatus = buddy_getprintstatus(bud);
 autowhois   = buddy_getautowhois(bud);
 }
-jb_set_storage_bookmark(roomid, name, nick, NULL, autojoin,
+xmpp_set_storage_bookmark(roomid, name, nick, NULL, autojoin,
 printstatus, autowhois);
 }
 static void display_all_bookmarks(void)
 {
 GSList *bm, *bmp;
 GString *sbuf;
 struct bookmark *bm_elt;
-bm = jb_get_all_storage_bookmarks();
+bm = xmpp_get_all_storage_bookmarks();
 if (!bm)
 return;
 sbuf = g_string_new("");
 {
 char **paramlst;
 char *subcmd;
 gpointer bud;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 1); // subcmd, arg
 {
 char **paramlst;
 char *subcmd;
 char *jid_utf8;
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 paramlst = split_arg(arg, 2, 0); // subcmd, [jid]
 } else {
 jid_utf8 = to_utf8(arg);
 }
 if (!strcasecmp(subcmd, "allow"))  {
-jb_subscr_send_auth(jid_utf8);
+xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_SUBSCRIBED);
 scr_LogPrint(LPRINT_LOGNORM,
 "<%s> is now allowed to receive your presence updates.",
 jid_utf8);
 } else if (!strcasecmp(subcmd, "cancel"))  {
-jb_subscr_cancel_auth(jid_utf8);
+xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED);
 scr_LogPrint(LPRINT_LOGNORM,
 "<%s> will no longer receive your presence updates.",
 jid_utf8);
 } else if (!strcasecmp(subcmd, "request"))  {
-jb_subscr_request_auth(jid_utf8);
+xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_SUBSCRIBE);
 scr_LogPrint(LPRINT_LOGNORM,
 "Sent presence notification request to <%s>.", jid_utf8);
 } else if (!strcasecmp(subcmd, "request_unsubscribe"))  {
-jb_subscr_request_cancel(jid_utf8);
+xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE);
 scr_LogPrint(LPRINT_LOGNORM,
 "Sent presence notification unsubscription request to <%s>.",
 jid_utf8);
 } else {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 numtype = iqreq_time;
 else if (!strcasecmp(type, "last"))
 numtype = iqreq_last;
 else if (!strcasecmp(type, "vcard"))
 numtype = iqreq_vcard;
-else if (!strcasecmp(type, "show_list")) {
-// Undocumented command, for debugging purposes only
-jb_iqs_display_list();
-free_arg_lst(paramlst);
-return;
-}
 }
 if (!type || !numtype) {
 scr_LogPrint(LPRINT_NORMAL,
 "Please specify a query type (version, time...).");
 free_arg_lst(paramlst);
 return;
 }
-if (!jb_getonline()) {
+if (!lm_connection_is_authenticated(lconnection)) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 free_arg_lst(paramlst);
 return;
 }
 switch (numtype) {
 case iqreq_version:
 case iqreq_time:
 case iqreq_last:
 case iqreq_vcard:
-jb_request(fjid, numtype);
+xmpp_request(fjid, numtype);
 break;
 default:
 break;
 }
 }
 scr_LogPrint(LPRINT_NORMAL, "Please recompile mcabber with libotr enabled.");
 #endif /* HAVE_LIBOTR */
 }
 #ifdef HAVE_LIBOTR
-static char * string_for_otrpolicy(enum otr_policy p)
+static char *string_for_otrpolicy(enum otr_policy p)
 {
 switch (p) {
 case plain:         return "plain";
 case opportunistic: return "opportunistic";
 case manual:        return "manual";
 case always:        return "always";
 default:            return "unknown";
 }
 }
-static void dump_otrpolicy(char * k, char * v, void * nothing)
+static void dump_otrpolicy(char *k, char *v, void *nothing)
 {
 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "otrpolicy for %s: %s", k,
 string_for_otrpolicy(*(enum otr_policy*)v));
 }
 #endif
 g_free(expfname);
 }
 static void do_connect(char *arg)
 {
-mcabber_connect();
+xmpp_connect();
 }
 static void do_disconnect(char *arg)
 {
-jb_disconnect();
+xmpp_disconnect();
-AutoConnection = FALSE;
 }
 static void do_help(char *arg)
 {
 help_process(arg);

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/commands.c @ 1598:a087125d8fc8