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