Mercurial > ~mikael > mcabber > hg
annotate mcabber/src/xmpp_iq.c @ 1652:8036750d0169
Fix leave_groupchats remote command
Reported by Nixtrian
author | Myhailo Danylenko <isbear@ukrpost.net> |
---|---|
date | Sun, 22 Nov 2009 23:38:31 +0200 |
parents | e38300775548 |
children | fca9a4c17432 |
rev | line source |
---|---|
1599 | 1 /* |
2 * xmpp_iq.c -- Jabber protocol IQ-related stuff | |
3 * | |
4 * Copyright (C) 2008-2009 Frank Zschockelt <mcabber@freakysoft.de> | |
5 * Copyright (C) 2005-2009 Mikael Berthe <mikael@lilotux.net> | |
6 * Parts come from the centericq project: | |
7 * Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua> | |
8 * Some small parts come from the Pidgin project <http://pidgin.im/> | |
9 * | |
10 * This program is free software; you can redistribute it and/or modify | |
11 * it under the terms of the GNU General Public License as published by | |
12 * the Free Software Foundation; either version 2 of the License, or (at | |
13 * your option) any later version. | |
14 * | |
15 * This program is distributed in the hope that it will be useful, but | |
16 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
18 * General Public License for more details. | |
19 * | |
20 * You should have received a copy of the GNU General Public License | |
21 * along with this program; if not, write to the Free Software | |
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
23 * USA | |
24 */ | |
1598 | 25 |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
26 #include <string.h> |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
27 #include <sys/utsname.h> |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
28 |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
29 #include "xmpp_helper.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
30 #include "commands.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
31 #include "screen.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
32 #include "utils.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
33 #include "logprint.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
34 #include "settings.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
35 #include "caps.h" |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
36 |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
37 extern struct xmpp_error xmpp_errors[]; |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
38 |
1598 | 39 static LmHandlerResult handle_iq_command_set_status(LmMessageHandler *h, |
40 LmConnection *c, | |
41 LmMessage *m, | |
42 gpointer ud); | |
29 | 43 |
1598 | 44 static LmHandlerResult handle_iq_command_leave_groupchats(LmMessageHandler *h, |
45 LmConnection *c, | |
46 LmMessage *m, | |
47 gpointer ud); | |
29 | 48 |
1598 | 49 inline double seconds_since_last_use(void); |
29 | 50 |
1598 | 51 struct adhoc_command { |
52 char *name; | |
53 char *description; | |
54 bool only_for_self; | |
55 LmHandleMessageFunction callback; | |
1378 | 56 }; |
57 | |
1598 | 58 const struct adhoc_command adhoc_command_list[] = { |
59 { "http://jabber.org/protocol/rc#set-status", | |
60 "Change client status", | |
61 1, | |
62 &handle_iq_command_set_status }, | |
63 { "http://jabber.org/protocol/rc#leave-groupchats", | |
64 "Leave groupchat(s)", | |
65 1, | |
66 &handle_iq_command_leave_groupchats }, | |
67 { NULL, NULL, 0, NULL }, | |
68 }; | |
1383 | 69 |
1598 | 70 struct adhoc_status { |
71 char *name; // the name used by adhoc | |
72 char *description; | |
73 char *status; // the string, used by setstus | |
74 }; | |
75 // It has to match imstatus of roster.h! | |
76 const struct adhoc_status adhoc_status_list[] = { | |
77 {"offline", "Offline", "offline"}, | |
78 {"online", "Online", "avail"}, | |
79 {"chat", "Chat", "free"}, | |
80 {"dnd", "Do not disturb", "dnd"}, | |
81 {"xd", "Extended away", "notavail"}, | |
82 {"away", "Away", "away"}, | |
83 {"invisible", "Invisible", "invisible"}, | |
84 {NULL, NULL, NULL}, | |
85 }; | |
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
86 |
1598 | 87 static char *generate_session_id(char *prefix) |
29 | 88 { |
1598 | 89 char *result; |
90 static int counter = 0; | |
91 counter++; | |
92 // TODO better use timestamp? | |
93 result = g_strdup_printf("%s-%i", prefix, counter); | |
94 return result; | |
29 | 95 } |
96 | |
1598 | 97 static LmMessage *lm_message_new_iq_error(LmMessage *m, guint error) |
29 | 98 { |
1598 | 99 LmMessage *r; |
100 LmMessageNode *err; | |
101 int i; | |
102 | |
103 for (i = 0; xmpp_errors[i].code; ++i) | |
104 if (xmpp_errors[i].code == error) | |
105 break; | |
106 g_return_val_if_fail(xmpp_errors[i].code > 0, NULL); | |
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
294
diff
changeset
|
107 |
1598 | 108 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_ERROR); |
109 err = lm_message_node_add_child(r->node, "error", NULL); | |
110 lm_message_node_set_attribute(err, "code", xmpp_errors[i].code_str); | |
111 lm_message_node_set_attribute(err, "type", xmpp_errors[i].type); | |
112 lm_message_node_set_attribute | |
113 (lm_message_node_add_child(err, | |
114 xmpp_errors[i].condition, NULL), | |
115 "xmlns", NS_XMPP_STANZAS); | |
634
f3c05d5fe459
Send "</stream:stream>" when disconnecting from the server
Mikael Berthe <mikael@lilotux.net>
parents:
633
diff
changeset
|
116 |
1598 | 117 return r; |
436 | 118 } |
119 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
120 void send_iq_error(LmConnection *c, LmMessage *m, guint error) |
1001
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
121 { |
1598 | 122 LmMessage *r; |
123 r = lm_message_new_iq_error(m, error); | |
124 lm_connection_send(c, r, NULL); | |
125 lm_message_unref(r); | |
1001
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
126 } |
dff25377c11f
Auto-reconnect after a network/server failure
Mikael Berthe <mikael@lilotux.net>
parents:
999
diff
changeset
|
127 |
1598 | 128 static void lm_message_node_add_dataform_result(LmMessageNode *node, |
129 const char *message) | |
29 | 130 { |
1598 | 131 LmMessageNode *x, *field; |
939
12fa2ae6445d
Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
132 |
1598 | 133 x = lm_message_node_add_child(node, "x", NULL); |
134 lm_message_node_set_attributes(x, | |
135 "type", "result", | |
136 "xmlns", "jabber:x:data", | |
137 NULL); | |
138 field = lm_message_node_add_child(x, "field", NULL); | |
139 lm_message_node_set_attributes(field, | |
140 "type", "text-single", | |
141 "var", "message", | |
142 NULL); | |
143 lm_message_node_add_child(field, "value", message); | |
144 } | |
1439
fd09c95bc2b5
Wake up less often when not connected to the server
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
145 |
1598 | 146 static LmHandlerResult handle_iq_commands_list(LmMessageHandler *h, |
147 LmConnection *c, | |
148 LmMessage *m, gpointer ud) | |
149 { | |
150 LmMessage *iq; | |
151 LmMessageNode *query; | |
152 const char *requester_jid; | |
153 const struct adhoc_command *command; | |
154 const char *node; | |
155 gboolean from_self; | |
940 | 156 |
1598 | 157 iq = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
158 query = lm_message_node_add_child(iq->node, "query", NULL); | |
159 node = lm_message_node_get_attribute | |
160 (lm_message_node_get_child(m->node, "query"), | |
161 "node"); | |
162 if (node) | |
163 lm_message_node_set_attribute(query, "node", node); | |
29 | 164 |
1598 | 165 requester_jid = lm_message_get_from(m); |
166 from_self = jid_equal(lm_connection_get_jid(c), requester_jid); | |
686
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
684
diff
changeset
|
167 |
1598 | 168 for (command = adhoc_command_list ; command->name ; command++) { |
169 if (!command->only_for_self || from_self) { | |
170 lm_message_node_set_attributes | |
171 (lm_message_node_add_child(query, "item", NULL), | |
172 "node", command->name, | |
173 "name", command->description, | |
174 "jid", lm_connection_get_jid(c), | |
175 NULL); | |
29 | 176 } |
177 } | |
178 | |
1598 | 179 lm_connection_send(c, iq, NULL); |
180 lm_message_unref(iq); | |
181 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
534 | 182 } |
183 | |
1598 | 184 static LmHandlerResult handle_iq_command_set_status(LmMessageHandler *h, |
185 LmConnection *c, | |
186 LmMessage *m, gpointer ud) | |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
187 { |
1598 | 188 const char *action, *node; |
189 char *sessionid; | |
190 LmMessage *iq; | |
191 LmMessageNode *command, *x, *y; | |
192 const struct adhoc_status *s; | |
193 | |
194 x = lm_message_node_get_child(m->node, "command"); | |
195 action = lm_message_node_get_attribute(x, "action"); | |
196 node = lm_message_node_get_attribute(x, "node"); | |
197 sessionid = (char *)lm_message_node_get_attribute(x, "sessionid"); | |
198 | |
199 iq = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); | |
200 command = lm_message_node_add_child(iq->node, "command", NULL); | |
201 lm_message_node_set_attribute(command, "node", node); | |
202 lm_message_node_set_attribute(command, "xmlns", NS_COMMANDS); | |
203 | |
204 if (!sessionid) { | |
205 sessionid = generate_session_id("set-status"); | |
206 lm_message_node_set_attribute(command, "sessionid", sessionid); | |
207 g_free(sessionid); | |
208 sessionid = NULL; | |
209 lm_message_node_set_attribute(command, "status", "executing"); | |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
210 |
1598 | 211 x = lm_message_node_add_child(command, "x", NULL); |
212 lm_message_node_set_attribute(x, "type", "form"); | |
213 lm_message_node_set_attribute(x, "xmlns", "jabber:x:data"); | |
214 | |
215 lm_message_node_add_child(x, "title", "Change Status"); | |
216 | |
217 lm_message_node_add_child(x, "instructions", | |
218 "Choose the status and status message"); | |
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
444
diff
changeset
|
219 |
1598 | 220 // TODO see if factorisation is possible |
221 y = lm_message_node_add_child(x, "field", NULL); | |
222 lm_message_node_set_attribute(y, "type", "hidden"); | |
223 lm_message_node_set_attribute(y, "var", "FORM_TYPE"); | |
224 | |
225 lm_message_node_add_child(y, "value", "http://jabber.org/protocol/rc"); | |
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1053
diff
changeset
|
226 |
1598 | 227 y = lm_message_node_add_child(x, "field", NULL); |
228 lm_message_node_set_attributes(y, | |
229 "type", "list-single", | |
230 "var", "status", | |
231 "label", "Status", | |
232 NULL); | |
233 lm_message_node_add_child(y, "required", NULL); | |
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
234 |
1598 | 235 // XXX: ugly |
236 lm_message_node_add_child(y, "value", | |
237 adhoc_status_list[xmpp_getstatus()].name); | |
238 for (s = adhoc_status_list; s->name; s++) { | |
239 LmMessageNode *option = lm_message_node_add_child(y, "option", NULL); | |
240 lm_message_node_add_child(option, "value", s->name); | |
241 lm_message_node_set_attribute(option, "label", s->description); | |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1290
diff
changeset
|
242 } |
1598 | 243 // TODO add priority ? |
244 // I do not think this is useful, user should not have to care of the | |
245 // priority like gossip and gajim do (misc) | |
246 lm_message_node_set_attributes | |
247 (lm_message_node_add_child(x, "field", NULL), | |
248 "type", "text-multi", | |
249 "var", "status-message", | |
250 "label", "Message", | |
251 NULL); | |
252 } else if (action && !strcmp(action, "cancel")) { | |
253 lm_message_node_set_attribute(command, "status", "canceled"); | |
254 } else { // (if sessionid and not canceled) | |
255 y = lm_message_node_find_xmlns(x, "jabber:x:data"); //x?xmlns=jabber:x:data | |
256 if (y) { | |
257 const char *value=NULL, *message=NULL; | |
258 LmMessageNode *fields, *field; | |
259 field = fields = lm_message_node_get_child(y, "field"); //field?var=status | |
260 while (field && strcmp("status", | |
261 lm_message_node_get_attribute(field, "var"))) | |
262 field = field->next; | |
263 field = lm_message_node_get_child(field, "value"); | |
264 if (field) | |
265 value = lm_message_node_get_value(field); | |
266 field = fields; //field?var=status-message | |
267 while (field && strcmp("status-message", | |
268 lm_message_node_get_attribute(field, "var"))) | |
269 field = field->next; | |
270 field = lm_message_node_get_child(field, "value"); | |
271 if (field) | |
272 message = lm_message_node_get_value(field); | |
273 if (value) { | |
274 for (s = adhoc_status_list; !s->name || strcmp(s->name, value); s++); | |
275 if (s->name) { | |
276 char *status = g_strdup_printf("%s %s", s->status, | |
277 message ? message : ""); | |
278 cmd_setstatus(NULL, status); | |
279 g_free(status); | |
280 lm_message_node_set_attribute(command, "status", "completed"); | |
281 lm_message_node_add_dataform_result(command, | |
282 "Status has been changed"); | |
1197 | 283 } |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
284 } |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1058
diff
changeset
|
285 } |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
286 } |
1598 | 287 if (sessionid) |
288 lm_message_node_set_attribute(command, "sessionid", sessionid); | |
289 lm_connection_send(c, iq, NULL); | |
290 lm_message_unref(iq); | |
291 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
292 } | |
1067
a5dc85fdebde
Add key comparison for signatures & use user-provided PGP keys for encryption
Mikael Berthe <mikael@lilotux.net>
parents:
1065
diff
changeset
|
293 |
1598 | 294 static void _callback_foreach_buddy_groupchat(gpointer rosterdata, void *param) |
295 { | |
296 LmMessageNode *field, *value, *option; | |
297 const char *room_jid, *nickname; | |
298 char *desc; | |
299 | |
300 room_jid = buddy_getjid(rosterdata); | |
301 if (!room_jid) return; | |
302 nickname = buddy_getnickname(rosterdata); | |
303 if (!nickname) return; | |
304 field = param; | |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
305 |
1598 | 306 option = lm_message_node_add_child(field, "option", NULL); |
307 value = lm_message_node_add_child(option, "value", room_jid); | |
308 desc = g_strdup_printf("%s on %s", nickname, room_jid); | |
309 lm_message_node_set_attribute(option, "label", desc); | |
310 g_free(desc); | |
311 } | |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
312 |
1598 | 313 static LmHandlerResult handle_iq_command_leave_groupchats(LmMessageHandler *h, |
314 LmConnection *c, | |
315 LmMessage *m, | |
316 gpointer ud) | |
317 { | |
318 const char *action, *node; | |
319 char *sessionid; | |
320 LmMessage *iq; | |
321 LmMessageNode *command, *x; | |
1044
52cfe9bf9840
Encryption support for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
1043
diff
changeset
|
322 |
1598 | 323 x = lm_message_node_get_child(m->node, "command"); |
324 action = lm_message_node_get_attribute(x, "action"); | |
325 node = lm_message_node_get_attribute(x, "node"); | |
326 sessionid = (char*)lm_message_node_get_attribute(x, "sessionid"); | |
327 | |
328 iq = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); | |
329 command = lm_message_node_add_child(iq->node, "command", NULL); | |
330 lm_message_node_set_attributes(command, | |
331 "node", node, | |
332 "xmlns", NS_COMMANDS, | |
333 NULL); | |
334 | |
335 if (!sessionid) { | |
336 LmMessageNode *field; | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
337 |
1598 | 338 sessionid = generate_session_id("leave-groupchats"); |
339 lm_message_node_set_attribute(command, "sessionid", sessionid); | |
340 g_free(sessionid); | |
341 sessionid = NULL; | |
342 lm_message_node_set_attribute(command, "status", "executing"); | |
343 | |
344 x = lm_message_node_add_child(command, "x", NULL); | |
345 lm_message_node_set_attributes(x, | |
346 "type", "form", | |
347 "xmlns", "jabber:x:data", | |
348 NULL); | |
349 | |
350 lm_message_node_add_child(x, "title", "Leave groupchat(s)"); | |
351 | |
352 lm_message_node_add_child(x, "instructions", | |
353 "What groupchats do you want to leave?"); | |
354 | |
355 field = lm_message_node_add_child(x, "field", NULL); | |
356 lm_message_node_set_attributes(field, | |
357 "type", "hidden", | |
358 "var", "FORM_TYPE", | |
359 NULL); | |
360 | |
361 lm_message_node_add_child(field, "value", | |
362 "http://jabber.org/protocol/rc"); | |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
363 |
1598 | 364 field = lm_message_node_add_child(x, "field", NULL); |
365 lm_message_node_set_attributes(field, | |
366 "type", "list-multi", | |
367 "var", "groupchats", | |
368 "label", "Groupchats: ", | |
369 NULL); | |
370 lm_message_node_add_child(field, "required", NULL); | |
371 | |
372 foreach_buddy(ROSTER_TYPE_ROOM, &_callback_foreach_buddy_groupchat, field); | |
373 //TODO: return an error if we are not connected to groupchats | |
374 } else if (action && !strcmp(action, "cancel")) { | |
375 lm_message_node_set_attribute(command, "status", "canceled"); | |
376 } else { // (if sessionid and not canceled) | |
377 LmMessageNode *form = lm_message_node_find_xmlns(x, "jabber:x:data");//TODO | |
378 if (form) { | |
379 LmMessageNode *field; | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
380 |
1598 | 381 lm_message_node_set_attribute(command, "status", "completed"); |
382 //TODO: implement sth. like "field?var=groupchats" in xmlnode... | |
383 field = lm_message_node_get_child(form, "field"); | |
384 while (field && strcmp("groupchats", | |
385 lm_message_node_get_attribute(field, "var"))) | |
386 field = field->next; | |
387 | |
1652
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
388 if (field) |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
389 for (x = field->children ; x ; x = x->next) |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
390 { |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
391 if (!strcmp (x->name, "value")) { |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
392 GList* b = buddy_search_jid(lm_message_node_get_value(x)); |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
393 if (b) |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
394 cmd_room_leave(b->data, "Requested by remote command"); |
8036750d0169
Fix leave_groupchats remote command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1636
diff
changeset
|
395 } |
1598 | 396 } |
397 lm_message_node_add_dataform_result(command, | |
398 "Groupchats have been left"); | |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
399 } |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
400 } |
1598 | 401 if (sessionid) |
402 lm_message_node_set_attribute(command, "sessionid", sessionid); | |
403 lm_connection_send(c, iq, NULL); | |
404 lm_message_unref(iq); | |
405 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
406 } | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
407 |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
408 LmHandlerResult handle_iq_commands(LmMessageHandler *h, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
409 LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
410 LmMessage *m, gpointer ud) |
1598 | 411 { |
412 const char *requester_jid = NULL; | |
413 LmMessageNode *cmd; | |
414 const struct adhoc_command *command; | |
415 | |
416 // mcabber has only partial XEP-0146 support... | |
417 if (LM_MESSAGE_SUB_TYPE_SET != lm_message_get_sub_type(m)) | |
418 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; | |
419 | |
420 requester_jid = lm_message_get_from(m); | |
988
6e2bfd1ffded
Add ids to message stanzas if needed
Mikael Berthe <mikael@lilotux.net>
parents:
987
diff
changeset
|
421 |
1598 | 422 cmd = lm_message_node_get_child(m->node, "command"); |
423 if (jid_equal(lm_connection_get_jid(c), requester_jid)) { | |
424 const char *action, *node; | |
425 action = lm_message_node_get_attribute(cmd, "action"); | |
426 node = lm_message_node_get_attribute(cmd, "node"); | |
427 // action can be NULL, in which case it seems to take the default, | |
428 // ie execute | |
429 if (!action || !strcmp(action, "execute") || !strcmp(action, "cancel") | |
430 || !strcmp(action, "next") || !strcmp(action, "complete")) { | |
431 for (command = adhoc_command_list; command->name; command++) { | |
432 if (!strcmp(node, command->name)) | |
433 command->callback(h, c, m, ud); | |
434 } | |
435 // "prev" action will get there, as we do not implement it, | |
436 // and do not authorize it | |
437 } else { | |
438 LmMessage *r; | |
439 LmMessageNode *err; | |
440 r = lm_message_new_iq_error(m, XMPP_ERROR_BAD_REQUEST); | |
441 err = lm_message_node_get_child(r->node, "error"); | |
442 lm_message_node_set_attribute | |
443 (lm_message_node_add_child(err, "malformed-action", NULL), | |
444 "xmlns", NS_COMMANDS); | |
445 lm_connection_send(c, r, NULL); | |
446 lm_message_unref(r); | |
447 } | |
448 } else { | |
449 send_iq_error(c, m, XMPP_ERROR_FORBIDDEN); | |
450 } | |
451 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
35 | 452 } |
453 | |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
454 |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
455 LmHandlerResult handle_iq_disco_items(LmMessageHandler *h, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
456 LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
457 LmMessage *m, gpointer ud) |
990
35e7913affb7
Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents:
989
diff
changeset
|
458 { |
1598 | 459 LmMessageNode *query; |
460 const char *node; | |
461 query = lm_message_node_get_child(m->node, "query"); | |
462 node = lm_message_node_get_attribute(query, "node"); | |
463 if (node) { | |
464 if (!strcmp(node, NS_COMMANDS)) { | |
465 return handle_iq_commands_list(NULL, c, m, ud); | |
466 } else { | |
467 send_iq_error(c, m, XMPP_ERROR_NOT_IMPLEMENTED); | |
1091
10f9d6fcfeab
JEP85: Reset composing/paused state when a resource with higher prio comes up
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
468 } |
1598 | 469 } else { |
470 // not sure about this one | |
471 send_iq_error(c, m, XMPP_ERROR_NOT_IMPLEMENTED); | |
205 | 472 } |
1598 | 473 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
1395
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1385
diff
changeset
|
474 } |
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1385
diff
changeset
|
475 |
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1385
diff
changeset
|
476 |
1600 | 477 void _disco_add_feature_helper(gpointer data, gpointer user_data) |
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1161
diff
changeset
|
478 { |
1600 | 479 LmMessageNode *node = user_data; |
480 lm_message_node_set_attribute | |
481 (lm_message_node_add_child(node, "feature", NULL), "var", data); | |
1016 | 482 } |
483 | |
1600 | 484 // disco_info_set_caps(ansquery, entitycaps) |
485 // Add features attributes to ansquery. entitycaps should either be a | |
486 // valid capabilities hash or NULL. If it is NULL, the node attribute won't | |
487 // be added to the query child and Entity Capabilities will be announced | |
488 // as a feature. | |
1598 | 489 // Please change the entity version string if you modify mcabber disco |
490 // source code, so that it doesn't conflict with the upstream client. | |
1600 | 491 static void disco_info_set_caps(LmMessageNode *ansquery, |
492 const char *entitycaps) | |
1016 | 493 { |
1600 | 494 if (entitycaps) { |
495 char *eversion; | |
496 eversion = g_strdup_printf("%s#%s", MCABBER_CAPS_NODE, entitycaps); | |
497 lm_message_node_set_attribute(ansquery, "node", eversion); | |
498 g_free(eversion); | |
499 } | |
1016 | 500 |
1600 | 501 lm_message_node_set_attributes |
502 (lm_message_node_add_child(ansquery, "identity", NULL), | |
503 "category", "client", | |
504 "name", PACKAGE_STRING, | |
505 "type", "pc", | |
506 NULL); | |
1016 | 507 |
1600 | 508 if (entitycaps) |
509 caps_foreach_feature(entitycaps, _disco_add_feature_helper, ansquery); | |
510 else { | |
511 caps_foreach_feature(entity_version(xmpp_getstatus()), | |
512 _disco_add_feature_helper, | |
513 ansquery); | |
1598 | 514 lm_message_node_set_attribute |
515 (lm_message_node_add_child(ansquery, "feature", NULL), | |
1600 | 516 "var", NS_CAPS); |
517 } | |
1016 | 518 } |
519 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
520 LmHandlerResult handle_iq_disco_info(LmMessageHandler *h, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
521 LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
522 LmMessage *m, gpointer ud) |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
523 { |
1598 | 524 LmMessage *r; |
525 LmMessageNode *query, *tmp; | |
526 const char *node = NULL; | |
1600 | 527 const char *param = NULL; |
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1042
diff
changeset
|
528 |
1636
e38300775548
Do not reply to disco "result" IQ messages
Mikael Berthe <mikael@lilotux.net>
parents:
1615
diff
changeset
|
529 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_RESULT) |
e38300775548
Do not reply to disco "result" IQ messages
Mikael Berthe <mikael@lilotux.net>
parents:
1615
diff
changeset
|
530 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
e38300775548
Do not reply to disco "result" IQ messages
Mikael Berthe <mikael@lilotux.net>
parents:
1615
diff
changeset
|
531 |
1598 | 532 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
533 query = lm_message_node_add_child(r->node, "query", NULL); | |
534 lm_message_node_set_attribute(query, "xmlns", NS_DISCO_INFO); | |
535 tmp = lm_message_node_find_child(m->node, "query"); | |
1600 | 536 if (tmp) { |
1598 | 537 node = lm_message_node_get_attribute(tmp, "node"); |
1600 | 538 param = node+strlen(MCABBER_CAPS_NODE)+1; |
539 } | |
540 if (node && startswith(node, MCABBER_CAPS_NODE "#", FALSE)) | |
541 disco_info_set_caps(query, param); // client#version | |
542 else | |
1598 | 543 // Basic discovery request |
1600 | 544 disco_info_set_caps(query, NULL); |
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1344
diff
changeset
|
545 |
1598 | 546 lm_connection_send(c, r, NULL); |
547 lm_message_unref(r); | |
548 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
624
diff
changeset
|
549 } |
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
624
diff
changeset
|
550 |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
551 LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
552 LmMessage *m, gpointer ud) |
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
553 { |
1598 | 554 LmMessageNode *y; |
555 const char *fjid, *name, *group, *sub, *ask; | |
556 char *cleanalias; | |
557 enum subscr esub; | |
558 int need_refresh = FALSE; | |
559 guint roster_type; | |
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
560 |
1598 | 561 for (y = lm_message_node_find_child(lm_message_node_find_xmlns |
562 (m->node, NS_ROSTER), | |
563 "item"); | |
564 y; | |
565 y = y->next) { | |
566 char *name_tmp = NULL; | |
864
a7b3409df6bc
MUC: Work around user server restart
Mikael Berthe <mikael@lilotux.net>
parents:
862
diff
changeset
|
567 |
1598 | 568 fjid = lm_message_node_get_attribute(y, "jid"); |
569 name = lm_message_node_get_attribute(y, "name"); | |
570 sub = lm_message_node_get_attribute(y, "subscription"); | |
571 ask = lm_message_node_get_attribute(y, "ask"); | |
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
572 |
1598 | 573 if (lm_message_node_find_child(y, "group")) |
574 group = lm_message_node_get_value(lm_message_node_find_child(y, "group")); | |
575 else | |
576 group = NULL; | |
1396
8f9928839a36
Automatically unlock new rooms (suggested by Michael Weiser)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
577 |
1598 | 578 if (!fjid) |
579 continue; | |
580 | |
581 cleanalias = jidtodisp(fjid); | |
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
582 |
1598 | 583 esub = sub_none; |
584 if (sub) { | |
585 if (!strcmp(sub, "to")) esub = sub_to; | |
586 else if (!strcmp(sub, "from")) esub = sub_from; | |
587 else if (!strcmp(sub, "both")) esub = sub_both; | |
588 else if (!strcmp(sub, "remove")) esub = sub_remove; | |
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
589 } |
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
590 |
1598 | 591 if (esub == sub_remove) { |
592 roster_del_user(cleanalias); | |
593 scr_LogPrint(LPRINT_LOGNORM, "Buddy <%s> has been removed " | |
594 "from the roster", cleanalias); | |
595 g_free(cleanalias); | |
596 need_refresh = TRUE; | |
597 continue; | |
598 } | |
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
599 |
1598 | 600 if (ask && !strcmp(ask, "subscribe")) |
601 esub |= sub_pending; | |
602 | |
603 if (!name) { | |
604 if (!settings_opt_get_int("roster_hide_domain")) { | |
605 name = cleanalias; | |
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
606 } else { |
1598 | 607 char *p; |
608 name = name_tmp = g_strdup(cleanalias); | |
609 p = strchr(name_tmp, JID_DOMAIN_SEPARATOR); | |
610 if (p) *p = '\0'; | |
581
ad07c868ff43
Tell the user when he or she has been kicked/banned
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
611 } |
583
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
612 } |
32ae027a3238
MUC: clean up departure message code
Mikael Berthe <mikael@lilotux.net>
parents:
581
diff
changeset
|
613 |
1598 | 614 // Tricky... :-\ My guess is that if there is no JID_DOMAIN_SEPARATOR, |
615 // this is an agent. | |
616 if (strchr(cleanalias, JID_DOMAIN_SEPARATOR)) | |
617 roster_type = ROSTER_TYPE_USER; | |
618 else | |
619 roster_type = ROSTER_TYPE_AGENT; | |
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
620 |
1598 | 621 roster_add_user(cleanalias, name, group, roster_type, esub, 1); |
579
0c67755e0fa7
Introduce a handle_presence_muc() function
Mikael Berthe <mikael@lilotux.net>
parents:
578
diff
changeset
|
622 |
1598 | 623 g_free(name_tmp); |
624 g_free(cleanalias); | |
1446
49c8be874344
Add option 'ignore_self_presence'
Mikael Berthe <mikael@lilotux.net>
parents:
1439
diff
changeset
|
625 } |
49c8be874344
Add option 'ignore_self_presence'
Mikael Berthe <mikael@lilotux.net>
parents:
1439
diff
changeset
|
626 |
1598 | 627 buddylist_build(); |
628 update_roster = TRUE; | |
629 if (need_refresh) | |
630 scr_UpdateBuddyWindow(); | |
631 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
632 } | |
644
68fb0c1dfb15
MUC: better nickname check when entering a room
Mikael Berthe <mikael@lilotux.net>
parents:
643
diff
changeset
|
633 |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
634 LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
635 LmMessage *m, gpointer ud) |
1598 | 636 { |
637 LmMessage *r; | |
644
68fb0c1dfb15
MUC: better nickname check when entering a room
Mikael Berthe <mikael@lilotux.net>
parents:
643
diff
changeset
|
638 |
1598 | 639 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
640 lm_connection_send(c, r, NULL); | |
641 lm_message_unref(r); | |
642 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
643 } | |
644 | |
645 double seconds_since_last_use(void) | |
646 { | |
647 return difftime(time(NULL), iqlast); | |
648 } | |
644
68fb0c1dfb15
MUC: better nickname check when entering a room
Mikael Berthe <mikael@lilotux.net>
parents:
643
diff
changeset
|
649 |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
650 LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
651 LmMessage *m, gpointer ud) |
1598 | 652 { |
653 LmMessage *r; | |
654 LmMessageNode *query; | |
655 char *seconds; | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
656 |
1598 | 657 if (!settings_opt_get_int("iq_hide_requests")) { |
658 scr_LogPrint(LPRINT_LOGNORM, "Received an IQ last time request from <%s>", | |
659 lm_message_get_from(m)); | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
660 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
661 |
1598 | 662 if (settings_opt_get_int("iq_last_disable") || |
663 (settings_opt_get_int("iq_last_disable_when_notavail") && | |
664 xmpp_getstatus() == notavail)) | |
665 { | |
666 send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); | |
667 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
668 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
669 |
1598 | 670 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
671 query = lm_message_node_add_child(r->node, "query", NULL); | |
672 seconds = g_strdup_printf("%.0f", seconds_since_last_use()); | |
673 lm_message_node_set_attribute(query, "seconds", seconds); | |
674 g_free(seconds); | |
1236
f7b35b1c343d
Fix a roster bug when receiving a MUC invitation
Mikael Berthe <mikael@lilotux.net>
parents:
1215
diff
changeset
|
675 |
1598 | 676 lm_connection_send(c, r, NULL); |
677 lm_message_unref(r); | |
678 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
1128 | 679 } |
680 | |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
681 LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
682 LmMessage *m, gpointer ud) |
1128 | 683 { |
1598 | 684 LmMessage *r; |
685 LmMessageNode *query; | |
686 char *os = NULL; | |
687 char *ver = mcabber_version(); | |
1128 | 688 |
1598 | 689 if (!settings_opt_get_int("iq_hide_requests")) { |
690 scr_LogPrint(LPRINT_LOGNORM, "Received an IQ version request from <%s>", | |
691 lm_message_get_from(m)); | |
692 } | |
693 if (!settings_opt_get_int("iq_version_hide_os")) { | |
694 struct utsname osinfo; | |
695 uname(&osinfo); | |
696 os = g_strdup_printf("%s %s %s", osinfo.sysname, osinfo.release, | |
697 osinfo.machine); | |
1128 | 698 } |
1598 | 699 |
700 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); | |
701 | |
702 query = lm_message_node_add_child(r->node, "query", NULL); | |
703 | |
704 lm_message_node_add_child(query, "name", PACKAGE_NAME); | |
705 lm_message_node_add_child(query, "version", ver); | |
706 if (os) { | |
707 lm_message_node_add_child(query, "os", os); | |
708 g_free(os); | |
709 } | |
710 | |
711 g_free(ver); | |
712 lm_connection_send(c, r, NULL); | |
713 lm_message_unref(r); | |
714 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
1128 | 715 } |
716 | |
1598 | 717 // This function borrows some code from the Pidgin project |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
718 LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
719 LmMessage *m, gpointer ud) |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
720 { |
1598 | 721 LmMessage *r; |
722 LmMessageNode *query; | |
723 char *buf, *utf8_buf; | |
724 time_t now_t; | |
725 struct tm *now; | |
1528
4b4b3948420c
MUC fix: the topic couldn't be cleared
Mikael Berthe <mikael@lilotux.net>
parents:
1525
diff
changeset
|
726 |
1598 | 727 time(&now_t); |
728 | |
729 if (!settings_opt_get_int("iq_hide_requests")) { | |
730 scr_LogPrint(LPRINT_LOGNORM, "Received an IQ time request from <%s>", | |
731 lm_message_get_from(m)); | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
732 } |
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
733 |
1598 | 734 buf = g_new0(char, 512); |
735 | |
736 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); | |
737 query = lm_message_node_add_child(r->node, "query", NULL); | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
738 |
1598 | 739 now = gmtime(&now_t); |
1128 | 740 |
1598 | 741 strftime(buf, 512, "%Y%m%dT%T", now); |
742 lm_message_node_add_child(query, "utc", buf); | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
743 |
1598 | 744 now = localtime(&now_t); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
745 |
1598 | 746 strftime(buf, 512, "%Z", now); |
747 if ((utf8_buf = to_utf8(buf))) { | |
748 lm_message_node_add_child(query, "tz", utf8_buf); | |
749 g_free(utf8_buf); | |
750 } | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
751 |
1598 | 752 strftime(buf, 512, "%d %b %Y %T", now); |
753 if ((utf8_buf = to_utf8(buf))) { | |
754 lm_message_node_add_child(query, "display", utf8_buf); | |
755 g_free(utf8_buf); | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
756 } |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
757 |
1598 | 758 lm_connection_send(c, r, NULL); |
759 lm_message_unref(r); | |
760 g_free(buf); | |
761 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
762 } | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
763 |
1598 | 764 // This function borrows some code from the Pidgin project |
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
765 LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c, |
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1600
diff
changeset
|
766 LmMessage *m, gpointer ud) |
1598 | 767 { |
768 LmMessage *r; | |
769 LmMessageNode *query; | |
770 char *buf, *utf8_buf; | |
771 time_t now_t; | |
772 struct tm *now; | |
773 char const *sign; | |
774 int diff = 0; | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
775 |
1598 | 776 time(&now_t); |
777 | |
778 if (!settings_opt_get_int("iq_hide_requests")) { | |
779 scr_LogPrint(LPRINT_LOGNORM, "Received an IQ time request from <%s>", | |
780 lm_message_get_from(m)); | |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
781 } |
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
782 |
1598 | 783 buf = g_new0(char, 512); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
784 |
1598 | 785 r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
786 query = lm_message_node_add_child(r->node, "time", NULL); | |
787 lm_message_node_set_attribute(query, "xmlns", NS_XMPP_TIME); | |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
788 |
1598 | 789 now = localtime(&now_t); |
987
f47e312560af
Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents:
986
diff
changeset
|
790 |
1598 | 791 if (now->tm_isdst >= 0) { |
792 #if defined HAVE_TM_GMTOFF | |
793 diff = now->tm_gmtoff; | |
794 #elif defined HAVE_TIMEZONE | |
795 tzset(); | |
796 diff = -timezone; | |
989
859ab76e5093
Send JEP-22 delivered messages
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
797 #endif |
986
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
798 } |
ed697234bd39
Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
799 |
1598 | 800 if (diff < 0) { |
801 sign = "-"; | |
802 diff = -diff; | |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
803 } else { |
1598 | 804 sign = "+"; |
749
6c633adaae10
Use events system for subscription requests
Mikael Berthe <mikael@lilotux.net>
parents:
745
diff
changeset
|
805 } |
1598 | 806 diff /= 60; |
807 snprintf(buf, 512, "%c%02d:%02d", *sign, diff / 60, diff % 60); | |
808 if ((utf8_buf = to_utf8(buf))) { | |
809 lm_message_node_add_child(query, "tzo", utf8_buf); | |
810 g_free(utf8_buf); | |
1128 | 811 } |
812 | |
1598 | 813 now = gmtime(&now_t); |
818
55cd45481a07
Fix a buddylist bug when receiving a subscription request
Mikael Berthe <mikael@lilotux.net>
parents:
793
diff
changeset
|
814 |
1598 | 815 strftime(buf, 512, "%Y-%m-%dT%TZ", now); |
816 lm_message_node_add_child(query, "utc", buf); | |
611
ad737139a144
Improve subscription management
Mikael Berthe <mikael@lilotux.net>
parents:
610
diff
changeset
|
817 |
1598 | 818 lm_connection_send(c, r, NULL); |
819 lm_message_unref(r); | |
820 g_free(buf); | |
821 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
822 } |
1599 | 823 |
1615
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
824 LmHandlerResult handle_iq_vcard(LmMessageHandler *h, LmConnection *c, |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
825 LmMessage *m, gpointer ud) |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
826 { |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
827 send_iq_error(c, m, XMPP_ERROR_SERVICE_UNAVAILABLE); |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
828 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
829 } |
171ae5a258fa
Add dummy vcard IQ handler
Mikael Berthe <mikael@lilotux.net>
parents:
1604
diff
changeset
|
830 |
1599 | 831 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |