Mercurial > ~mikael > mcabber > hg
annotate mcabber/src/commands.c @ 979:ea939ff047d8
Improve /buffer search_*
Quotes can be used in search strings, for example one can search for
" is " now (with spaces around the word).
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 21 Oct 2006 11:22:15 +0200 |
| parents | a58dfdd6d058 |
| children | 6e2bfd1ffded |
| rev | line source |
|---|---|
| 47 | 1 /* |
| 699 | 2 * commands.c -- user commands handling |
| 393 | 3 * |
| 699 | 4 * Copyright (C) 2005, 2006 Mikael Berthe <bmikael@lists.lilotux.net> |
| 47 | 5 * |
| 6 * This program is free software; you can redistribute it and/or modify | |
| 7 * it under the terms of the GNU General Public License as published by | |
| 8 * the Free Software Foundation; either version 2 of the License, or (at | |
| 9 * your option) any later version. | |
| 10 * | |
| 11 * This program is distributed in the hope that it will be useful, but | |
| 12 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 * General Public License for more details. | |
| 15 * | |
| 16 * You should have received a copy of the GNU General Public License | |
| 17 * along with this program; if not, write to the Free Software | |
| 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
| 19 * USA | |
| 20 */ | |
| 21 | |
| 95 | 22 #include <string.h> |
| 23 | |
| 47 | 24 #include "commands.h" |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
25 #include "help.h" |
| 47 | 26 #include "jabglue.h" |
| 81 | 27 #include "roster.h" |
| 47 | 28 #include "screen.h" |
| 95 | 29 #include "compl.h" |
| 113 | 30 #include "hooks.h" |
| 191 | 31 #include "hbuf.h" |
| 47 | 32 #include "utils.h" |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
33 #include "settings.h" |
| 748 | 34 #include "events.h" |
| 47 | 35 |
| 967 | 36 #define IMSTATUS_AWAY "away" |
| 37 #define IMSTATUS_ONLINE "online" | |
| 38 #define IMSTATUS_OFFLINE "offline" | |
| 39 #define IMSTATUS_FREE4CHAT "free" | |
| 40 #define IMSTATUS_INVISIBLE "invisible" | |
| 41 #define IMSTATUS_AVAILABLE "avail" | |
| 42 #define IMSTATUS_NOTAVAILABLE "notavail" | |
| 43 #define IMSTATUS_DONOTDISTURB "dnd" | |
| 44 | |
| 104 | 45 // Commands callbacks |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
46 static void do_roster(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
47 static void do_status(char *arg); |
| 444 | 48 static void do_status_to(char *arg); |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
49 static void do_add(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
50 static void do_del(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
51 static void do_group(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
52 static void do_say(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
53 static void do_msay(char *arg); |
| 480 | 54 static void do_say_to(char *arg); |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
55 static void do_buffer(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
56 static void do_clear(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
57 static void do_info(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
58 static void do_rename(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
59 static void do_move(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
60 static void do_set(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
61 static void do_alias(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
62 static void do_bind(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
63 static void do_connect(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
64 static void do_disconnect(char *arg); |
| 436 | 65 static void do_rawxml(char *arg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
66 static void do_room(char *arg); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
67 static void do_authorization(char *arg); |
| 622 | 68 static void do_version(char *arg); |
| 693 | 69 static void do_request(char *arg); |
| 748 | 70 static void do_event(char *arg); |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
71 static void do_help(char *arg); |
| 47 | 72 |
| 104 | 73 // Global variable for the commands list |
| 95 | 74 static GSList *Commands; |
| 75 | |
| 104 | 76 |
| 95 | 77 // cmd_add() |
| 78 // Adds a command to the commands list and to the CMD completion list | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
79 static void cmd_add(const char *name, const char *help, |
| 104 | 80 guint flags_row1, guint flags_row2, void (*f)()) |
| 95 | 81 { |
| 82 cmd *n_cmd = g_new0(cmd, 1); | |
| 83 strncpy(n_cmd->name, name, 32-1); | |
| 84 n_cmd->help = help; | |
| 85 n_cmd->completion_flags[0] = flags_row1; | |
| 86 n_cmd->completion_flags[1] = flags_row2; | |
| 87 n_cmd->func = f; | |
| 102 | 88 Commands = g_slist_append(Commands, n_cmd); |
| 95 | 89 // Add to completion CMD category |
| 90 compl_add_category_word(COMPL_CMD, name); | |
| 91 } | |
| 92 | |
| 93 // cmd_init() | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
94 // Commands table initialization |
| 95 | 95 void cmd_init(void) |
| 96 { | |
| 124 | 97 cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add); |
| 285 | 98 cmd_add("alias", "Add an alias", 0, 0, &do_alias); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
99 cmd_add("authorization", "Manage subscription authorizations", |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
100 COMPL_AUTH, COMPL_JID, &do_authorization); |
| 288 | 101 cmd_add("bind", "Add an key binding", 0, 0, &do_bind); |
| 187 | 102 cmd_add("buffer", "Manipulate current buddy's buffer (chat window)", |
| 103 COMPL_BUFFER, 0, &do_buffer); | |
| 108 | 104 cmd_add("clear", "Clear the dialog window", 0, 0, &do_clear); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
105 cmd_add("connect", "Connect to the server", 0, 0, &do_connect); |
| 205 | 106 cmd_add("del", "Delete the current buddy", 0, 0, &do_del); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
107 cmd_add("disconnect", "Disconnect from server", 0, 0, &do_disconnect); |
|
757
ae23c8826efb
Improve completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
755
diff
changeset
|
108 cmd_add("event", "Process an event", COMPL_EVENTSID, COMPL_EVENTS, &do_event); |
| 128 | 109 cmd_add("group", "Change group display settings", COMPL_GROUP, 0, &do_group); |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
110 cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help); |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
111 cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info); |
| 225 | 112 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME, |
| 113 0, &do_move); | |
| 238 | 114 cmd_add("msay", "Send a multi-lines message to the selected buddy", |
| 115 COMPL_MULTILINE, 0, &do_msay); | |
| 95 | 116 cmd_add("quit", "Exit the software", 0, 0, NULL); |
| 436 | 117 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml); |
| 208 | 118 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename); |
|
902
2016f52a167f
Sort commands (for the completion system)
Mikael Berthe <mikael@lilotux.net>
parents:
900
diff
changeset
|
119 cmd_add("request", "Send a Jabber IQ request", COMPL_REQUEST, COMPL_JID, |
|
2016f52a167f
Sort commands (for the completion system)
Mikael Berthe <mikael@lilotux.net>
parents:
900
diff
changeset
|
120 &do_request); |
|
2016f52a167f
Sort commands (for the completion system)
Mikael Berthe <mikael@lilotux.net>
parents:
900
diff
changeset
|
121 cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room); |
| 128 | 122 cmd_add("roster", "Manipulate the roster/buddylist", COMPL_ROSTER, 0, |
| 123 &do_roster); | |
| 132 | 124 cmd_add("say", "Say something to the selected buddy", 0, 0, &do_say); |
|
488
9e8519078e00
Enable jid completion for /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
486
diff
changeset
|
125 cmd_add("say_to", "Say something to a specific buddy", COMPL_JID, 0, |
|
9e8519078e00
Enable jid completion for /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
486
diff
changeset
|
126 &do_say_to); |
| 95 | 127 //cmd_add("search"); |
| 310 | 128 cmd_add("set", "Set/query an option value", 0, 0, &do_set); |
| 116 | 129 cmd_add("status", "Show or set your status", COMPL_STATUS, 0, &do_status); |
| 444 | 130 cmd_add("status_to", "Show or set your status for one recipient", |
| 131 COMPL_JID, COMPL_STATUS, &do_status_to); | |
| 622 | 132 cmd_add("version", "Show mcabber version", 0, 0, &do_version); |
| 95 | 133 |
| 134 // Status category | |
| 135 compl_add_category_word(COMPL_STATUS, "online"); | |
| 136 compl_add_category_word(COMPL_STATUS, "avail"); | |
| 137 compl_add_category_word(COMPL_STATUS, "invisible"); | |
| 138 compl_add_category_word(COMPL_STATUS, "free"); | |
| 139 compl_add_category_word(COMPL_STATUS, "dnd"); | |
| 140 compl_add_category_word(COMPL_STATUS, "notavail"); | |
| 141 compl_add_category_word(COMPL_STATUS, "away"); | |
| 103 | 142 |
| 143 // Roster category | |
| 144 compl_add_category_word(COMPL_ROSTER, "bottom"); | |
| 265 | 145 compl_add_category_word(COMPL_ROSTER, "top"); |
|
377
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
146 compl_add_category_word(COMPL_ROSTER, "up"); |
|
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
147 compl_add_category_word(COMPL_ROSTER, "down"); |
|
707
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
148 compl_add_category_word(COMPL_ROSTER, "hide"); |
|
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
149 compl_add_category_word(COMPL_ROSTER, "show"); |
|
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
150 compl_add_category_word(COMPL_ROSTER, "toggle"); |
| 103 | 151 compl_add_category_word(COMPL_ROSTER, "hide_offline"); |
| 152 compl_add_category_word(COMPL_ROSTER, "show_offline"); | |
|
290
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
153 compl_add_category_word(COMPL_ROSTER, "toggle_offline"); |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
154 compl_add_category_word(COMPL_ROSTER, "item_lock"); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
155 compl_add_category_word(COMPL_ROSTER, "item_unlock"); |
| 330 | 156 compl_add_category_word(COMPL_ROSTER, "alternate"); |
| 265 | 157 compl_add_category_word(COMPL_ROSTER, "search"); |
| 236 | 158 compl_add_category_word(COMPL_ROSTER, "unread_first"); |
| 159 compl_add_category_word(COMPL_ROSTER, "unread_next"); | |
| 127 | 160 |
| 187 | 161 // Roster category |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
162 compl_add_category_word(COMPL_BUFFER, "clear"); |
| 187 | 163 compl_add_category_word(COMPL_BUFFER, "bottom"); |
| 164 compl_add_category_word(COMPL_BUFFER, "top"); | |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
165 compl_add_category_word(COMPL_BUFFER, "up"); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
166 compl_add_category_word(COMPL_BUFFER, "down"); |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
167 compl_add_category_word(COMPL_BUFFER, "search_backward"); |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
168 compl_add_category_word(COMPL_BUFFER, "search_forward"); |
| 464 | 169 compl_add_category_word(COMPL_BUFFER, "date"); |
| 462 | 170 compl_add_category_word(COMPL_BUFFER, "%"); |
| 866 | 171 compl_add_category_word(COMPL_BUFFER, "purge"); |
|
873
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
172 compl_add_category_word(COMPL_BUFFER, "scroll_lock"); |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
173 compl_add_category_word(COMPL_BUFFER, "scroll_unlock"); |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
174 compl_add_category_word(COMPL_BUFFER, "scroll_toggle"); |
| 187 | 175 |
| 127 | 176 // Group category |
| 240 | 177 compl_add_category_word(COMPL_GROUP, "fold"); |
| 178 compl_add_category_word(COMPL_GROUP, "unfold"); | |
| 130 | 179 compl_add_category_word(COMPL_GROUP, "toggle"); |
| 238 | 180 |
| 181 // Multi-line (msay) category | |
| 182 compl_add_category_word(COMPL_MULTILINE, "abort"); | |
| 183 compl_add_category_word(COMPL_MULTILINE, "begin"); | |
| 184 compl_add_category_word(COMPL_MULTILINE, "send"); | |
| 636 | 185 compl_add_category_word(COMPL_MULTILINE, "send_to"); |
|
796
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
186 compl_add_category_word(COMPL_MULTILINE, "toggle"); |
|
838
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
187 compl_add_category_word(COMPL_MULTILINE, "toggle_verbatim"); |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
188 compl_add_category_word(COMPL_MULTILINE, "verbatim"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
189 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
190 // Room category |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
191 compl_add_category_word(COMPL_ROOM, "affil"); |
| 571 | 192 compl_add_category_word(COMPL_ROOM, "ban"); |
| 599 | 193 compl_add_category_word(COMPL_ROOM, "destroy"); |
| 486 | 194 compl_add_category_word(COMPL_ROOM, "invite"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
195 compl_add_category_word(COMPL_ROOM, "join"); |
| 568 | 196 compl_add_category_word(COMPL_ROOM, "kick"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
197 compl_add_category_word(COMPL_ROOM, "leave"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
198 compl_add_category_word(COMPL_ROOM, "names"); |
| 470 | 199 compl_add_category_word(COMPL_ROOM, "nick"); |
| 490 | 200 compl_add_category_word(COMPL_ROOM, "privmsg"); |
|
448
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
201 compl_add_category_word(COMPL_ROOM, "remove"); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
202 compl_add_category_word(COMPL_ROOM, "role"); |
|
475
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
203 compl_add_category_word(COMPL_ROOM, "topic"); |
| 449 | 204 compl_add_category_word(COMPL_ROOM, "unlock"); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
205 compl_add_category_word(COMPL_ROOM, "whois"); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
206 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
207 // Authorization category |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
208 compl_add_category_word(COMPL_AUTH, "allow"); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
209 compl_add_category_word(COMPL_AUTH, "cancel"); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
210 compl_add_category_word(COMPL_AUTH, "request"); |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
211 compl_add_category_word(COMPL_AUTH, "request_unsubscribe"); |
| 693 | 212 |
| 213 // Request (query) category | |
| 214 compl_add_category_word(COMPL_REQUEST, "time"); | |
| 215 compl_add_category_word(COMPL_REQUEST, "version"); | |
|
750
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
216 |
|
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
217 // Events category |
|
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
218 compl_add_category_word(COMPL_EVENTS, "accept"); |
| 755 | 219 compl_add_category_word(COMPL_EVENTS, "ignore"); |
|
750
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
220 compl_add_category_word(COMPL_EVENTS, "reject"); |
| 95 | 221 } |
| 94 | 222 |
| 285 | 223 // expandalias(line) |
| 224 // If there is one, expand the alias in line and returns a new allocated line | |
| 225 // If no alias is found, returns line | |
| 226 // Note : if the returned pointer is different from line, the caller should | |
| 227 // g_free() the pointer after use | |
| 228 char *expandalias(char *line) | |
| 229 { | |
| 230 const char *p1, *p2; | |
| 231 char *word; | |
| 232 const gchar *value; | |
| 233 char *newline = line; | |
| 234 | |
| 967 | 235 // Ignore leading COMMAND_CHAR |
| 236 for (p1 = line ; *p1 == COMMAND_CHAR ; p1++) | |
| 285 | 237 ; |
| 238 // Locate the end of the word | |
| 239 for (p2 = p1 ; *p2 && (*p2 != ' ') ; p2++) | |
| 240 ; | |
| 241 // Extract the word | |
| 242 word = g_strndup(p1, p2-p1); | |
| 243 | |
| 244 // Look for an alias in the list | |
| 245 value = settings_get(SETTINGS_TYPE_ALIAS, (const char*)word); | |
| 246 if (value) { | |
| 247 // There is an alias to expand | |
| 248 newline = g_new(char, strlen(value)+strlen(p2)+2); | |
| 967 | 249 *newline = COMMAND_CHAR; |
| 285 | 250 strcpy(newline+1, value); |
| 251 strcat(newline, p2); | |
| 252 } | |
| 253 g_free(word); | |
| 254 | |
| 255 return newline; | |
| 256 } | |
| 257 | |
| 102 | 258 // cmd_get |
| 259 // Finds command in the command list structure. | |
| 260 // Returns a pointer to the cmd entry, or NULL if command not found. | |
| 238 | 261 cmd *cmd_get(const char *command) |
| 102 | 262 { |
| 238 | 263 const char *p1, *p2; |
| 102 | 264 char *com; |
| 265 GSList *sl_com; | |
| 285 | 266 |
| 967 | 267 // Ignore leading COMMAND_CHAR |
| 268 for (p1 = command ; *p1 == COMMAND_CHAR ; p1++) | |
| 102 | 269 ; |
| 270 // Locate the end of the command | |
| 271 for (p2 = p1 ; *p2 && (*p2 != ' ') ; p2++) | |
| 272 ; | |
| 273 // Copy the clean command | |
| 274 com = g_strndup(p1, p2-p1); | |
| 275 | |
| 276 // Look for command in the list | |
| 277 for (sl_com=Commands; sl_com; sl_com = g_slist_next(sl_com)) { | |
| 278 if (!strcasecmp(com, ((cmd*)sl_com->data)->name)) | |
| 279 break; | |
| 280 } | |
| 281 g_free(com); | |
| 282 | |
| 283 if (sl_com) // Command has been found. | |
| 284 return (cmd*)sl_com->data; | |
| 285 return NULL; | |
| 286 } | |
| 287 | |
| 47 | 288 // send_message(msg) |
| 289 // Write the message in the buddy's window and send the message on | |
| 290 // the network. | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
291 static void send_message(const char *msg, const char *subj) |
| 47 | 292 { |
| 81 | 293 const char *jid; |
| 393 | 294 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
295 if (!jb_getonline()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
296 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
297 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
298 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
299 |
| 81 | 300 if (!current_buddy) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
301 scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected."); |
| 81 | 302 return; |
| 303 } | |
| 304 | |
| 305 jid = CURRENT_JID; | |
| 306 if (!jid) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
307 scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected."); |
| 81 | 308 return; |
| 309 } | |
| 47 | 310 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
311 if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
312 // local part (UI, logging, etc.) |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
313 gchar *hmsg; |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
314 if (subj) |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
315 hmsg = g_strdup_printf("[%s]\n%s", subj, msg); |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
316 else |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
317 hmsg = (char*)msg; |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
318 hk_message_out(jid, NULL, 0, hmsg); |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
319 if (hmsg != msg) g_free(hmsg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
320 } |
| 47 | 321 |
| 322 // Network part | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
323 jb_send_msg(jid, msg, buddy_gettype(BUDDATA(current_buddy)), subj); |
| 47 | 324 } |
| 325 | |
| 288 | 326 // process_command(line) |
| 327 // Process a command line. | |
| 328 // Return 255 if this is the /quit command, and 0 for the other commands. | |
| 329 int process_command(char *line) | |
| 47 | 330 { |
| 101 | 331 char *p; |
| 285 | 332 char *xpline; |
| 104 | 333 cmd *curcmd; |
| 334 | |
| 285 | 335 // We do alias expansion here |
| 288 | 336 if (scr_get_multimode() != 2) |
| 337 xpline = expandalias(line); | |
| 338 else | |
| 339 xpline = line; // No expansion in verbatim multi-line mode | |
| 285 | 340 |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
341 // We want to have a copy |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
342 if (xpline == line) |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
343 xpline = g_strdup(line); |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
344 |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
345 // Remove trailing spaces: |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
346 for (p=xpline ; *p ; p++) |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
347 ; |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
348 for (p-- ; p>xpline && (*p == ' ') ; p--) |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
349 *p = 0; |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
350 |
| 101 | 351 // Command "quit"? |
| 967 | 352 if ((scr_get_multimode() != 2) |
| 353 && (!strncasecmp(xpline, mkcmdstr("quit"), strlen(mkcmdstr("quit"))))) | |
| 285 | 354 if (!xpline[5] || xpline[5] == ' ') |
| 116 | 355 return 255; |
| 104 | 356 |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
357 // If verbatim multi-line mode, we check if another /msay command is typed |
| 967 | 358 if ((scr_get_multimode() == 2) |
| 359 && (strncasecmp(xpline, mkcmdstr("msay "), strlen(mkcmdstr("msay "))))) { | |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
360 // It isn't an /msay command |
| 285 | 361 scr_append_multiline(xpline); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
362 g_free(xpline); |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
363 return 0; |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
364 } |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
365 |
| 47 | 366 // Commands handling |
| 285 | 367 curcmd = cmd_get(xpline); |
| 47 | 368 |
| 104 | 369 if (!curcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
370 scr_LogPrint(LPRINT_NORMAL, "Unrecognized command. " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
371 "Please see the manual for a list of known commands."); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
372 g_free(xpline); |
| 104 | 373 return 0; |
| 374 } | |
| 375 if (!curcmd->func) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
376 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
377 "This functionality is not yet implemented, sorry."); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
378 g_free(xpline); |
| 104 | 379 return 0; |
| 380 } | |
| 381 // Lets go to the command parameters | |
| 285 | 382 for (p = xpline+1; *p && (*p != ' ') ; p++) |
| 104 | 383 ; |
| 384 // Skip spaces | |
| 285 | 385 while (*p && (*p == ' ')) |
| 386 p++; | |
| 104 | 387 // Call command-specific function |
| 285 | 388 (*curcmd->func)(p); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
389 g_free(xpline); |
| 47 | 390 return 0; |
| 391 } | |
| 392 | |
| 288 | 393 // process_line(line) |
| 394 // Process a command/message line. | |
| 395 // If this isn't a command, this is a message and it is sent to the | |
| 396 // currently selected buddy. | |
| 397 // Return 255 if the line is the /quit command, or 0. | |
| 398 int process_line(char *line) | |
| 399 { | |
| 400 if (!*line) { // User only pressed enter | |
| 401 if (scr_get_multimode()) { | |
| 402 scr_append_multiline(""); | |
| 403 return 0; | |
| 404 } | |
| 405 if (current_buddy) { | |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
406 // Enter chat mode |
| 288 | 407 scr_set_chatmode(TRUE); |
| 408 scr_ShowBuddyWindow(); | |
| 409 } | |
| 410 return 0; | |
| 411 } | |
| 412 | |
| 967 | 413 if (*line != COMMAND_CHAR) { |
| 288 | 414 // This isn't a command |
| 415 if (scr_get_multimode()) | |
| 416 scr_append_multiline(line); | |
| 417 else | |
| 418 do_say(line); | |
| 419 return 0; | |
| 420 } | |
| 421 | |
| 422 /* It is (probably) a command -- except for verbatim multi-line mode */ | |
| 423 return process_command(line); | |
| 424 } | |
| 425 | |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
426 // Helper routine for buffer item_{lock,unlock} |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
427 static void roster_buddylock(char *jid, bool lock) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
428 { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
429 gpointer bud = NULL; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
430 bool may_need_refresh = FALSE; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
431 |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
432 // Allow special jid "" or "." (current buddy) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
433 if (jid && (!*jid || !strcmp(jid, "."))) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
434 jid = NULL; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
435 |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
436 if (jid) { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
437 // The JID has been specified. Quick check... |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
438 if (check_jid_syntax(jid)) { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
439 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
440 } else { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
441 // Find the buddy |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
442 GSList *roster_elt; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
443 roster_elt = roster_find(jid, jidsearch, |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
444 ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
445 if (roster_elt) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
446 bud = roster_elt->data; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
447 else |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
448 scr_LogPrint(LPRINT_NORMAL, "This jid isn't in the roster."); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
449 may_need_refresh = TRUE; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
450 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
451 } else { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
452 // Use the current buddy |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
453 if (current_buddy) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
454 bud = BUDDATA(current_buddy); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
455 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
456 |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
457 // Update the ROSTER_FLAG_USRLOCK flag |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
458 if (bud) { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
459 buddy_setflags(bud, ROSTER_FLAG_USRLOCK, lock); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
460 if (may_need_refresh) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
461 buddylist_build(); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
462 update_roster = TRUE; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
463 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
464 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
465 |
| 104 | 466 /* Commands callback functions */ |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
467 /* All these do_*() functions will be called with a "arg" parameter */ |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
468 /* (with arg not null) */ |
| 104 | 469 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
470 static void do_roster(char *arg) |
| 104 | 471 { |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
472 char **paramlst; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
473 char *subcmd; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
474 |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
475 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
476 subcmd = *paramlst; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
477 arg = *(paramlst+1); |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
478 |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
479 if (!subcmd || !*subcmd) { |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
480 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
481 free_arg_lst(paramlst); |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
482 return; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
483 } |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
484 |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
485 if (!strcasecmp(subcmd, "top")) { |
| 104 | 486 scr_RosterTop(); |
| 128 | 487 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
488 } else if (!strcasecmp(subcmd, "bottom")) { |
| 104 | 489 scr_RosterBottom(); |
| 128 | 490 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
491 } else if (!strcasecmp(subcmd, "hide")) { |
|
707
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
492 scr_RosterVisibility(0); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
493 } else if (!strcasecmp(subcmd, "show")) { |
|
707
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
494 scr_RosterVisibility(1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
495 } else if (!strcasecmp(subcmd, "toggle")) { |
|
707
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
496 scr_RosterVisibility(-1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
497 } else if (!strcasecmp(subcmd, "hide_offline")) { |
| 120 | 498 buddylist_set_hide_offline_buddies(TRUE); |
| 104 | 499 if (current_buddy) |
| 500 buddylist_build(); | |
| 128 | 501 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
502 } else if (!strcasecmp(subcmd, "show_offline")) { |
| 120 | 503 buddylist_set_hide_offline_buddies(FALSE); |
| 124 | 504 buddylist_build(); |
| 128 | 505 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
506 } else if (!strcasecmp(subcmd, "toggle_offline")) { |
|
290
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
507 buddylist_set_hide_offline_buddies(-1); |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
508 buddylist_build(); |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
509 update_roster = TRUE; |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
510 } else if (!strcasecmp(subcmd, "item_lock")) { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
511 roster_buddylock(arg, TRUE); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
512 } else if (!strcasecmp(subcmd, "item_unlock")) { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
513 roster_buddylock(arg, FALSE); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
514 } else if (!strcasecmp(subcmd, "unread_first")) { |
| 236 | 515 scr_RosterUnreadMessage(0); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
516 } else if (!strcasecmp(subcmd, "unread_next")) { |
| 236 | 517 scr_RosterUnreadMessage(1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
518 } else if (!strcasecmp(subcmd, "alternate")) { |
| 330 | 519 scr_RosterJumpAlternate(); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
520 } else if (!strncasecmp(subcmd, "search", 6)) { |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
521 strip_arg_special_chars(arg); |
|
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
522 if (!arg || !*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
523 scr_LogPrint(LPRINT_NORMAL, "What name or JID are you looking for?"); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
524 free_arg_lst(paramlst); |
| 265 | 525 return; |
| 526 } | |
| 978 | 527 scr_RosterSearch(arg); |
| 265 | 528 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
529 } else if (!strcasecmp(subcmd, "up")) { |
|
377
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
530 scr_RosterUp(); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
531 } else if (!strcasecmp(subcmd, "down")) { |
|
377
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
532 scr_RosterDown(); |
| 104 | 533 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
534 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
535 free_arg_lst(paramlst); |
| 104 | 536 } |
| 108 | 537 |
| 444 | 538 // setstatus(recipient, arg) |
| 539 // Set your Jabber status. | |
| 540 // - if recipient is not NULL, the status is sent to this contact only | |
| 541 // - arg must be "status message" (message is optional) | |
| 542 static void setstatus(const char *recipient, const char *arg) | |
| 116 | 543 { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
544 char **paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
545 char *status; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
546 char *msg; |
| 116 | 547 enum imstatus st; |
| 548 | |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
549 if (!jb_getonline()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
550 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
551 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
552 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
553 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
554 paramlst = split_arg(arg, 2, 0); // status, message |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
555 status = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
556 msg = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
557 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
558 if (!status) { |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
559 free_arg_lst(paramlst); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
560 return; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
561 } |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
562 |
| 967 | 563 if (!strcasecmp(status, IMSTATUS_OFFLINE)) st = offline; |
| 564 else if (!strcasecmp(status, IMSTATUS_ONLINE)) st = available; | |
| 565 else if (!strcasecmp(status, IMSTATUS_AVAILABLE)) st = available; | |
| 566 else if (!strcasecmp(status, IMSTATUS_AWAY)) st = away; | |
| 567 else if (!strcasecmp(status, IMSTATUS_INVISIBLE)) st = invisible; | |
| 568 else if (!strcasecmp(status, IMSTATUS_DONOTDISTURB)) st = dontdisturb; | |
| 569 else if (!strcasecmp(status, IMSTATUS_NOTAVAILABLE)) st = notavail; | |
| 570 else if (!strcasecmp(status, IMSTATUS_FREE4CHAT)) st = freeforchat; | |
| 116 | 571 else { |
| 444 | 572 scr_LogPrint(LPRINT_NORMAL, "Unrecognized status!"); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
573 free_arg_lst(paramlst); |
| 116 | 574 return; |
| 575 } | |
| 576 | |
|
677
633a0522bd37
Using "/status invisible -" did not clear the status message
Mikael Berthe <mikael@lilotux.net>
parents:
659
diff
changeset
|
577 // Use provided message |
|
633a0522bd37
Using "/status invisible -" did not clear the status message
Mikael Berthe <mikael@lilotux.net>
parents:
659
diff
changeset
|
578 if (msg && !*msg) { |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
579 msg = NULL; |
|
677
633a0522bd37
Using "/status invisible -" did not clear the status message
Mikael Berthe <mikael@lilotux.net>
parents:
659
diff
changeset
|
580 } |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
581 |
|
528
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
582 // If a recipient is specified, let's don't use default status messages |
|
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
583 if (recipient && !msg) |
|
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
584 msg = ""; |
|
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
585 |
| 444 | 586 jb_setstatus(st, recipient, msg); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
587 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
588 free_arg_lst(paramlst); |
| 444 | 589 } |
| 590 | |
| 591 static void do_status(char *arg) | |
| 592 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
593 if (!*arg) { |
|
519
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
594 const char *sm = jb_getstatusmsg(); |
|
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
595 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s", |
|
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
596 imstatus2char[jb_getstatus()], |
|
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
597 (sm ? sm : "")); |
| 444 | 598 return; |
| 599 } | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
600 arg = to_utf8(arg); |
| 444 | 601 setstatus(NULL, arg); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
602 g_free(arg); |
| 444 | 603 } |
| 604 | |
| 605 static void do_status_to(char *arg) | |
| 606 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
607 char **paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
608 char *jid, *st, *msg; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
609 char *jid_utf8 = NULL; |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
610 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
611 paramlst = split_arg(arg, 3, 1); // jid, status, [message] |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
612 jid = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
613 st = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
614 msg = *(paramlst+2); |
| 444 | 615 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
616 if (!jid || !st) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
617 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
618 "Please specify both a Jabber ID and a status."); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
619 free_arg_lst(paramlst); |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
620 return; |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
621 } |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
622 |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
623 // Allow things like /status_to "" away |
|
641
62679532ea55
Allow special jid "." in commands /add and /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
640
diff
changeset
|
624 if (!*jid || !strcmp(jid, ".")) |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
625 jid = NULL; |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
626 |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
627 if (jid) { |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
628 // The JID has been specified. Quick check... |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
629 if (check_jid_syntax(jid)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
630 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
631 jid = NULL; |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
632 } else { |
|
696
ee06382dfb22
/status_to: Do not convert resource name to lower case
Mikael Berthe <mikael@lilotux.net>
parents:
694
diff
changeset
|
633 // Convert jid to lowercase |
|
ee06382dfb22
/status_to: Do not convert resource name to lower case
Mikael Berthe <mikael@lilotux.net>
parents:
694
diff
changeset
|
634 char *p = jid; |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
974
diff
changeset
|
635 for ( ; *p && *p != JID_RESOURCE_SEPARATOR; p++) |
|
696
ee06382dfb22
/status_to: Do not convert resource name to lower case
Mikael Berthe <mikael@lilotux.net>
parents:
694
diff
changeset
|
636 *p = tolower(*p); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
637 jid = jid_utf8 = to_utf8(jid); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
638 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
639 } else { |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
640 // Add the current buddy |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
641 if (current_buddy) |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
642 jid = (char*)buddy_getjid(BUDDATA(current_buddy)); |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
643 if (!jid) |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
644 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
645 } |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
646 |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
647 if (jid) { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
648 char *cmd; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
649 if (!msg) |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
650 msg = ""; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
651 msg = to_utf8(msg); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
652 cmd = g_strdup_printf("%s %s", st, msg); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
653 scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", jid, cmd); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
654 setstatus(jid, cmd); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
655 g_free(msg); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
656 g_free(cmd); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
657 g_free(jid_utf8); |
| 444 | 658 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
659 free_arg_lst(paramlst); |
| 116 | 660 } |
| 661 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
662 static void do_add(char *arg) |
| 124 | 663 { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
664 char **paramlst; |
| 244 | 665 char *id, *nick; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
666 char *jid_utf8 = NULL; |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
667 |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
668 if (!jb_getonline()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
669 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
670 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
671 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
672 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
673 paramlst = split_arg(arg, 2, 0); // jid, [nickname] |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
674 id = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
675 nick = *(paramlst+1); |
| 244 | 676 |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
677 if (!id) |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
678 nick = NULL; // Allow things like: /add "" nick |
|
641
62679532ea55
Allow special jid "." in commands /add and /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
640
diff
changeset
|
679 else if (!*id || !strcmp(id, ".")) |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
680 id = NULL; |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
681 |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
682 if (id) { |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
683 // The JID has been specified. Quick check... |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
684 if (check_jid_syntax(id)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
685 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", id); |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
686 id = NULL; |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
687 } else { |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
688 mc_strtolower(id); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
689 // Actually an UTF-8 id isn't needed because only the bare jid will |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
690 // be used. |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
691 id = jid_utf8 = to_utf8(id); |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
692 } |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
693 } else { |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
694 // Add the current buddy |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
695 if (current_buddy) |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
696 id = (char*)buddy_getjid(BUDDATA(current_buddy)); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
697 if (!id) |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
698 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
699 } |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
700 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
701 if (nick) |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
702 nick = to_utf8(nick); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
703 |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
704 if (id) { |
| 452 | 705 // 2nd parameter = optional nickname |
| 706 jb_addbuddy(id, nick, NULL); | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
707 scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.", |
| 452 | 708 id); |
| 709 } | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
710 |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
711 g_free(jid_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
712 g_free(nick); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
713 free_arg_lst(paramlst); |
| 124 | 714 } |
| 128 | 715 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
716 static void do_del(char *arg) |
| 206 | 717 { |
| 718 const char *jid; | |
| 719 | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
720 if (*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
721 scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
722 "the currently-selected buddy will be deleted."); |
| 206 | 723 return; |
| 724 } | |
| 725 | |
| 726 if (!current_buddy) return; | |
| 727 jid = buddy_getjid(BUDDATA(current_buddy)); | |
| 728 if (!jid) return; | |
| 729 | |
|
540
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
730 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM) { |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
731 // This is a chatroom |
|
652
b243d3b3ff1b
We do not need buddy_isresource() anymore
Mikael Berthe <mikael@lilotux.net>
parents:
650
diff
changeset
|
732 if (buddy_getinsideroom(BUDDATA(current_buddy))) { |
|
540
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
733 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
734 return; |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
735 } |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
736 } |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
737 |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
738 scr_LogPrint(LPRINT_LOGNORM, "Removing <%s>...", jid); |
| 206 | 739 jb_delbuddy(jid); |
|
865
cee8d6be04e1
Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents:
861
diff
changeset
|
740 scr_UpdateBuddyWindow(); |
| 206 | 741 } |
| 742 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
743 static void do_group(char *arg) |
| 128 | 744 { |
| 745 gpointer group; | |
|
958
30b799632653
Cosmetics (change a variable name)
Mikael Berthe <mikael@lilotux.net>
parents:
957
diff
changeset
|
746 guint leave_buddywindow; |
| 128 | 747 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
748 if (!*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
749 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
| 128 | 750 return; |
| 751 } | |
| 752 | |
| 166 | 753 if (!current_buddy) return; |
| 128 | 754 |
| 166 | 755 group = buddy_getgroup(BUDDATA(current_buddy)); |
|
853
bdd526ec62bc
Fix segfault when using /group with the [status] entry
Mikael Berthe <mikael@lilotux.net>
parents:
848
diff
changeset
|
756 if (!group) return; |
|
bdd526ec62bc
Fix segfault when using /group with the [status] entry
Mikael Berthe <mikael@lilotux.net>
parents:
848
diff
changeset
|
757 |
| 212 | 758 // We'll have to redraw the chat window if we're not currently on the group |
| 759 // entry itself, because it means we'll have to leave the current buddy | |
| 760 // chat window. | |
|
958
30b799632653
Cosmetics (change a variable name)
Mikael Berthe <mikael@lilotux.net>
parents:
957
diff
changeset
|
761 leave_buddywindow = (group != BUDDATA(current_buddy)); |
| 166 | 762 |
| 128 | 763 if (!(buddy_gettype(group) & ROSTER_TYPE_GROUP)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
764 scr_LogPrint(LPRINT_NORMAL, "You need to select a group."); |
| 128 | 765 return; |
| 766 } | |
| 166 | 767 |
| 768 if (!strcasecmp(arg, "expand") || !strcasecmp(arg, "unfold")) { | |
| 128 | 769 buddy_setflags(group, ROSTER_FLAG_HIDE, FALSE); |
| 166 | 770 } else if (!strcasecmp(arg, "shrink") || !strcasecmp(arg, "fold")) { |
| 128 | 771 buddy_setflags(group, ROSTER_FLAG_HIDE, TRUE); |
| 130 | 772 } else if (!strcasecmp(arg, "toggle")) { |
| 773 buddy_setflags(group, ROSTER_FLAG_HIDE, | |
| 774 !(buddy_getflags(group) & ROSTER_FLAG_HIDE)); | |
| 128 | 775 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
776 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 128 | 777 return; |
| 778 } | |
| 779 | |
| 780 buddylist_build(); | |
| 781 update_roster = TRUE; | |
|
958
30b799632653
Cosmetics (change a variable name)
Mikael Berthe <mikael@lilotux.net>
parents:
957
diff
changeset
|
782 if (leave_buddywindow) scr_ShowBuddyWindow(); |
| 128 | 783 } |
| 784 | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
785 static int send_message_to(const char *jid, const char *msg, const char *subj) |
| 636 | 786 { |
| 787 char *bare_jid, *rp; | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
788 char *hmsg; |
| 636 | 789 |
| 790 if (!jid || !*jid) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
791 scr_LogPrint(LPRINT_NORMAL, "You must specify a Jabber ID."); |
| 636 | 792 return 1; |
| 793 } | |
| 794 if (!msg || !*msg) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
795 scr_LogPrint(LPRINT_NORMAL, "You must specify a message."); |
| 636 | 796 return 1; |
| 797 } | |
| 798 if (check_jid_syntax((char*)jid)) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
799 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid); |
| 636 | 800 return 1; |
| 801 } | |
| 802 | |
| 803 // We must use the bare jid in hk_message_out() | |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
974
diff
changeset
|
804 rp = strchr(jid, JID_RESOURCE_SEPARATOR); |
| 636 | 805 if (rp) bare_jid = g_strndup(jid, rp - jid); |
| 806 else bare_jid = (char*)jid; | |
| 807 | |
| 808 // Jump to window, create one if needed | |
| 809 scr_RosterJumpJid(bare_jid); | |
| 810 | |
| 811 // Check if we're sending a message to a conference room | |
| 812 // If not, we must make sure rp is NULL, for hk_message_out() | |
| 813 if (rp) { | |
| 814 if (roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM)) rp++; | |
| 815 else rp = NULL; | |
| 816 } | |
| 817 | |
| 818 // local part (UI, logging, etc.) | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
819 if (subj) |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
820 hmsg = g_strdup_printf("[%s]\n%s", subj, msg); |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
821 else |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
822 hmsg = (char*)msg; |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
823 |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
824 hk_message_out(bare_jid, rp, 0, hmsg); |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
825 if (hmsg != msg) g_free(hmsg); |
| 636 | 826 |
| 827 // Network part | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
828 jb_send_msg(jid, msg, ROSTER_TYPE_USER, subj); |
| 636 | 829 |
| 830 if (rp) g_free(bare_jid); | |
| 831 return 0; | |
| 832 } | |
| 833 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
834 static void do_say(char *arg) |
| 132 | 835 { |
| 164 | 836 gpointer bud; |
| 132 | 837 |
| 838 scr_set_chatmode(TRUE); | |
| 164 | 839 |
| 840 if (!current_buddy) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
841 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
842 "Whom are you talking to? Please select a buddy."); |
| 164 | 843 return; |
| 132 | 844 } |
| 164 | 845 |
| 846 bud = BUDDATA(current_buddy); | |
|
631
423c24e5875a
Allow sending a message to an agent
Mikael Berthe <mikael@lilotux.net>
parents:
626
diff
changeset
|
847 if (!(buddy_gettype(bud) & |
|
423c24e5875a
Allow sending a message to an agent
Mikael Berthe <mikael@lilotux.net>
parents:
626
diff
changeset
|
848 (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM))) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
849 scr_LogPrint(LPRINT_NORMAL, "This is not a user."); |
| 164 | 850 return; |
| 851 } | |
| 852 | |
| 853 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
854 arg = to_utf8(arg); |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
855 send_message(arg, NULL); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
856 g_free(arg); |
| 132 | 857 } |
| 858 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
859 static void do_msay(char *arg) |
| 238 | 860 { |
| 636 | 861 /* Parameters: begin verbatim abort send send_to */ |
| 862 char **paramlst; | |
| 863 char *subcmd; | |
| 864 | |
| 865 paramlst = split_arg(arg, 2, 1); // subcmd, arg | |
| 866 subcmd = *paramlst; | |
| 867 arg = *(paramlst+1); | |
| 238 | 868 |
| 636 | 869 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
870 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
| 636 | 871 scr_LogPrint(LPRINT_NORMAL, "Please read the manual before using " |
| 872 "the /msay command."); | |
| 967 | 873 scr_LogPrint(LPRINT_NORMAL, "(Use \"%s begin\" to enter " |
| 874 "multi-line mode...)", mkcmdstr("msay")); | |
| 636 | 875 free_arg_lst(paramlst); |
| 876 return; | |
| 877 } | |
| 878 | |
|
796
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
879 if (!strcasecmp(subcmd, "toggle")) { |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
880 if (scr_get_multimode()) |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
881 subcmd = "send"; |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
882 else |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
883 subcmd = "begin"; |
|
838
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
884 } else if (!strcasecmp(subcmd, "toggle_verbatim")) { |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
885 if (scr_get_multimode()) |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
886 subcmd = "send"; |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
887 else |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
888 subcmd = "verbatim"; |
|
796
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
889 } |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
890 |
| 636 | 891 if (!strcasecmp(subcmd, "abort")) { |
|
315
65aa05520556
First Ctrl-C now also leaves multi-line message mode
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
892 if (scr_get_multimode()) |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
893 scr_LogPrint(LPRINT_NORMAL, "Leaving multi-line message mode."); |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
894 scr_set_multimode(FALSE, NULL); |
| 238 | 895 return; |
| 636 | 896 } else if ((!strcasecmp(subcmd, "begin")) || |
| 897 (!strcasecmp(subcmd, "verbatim"))) { | |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
898 bool verbat; |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
899 gchar *subj_utf8 = to_utf8(arg); |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
900 if (!strcasecmp(subcmd, "verbatim")) { |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
901 scr_set_multimode(2, subj_utf8); |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
902 verbat = TRUE; |
|
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
903 } else { |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
904 scr_set_multimode(1, subj_utf8); |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
905 verbat = FALSE; |
|
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
906 } |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
907 |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
908 scr_LogPrint(LPRINT_NORMAL, "Entered %smulti-line message mode.", |
|
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
909 verbat ? "VERBATIM " : ""); |
| 967 | 910 scr_LogPrint(LPRINT_NORMAL, "Select a buddy and use \"%s send\" " |
| 911 "when your message is ready.", mkcmdstr("msay")); | |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
912 if (verbat) |
| 967 | 913 scr_LogPrint(LPRINT_NORMAL, "Use \"%s abort\" to abort this mode.", |
| 914 mkcmdstr("msay")); | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
915 g_free(subj_utf8); |
| 238 | 916 return; |
| 636 | 917 } else if (strcasecmp(subcmd, "send") && strcasecmp(subcmd, "send_to")) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
918 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 238 | 919 return; |
| 920 } | |
| 921 | |
| 636 | 922 /* send/send_to command */ |
| 238 | 923 |
| 924 if (!scr_get_multimode()) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
925 scr_LogPrint(LPRINT_NORMAL, "No message to send. " |
| 967 | 926 "Use \"%s begin\" first.", mkcmdstr("msay")); |
| 238 | 927 return; |
| 928 } | |
| 929 | |
| 930 scr_set_chatmode(TRUE); | |
| 931 | |
| 636 | 932 if (!strcasecmp(subcmd, "send_to")) { |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
933 int err = FALSE; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
934 gchar *msg_utf8; |
| 636 | 935 // Let's send to the specified JID. We leave now if there |
| 936 // has been an error (so we don't leave multi-line mode). | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
937 arg = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
938 msg_utf8 = to_utf8(scr_get_multiline()); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
939 if (msg_utf8) { |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
940 err = send_message_to(arg, msg_utf8, scr_get_multimode_subj()); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
941 g_free(msg_utf8); |
|
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
942 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
943 g_free(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
944 if (err) |
| 636 | 945 return; |
| 946 } else { // Send to currently selected buddy | |
| 947 gpointer bud; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
948 gchar *msg_utf8; |
| 238 | 949 |
| 636 | 950 if (!current_buddy) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
951 scr_LogPrint(LPRINT_NORMAL, "Whom are you talking to?"); |
| 636 | 952 return; |
| 953 } | |
| 954 | |
| 955 bud = BUDDATA(current_buddy); | |
| 956 if (!(buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_ROOM))) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
957 scr_LogPrint(LPRINT_NORMAL, "This is not a user."); |
| 636 | 958 return; |
| 959 } | |
| 960 | |
| 961 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
962 msg_utf8 = to_utf8(scr_get_multiline()); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
963 if (msg_utf8) { |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
964 send_message(msg_utf8, scr_get_multimode_subj()); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
965 g_free(msg_utf8); |
|
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
966 } |
| 238 | 967 } |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
968 scr_set_multimode(FALSE, NULL); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
969 scr_LogPrint(LPRINT_NORMAL, "You have left multi-line message mode."); |
| 238 | 970 } |
| 971 | |
| 480 | 972 static void do_say_to(char *arg) |
| 973 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
974 char **paramlst; |
| 480 | 975 char *jid, *msg; |
| 976 | |
| 977 if (!jb_getonline()) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
978 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
| 480 | 979 return; |
| 980 } | |
| 981 | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
982 paramlst = split_arg(arg, 2, 1); // jid, message |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
983 jid = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
984 msg = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
985 |
|
844
5002948c7360
"/say_to ." is not valid
Mikael Berthe <mikael@lilotux.net>
parents:
843
diff
changeset
|
986 if (!jid || !strcmp(jid, ".")) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
987 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
988 free_arg_lst(paramlst); |
| 480 | 989 return; |
| 990 } | |
| 991 | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
992 jid = to_utf8(jid); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
993 msg = to_utf8(msg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
994 |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
995 send_message_to(jid, msg, NULL); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
996 |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
997 g_free(jid); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
998 g_free(msg); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
999 free_arg_lst(paramlst); |
| 480 | 1000 } |
| 1001 | |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1002 // buffer_updown(updown, nblines) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1003 // updown: -1=up, +1=down |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1004 inline static void buffer_updown(int updown, char *nlines) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1005 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1006 int nblines; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1007 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1008 if (!nlines || !*nlines) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1009 nblines = 0; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1010 else |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1011 nblines = atoi(nlines); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1012 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1013 if (nblines >= 0) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1014 scr_BufferScrollUpDown(updown, nblines); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1015 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1016 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1017 static void buffer_search(int direction, char *arg) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1018 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1019 if (!arg || !*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1020 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1021 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1022 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1023 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1024 scr_BufferSearch(direction, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1025 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1026 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1027 static void buffer_date(char *date) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1028 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1029 time_t t; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1030 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1031 if (!date || !*date) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1032 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1033 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1034 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1035 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1036 strip_arg_special_chars(date); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1037 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1038 t = from_iso8601(date, 0); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1039 if (t) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1040 scr_BufferDate(t); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1041 else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1042 scr_LogPrint(LPRINT_NORMAL, "The date you specified is " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1043 "not correctly formatted or invalid."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1044 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1045 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1046 static void buffer_percent(char *arg1, char *arg2) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1047 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1048 // Basically, user has typed "%arg1 arg2" |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1049 // "%50" -> arg1 = 50, arg2 null pointer |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1050 // "% 50" -> arg1 = \0, arg2 = 50 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1051 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1052 if (!*arg1 && (!arg2 || !*arg2)) { // No value |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1053 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1054 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1055 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1056 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1057 if (*arg1 && arg2 && *arg2) { // Two values |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1058 scr_LogPrint(LPRINT_NORMAL, "Wrong parameters."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1059 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1060 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1061 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1062 scr_BufferPercent(atoi((*arg1 ? arg1 : arg2))); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1063 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1064 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1065 static void do_buffer(char *arg) |
| 187 | 1066 { |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1067 char **paramlst; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1068 char *subcmd; |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
1069 |
|
471
82a27508fb85
Fix segfaults when using /buffer and /room while not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
1070 if (!current_buddy) return; |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1071 |
| 446 | 1072 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1073 scr_LogPrint(LPRINT_NORMAL, "Groups have no buffer."); |
| 446 | 1074 return; |
| 1075 } | |
| 1076 | |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1077 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1078 subcmd = *paramlst; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1079 arg = *(paramlst+1); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1080 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1081 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1082 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1083 free_arg_lst(paramlst); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1084 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1085 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1086 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1087 if (!strcasecmp(subcmd, "top")) { |
|
361
51ff319947c3
Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
1088 scr_BufferTopBottom(-1); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1089 } else if (!strcasecmp(subcmd, "bottom")) { |
|
361
51ff319947c3
Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
1090 scr_BufferTopBottom(1); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1091 } else if (!strcasecmp(subcmd, "clear")) { |
|
369
499170ed71c9
Rename some buffer commands, for homogeneity
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
1092 scr_BufferClear(); |
| 866 | 1093 } else if (!strcasecmp(subcmd, "purge")) { |
| 1094 scr_BufferPurge(); | |
|
873
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1095 } else if (!strcasecmp(subcmd, "scroll_lock")) { |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1096 scr_BufferScrollLock(1); |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1097 } else if (!strcasecmp(subcmd, "scroll_unlock")) { |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1098 scr_BufferScrollLock(0); |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1099 } else if (!strcasecmp(subcmd, "scroll_toggle")) { |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1100 scr_BufferScrollLock(-1); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1101 } else if (!strcasecmp(subcmd, "up")) { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1102 buffer_updown(-1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1103 } else if (!strcasecmp(subcmd, "down")) { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1104 buffer_updown(1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1105 } else if (!strcasecmp(subcmd, "search_backward")) { |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
1106 strip_arg_special_chars(arg); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1107 buffer_search(-1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1108 } else if (!strcasecmp(subcmd, "search_forward")) { |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
1109 strip_arg_special_chars(arg); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1110 buffer_search(1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1111 } else if (!strcasecmp(subcmd, "date")) { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1112 buffer_date(arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1113 } else if (*subcmd == '%') { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1114 buffer_percent(subcmd+1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1115 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1116 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1117 } |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
1118 |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1119 free_arg_lst(paramlst); |
| 187 | 1120 } |
| 1121 | |
| 967 | 1122 static void do_clear(char *arg) // Alias for "buffer clear" |
| 187 | 1123 { |
| 1124 do_buffer("clear"); | |
| 1125 } | |
| 1126 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1127 static void do_info(char *arg) |
| 191 | 1128 { |
| 1129 gpointer bud; | |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1130 const char *jid, *name; |
| 191 | 1131 guint type; |
| 1132 char *buffer; | |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1133 enum subscr esub; |
| 191 | 1134 |
| 1135 if (!current_buddy) return; | |
| 1136 bud = BUDDATA(current_buddy); | |
| 1137 | |
| 1138 jid = buddy_getjid(bud); | |
| 1139 name = buddy_getname(bud); | |
| 1140 type = buddy_gettype(bud); | |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1141 esub = buddy_getsubscription(bud); |
| 191 | 1142 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1143 buffer = g_new(char, 4096); |
| 191 | 1144 |
| 1145 if (jid) { | |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1146 GSList *resources; |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1147 char *bstr = "unknown"; |
| 191 | 1148 |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1149 // Enter chat mode |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1150 scr_set_chatmode(TRUE); |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1151 scr_ShowBuddyWindow(); |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1152 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1153 snprintf(buffer, 4095, "jid: <%s>", jid); |
| 191 | 1154 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
| 1155 if (name) { | |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1156 snprintf(buffer, 4095, "Name: %s", name); |
| 191 | 1157 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
| 1158 } | |
| 1159 | |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1160 if (type == ROSTER_TYPE_USER) bstr = "user"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1161 else if (type == ROSTER_TYPE_ROOM) bstr = "chatroom"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1162 else if (type == ROSTER_TYPE_AGENT) bstr = "agent"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1163 snprintf(buffer, 127, "Type: %s", bstr); |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1164 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1165 |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1166 if (esub == sub_both) bstr = "both"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1167 else if (esub & sub_from) bstr = "from"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1168 else if (esub & sub_to) bstr = "to"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1169 else bstr = "none"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1170 snprintf(buffer, 64, "Subscription: %s", bstr); |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1171 if (esub & sub_pending) |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1172 strcat(buffer, " (pending)"); |
| 191 | 1173 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1174 |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1175 resources = buddy_getresources(bud); |
|
843
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1176 if (!resources && type == ROSTER_TYPE_USER) { |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1177 // No resource; display last status message, if any. |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1178 const char *rst_msg = buddy_getstatusmsg(bud, ""); |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1179 if (rst_msg) { |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1180 snprintf(buffer, 4095, "Last status message: %s", rst_msg); |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1181 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1182 } |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1183 } |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1184 for ( ; resources ; resources = g_slist_next(resources) ) { |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1185 gchar rprio; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1186 enum imstatus rstatus; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1187 const char *rst_msg; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1188 time_t rst_time; |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1189 |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1190 rprio = buddy_getresourceprio(bud, resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1191 rstatus = buddy_getstatus(bud, resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1192 rst_msg = buddy_getstatusmsg(bud, resources->data); |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1193 rst_time = buddy_getstatustime(bud, resources->data); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1194 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1195 snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus], |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1196 rprio, (char*)resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1197 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1198 if (rst_msg) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1199 snprintf(buffer, 4095, "Status message: %s", rst_msg); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
1200 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1201 } |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1202 if (rst_time) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1203 char tbuf[128]; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1204 |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1205 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time)); |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1206 snprintf(buffer, 127, "Status timestamp: %s", tbuf); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
1207 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1208 } |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1209 } |
| 191 | 1210 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1211 if (name) scr_LogPrint(LPRINT_NORMAL, "Name: %s", name); |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1212 scr_LogPrint(LPRINT_NORMAL, "Type: %s", |
|
848
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1213 type == ROSTER_TYPE_GROUP ? "group" : |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1214 (type == ROSTER_TYPE_SPECIAL ? "special" : "unknown")); |
| 191 | 1215 } |
| 1216 | |
| 1217 g_free(buffer); | |
| 1218 } | |
| 1219 | |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1220 // room_names() is a variation of do_info(), for chatrooms only |
| 552 | 1221 static void room_names(gpointer bud, char *arg) |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1222 { |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1223 const char *jid; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1224 char *buffer; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1225 GSList *resources; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1226 |
| 552 | 1227 if (*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1228 scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter."); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1229 return; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1230 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1231 |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1232 // Enter chat mode |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1233 scr_set_chatmode(TRUE); |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1234 scr_ShowBuddyWindow(); |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1235 |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1236 jid = buddy_getjid(bud); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1237 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1238 buffer = g_new(char, 4096); |
|
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1239 strncpy(buffer, "Room members:", 127); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1240 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1241 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1242 resources = buddy_getresources(bud); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1243 for ( ; resources ; resources = g_slist_next(resources) ) { |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1244 enum imstatus rstatus; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1245 const char *rst_msg; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1246 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1247 rstatus = buddy_getstatus(bud, resources->data); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1248 rst_msg = buddy_getstatusmsg(bud, resources->data); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1249 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1250 snprintf(buffer, 4095, "[%c] %s", imstatus2char[rstatus], |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1251 (char*)resources->data); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1252 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1253 if (rst_msg) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1254 snprintf(buffer, 4095, "Status message: %s", rst_msg); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
1255 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1256 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1257 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1258 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1259 g_free(buffer); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1260 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1261 |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1262 static void move_group_member(gpointer bud, void *groupnamedata) |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1263 { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1264 const char *jid, *name, *groupname; |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1265 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1266 groupname = (char *)groupnamedata; |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1267 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1268 jid = buddy_getjid(bud); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1269 name = buddy_getname(bud); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1270 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1271 jb_updatebuddy(jid, name, *groupname ? groupname : NULL); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1272 } |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1273 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1274 static void do_rename(char *arg) |
| 208 | 1275 { |
| 1276 gpointer bud; | |
| 1277 const char *jid, *group; | |
| 1278 guint type; | |
| 1279 char *newname, *p; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1280 char *name_utf8; |
| 208 | 1281 |
| 1282 if (!current_buddy) return; | |
| 1283 bud = BUDDATA(current_buddy); | |
| 1284 | |
| 1285 jid = buddy_getjid(bud); | |
| 1286 group = buddy_getgroupname(bud); | |
| 1287 type = buddy_gettype(bud); | |
| 1288 | |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1289 if (type & ROSTER_TYPE_SPECIAL) { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1290 scr_LogPrint(LPRINT_NORMAL, "You can't rename this item."); |
| 208 | 1291 return; |
| 1292 } | |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1293 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1294 if (!*arg && !(type & ROSTER_TYPE_GROUP)) { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1295 scr_LogPrint(LPRINT_NORMAL, "Please specify a new name."); |
|
848
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1296 return; |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1297 } |
| 208 | 1298 |
| 1299 newname = g_strdup(arg); | |
| 1300 // Remove trailing space | |
| 1301 for (p = newname; *p; p++) ; | |
| 1302 while (p > newname && *p == ' ') *p = 0; | |
| 1303 | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1304 strip_arg_special_chars(newname); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1305 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1306 name_utf8 = to_utf8(newname); |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1307 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1308 if (type & ROSTER_TYPE_GROUP) { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1309 // Rename a whole group |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1310 foreach_group_member(bud, &move_group_member, name_utf8); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1311 // Let's jump to the previous buddy, because this group name should |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1312 // disappear when we receive the server answer. |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1313 scr_RosterUp(); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1314 } else { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1315 // Rename a single buddy |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1316 buddy_setname(bud, name_utf8); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1317 jb_updatebuddy(jid, name_utf8, group); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
1318 } |
| 208 | 1319 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1320 g_free(name_utf8); |
| 208 | 1321 g_free(newname); |
| 1322 update_roster = TRUE; | |
| 1323 } | |
| 1324 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1325 static void do_move(char *arg) |
| 210 | 1326 { |
| 1327 gpointer bud; | |
|
620
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
1328 const char *jid, *name, *oldgroupname; |
| 210 | 1329 guint type; |
| 1330 char *newgroupname, *p; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1331 char *group_utf8; |
| 210 | 1332 |
| 1333 if (!current_buddy) return; | |
| 1334 bud = BUDDATA(current_buddy); | |
| 1335 | |
| 1336 jid = buddy_getjid(bud); | |
| 1337 name = buddy_getname(bud); | |
| 1338 type = buddy_gettype(bud); | |
| 1339 | |
|
620
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
1340 oldgroupname = buddy_getgroupname(bud); |
|
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
1341 |
| 210 | 1342 if (type & ROSTER_TYPE_GROUP) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1343 scr_LogPrint(LPRINT_NORMAL, "You can't move groups!"); |
| 210 | 1344 return; |
| 1345 } | |
|
848
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1346 if (type & ROSTER_TYPE_SPECIAL) { |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1347 scr_LogPrint(LPRINT_NORMAL, "You can't move this item."); |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1348 return; |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
1349 } |
| 210 | 1350 |
| 1351 newgroupname = g_strdup(arg); | |
| 1352 // Remove trailing space | |
| 1353 for (p = newgroupname; *p; p++) ; | |
|
608
89f5672eb523
/move: really strip trailing space, and assign to no group if no group is specified
Mikael Berthe <mikael@lilotux.net>
parents:
604
diff
changeset
|
1354 while (p > newgroupname && *p == ' ') *p-- = 0; |
| 210 | 1355 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1356 strip_arg_special_chars(newgroupname); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1357 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1358 group_utf8 = to_utf8(newgroupname); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1359 if (strcmp(oldgroupname, group_utf8)) { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1360 jb_updatebuddy(jid, name, *group_utf8 ? group_utf8 : NULL); |
|
620
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
1361 scr_RosterUp(); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1362 buddy_setgroup(bud, group_utf8); |
|
620
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
1363 } |
| 210 | 1364 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1365 g_free(group_utf8); |
| 210 | 1366 g_free(newgroupname); |
| 1367 update_roster = TRUE; | |
| 1368 } | |
| 1369 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1370 static void do_set(char *arg) |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1371 { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1372 guint assign; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1373 const gchar *option, *value; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1374 gchar *option_utf8; |
| 393 | 1375 |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1376 assign = parse_assigment(arg, &option, &value); |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1377 if (!option) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1378 scr_LogPrint(LPRINT_NORMAL, "Set what option?"); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1379 return; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1380 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1381 option_utf8 = to_utf8(option); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1382 if (!assign) { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1383 // This is a query |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1384 value = settings_opt_get(option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1385 if (value) { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1386 scr_LogPrint(LPRINT_NORMAL, "%s = [%s]", option_utf8, value); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1387 } else |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1388 scr_LogPrint(LPRINT_NORMAL, "Option %s is not set", option_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1389 g_free(option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1390 return; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1391 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1392 // Update the option |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1393 // XXX Maybe some options should be protected when user is connected |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1394 // (server, username, etc.). And we should catch some options here, too |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1395 // (hide_offline_buddies for ex.) |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1396 if (!value) { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1397 settings_del(SETTINGS_TYPE_OPTION, option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1398 } else { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1399 gchar *value_utf8 = to_utf8(value); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1400 settings_set(SETTINGS_TYPE_OPTION, option_utf8, value_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1401 g_free(value_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1402 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1403 g_free(option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1404 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1405 |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1406 static void dump_alias(void *param, char *k, char *v) |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1407 { |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1408 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "Alias %s = %s", k, v); |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1409 } |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1410 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1411 static void do_alias(char *arg) |
| 285 | 1412 { |
| 1413 guint assign; | |
| 1414 const gchar *alias, *value; | |
| 393 | 1415 |
| 285 | 1416 assign = parse_assigment(arg, &alias, &value); |
| 1417 if (!alias) { | |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1418 settings_foreach(SETTINGS_TYPE_ALIAS, &dump_alias, NULL); |
| 285 | 1419 return; |
| 1420 } | |
| 1421 if (!assign) { | |
| 1422 // This is a query | |
| 1423 value = settings_get(SETTINGS_TYPE_ALIAS, alias); | |
| 1424 if (value) { | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1425 // XXX LPRINT_NOTUTF8 here, see below why it isn't encoded... |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1426 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "%s = %s", alias, value); |
| 285 | 1427 } else |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1428 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1429 "Alias '%s' does not exist", alias); |
| 285 | 1430 return; |
| 1431 } | |
| 1432 // Check the alias does not conflict with a registered command | |
| 1433 if (cmd_get(alias)) { | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1434 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1435 "'%s' is a reserved word!", alias); |
| 285 | 1436 return; |
| 1437 } | |
| 1438 // Update the alias | |
| 1439 if (!value) { | |
| 1440 if (settings_get(SETTINGS_TYPE_ALIAS, alias)) { | |
| 1441 settings_del(SETTINGS_TYPE_ALIAS, alias); | |
| 1442 // Remove alias from the completion list | |
| 1443 compl_del_category_word(COMPL_CMD, alias); | |
| 1444 } | |
| 1445 } else { | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1446 /* Add alias to the completion list, if not already in. |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1447 XXX We're not UTF8-encoding "alias" and "value" here because UTF-8 is |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1448 not yet supported in the UI... (and we use the values in the completion |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1449 system) |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1450 */ |
| 285 | 1451 if (!settings_get(SETTINGS_TYPE_ALIAS, alias)) |
| 1452 compl_add_category_word(COMPL_CMD, alias); | |
| 1453 settings_set(SETTINGS_TYPE_ALIAS, alias, value); | |
| 1454 } | |
| 1455 } | |
| 1456 | |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1457 static void dump_bind(void *param, char *k, char *v) |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1458 { |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1459 scr_LogPrint(LPRINT_NORMAL, "Key %4s is bound to: %s", k, v); |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1460 } |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1461 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1462 static void do_bind(char *arg) |
| 288 | 1463 { |
| 1464 guint assign; | |
| 1465 const gchar *keycode, *value; | |
| 393 | 1466 |
| 288 | 1467 assign = parse_assigment(arg, &keycode, &value); |
| 1468 if (!keycode) { | |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
1469 settings_foreach(SETTINGS_TYPE_BINDING, &dump_bind, NULL); |
| 288 | 1470 return; |
| 1471 } | |
| 1472 if (!assign) { | |
| 1473 // This is a query | |
| 1474 value = settings_get(SETTINGS_TYPE_BINDING, keycode); | |
| 1475 if (value) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1476 scr_LogPrint(LPRINT_NORMAL, "Key %s is bound to: %s", keycode, value); |
| 288 | 1477 } else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1478 scr_LogPrint(LPRINT_NORMAL, "Key %s is not bound.", keycode); |
| 288 | 1479 return; |
| 1480 } | |
| 1481 // Update the key binding | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1482 if (!value) { |
| 288 | 1483 settings_del(SETTINGS_TYPE_BINDING, keycode); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1484 } else { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1485 gchar *value_utf8 = to_utf8(value); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1486 settings_set(SETTINGS_TYPE_BINDING, keycode, value_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1487 g_free(value_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1488 } |
| 288 | 1489 } |
| 1490 | |
| 436 | 1491 static void do_rawxml(char *arg) |
| 1492 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1493 char **paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1494 char *subcmd; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1495 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1496 if (!jb_getonline()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1497 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1498 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1499 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1500 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1501 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1502 subcmd = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1503 arg = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1504 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1505 if (!subcmd || !*subcmd) { |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1506 scr_LogPrint(LPRINT_NORMAL, "Please read the manual page" |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1507 " before using /rawxml :-)"); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1508 free_arg_lst(paramlst); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1509 return; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1510 } |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1511 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1512 if (!strcasecmp(subcmd, "send")) { |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1513 gchar *buffer; |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1514 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1515 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1516 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1517 free_arg_lst(paramlst); |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1518 return; |
|
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1519 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1520 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1521 // We don't strip_arg_special_chars() here, because it would be a pain for |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1522 // the user to escape quotes in a XML stream... |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1523 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1524 buffer = to_utf8(arg); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1525 if (buffer) { |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1526 scr_LogPrint(LPRINT_NORMAL, "Sending XML string"); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1527 jb_send_raw(buffer); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1528 g_free(buffer); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1529 } else { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1530 scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string."); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1531 } |
| 436 | 1532 } else { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1533 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 436 | 1534 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1535 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1536 free_arg_lst(paramlst); |
| 436 | 1537 } |
| 1538 | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1539 // check_room_subcommand(arg, param_needed, buddy_must_be_a_room) |
| 552 | 1540 // - Check if this is a room, if buddy_must_be_a_room is not null |
| 1541 // - Check there is at least 1 parameter, if param_needed is true | |
| 1542 // - Return null if one of the checks fails, or a pointer to the first | |
| 1543 // non-space character. | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1544 static char *check_room_subcommand(char *arg, bool param_needed, |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1545 gpointer buddy_must_be_a_room) |
| 552 | 1546 { |
| 1547 if (buddy_must_be_a_room && | |
| 1548 !(buddy_gettype(buddy_must_be_a_room) & ROSTER_TYPE_ROOM)) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1549 scr_LogPrint(LPRINT_NORMAL, "This isn't a conference room."); |
| 552 | 1550 return NULL; |
| 1551 } | |
| 1552 | |
| 1553 if (param_needed) { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1554 if (!arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1555 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
| 552 | 1556 return NULL; |
| 1557 } | |
| 1558 } | |
| 1559 | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1560 if (arg) |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1561 return arg; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1562 else |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1563 return ""; |
| 552 | 1564 } |
| 1565 | |
| 1566 static void room_join(gpointer bud, char *arg) | |
| 1567 { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1568 char **paramlst; |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1569 char *roomname, *nick, *pass, *roomname_tmp; |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1570 char *tmpnick = NULL; |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1571 char *pass_utf8; |
| 552 | 1572 |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1573 paramlst = split_arg(arg, 3, 0); // roomid, nickname, password |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1574 roomname = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1575 nick = *(paramlst+1); |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1576 pass = *(paramlst+2); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1577 |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1578 if (!nick) |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1579 pass = NULL; |
| 552 | 1580 |
|
841
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1581 if (!roomname || !strcmp(roomname, ".")) { |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1582 // If the current_buddy is recognized as a room, the room name |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1583 // can be omitted (or "." can be used). |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1584 if (!bud || !(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1585 scr_LogPrint(LPRINT_NORMAL, "Please specify a room name."); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1586 free_arg_lst(paramlst); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1587 return; |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1588 } |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1589 if (!roomname) |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1590 nick = NULL; |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1591 roomname = (char*)buddy_getjid(bud); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1592 } else if (strchr(roomname, '/')) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1593 scr_LogPrint(LPRINT_NORMAL, "Invalid room name."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1594 free_arg_lst(paramlst); |
| 552 | 1595 return; |
| 1596 } | |
| 1597 | |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1598 // If no nickname is provided with the /join command, |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1599 // we try the "nickname" option, then the username part of the jid. |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1600 if (!nick || !*nick) { |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1601 nick = (char*)settings_opt_get("nickname"); |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1602 if (!nick) { |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1603 nick = (char*)settings_opt_get("username"); |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
974
diff
changeset
|
1604 if (nick && (strchr(nick, JID_DOMAIN_SEPARATOR) > nick)) { |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1605 char *p; |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1606 nick = tmpnick = g_strdup(nick); |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
974
diff
changeset
|
1607 p = strchr(nick, JID_DOMAIN_SEPARATOR); |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1608 *p = 0; |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1609 } |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1610 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1611 } else { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1612 nick = tmpnick = to_utf8(nick); |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1613 } |
|
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
1614 // If we still have no nickname, give up |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1615 if (!nick || !*nick) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1616 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname."); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1617 g_free(tmpnick); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1618 free_arg_lst(paramlst); |
| 552 | 1619 return; |
| 1620 } | |
| 1621 | |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1622 pass_utf8 = to_utf8(pass); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1623 |
|
841
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1624 roomname_tmp = g_strdup(roomname); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1625 mc_strtolower(roomname_tmp); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1626 roomname = to_utf8(roomname_tmp); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1627 g_free(roomname_tmp); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
1628 |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1629 jb_room_join(roomname, nick, pass_utf8); |
| 552 | 1630 |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1631 scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname); |
|
653
d5db5be78eb0
MUC: Be more verbose when joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
652
diff
changeset
|
1632 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1633 g_free(roomname); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1634 g_free(tmpnick); |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1635 g_free(pass_utf8); |
| 552 | 1636 buddylist_build(); |
| 1637 update_roster = TRUE; | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1638 free_arg_lst(paramlst); |
| 552 | 1639 } |
| 1640 | |
| 1641 static void room_invite(gpointer bud, char *arg) | |
| 1642 { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1643 char **paramlst; |
| 552 | 1644 const gchar *roomname; |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1645 char* jid; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1646 gchar *reason_utf8; |
| 552 | 1647 |
|
570
29806b0fe830
Some parsing improvements
Mikael Berthe <mikael@lilotux.net>
parents:
568
diff
changeset
|
1648 paramlst = split_arg(arg, 2, 1); // jid, [reason] |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1649 jid = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1650 arg = *(paramlst+1); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1651 // An empty reason is no reason... |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1652 if (arg && !*arg) |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1653 arg = NULL; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1654 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1655 if (!jid || !*jid) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1656 scr_LogPrint(LPRINT_NORMAL, "Missing or incorrect Jabber ID."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1657 free_arg_lst(paramlst); |
| 552 | 1658 return; |
| 1659 } | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1660 |
| 552 | 1661 roomname = buddy_getjid(bud); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1662 reason_utf8 = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1663 jb_room_invite(roomname, jid, reason_utf8); |
| 957 | 1664 scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>.", jid); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1665 g_free(reason_utf8); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1666 free_arg_lst(paramlst); |
| 552 | 1667 } |
| 1668 | |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1669 static void room_affil(gpointer bud, char *arg) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1670 { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1671 char **paramlst; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1672 gchar *jid, *rolename; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1673 struct role_affil ra; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1674 const char *roomid = buddy_getjid(bud); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1675 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1676 paramlst = split_arg(arg, 3, 1); // jid, new_affil, [reason] |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1677 jid = *paramlst; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1678 rolename = *(paramlst+1); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1679 arg = *(paramlst+2); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1680 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1681 if (!jid || !*jid || !rolename || !*rolename) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1682 scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1683 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1684 return; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1685 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1686 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1687 ra.type = type_affil; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1688 ra.val.affil = affil_none; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1689 for (; ra.val.affil < imaffiliation_size; ra.val.affil++) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1690 if (!strcasecmp(rolename, straffil[ra.val.affil])) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1691 break; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1692 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1693 if (ra.val.affil < imaffiliation_size) { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1694 gchar *jid_utf8, *reason_utf8; |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1695 jid_utf8 = to_utf8(jid); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1696 reason_utf8 = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1697 jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1698 g_free(jid_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1699 g_free(reason_utf8); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1700 } else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1701 scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1702 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1703 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1704 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1705 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1706 static void room_role(gpointer bud, char *arg) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1707 { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1708 char **paramlst; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1709 gchar *jid, *rolename; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1710 struct role_affil ra; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1711 const char *roomid = buddy_getjid(bud); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1712 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1713 paramlst = split_arg(arg, 3, 1); // jid, new_role, [reason] |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1714 jid = *paramlst; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1715 rolename = *(paramlst+1); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1716 arg = *(paramlst+2); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1717 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1718 if (!jid || !*jid || !rolename || !*rolename) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1719 scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1720 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1721 return; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1722 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1723 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1724 ra.type = type_role; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1725 ra.val.role = role_none; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1726 for (; ra.val.role < imrole_size; ra.val.role++) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1727 if (!strcasecmp(rolename, strrole[ra.val.role])) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1728 break; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1729 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1730 if (ra.val.role < imrole_size) { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1731 gchar *jid_utf8, *reason_utf8; |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1732 jid_utf8 = to_utf8(jid); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1733 reason_utf8 = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1734 jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1735 g_free(jid_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1736 g_free(reason_utf8); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1737 } else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1738 scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1739 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1740 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1741 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1742 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
1743 |
| 571 | 1744 // The expected argument is a Jabber id |
| 1745 static void room_ban(gpointer bud, char *arg) | |
| 1746 { | |
| 1747 char **paramlst; | |
| 1748 gchar *jid; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1749 gchar *jid_utf8, *reason_utf8; |
| 584 | 1750 struct role_affil ra; |
| 571 | 1751 const char *roomid = buddy_getjid(bud); |
| 1752 | |
| 1753 paramlst = split_arg(arg, 2, 1); // jid, [reason] | |
| 1754 jid = *paramlst; | |
| 1755 arg = *(paramlst+1); | |
| 1756 | |
| 1757 if (!jid || !*jid) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1758 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
| 571 | 1759 free_arg_lst(paramlst); |
| 1760 return; | |
| 1761 } | |
| 1762 | |
| 584 | 1763 ra.type = type_affil; |
| 1764 ra.val.affil = affil_outcast; | |
| 1765 | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1766 jid_utf8 = to_utf8(jid); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1767 reason_utf8 = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1768 jb_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1769 g_free(jid_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1770 g_free(reason_utf8); |
| 571 | 1771 |
| 1772 free_arg_lst(paramlst); | |
| 1773 } | |
| 1774 | |
| 1775 // The expected argument is a nickname | |
| 568 | 1776 static void room_kick(gpointer bud, char *arg) |
| 1777 { | |
| 1778 char **paramlst; | |
| 1779 gchar *nick; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1780 gchar *nick_utf8, *reason_utf8; |
| 584 | 1781 struct role_affil ra; |
| 568 | 1782 const char *roomid = buddy_getjid(bud); |
| 1783 | |
| 571 | 1784 paramlst = split_arg(arg, 2, 1); // nickname, [reason] |
| 568 | 1785 nick = *paramlst; |
| 1786 arg = *(paramlst+1); | |
| 1787 | |
| 1788 if (!nick || !*nick) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1789 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname."); |
| 568 | 1790 free_arg_lst(paramlst); |
| 1791 return; | |
| 1792 } | |
| 1793 | |
| 584 | 1794 ra.type = type_role; |
| 1795 ra.val.affil = role_none; | |
| 1796 | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1797 nick_utf8 = to_utf8(nick); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1798 reason_utf8 = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1799 jb_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1800 g_free(nick_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1801 g_free(reason_utf8); |
| 568 | 1802 |
| 1803 free_arg_lst(paramlst); | |
| 1804 } | |
| 1805 | |
| 552 | 1806 static void room_leave(gpointer bud, char *arg) |
| 1807 { | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1808 gchar *roomid, *desc; |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1809 const char *nickname; |
| 552 | 1810 |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1811 nickname = buddy_getnickname(bud); |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1812 if (!nickname) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1813 scr_LogPrint(LPRINT_NORMAL, "You are not in this room."); |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1814 return; |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1815 } |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1816 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1817 roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), nickname); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1818 desc = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1819 jb_setstatus(offline, roomid, desc); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1820 g_free(desc); |
| 552 | 1821 g_free(roomid); |
| 1822 } | |
| 1823 | |
| 1824 static void room_nick(gpointer bud, char *arg) | |
| 1825 { | |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1826 if (!buddy_getinsideroom(bud)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1827 scr_LogPrint(LPRINT_NORMAL, "You are not in this room."); |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1828 return; |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1829 } |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1830 |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1831 if (!arg || !*arg) { |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1832 const char *nick = buddy_getnickname(bud); |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1833 if (nick) |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1834 scr_LogPrint(LPRINT_NORMAL, "Your nickname is: %s", nick); |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1835 else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1836 scr_LogPrint(LPRINT_NORMAL, "You have no nickname in this room."); |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1837 } else { |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1838 gchar *roomname, *roomname_tmp, *nick; |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1839 roomname_tmp = g_strdup(buddy_getjid(bud)); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1840 mc_strtolower(roomname_tmp); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1841 roomname = to_utf8(roomname_tmp); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1842 g_free(roomname_tmp); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1843 nick = to_utf8(arg); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1844 |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1845 jb_room_join(roomname, nick, NULL); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1846 g_free(roomname); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
1847 g_free(nick); |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
1848 } |
| 552 | 1849 } |
| 1850 | |
| 1851 static void room_privmsg(gpointer bud, char *arg) | |
| 1852 { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1853 char **paramlst; |
| 552 | 1854 gchar *nick, *cmd; |
| 1855 | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1856 paramlst = split_arg(arg, 2, 0); // nickname, message |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1857 nick = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1858 arg = *(paramlst+1); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1859 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1860 if (!nick || !*nick || !arg || !*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1861 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1862 "Please specify both a Jabber ID and a message."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1863 free_arg_lst(paramlst); |
| 552 | 1864 return; |
| 1865 } | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1866 |
| 552 | 1867 cmd = g_strdup_printf("%s/%s %s", buddy_getjid(bud), nick, arg); |
| 1868 do_say_to(cmd); | |
| 1869 g_free(cmd); | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
1870 free_arg_lst(paramlst); |
| 552 | 1871 } |
| 1872 | |
| 1873 static void room_remove(gpointer bud, char *arg) | |
| 1874 { | |
| 1875 if (*arg) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1876 scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1877 "the currently-selected room will be removed."); |
| 552 | 1878 return; |
| 1879 } | |
| 1880 | |
| 1881 // Quick check: if there are resources, we haven't left | |
|
652
b243d3b3ff1b
We do not need buddy_isresource() anymore
Mikael Berthe <mikael@lilotux.net>
parents:
650
diff
changeset
|
1882 if (buddy_getinsideroom(bud)) { |
| 552 | 1883 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
| 1884 return; | |
| 1885 } | |
| 1886 // Delete the room | |
| 1887 roster_del_user(buddy_getjid(bud)); | |
|
865
cee8d6be04e1
Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents:
861
diff
changeset
|
1888 scr_UpdateBuddyWindow(); |
| 552 | 1889 buddylist_build(); |
| 1890 update_roster = TRUE; | |
| 1891 } | |
| 1892 | |
| 1893 static void room_topic(gpointer bud, char *arg) | |
| 1894 { | |
| 1895 gchar *msg; | |
| 1896 | |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1897 if (!buddy_getinsideroom(bud)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1898 scr_LogPrint(LPRINT_NORMAL, "You are not in this room."); |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1899 return; |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1900 } |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
1901 |
| 552 | 1902 // If no parameter is given, display the current topic |
| 1903 if (!*arg) { | |
| 1904 const char *topic = buddy_gettopic(bud); | |
| 1905 if (topic) | |
| 1906 scr_LogPrint(LPRINT_NORMAL, "Topic: %s", topic); | |
| 1907 else | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1908 scr_LogPrint(LPRINT_NORMAL, "No topic has been set."); |
| 552 | 1909 return; |
| 1910 } | |
| 1911 | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1912 arg = to_utf8(arg); |
| 552 | 1913 // Set the topic |
| 967 | 1914 msg = g_strdup_printf("%s has set the topic to: %s", mkcmdstr("me"), arg); |
| 552 | 1915 jb_send_msg(buddy_getjid(bud), msg, ROSTER_TYPE_ROOM, arg); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1916 g_free(arg); |
| 552 | 1917 g_free(msg); |
| 1918 } | |
| 1919 | |
| 599 | 1920 static void room_destroy(gpointer bud, char *arg) |
| 1921 { | |
| 1922 gchar *msg; | |
| 1923 | |
| 1924 if (arg && *arg) | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1925 msg = to_utf8(arg); |
| 599 | 1926 else |
| 1927 msg = NULL; | |
| 1928 | |
| 1929 jb_room_destroy(buddy_getjid(bud), NULL, msg); | |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
1930 g_free(msg); |
| 599 | 1931 } |
| 1932 | |
| 552 | 1933 static void room_unlock(gpointer bud, char *arg) |
| 1934 { | |
| 1935 if (*arg) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1936 scr_LogPrint(LPRINT_NORMAL, "Unknown parameter."); |
| 552 | 1937 return; |
| 1938 } | |
| 1939 | |
| 1940 jb_room_unlock(buddy_getjid(bud)); | |
| 1941 } | |
| 1942 | |
|
960
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1943 // room_whois(..) |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1944 // If interactive is TRUE, chatmode can be enabled. |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1945 void room_whois(gpointer bud, char *arg, guint interactive) |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1946 { |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1947 char **paramlst; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1948 gchar *nick, *buffer; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1949 const char *jid, *realjid; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1950 const char *rst_msg; |
| 575 | 1951 gchar rprio; |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1952 enum imstatus rstatus; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1953 enum imrole role; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1954 enum imaffiliation affil; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1955 time_t rst_time; |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1956 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1957 char *strroles[] = { "none", "moderator", "participant", "visitor" }; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1958 char *straffil[] = { "none", "owner", "admin", "member", "outcast" }; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1959 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1960 paramlst = split_arg(arg, 1, 0); // nickname |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1961 nick = *paramlst; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1962 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1963 if (!nick || !*nick) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1964 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname."); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1965 free_arg_lst(paramlst); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1966 return; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1967 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1968 |
|
791
6c9e8fb69965
Fix "/room whois" with UTF-8 nickname
Mikael Berthe <mikael@lilotux.net>
parents:
777
diff
changeset
|
1969 nick = to_utf8(nick); |
|
6c9e8fb69965
Fix "/room whois" with UTF-8 nickname
Mikael Berthe <mikael@lilotux.net>
parents:
777
diff
changeset
|
1970 |
|
960
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1971 if (interactive) { |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1972 // Enter chat mode |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1973 scr_set_chatmode(TRUE); |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1974 scr_ShowBuddyWindow(); |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
1975 } |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1976 |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1977 jid = buddy_getjid(bud); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1978 rstatus = buddy_getstatus(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1979 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1980 if (rstatus == offline) { |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1981 scr_LogPrint(LPRINT_NORMAL, "No such member: %s", nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1982 free_arg_lst(paramlst); |
|
791
6c9e8fb69965
Fix "/room whois" with UTF-8 nickname
Mikael Berthe <mikael@lilotux.net>
parents:
777
diff
changeset
|
1983 g_free(nick); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1984 return; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1985 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1986 |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1987 rst_time = buddy_getstatustime(bud, nick); |
| 575 | 1988 rprio = buddy_getresourceprio(bud, nick); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1989 rst_msg = buddy_getstatusmsg(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1990 if (!rst_msg) rst_msg = ""; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1991 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1992 role = buddy_getrole(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1993 affil = buddy_getaffil(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1994 realjid = buddy_getrjid(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1995 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1996 buffer = g_new(char, 4096); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1997 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1998 snprintf(buffer, 4095, "Whois [%s]", nick); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
1999 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2000 snprintf(buffer, 4095, "Status : [%c] %s", imstatus2char[rstatus], |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2001 rst_msg); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
2002 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2003 |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2004 if (rst_time) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2005 char tbuf[128]; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2006 |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2007 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time)); |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2008 snprintf(buffer, 127, "Timestamp: %s", tbuf); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
2009 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2010 } |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2011 |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2012 if (realjid) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2013 snprintf(buffer, 4095, "JID : <%s>", realjid); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
2014 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2015 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2016 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2017 snprintf(buffer, 4095, "Role : %s", strroles[role]); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
2018 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2019 snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
2020 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2021 snprintf(buffer, 4095, "Priority : %d", rprio); |
|
847
e1b7f71b0b1c
Improve readability for some commands
Mikael Berthe <mikael@lilotux.net>
parents:
846
diff
changeset
|
2022 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE); |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
2023 |
| 575 | 2024 scr_WriteIncomingMessage(jid, "End of WHOIS", 0, HBB_PREFIX_INFO); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2025 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2026 g_free(buffer); |
|
791
6c9e8fb69965
Fix "/room whois" with UTF-8 nickname
Mikael Berthe <mikael@lilotux.net>
parents:
777
diff
changeset
|
2027 g_free(nick); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2028 free_arg_lst(paramlst); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2029 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2030 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2031 static void do_room(char *arg) |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2032 { |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2033 char **paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2034 char *subcmd; |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2035 gpointer bud; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2036 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2037 if (!jb_getonline()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2038 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2039 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2040 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2041 |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2042 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2043 subcmd = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2044 arg = *(paramlst+1); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2045 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2046 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2047 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2048 free_arg_lst(paramlst); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2049 return; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2050 } |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2051 |
|
831
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2052 if (current_buddy) { |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2053 bud = BUDDATA(current_buddy); |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2054 } else { |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2055 if (strcasecmp(subcmd, "join")) |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2056 return; |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2057 // "room join" is a special case, we don't need to have a valid |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2058 // current_buddy. |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2059 bud = NULL; |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2060 } |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
2061 |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2062 if (!strcasecmp(subcmd, "join")) { |
|
841
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2063 if ((arg = check_room_subcommand(arg, FALSE, NULL)) != NULL) |
| 552 | 2064 room_join(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2065 } else if (!strcasecmp(subcmd, "invite")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2066 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
| 552 | 2067 room_invite(bud, arg); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2068 } else if (!strcasecmp(subcmd, "affil")) { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2069 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2070 room_affil(bud, arg); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2071 } else if (!strcasecmp(subcmd, "role")) { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2072 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2073 room_role(bud, arg); |
| 571 | 2074 } else if (!strcasecmp(subcmd, "ban")) { |
| 2075 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) | |
| 2076 room_ban(bud, arg); | |
| 568 | 2077 } else if (!strcasecmp(subcmd, "kick")) { |
| 2078 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) | |
| 2079 room_kick(bud, arg); | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2080 } else if (!strcasecmp(subcmd, "leave")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2081 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 2082 room_leave(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2083 } else if (!strcasecmp(subcmd, "names")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2084 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 2085 room_names(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2086 } else if (!strcasecmp(subcmd, "nick")) { |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2087 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 2088 room_nick(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2089 } else if (!strcasecmp(subcmd, "privmsg")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2090 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
| 552 | 2091 room_privmsg(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2092 } else if (!strcasecmp(subcmd, "remove")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2093 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 2094 room_remove(bud, arg); |
| 599 | 2095 } else if (!strcasecmp(subcmd, "destroy")) { |
| 2096 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) | |
| 2097 room_destroy(bud, arg); | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2098 } else if (!strcasecmp(subcmd, "unlock")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2099 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 2100 room_unlock(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2101 } else if (!strcasecmp(subcmd, "topic")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2102 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 2103 room_topic(bud, arg); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2104 } else if (!strcasecmp(subcmd, "whois")) { |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
2105 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
960
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
2106 room_whois(bud, arg, TRUE); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2107 } else { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2108 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2109 } |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2110 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2111 free_arg_lst(paramlst); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2112 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
2113 |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2114 static void do_authorization(char *arg) |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2115 { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2116 char **paramlst; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2117 char *subcmd; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2118 char *jid_utf8; |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2119 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2120 if (!jb_getonline()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2121 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2122 return; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2123 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2124 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2125 paramlst = split_arg(arg, 2, 0); // subcmd, [jid] |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2126 subcmd = *paramlst; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2127 arg = *(paramlst+1); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2128 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2129 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2130 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2131 free_arg_lst(paramlst); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2132 return; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2133 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2134 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2135 // Use the provided jid, if it looks valid |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2136 if (arg) { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2137 if (!*arg) { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2138 // If no jid is provided, we use the current selected buddy |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2139 arg = NULL; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2140 } else { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2141 if (check_jid_syntax(arg)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2142 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", arg); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2143 free_arg_lst(paramlst); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2144 return; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2145 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2146 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2147 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2148 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2149 if (!arg) { // Use the current selected buddy's jid |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2150 gpointer bud; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2151 guint type; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2152 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2153 if (!current_buddy) return; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2154 bud = BUDDATA(current_buddy); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2155 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2156 jid_utf8 = arg = (char*)buddy_getjid(bud); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2157 type = buddy_gettype(bud); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2158 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2159 if (!(type & (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT))) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2160 scr_LogPrint(LPRINT_NORMAL, "Invalid buddy."); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2161 return; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2162 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2163 } else { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2164 jid_utf8 = to_utf8(arg); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2165 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2166 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2167 if (!strcasecmp(subcmd, "allow")) { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2168 jb_subscr_send_auth(jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2169 scr_LogPrint(LPRINT_LOGNORM, |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2170 "<%s> is now allowed to receive your presence updates.", |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2171 jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2172 } else if (!strcasecmp(subcmd, "cancel")) { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2173 jb_subscr_cancel_auth(jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2174 scr_LogPrint(LPRINT_LOGNORM, |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2175 "<%s> will no longer receive your presence updates.", |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2176 jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2177 } else if (!strcasecmp(subcmd, "request")) { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2178 jb_subscr_request_auth(jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2179 scr_LogPrint(LPRINT_LOGNORM, |
| 957 | 2180 "Sent presence notification request to <%s>.", jid_utf8); |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
2181 } else if (!strcasecmp(subcmd, "request_unsubscribe")) { |
|
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
2182 jb_subscr_request_cancel(jid_utf8); |
|
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
2183 scr_LogPrint(LPRINT_LOGNORM, |
| 957 | 2184 "Sent presence notification unsubscription request to <%s>.", |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
2185 jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2186 } else { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2187 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2188 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2189 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2190 // Only free jid_utf8 if it has been allocated, i.e. if != arg. |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2191 if (jid_utf8 && jid_utf8 != arg) |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2192 g_free(jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2193 free_arg_lst(paramlst); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2194 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
2195 |
| 622 | 2196 static void do_version(char *arg) |
| 2197 { | |
|
777
e6d42f239541
"/version" shows Mercurial changeset (if there's one)
Mikael Berthe <mikael@lilotux.net>
parents:
774
diff
changeset
|
2198 gchar *ver = mcabber_version(); |
|
e6d42f239541
"/version" shows Mercurial changeset (if there's one)
Mikael Berthe <mikael@lilotux.net>
parents:
774
diff
changeset
|
2199 scr_LogPrint(LPRINT_NORMAL, "This is mcabber version %s.", ver); |
|
e6d42f239541
"/version" shows Mercurial changeset (if there's one)
Mikael Berthe <mikael@lilotux.net>
parents:
774
diff
changeset
|
2200 g_free(ver); |
| 622 | 2201 } |
| 2202 | |
| 693 | 2203 static void do_request(char *arg) |
| 2204 { | |
| 2205 char **paramlst; | |
| 2206 char *jid, *type; | |
| 740 | 2207 enum iqreq_type numtype = iqreq_none; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2208 char *jid_utf8 = NULL; |
| 693 | 2209 |
| 2210 paramlst = split_arg(arg, 2, 0); // type, jid | |
| 2211 type = *paramlst; | |
| 2212 jid = *(paramlst+1); | |
| 2213 | |
| 2214 if (type) { | |
| 2215 // Quick check... | |
| 2216 if (!strcasecmp(type, "version")) | |
| 2217 numtype = iqreq_version; | |
| 2218 else if (!strcasecmp(type, "time")) | |
| 2219 numtype = iqreq_time; | |
|
694
6d6fdaf846ed
Add "/request show_list"
Mikael Berthe <mikael@lilotux.net>
parents:
693
diff
changeset
|
2220 else if (!strcasecmp(type, "show_list")) { |
|
6d6fdaf846ed
Add "/request show_list"
Mikael Berthe <mikael@lilotux.net>
parents:
693
diff
changeset
|
2221 // Undocumented command, for debugging purposes only |
|
6d6fdaf846ed
Add "/request show_list"
Mikael Berthe <mikael@lilotux.net>
parents:
693
diff
changeset
|
2222 jb_iqs_display_list(); |
|
6d6fdaf846ed
Add "/request show_list"
Mikael Berthe <mikael@lilotux.net>
parents:
693
diff
changeset
|
2223 free_arg_lst(paramlst); |
|
6d6fdaf846ed
Add "/request show_list"
Mikael Berthe <mikael@lilotux.net>
parents:
693
diff
changeset
|
2224 return; |
|
6d6fdaf846ed
Add "/request show_list"
Mikael Berthe <mikael@lilotux.net>
parents:
693
diff
changeset
|
2225 } |
| 693 | 2226 } |
| 2227 | |
| 2228 if (!type || !numtype) { | |
| 2229 scr_LogPrint(LPRINT_NORMAL, | |
| 2230 "Please specify a query type (version, time)."); | |
| 2231 free_arg_lst(paramlst); | |
| 2232 return; | |
| 2233 } | |
| 2234 | |
| 2235 // Allow special jid "" or "." (current buddy) | |
| 2236 if (jid && (!*jid || !strcmp(jid, "."))) | |
| 2237 jid = NULL; | |
| 2238 | |
| 2239 if (jid) { | |
| 2240 // The JID has been specified. Quick check... | |
| 2241 if (check_jid_syntax(jid)) { | |
| 2242 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid); | |
| 2243 jid = NULL; | |
| 2244 } else { | |
| 2245 // Convert jid to lowercase | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2246 char *p; |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
974
diff
changeset
|
2247 for (p = jid; *p && *p != JID_RESOURCE_SEPARATOR; p++) |
| 693 | 2248 *p = tolower(*p); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2249 jid = jid_utf8 = to_utf8(jid); |
| 693 | 2250 } |
| 2251 } else { | |
| 2252 // Add the current buddy | |
| 2253 if (current_buddy) | |
| 2254 jid = (char*)buddy_getjid(BUDDATA(current_buddy)); | |
| 2255 if (!jid) | |
| 2256 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); | |
| 2257 } | |
| 2258 | |
| 2259 if (jid) { | |
| 2260 switch (numtype) { | |
| 2261 case iqreq_version: | |
| 2262 case iqreq_time: | |
| 2263 jb_request(jid, numtype); | |
| 2264 break; | |
| 2265 default: | |
| 2266 break; | |
| 2267 } | |
| 2268 } | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2269 g_free(jid_utf8); |
| 693 | 2270 free_arg_lst(paramlst); |
| 2271 } | |
| 2272 | |
| 748 | 2273 static void do_event(char *arg) |
| 2274 { | |
| 2275 char **paramlst; | |
| 2276 char *evid, *subcmd; | |
| 2277 int action = -1; | |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2278 GSList *evidlst; |
| 748 | 2279 |
| 2280 paramlst = split_arg(arg, 2, 0); // id, subcmd | |
| 2281 evid = *paramlst; | |
| 2282 subcmd = *(paramlst+1); | |
| 2283 | |
| 2284 if (!evid || !subcmd) { | |
| 2285 // Special case: /event list | |
| 2286 if (evid && !strcasecmp(evid, "list")) | |
| 2287 evs_display_list(); | |
| 2288 else | |
| 2289 scr_LogPrint(LPRINT_NORMAL, | |
| 2290 "Missing parameter. Usage: /event num action"); | |
| 2291 free_arg_lst(paramlst); | |
| 2292 return; | |
| 2293 } | |
| 2294 | |
| 2295 if (!strcasecmp(subcmd, "reject")) | |
| 2296 action = 0; | |
| 2297 else if (!strcasecmp(subcmd, "accept")) | |
| 2298 action = 1; | |
| 755 | 2299 else if (!strcasecmp(subcmd, "ignore")) |
| 2300 action = 2; | |
| 748 | 2301 |
| 2302 if (action == -1) { | |
| 2303 scr_LogPrint(LPRINT_NORMAL, "Wrong action parameter."); | |
| 755 | 2304 } else if (action >= 0 && action <= 2) { |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2305 GSList *p; |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2306 |
| 755 | 2307 if (action == 2) { |
| 2308 action = EVS_CONTEXT_CANCEL; | |
| 2309 } else { | |
| 2310 action += EVS_CONTEXT_USER; | |
| 2311 } | |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2312 |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2313 if (!strcmp(evid, "*")) { |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2314 // Use completion list |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2315 evidlst = evs_geteventslist(FALSE); |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2316 } else { |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2317 // Let's create a slist with the provided event id |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2318 evidlst = g_slist_append(NULL, g_strdup(evid)); |
| 748 | 2319 } |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2320 for (p = evidlst; p; p = g_slist_next(p)) { |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2321 if (evs_callback(p->data, action) == -1) { |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2322 scr_LogPrint(LPRINT_NORMAL, "Event %s not found.", p->data); |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2323 } |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2324 g_free(p->data); |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2325 } |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
2326 g_slist_free(evidlst); |
| 748 | 2327 } |
| 2328 | |
| 2329 free_arg_lst(paramlst); | |
| 2330 } | |
| 2331 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2332 static void do_connect(char *arg) |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2333 { |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2334 mcabber_connect(); |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2335 } |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2336 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2337 static void do_disconnect(char *arg) |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2338 { |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2339 jb_disconnect(); |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
2340 } |
| 576 | 2341 |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
2342 static void do_help(char *arg) |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
2343 { |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
2344 help_process(arg); |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
2345 } |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
2346 |
| 580 | 2347 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |