aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
6,309 Commits 32 Branches 59 Tags 24 MiB
014e03c72e
Commit Graph

974 Commits

Author SHA1 Message Date
James Booth
f65c82e112 Merge branch 'master' into pgp 2015-05-03 01:48:32 +01:00
James Booth
f25f90b38b Extracted receipt request processing in message.c 2015-05-03 01:48:12 +01:00
James Booth
d3f4347513 Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-05-03 01:30:14 +01:00
James Booth
530c060d2a Extract private message hanlding in message.c 2015-05-03 01:25:33 +01:00
James Booth
79d21d4cd2 Merge branch 'master' into pgp 2015-05-03 00:35:47 +01:00
James Booth
236c854419 Tidy message.c 2015-05-03 00:35:31 +01:00
James Booth
03ef791401 Merge branch 'master' into pgp 2015-05-03 00:06:12 +01:00
James Booth
5a90e2862e Extracted receipt received handler 2015-05-03 00:05:47 +01:00
James Booth
0bc4377ad7 Merge branch 'master' into pgp 2015-05-02 23:40:34 +01:00
James Booth
ddc64755a0 Tidy message.c 2015-05-02 23:40:14 +01:00
James Booth
cade9e7c4c Merge branch 'master' into pgp 2015-05-01 00:55:58 +01:00
James Booth
0118178080 Removed server event delegation functions 2015-05-01 00:55:40 +01:00
James Booth
5d827cafec Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-04-28 23:57:28 +01:00
James Booth
8aba52f4fe Renamed event functions 2015-04-28 23:38:56 +01:00
James Booth
d612b9695a Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-04-19 17:33:35 +01:00
James Booth
e688dd7d28 Renamed server event functions 2015-04-19 17:29:54 +01:00
James Booth
60f94722d4 Merge branch 'master' into pgp 2015-04-19 16:56:11 +01:00
James Booth
424f52c3fa Moved server_events to event/ 2015-04-19 16:54:16 +01:00
James Booth
7e4b756e44 Merge branch 'master' into pgp 2015-04-11 23:38:44 +01:00
James Booth
a2ccd89646 Autogenerate room name with UUID for /join with no args 2015-04-11 23:37:52 +01:00
James Booth
5305a3e3a6 Fixed message sending when not PGP key found 2015-04-05 16:03:50 +01:00
James Booth
c8c12a8f7a Merge branch 'master' into pgp 2015-03-29 03:17:41 +01:00
James Booth
71c2be599b Use password for chat room invites 2015-03-29 03:16:41 +01:00
James Booth
c36d4b3643 Merge branch 'master' into pgp 2015-03-29 02:51:05 +01:00
James Booth
1917d4c095 Added password to direct invites 2015-03-29 02:46:59 +01:00
James Booth
c1eceebcba Merge branch 'master' into pgp 2015-03-29 00:59:42 +00:00
James Booth
714faeb2e6 Add callback data to room disco info response handler 2015-03-29 00:55:33 +00:00
James Booth
24a45e5292 Set members only property when getting room features 2015-03-29 00:21:18 +00:00
James Booth
fac2b2cf66 Added check members only room to send mediated invites 2015-03-28 22:51:41 +00:00
James Booth
0f6bc9b55d Decrypt incoming messages 2015-03-25 00:05:32 +00:00
James Booth
eb5cb7b2f8 Send encrypted messages 2015-03-24 23:34:24 +00:00
James Booth
551f7df1f7 Added signature verification, /pgp fps command 2015-03-24 00:47:13 +00:00
James Booth
b87130b601 Added check for HAVE_LIBGPGME in presence.c 2015-03-23 23:51:35 +00:00
James Booth
475dfebd97 Added pgpkeyid account setting, send signed presence 2015-03-23 23:38:06 +00:00
James Booth
f1f047889e Added individual options to send and request delivery receipts 2015-03-19 22:57:51 +00:00
James Booth
125719673b Return after message receipt 2015-03-14 23:25:20 +00:00
James Booth
a79ea3cbe2 Merge branch 'master' into xep-0184 2015-03-14 16:45:44 +00:00
James Booth
ede3368f7a Check for sent and received carbons 2015-03-14 16:44:21 +00:00
James Booth
060dcc24e3 Merge branch 'master' into xep-0184 
Conflicts:
	src/xmpp/message.c
 2015-03-14 16:41:40 +00:00
James Booth
2fc7937dcd Fixed error with /otr start with carbons enabled 2015-03-14 16:37:33 +00:00
James Booth
57c7564445 Show message received text for receipts 2015-03-11 23:47:11 +00:00
James Booth
78becceedb Added basic delivery receipts 2015-03-11 23:18:28 +00:00
James Booth
2ff6873cf1 Send private carbons element with message when encrypted 2015-03-10 21:16:34 +00:00
James Booth
3c1e8c4e15 Added server error handling when setting /carbons preference 2015-03-09 23:07:51 +00:00
James Booth
945f29873e Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 2015-03-08 21:51:50 +00:00
James Booth
70b923a7fc Lowercase barejid in Jid 2015-02-23 23:44:34 +00:00
James Booth
a2a187892b Lowercase barejid before adding to roster 2015-02-23 23:12:44 +00:00
Olivier LE MOAL
ced5a8c2e0 merge 2015-02-23 10:47:54 +01:00
Olivier Le Moal
3eeafa2277 fix segfault on self sent message carbon 2015-02-21 22:22:21 +01:00
Christian Storm
a1d14c4526 Fixed spelling. 2015-02-17 10:52:37 +01:00
James Booth
9951da0c8f Free jid on caps response handler 2015-02-11 00:17:07 +00:00
James Booth
b3be26a214 Updated copyright 2015-02-10 23:16:09 +00:00
Olivier LE MOAL
48f9f3b3b0 Add XEP-0280 support 2015-02-10 11:32:22 +01:00
James Booth
38e6dc0e85 Free expected_node for legacy caps 2015-02-09 21:59:17 +00:00
James Booth
50601d4db3 Removed strdup calls when creating capabilities 2015-02-09 21:36:04 +00:00
Olivier LE MOAL
2a12a4d93b Add preference/commands for carbons message 2015-02-03 15:27:56 +01:00
Olivier LE MOAL
e3feacddd6 Add XEP-0280 support 2015-02-02 11:10:05 +01:00
James Booth
4c6cfcdca0 Simplified autocompleters and command history 2015-01-16 22:50:40 +00:00
James Booth
13f0166aa0 Only show UI events for chat states when in session 2015-01-11 23:04:22 +00:00
James Booth
c16871d143 Added remaining chat states 2015-01-11 20:20:17 +00:00
James Booth
76bd2ec13f Send active chat state, handle composing and gone from recipients 2015-01-10 22:03:40 +00:00
James Booth
c3ad3c0ba6 Show resource in titlebar and on each message 2015-01-10 18:35:59 +00:00
James Booth
5e7d2f5f91 Removed chat states from chat_session module, WIP 2015-01-08 00:57:25 +00:00
James Booth
8bbf126e83 Refactored chat sessions in _chat_handler 2015-01-07 00:17:54 +00:00
James Booth
95ad564372 Added offline handler for chat sessions 2015-01-06 23:19:56 +00:00
James Booth
c2dccad818 Create chat session when no resource 2015-01-05 00:48:30 +00:00
James Booth
8326c8b3a2 Refactored chat session handling on sending message 2015-01-04 23:40:10 +00:00
James Booth
42a5c431c7 Use resource in chat sessions 2015-01-04 20:19:42 +00:00
James Booth
4898ed10a4 Fix for receiving regular chat messages with no type attribute 2015-01-04 17:54:56 +00:00
James Booth
10a3a3a675 Use events for chat sessions 2014-12-29 01:17:59 +00:00
James Booth
4be06c0ae2 Moved chat_session_set_sent from message.c module 2014-12-29 00:31:57 +00:00
James Booth
fe2ef44cac Added chat_session_on_incoming_message 2014-12-29 00:16:40 +00:00
James Booth
ac4b59eda0 Fixed chat state for non OTR 2014-12-28 22:45:25 +00:00
James Booth
e602c2909e Moved chat states out of xmpp module for message send chat 2014-12-27 00:52:34 +00:00
James Booth
9d94ac5c63 Removed function pointers 2014-12-22 22:13:42 +00:00
James Booth
ea267e2017 Refactored all window recipients and types 
Tests need fixing
 2014-12-20 00:52:35 +00:00
James Booth
9ba5a576ba Split private message handling to separate functions 2014-12-10 22:23:33 +00:00
James Booth
aec7afd06a Added caching of legacy capabilities 2014-11-30 00:37:36 +00:00
James Booth
94bd9dbdfe Store capabilities against fulljid when unsupported hash 2014-11-27 01:08:02 +00:00
James Booth
e263e00a85 Refactored parsing caps 2014-11-26 21:59:36 +00:00
James Booth
508bfeb2bf Refactored available presence handler 2014-11-26 21:07:46 +00:00
James Booth
5030d49952 Removed bookmark autojoin limit 2014-11-20 22:33:46 +00:00
James Booth
9d9ffb08cf Show roster after roster received 2014-11-20 00:32:33 +00:00
James Booth
4e429fe788 Implemented /roster by group 2014-11-13 00:22:22 +00:00
James Booth
7a03dd7641 Free datetime on ping errors 2014-11-03 21:09:49 +00:00
James Booth
c4ab9405f6 Fixed leaks in /affiliation and /role 2014-11-03 20:57:22 +00:00
James Booth
c4412fe823 Fixed various memory leaks 2014-11-01 01:48:36 +00:00
James Booth
c014bb34b3 Renamed room destroy function 2014-10-23 23:33:12 +01:00
James Booth
bb3f1b0909 Set file permissions for logs 2014-10-18 21:41:39 +01:00
James Booth
0cc25e1b76 Removed debug messages when setting roles/affiliations 2014-10-18 19:19:01 +01:00
James Booth
77674beb7e Show occupants role/affiliation changes 2014-10-18 19:10:50 +01:00
James Booth
67755ca74d Added reason to role/affiliation changes 2014-10-18 01:37:52 +01:00
James Booth
9f2f54b2a0 Removed /duck command 2014-10-18 00:07:48 +01:00
James Booth
0e18b10b8e Include self in room roster 2014-10-07 01:16:46 +01:00
James Booth
d6a4af9992 Refactor muc user handler 2014-10-07 00:46:08 +01:00
James Booth
ea511f8fbc Refactor muc_user_handler 2014-10-07 00:22:39 +01:00
James Booth
78a1556f12 Added jid autocomplete for affiliation commands 2014-10-06 22:59:25 +01:00
James Booth
965f048b18 Implemented setting and listing roles 2014-10-06 21:42:09 +01:00
James Booth
d12534c58e Implemented /room kick command 2014-10-05 20:52:34 +01:00
James Booth
ac7bc02c63 Added /room kick command 2014-10-05 03:52:55 +01:00
James Booth
7584ddaa62 Added /room subject command 2014-10-05 03:05:46 +01:00
James Booth
2026ab4b6e Implemented getting affiliation list, and setting affiliation 2014-10-05 01:39:48 +01:00
James Booth
0b78a9a57e Implemented setting affiliation and listing affiliations 2014-10-04 23:40:36 +01:00
James Booth
58fb89ad33 Allow adding and removing room owners 2014-10-04 21:38:31 +01:00
James Booth
25b04537e1 Added service discovery to /room info command 2014-10-02 23:37:10 +01:00
James Booth
ba6aded2b4 Merge branch 'master' into muc_roles 2014-10-02 22:17:56 +01:00
James Booth
1423ee7a75 Handle roster set and result when item name is empty string 
fixed #431
 2014-10-02 22:12:41 +01:00
James Booth
60e0d5ef7b Store real jid with occupants 2014-10-01 13:27:01 +01:00
James Booth
bca5a5f78d Merge branch 'master' into muc_roles 
Conflicts:
	.gitignore
 2014-09-30 20:46:26 +01:00
James Booth
fbeb107cbe Dont check for var attribute on form fields of type fixed 2014-09-30 20:44:00 +01:00
James Booth
0365e88b7b wip - Store roles and affiliations with occupants 2014-09-30 19:46:35 +01:00
James Booth
4f7feedb65 Changed rooms to use Occupant type instead of PContact 2014-09-30 00:16:01 +01:00
James Booth
d25d6b4502 Tidied muc module 2014-09-28 22:09:20 +01:00
James Booth
41b49cb5d6 Store room affiliation and role 2014-09-28 01:55:24 +01:00
James Booth
a4f7932ed7 Check for NULL inside autocomplete_free 2014-09-26 00:48:48 +01:00
James Booth
0b2a1a1bc7 Renamed autocomplete function to get list 2014-09-26 00:06:50 +01:00
James Booth
7703f57584 Use log_warning for room config form errors 2014-09-25 20:26:42 +01:00
James Booth
9094c483d0 Fixed spelling mistake in form.h 2014-09-25 20:14:16 +01:00
James Booth
41f4621e6f Free caps, remove strdup 2014-09-24 01:06:49 +01:00
James Booth
5c36f85199 Free unique id 2014-09-24 00:48:28 +01:00
James Booth
95a2cec953 Handle errors for /disco info requests 2014-09-24 00:30:05 +01:00
James Booth
162aeab827 Capabilities: check for identity locale 2014-09-23 21:36:46 +01:00
James Booth
ab9c3ac330 Reordered identity attributes in caps cache for readability 2014-09-23 00:22:59 +01:00
James Booth
345a9e3f40 Create sha-1 of own capabilities once 2014-09-23 00:08:26 +01:00
James Booth
60a18c3c8d Cache capabilities to file 2014-09-22 01:36:45 +01:00
James Booth
9f7a8cea81 Show message when no capabilities available 2014-09-21 23:21:48 +01:00
James Booth
e8a450bc17 Sort form fields for sha-1 caps hash 2014-09-21 21:43:42 +01:00
James Booth
c343b3ecef Log errors on caps responses 2014-09-21 16:51:35 +01:00
James Booth
7aff51ba4d Handle capabilities for room participants 2014-09-21 01:57:09 +01:00
James Booth
c2e173479f Fixed muc presence check, remove logging from presence handler 2014-09-21 01:05:16 +01:00
James Booth
06856ecea1 Removed _get_caps_key function 2014-09-21 00:22:03 +01:00
James Booth
2fb9989123 Added jid->hash lookup for capabilities 2014-09-20 23:50:19 +01:00
James Booth
6e19476f6f Do not send caps request on self presence 2014-09-19 01:28:44 +01:00
James Booth
99c0b3f2cf wip - refactoring capabilities 2014-09-19 00:49:48 +01:00
James Booth
93058636ce Tidied available presence handler 2014-09-18 21:36:43 +01:00
James Booth
a905ce18a3 Added autocompletion for jid-multi form fields 2014-09-17 23:36:10 +01:00
James Booth
45ba6f1fed Added autocompletion for form text-multi values 2014-09-17 23:35:51 +01:00
James Booth
fa7b6f3000 Added autocompletion for form list-multi values 2014-09-17 23:03:03 +01:00
James Booth
e42a0847a2 Added autocompletion for form list-single values 2014-09-17 22:51:52 +01:00
James Booth
d2a06ab18e Handle result of room configuration submit 2014-09-17 21:48:55 +01:00
James Booth
f494faac99 Show form fields after updating 2014-09-15 23:28:12 +01:00
James Booth
c5b697dba7 Dont allow unsaved form windows to be closed 2014-09-15 22:31:15 +01:00
James Booth
b934ad54d5 Added form tests 2014-09-14 22:31:27 +01:00
James Booth
de0ce0b80d Allow removing data from text-multi form fields 2014-09-14 18:36:44 +01:00
James Booth
8cfe80e979 Added setting of unique form list values 2014-09-14 16:23:25 +01:00
James Booth
7a12684523 Added /room remove command, reformetted form output 2014-09-14 01:53:52 +01:00
James Booth
68b839a508 Added /room add for *-multi 2014-09-14 00:18:06 +01:00
James Booth
e13940daf4 Added form validation for list-single type 2014-09-13 23:07:52 +01:00
James Booth
b111419693 Added form type check on set 2014-09-13 22:39:06 +01:00
James Booth
c4b4cb557f form_get_field_by_var->form_get_form_type_field 2014-09-13 21:55:46 +01:00
James Booth
0a4dea55d5 Do not tag hidden form fields 2014-09-13 21:46:54 +01:00
James Booth
cbb199e06e Do not set hidden for fixed form fields 2014-09-13 21:40:16 +01:00
James Booth
d8400a5fd7 Initialise form field tag autocomplete 2014-09-13 21:36:16 +01:00
James Booth
128a4a811f Added autocomplete for setting room config form tags 2014-09-12 13:28:33 +01:00
James Booth
6c45f8ffae Check room config tag exists before setting 2014-09-12 00:39:37 +01:00
James Booth
38959e0c33 Added setting of *-single room config values 2014-09-12 00:21:28 +01:00
James Booth
42a14d0182 Added tags to form fields 2014-09-11 23:44:39 +01:00
James Booth
eba3a7cb30 Implemented /room config submit for saving room configuration 2014-09-10 23:05:35 +01:00
James Booth
acc7df161d Added form field type enum 2014-09-10 13:18:36 +01:00
James Booth
41a069278a Tidied error handling for room forms 2014-09-09 23:16:12 +01:00
James Booth
9d74bdb58d Merge branch 'master' into roomconfig 2014-09-09 22:44:14 +01:00
James Booth
aa7fe0991f Added usages for stanza_get_error_message in iq.c 2014-09-09 22:32:52 +01:00
James Booth
3417f25dd1 Use stanza_get_error_message for pong errors 2014-09-09 22:26:14 +01:00
James Booth
6166d456e8 Added TODO for handling room config form request errors 2014-09-09 00:16:29 +01:00
James Booth
14ede0e44c Merge branch 'master' into roomconfig 
Conflicts:
	src/server_events.h
 2014-09-07 21:54:04 +01:00
James Booth
8f08c7a21e Added error handling for /ping command responses 2014-09-07 21:50:59 +01:00
James Booth
ee6208866a Removed unnecessary NULL checks when freeing form 2014-09-07 14:13:44 +01:00
James Booth
055ba3c4b2 Fix option handling for room config form parsing 2014-09-06 23:34:49 +01:00
James Booth
a4f6e9391c Reassign stanza name when looking for field values 2014-09-06 23:23:23 +01:00
James Booth
2599c43d66 Rewrite form parser 2014-09-06 22:40:57 +01:00
James Booth
157a1b5ff7 Created form module 2014-09-05 21:04:16 +01:00
James Booth
9728d1a727 Debug room config form fields 2014-09-05 13:48:53 +01:00
James Booth
5e1023dfd9 Parse data form for room configuration 2014-09-04 23:15:51 +01:00
James Booth
763356464a Added ID handler for room config form 2014-09-04 22:41:10 +01:00
James Booth
1e0e5597c2 Added /room config edit and /room config cancel 2014-09-04 22:29:57 +01:00
James Booth
bf283652f8 Fix room config check for servers that don't send 110 status 2014-09-04 20:17:39 +01:00
James Booth
4ba33cb13c Added /ping command 2014-09-04 01:08:10 +01:00
James Booth
b50b786dcc Validate usage of /room config command, added UI messages 2014-09-03 22:56:33 +01:00
James Booth
64521eb135 Handle /room config cancel 2014-09-03 22:00:08 +01:00
James Booth
aa9f1dfa06 Send room destroy iq on /room config cancel 2014-09-03 20:29:17 +01:00
James Booth
09c10f62f2 Send instant room request 2014-09-03 13:55:06 +01:00
James Booth
57effcd504 Show message when room requires config 2014-09-03 00:23:04 +01:00
James Booth
15fe590eda Removed bookmarks todo 2014-08-31 23:11:30 +01:00
Dariusz Dwornikowski
1dcc028a71 Small spelling fixes in code and comments 2014-08-27 13:26:11 +02:00
James Booth
f9737251a6 Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
Jan Hacker
e87eb4c40e "/bookmark add foo" crash - fix 
A user providing an invalid JID when creating a new bookmark (like 'foo')
would reproducibly crash/segfault profanity, as it insists on checking
string length behind the @ of the JID. However, it could be NULL
if the user accidentally omitted it.
The patch avoids the crash by NULL-checking and prevents
getting there in the first place by checking the argument to "add".
Backtrace of unpatched profanity with above command:

Program received signal EXC_BAD_ACCESS, Could not access memory.
Reason: KERN_INVALID_ADDRESS at address: 0x0000000000000000
0x00007fff85699732 in strlen ()
(gdb) bt
 #0  0x00007fff85699732 in strlen ()
 #1  0x00000001000965d2 in xmpp_strdup ()
 #2  0x0000000100095d6d in xmpp_stanza_set_attribute ()
 #3  0x0000000100011c5c in _send_bookmarks ()
 #4  0x00000001000115a8 in _bookmark_add ()
 #5  0x000000010003320d in cmd_bookmark ()
 #6  0x000000010002a0f2 in cmd_execute ()
 #7  0x0000000100003a1d in process_input ()
 #8  0x00000001000037c7 in prof_run ()
 #9  0x0000000100045032 in main ()
(gdb)
 2014-08-17 22:22:12 +02:00
Dariusz Dwornikowski
225312802e Spelling errors fixed and hyphenation used as minus sign fixed 2014-08-11 18:54:20 +02:00
James Booth
954661e59e Added quote param to autocomplete_complete 2014-07-09 20:23:47 +01:00
James Booth
6483bc8d7c Removed string allocation in stanza when joining room 2014-06-15 22:26:28 +01:00
James Booth
1c62d7fda8 Renamed generate_unique_id -> create_unique_id 2014-06-15 21:49:34 +01:00
James Booth
efc833a202 Free string after use in sending caps response 2014-06-15 21:39:54 +01:00
James Booth
c9274a38b2 Free jabber_conn.log 2014-06-15 21:19:53 +01:00
James Booth
d6d714e1ed Free saved account details before replacing 2014-06-15 21:00:01 +01:00
James Booth
d181f500ea Fixed usages of get_unique_id to free result 2014-06-15 20:56:24 +01:00
James Booth
ccf5cb846b Added connection details to jabber_shutdown 2014-06-15 20:46:12 +01:00
James Booth
4d0566b5d1 Fixed memleak in _available_handler 2014-06-15 20:39:50 +01:00
James Booth
92837ec186 Renamed sha1 functions to avoid naming clashes 2014-06-15 19:08:18 +01:00
James Booth
b25b3f3180 Added notification setting for typing in current window 2014-05-24 21:13:33 +01:00
James Booth
b85fd5e78c Use account muc_nick when no nick for bookmark 2014-05-23 00:55:30 +01:00
James Booth
d2662a6f17 Refactored bookmarks to use option parser, allow bookmarking rooms with passwords 2014-05-10 00:50:43 +01:00
James Booth
143c5a3493 Refactroed self presence checks, handle null stanzas 
Issue #341
 2014-05-06 22:07:44 +01:00
James Booth
ba8d1325ad Added null check for presence error stanza namespace element 
Issue #341
 2014-05-05 22:01:27 +01:00
James Booth
524b1f2383 Changed to use gnutls instead of openssl for sha1 hashing 2014-05-01 22:18:04 +01:00
James Booth
d6e92f62dc Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
James Booth
4384a1f468 Tidied jabber_process_events 2014-04-23 20:51:57 +01:00
James Booth
1a0f12b0e6 Merge remote-tracking branch 'lucian/master' 2014-04-22 23:53:15 +01:00
James Booth
2c15aba92a Chat room windows now created only after successful join 2014-04-21 00:37:04 +01:00
James Booth
9a55d8ad19 Store password with room 2014-04-20 22:02:55 +01:00
lightb
1ceca89296 Added some otr policy functionality, if policy is set to "always" 
if otr_is_secure fails, the message will not be sent.

Changed both cmd_msg and cmd_execute_default
 2014-04-19 05:08:33 -04:00
James Booth
bf185d9907 Added simple stanza logging to main console 2014-04-15 01:08:41 +01:00
James Booth
bc6f8ceb3a Fixed handling of room subject 2014-04-13 03:11:46 +01:00
James Booth
f332b6681e Fixed "/bookmark remove" for disabling autojoin 
Issue #194
 2014-04-13 02:27:37 +01:00
James Booth
f62cf772a7 Refactored bookmark_remove 
Issue #194
 2014-04-13 02:05:12 +01:00
James Booth
73c146c65a Implemented "/bookmark remove" for private storage 
Issue #194
 2014-04-13 01:39:54 +01:00
James Booth
f7daaf0953 Clean up after removing bookmark 
Issue #194
 2014-04-13 01:11:21 +01:00
James Booth
5bb3fab17c Implemented "/bookmark add" for private storage 
Issue #194
 2014-04-13 01:01:53 +01:00
James Booth
aa2a87d162 Tidied ui dependencies 2014-04-06 21:35:17 +01:00
James Booth
8f7bdc3c2e Switch back to storage for muc bookmarks 2014-03-29 23:15:51 +00:00
James Booth
7e27d96f16 Revert "Commented bookmarks code for 0.4.0 release" 
This reverts commit 8306d4c244.
 2014-03-29 22:58:48 +00:00
James Booth
8306d4c244 Commented bookmarks code for 0.4.0 release 2014-03-16 18:20:31 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
b177250f47 Refactored muc_room_is_active to only take room, rather than full jid 2014-03-08 21:20:26 +00:00
James Booth
dd1ee18c72 Added test for /join with nick option 2014-03-08 21:10:23 +00:00
Dmitry Podgorny
0fbaa6f5ee fixed build error when make run with -jN option 
Race can occur when gitversion file isn't fully generated before
it is used.
 2014-03-06 02:06:22 +02:00
Kristofer M White
ced6e7f411 Making whitespace consistently spaces, not tabs 2014-02-27 05:40:31 +00:00
Kristofer M White
8a54c5895d Adding password handling for joining chatrooms 2014-02-27 05:31:10 +00:00
James Booth
3e02921859 Removed id from bookmarks add 2014-02-03 19:35:26 +00:00
James Booth
9394091f04 Implemented add bookmark for XEP-0223 
Issue #194
 2014-02-02 02:39:36 +00:00
James Booth
95c48a0f47 Test message when removing autojoin for non existent bookmark 2014-02-02 01:05:52 +00:00
James Booth
9d957e5f93 Show message on /bookmark remove when bookmark does not exist 2014-02-02 00:59:32 +00:00
James Booth
92b85bb7f1 Added message when bookmark updated 2014-02-02 00:49:02 +00:00
James Booth
12666b41e6 Refactored handle_presence_error, removed no longer used functions 2014-01-30 22:20:57 +00:00
James Booth
2cd24a484a Renamed handle_error_message -> handle_presence_error 2014-01-30 21:43:31 +00:00
James Booth
5afb296e67 Moved error handling logic to server_events 2014-01-28 22:37:50 +00:00
James Booth
c3ea8f8d0b Added generated id's to presence stanzas 2014-01-28 20:55:02 +00:00
James Booth
e9959d5d38 Refactored presence_error_handler 2014-01-27 22:35:04 +00:00
James Booth
27293ebbc2 Added fallback message error handlers 2014-01-27 22:09:16 +00:00
James Booth
678a5bd05c Fixed comment 2014-01-27 21:48:44 +00:00
James Booth
da94dcf3cf Moved connection_error_handler to _presence_error_handler 2014-01-27 21:42:34 +00:00
James Booth
f26686aeca Removed unnecessary strdup 2014-01-27 21:33:02 +00:00
James Booth
1a300ce7d3 Show original error message 2014-01-26 22:50:22 +00:00
James Booth
50f1a5ecc0 Changed error message when couldn't join room 2014-01-26 22:19:22 +00:00
James Booth
292ae567aa Handle recipient not found 2014-01-26 18:30:34 +00:00
James Booth
46b3ff6f44 Added generated id to chat state stanzas 2014-01-26 14:15:04 +00:00
James Booth
7184c34d30 Added generated id to invites 2014-01-26 14:10:45 +00:00
James Booth
ae1ccc7bae Add generated id to messages 2014-01-26 01:07:11 +00:00
James Booth
16de267906 Added id handler for pings, disable ping on error type 'cancel' 2014-01-26 00:53:24 +00:00
James Booth
3d7e923254 Use generated id on ping iqs 2014-01-26 00:18:15 +00:00
James Booth
5472c6965a Moved xmpp ping to iq module 2014-01-26 00:15:34 +00:00
James Booth
fbdecdad0c generate_unique_id allows prefix 2014-01-25 23:18:10 +00:00
James Booth
e1aca3b1f6 Add message and presence error handlers seperately 2014-01-25 22:57:53 +00:00
James Booth
9b82551809 Renamed iq handlers 2014-01-25 21:41:17 +00:00
James Booth
8600efa55b Renamed _room_presence_handler -> _muc_user_handler 2014-01-25 21:29:17 +00:00
James Booth
6a15a09ed7 Renamed xmpp roster handlers 2014-01-25 21:25:35 +00:00
James Booth
d8a92f933b Split xmpp message handlers by namespace 2014-01-25 21:20:56 +00:00
James Booth
78e8232b61 Renamed namespace variables 2014-01-25 20:47:32 +00:00
James Booth
aada6d5cd6 Don't show error for initial bookmarks request 2014-01-25 17:18:30 +00:00
James Booth
39e0782da8 Fixed test compilation 2014-01-18 20:34:46 +00:00
James Booth
e7013408e5 WIP - Adding port to account options 2014-01-18 01:45:05 +00:00
James Booth
db973457d0 Refactored roster add/update 2014-01-05 23:54:29 +00:00
James Booth
b8672d709a Moved roster handlers to server_events 2014-01-05 21:55:32 +00:00
James Booth
4bcd766d34 Moved presence handlers to server_events 2014-01-05 21:48:04 +00:00
James Booth
a54518f2d4 Moved messages handlers to server_events 2014-01-05 21:33:12 +00:00
James Booth
d083a5407d Moved handle_room_list and handle_disco_items to server_events 2014-01-05 21:20:15 +00:00
James Booth
b14d5707cb Moved handle_disco_info to server_events 2014-01-05 21:17:07 +00:00
James Booth
460a42c7c9 Moved handle_software_version_result to server_events 2014-01-05 21:11:09 +00:00
James Booth
42fd1fb13e Moved handle_lost_connection and handle_failed_login to server_events 2014-01-05 21:04:30 +00:00
James Booth
da03617e8b Moved handle_login_account_success to server_events 2014-01-05 20:58:19 +00:00
James Booth
87cdbe015a Added server_events.c 2014-01-05 20:52:45 +00:00
James Booth
4a8d6c2153 Renamed roster_add_new -> roster_send_add_new 2014-01-05 20:33:48 +00:00
Jasper van Bourgognie
7127a934c7 Fixed types of presence variables to resource_presence_type (avoid useless and implicit casts) 2013-12-27 20:50:43 +01:00
James Booth
6a9bb8ea11 Bind roster functions in main.c 2013-12-22 23:34:44 +00:00
James Booth
4e169689f6 Bind presence functions in main.c 2013-12-22 23:31:49 +00:00
James Booth
74e8a405d6 Bind message functions in main.c 2013-12-22 23:25:30 +00:00
James Booth
90e7ce1c56 Bind iq functions in main.c 2013-12-22 23:19:20 +00:00
James Booth
e818a6772b Bind capabilities functions in main.c 2013-12-22 23:16:19 +00:00
James Booth
c001f0e7cb Bind bookmark functions in main.c 2013-12-22 23:13:34 +00:00
James Booth
581f58e47f Bind jabber functions in main.c 2013-12-22 23:13:05 +00:00
James Booth
81909ef000 Dynamically bind xmpp module api 2013-12-18 20:16:55 +00:00
James Booth
107fdd355e Added simple mock test, refactored roster 2013-12-14 15:34:17 +00:00
James Booth
c5f76721ce Fixed compile error for -Wduplicate-decl-specifier on OSX 2013-11-10 18:48:55 +00:00
Tomás Senart
480589f0ae Use passwords from the accounts file 
This commit makes it so that if the password in an account in the
accounts file is present, then use it. Otherwise ask for the password to
the user.
 2013-10-14 20:15:51 +02:00
James Booth
d70245c887 Fixe rejoining room after nickname conflict 
fixes #241
 2013-09-22 01:26:40 +01:00
James Booth
d0c8ed462d Add error handler only once 
fixes #240
 2013-09-22 00:19:11 +01:00
James Booth
ee8ff948bf Use git revision in development strings 2013-09-17 01:28:35 +01:00
James Booth
70bbc2e344 Merge remote-tracking branch 'dmitry/fixes' 2013-08-26 14:49:47 +01:00
Dmitry Podgorny
7a9fcd53d2 fixed crash because of incorrect string releasing 2013-08-26 12:31:41 +03:00
Dmitry Podgorny
545a23e92f removed strdup in autocomplete calls 2013-08-26 03:29:50 +03:00
Dmitry Podgorny
32e18fb1a5 remove octet_compare 
strcmp provides the same functionality
 2013-08-26 02:42:01 +03:00
Dmitry Podgorny
b1bfdf650a fixed memory leaks in various files 2013-08-25 14:54:34 +03:00
Dmitry Podgorny
c7ec06ff65 removed strdup from g_string_append 2013-08-25 14:52:25 +03:00
Dmitry Podgorny
d6c90ac7ca fixed indenting 2013-08-24 00:41:57 +03:00
Dmitry Podgorny
012366cf13 fixed memleak in _iq_handle_discoinfo_get 2013-08-24 00:40:23 +03:00
James Booth
6651b13bd0 Merge branch 'master' into nextdev 2013-08-05 23:18:19 +01:00
James Booth
42eef398b4 Free Jid 2013-08-05 23:12:10 +01:00
James Booth
c6e9a7455d Undo change to stanza check for nick change return value 2013-08-05 23:08:30 +01:00
James Booth
1525be6133 Refactor MUC self presence checks 2013-08-05 22:55:11 +01:00
James Booth
55282e063d Handle when servers dont send status 101 or jid for MUC nick changes 2013-08-05 21:20:07 +01:00
Dmitry Podgorny
a6e66cc571 fixed memory leaks 
Also avoided several NULL pointer dereferences.
 2013-08-03 14:38:38 +03:00
Dmitry Podgorny
0346fda0b3 most FREE_SET_NULL replaced with free 
FREE_SET_NULL makes extra assignment of NULL for pointers in stack or
dynamic memory that is going to be freed.
FREE_SET_NULL is useful for pointers that can be used in future.
 2013-08-03 14:27:07 +03:00
James Booth
66238641e0 Merge branch 'master' into nextdev 2013-07-22 22:09:51 +01:00
James Booth
a64b293878 Removed escaping XML as handled by libstrophe 
4ad21c9283
 2013-07-22 20:35:43 +01:00
James Booth
7906bd6a9d Bookmarks: Move stanza pointer on in loop, check for autojoin "true" 2013-07-15 00:52:47 +01:00
Dmitry Podgorny
b9d29e9aa5 draft of bookmarks implementation 
'/bookmark add' and '/bookmark remove' ain't finished
 2013-07-14 23:58:02 +03:00
Dmitry Podgorny
6e23584575 improved autojoin logic 
Delete id handler after timeout (5sec) if response isn't received
Auto join maximum 5 conferences
 2013-07-14 17:08:49 +03:00
Dmitry Podgorny
ccbbd16d5f Merge branch 'master' into bookmarks 2013-07-14 13:50:57 +03:00
Dmitry Podgorny
034cf730cc use get_unique_id for bookmarks 2013-07-14 13:49:50 +03:00
James Booth
581c1e8b95 Coloured contact and subscription in /roster and /group output 2013-07-03 23:44:51 +01:00
Dmitry Podgorny
2837c4054f initial support of autojoin for MUC 2013-06-30 18:59:38 +03:00
James Booth
2077834b10 Changed client type to 'console' as per http://xmpp.org/registrar/disco-categories.html#client 2013-06-25 01:00:24 +01:00
James Booth
d5e9ca649d Show messages on /group add and /group remove 
closes #189
closes #190
 2013-06-23 17:38:30 +01:00
James Booth
dace47e5d3 Show message when removing contact from group when not in group 2013-06-23 16:35:13 +01:00
James Booth
265fff8f40 Show message when contact already in group 2013-06-23 16:29:42 +01:00
James Booth
b9fc61fd30 Moved stophe references in message send 2013-06-20 17:41:44 +01:00
James Booth
96496ca219 Merge remote-tracking branch 'dmitry/captcha-2' into captcha 2013-06-16 18:58:18 +01:00
Dmitry Podgorny
1f207beb99 fixed memory leaks in presence.c 2013-06-09 18:52:28 +03:00
Dmitry Podgorny
c84cb17bd4 added support of captcha in a MUC 2013-06-09 16:19:49 +03:00
Dmitry Podgorny
eff5986d38 fixed several memory leaks 
And infinity loop in stanza_destroy_form().
 2013-06-09 14:20:48 +03:00
James Booth
6082ab8778 Implemented /group command with no args (list groups) 2013-06-02 20:20:44 +01:00
James Booth
f72e7d89b8 Changed autocomplete for /group and /who 2013-06-02 17:51:38 +01:00
James Booth
9dd5456f88 Added group add and group remove to /roster command 2013-06-02 02:48:20 +01:00
James Booth
0e5d277c14 Added message in console on /roster remove 2013-06-02 00:24:22 +01:00
James Booth
65c09db19e Added message in console on /roster add 2013-06-02 00:20:22 +01:00
James Booth
01bdc6ae5a Added /roster remove command 2013-06-02 00:06:05 +01:00
James Booth
518b6721ff Added /roster add command 2013-06-01 23:48:24 +01:00
James Booth
d49a01a9c3 Added roster list when using /roster with no args 2013-06-01 23:27:46 +01:00
James Booth
ae7da18d7e Use waddstr for incoming messages to avoid truncation 
fixes #8
 2013-06-01 21:23:34 +01:00
James Booth
1ca2147844 Sort contacts on /who output 2013-05-30 21:47:30 +01:00
James Booth
d017999a91 Add groups to roster contacts 
fixes #175
 2013-05-22 23:38:52 +01:00
James Booth
2842b423d1 Refactor roster.c 2013-05-22 21:43:06 +01:00
James Booth
15c7820594 Reuse roster_add in roster_update 2013-05-22 21:15:05 +01:00
James Booth
c4e279202b Removed unused offline_msg parameter from roster_add 2013-05-21 22:40:39 +01:00
James Booth
7b20d8d4f4 Refactored roster push handling 2013-05-21 22:00:42 +01:00
James Booth
5a8e667e58 Renamed roster_change_handle -> roster_change_name 2013-05-21 21:18:12 +01:00
James Booth
f4a3dd84ea Renamed roster_barejid_from_handle -> roster_barejid_from_name 2013-05-21 21:12:00 +01:00
James Booth
8e4dd4b80f Renamed handle, jid and resource in roster 
Renamed to name, barejid and fulljid
 2013-05-21 21:07:32 +01:00
James Booth
e489ef1ad5 Renamed _roster_handle_set -> _roster_handle_push 2013-05-21 20:58:50 +01:00
James Booth
d16a31d096 Renamed roster_jid_from_handle -> roster_barejid_from_handle 2013-05-21 20:50:05 +01:00
James Booth
4a8db64d7a Roster handle changes handled correctly 2013-05-20 21:43:20 +01:00
James Booth
6c4b81d093 Added jid autocompleter for /roster nick command 2013-05-20 20:51:43 +01:00
James Booth
59a3a5fe9b Use handle in /msg command 2013-05-19 23:35:02 +01:00
James Booth
1c41a46dce Changing roster handle with no argument clears handle 2013-05-19 03:27:59 +01:00
James Booth
d300e8e763 Added /roster command with nick option to change handle 2013-05-19 02:07:01 +01:00
James Booth
c1ee75da40 Removed contact_list, moved roster logic to xmpp/roster module 2013-05-06 23:04:46 +01:00
James Booth
05f2d29396 Renamed contact_list_ functions to roster_ 2013-05-06 22:32:58 +01:00
James Booth
097ea18dab Tidied includes in iq.c 2013-05-06 22:00:11 +01:00
James Booth
3ae74feaa2 Created roster module, moved roster iq's 2013-05-06 21:53:59 +01:00
James Booth
78ff58cf77 Fixed error when losing connection and segfaulting on notify_remind() 2013-05-06 00:33:33 +01:00
James Booth
3d8d5214bb Autocomplete "/sub allow" parameter from subscription requests 2013-05-05 23:42:11 +01:00
James Booth
53eeb0ef45 Use autocomplete instead of hash table for subscription requests 2013-05-05 23:20:27 +01:00
James Booth
90ac69beb3 Added /duck command to perform searches using duckduckgo chat bot 2013-05-05 02:31:04 +01:00
James Booth
34217e4d44 Include open subscription requests in desktop reminder notifications 
closes #167
 2013-04-27 23:57:51 +01:00
James Booth
81020e6d43 Added /invite for direct MUC invitations 2013-04-20 20:18:13 +01:00
James Booth
91d587a19f Show shortened room jid if possible on invite 2013-04-18 22:49:46 +01:00
James Booth
f4041f049c Handle when servers do not send fulljid with presence 
A default resource "__prof_default" is created, and invisible to the
user for most purposes.
 2013-04-07 19:19:02 +01:00
James Booth
b6095ca955 Show message in console when receiving chat room invites 2013-03-24 21:46:00 +00:00
James Booth
270dae472f Added disco items to features in disco info responses 2013-03-24 17:45:12 +00:00
James Booth
ef7aacc709 Respond to disco items query 2013-03-24 17:40:46 +00:00
James Booth
d703301f7f Respond to disco info requests without node attribute 2013-03-24 17:27:30 +00:00
James Booth
1c8cba352e Refactor getting caps_key 2013-03-17 23:04:36 +00:00
James Booth
8d2e0656b4 Refactor show and status stanza handling 2013-03-17 22:21:05 +00:00
James Booth
e22970b304 Refactor resource handling in available handler 2013-03-17 21:53:34 +00:00
James Booth
e7202120cb Renamed ID attribute for capabilities disco info request 2013-03-17 21:46:49 +00:00
James Booth
e2bc9bde74 Implemented output for /disco info 2013-03-14 23:41:36 +00:00
James Booth
7bd7c15994 Added output for /disco items 2013-03-14 22:18:21 +00:00
James Booth
681c3b6be2 Show name as well as jid for room list 2013-03-14 22:03:38 +00:00
James Booth
816c019ef8 Removed unnecessary NULL checks 2013-03-14 21:20:18 +00:00
James Booth
31cd507d3c Added /disco command 2013-03-14 20:50:09 +00:00
James Booth
b960b76034 Added basic /rooms command to get chat room list 2013-03-13 23:38:26 +00:00
Dmitry Podgorny
ed2212a0ca fixed crash in stanza_create_form when text is NULL 
xmpp_stanza_get_text may return NULL.
Also fixed memory leak: xmpp_stanza_get_text returns new allocated
string and it must be freed by xmpp_free().
 2013-03-12 21:08:50 +02:00
James Booth
c8088bea41 Tidied fix for id attributes that cause a segfault 
fixes #151
 2013-03-08 00:17:31 +00:00
James Booth
5c475d630a Fixed problem with using id attribute with apostrophe. 
Needs a better solution, but the current one stop the crash
 2013-03-07 18:37:44 +00:00
James Booth
18b615c62f Check for NULL connection and context 
fixes #155
 2013-03-02 21:35:00 +00:00
James Booth
aeb0bfa13c Init and shutdown of libstrophe moved, free resources before creating 2013-02-27 23:14:41 +00:00
James Booth
24f0d9e6e5 Removed connection_shutdown function 2013-02-27 21:21:47 +00:00
James Booth
83171aff5b Replace FREE_SET_NULLs with function call 2013-02-27 20:56:04 +00:00
James Booth
2ecf20195c Split connection_free_resources 2013-02-27 20:54:38 +00:00
James Booth
8d1cc96bf2 Made connection free resources static function 2013-02-27 20:46:44 +00:00
James Booth
d0e0951943 Added debug to connection handler 2013-02-26 22:02:03 +00:00
James Booth
236895ec96 Check for resource in unavailable presence handler 2013-02-24 15:18:15 +00:00
James Booth
9f8a7f52a5 Add resource only when resourcepart in JID #152 2013-02-24 15:07:33 +00:00
James Booth
d1e28e44ca Revert "Commented self presence handling #151" 
This reverts commit 872726c5aa.
 2013-02-21 08:14:41 +00:00
James Booth
872726c5aa Commented self presence handling #151 2013-02-20 08:30:00 +00:00
James Booth
ec124a552c Remove all from resource hash table, rather than destroy 2013-02-19 00:34:07 +00:00
James Booth
502d7dc9fe Show available resources for current account with "/account" 2013-02-18 22:51:05 +00:00
James Booth
5a107459be Tidied new command output, ordered features 2013-02-17 16:50:44 +00:00
James Booth
1a913b7d9b Added ping to features 2013-02-17 16:43:26 +00:00
James Booth
e955df8894 Colour title on /caps and /software output 2013-02-17 16:39:37 +00:00
James Booth
c3b7388e61 Added chatstates to capabilities 2013-02-17 03:23:14 +00:00
James Booth
bced3d4b36 Added autocomplete for /software command 2013-02-17 02:10:56 +00:00
James Booth
44d2f8da7a Added /caps command 2013-02-17 01:04:10 +00:00
James Booth
a84e4adee7 Show all resources ordered by priority with /info command 2013-02-17 00:05:57 +00:00
James Booth
b5e06a079c Simple default resource hanlding on presence 2013-02-14 22:06:25 +00:00
James Booth
576be7921d Tidy up presence module 2013-02-10 23:29:37 +00:00
James Booth
ebc87b8b82 Added usage of handlers to message and presence modules 2013-02-10 19:39:19 +00:00
James Booth
e922568770 Added resource_presence_t and contact_presence_t 2013-02-10 17:13:19 +00:00
James Booth
59e9b10d19 Removed presence from jabber_conn 2013-02-10 13:36:11 +00:00
James Booth
591f8a8dbf Renamed jabber_presence_t->presence_t 2013-02-10 11:31:31 +00:00
James Booth
ec78914044 Only create contacts resource when online 2013-02-10 11:19:36 +00:00
James Booth
835906bada Changed parameter to contact_list_add jid->barejid 2013-02-10 00:02:06 +00:00
James Booth
5e5590b047 Show detailed software/os information if available in capabilities 2013-02-05 23:06:30 +00:00
James Booth
895399427e Removed debug from last commit 2013-02-05 20:38:07 +00:00
James Booth
523e4be1b8 SHA1 now generated correctly when data form included in caps 
fixes #149
 2013-02-05 20:36:21 +00:00
James Booth
c283908cc1 Send show, status, priority and caps when changing room nickname 2013-02-04 02:33:25 +00:00
James Booth
b94dc5ecdd Moved setting presence status and show into functions 2013-02-04 02:19:31 +00:00
James Booth
eb26cab739 Use of const in connection.c 2013-02-04 00:37:10 +00:00
James Booth
99232b0530 Small tidy up in connection.c 2013-02-03 23:59:04 +00:00
James Booth
2cea263917 Added asserts 2013-02-03 23:46:20 +00:00
James Booth
9bc70e29e8 Removed jabber_restart function 2013-02-03 22:56:23 +00:00
James Booth
2ee0c4d328 Moved caps_init() out of xmpp.h 2013-02-03 22:46:32 +00:00
James Booth
0b40de5a4f Moved private xmpp functions to connection.h 2013-02-03 22:40:54 +00:00
James Booth
1cd2d6c7c9 Moved function to get presence string from type to stanza.c 2013-02-03 22:18:40 +00:00
James Booth
1cea320a0c Send entity capabilities and status when joining room 2013-02-03 20:09:56 +00:00
James Booth
0b740bb355 Added debugging to presence and iq handlers 2013-02-03 18:28:54 +00:00
James Booth
d327a0dd5a Fixed crash on receiving dataform 2013-02-03 17:19:10 +00:00
James Booth
ca26452af6 Refactored getting boolean preferences 2013-02-03 02:35:04 +00:00
James Booth
9d34c41227 Added config dir to source 2013-02-02 21:59:29 +00:00
James Booth
fc5bfb7d33 Tidied #include's 2013-02-02 20:55:58 +00:00
James Booth
8cc4b55945 Removed caps functions from xmpp.h 2013-02-02 20:33:54 +00:00
James Booth
ccf71715ef Removed presence functions from xmpp.h 2013-02-02 20:27:46 +00:00
James Booth
5e3d414ee0 Removed iq functions from xmpp.h 2013-02-02 20:22:39 +00:00
James Booth
59b79ec20c Removed message handler function from xmpp.h 2013-02-02 20:18:23 +00:00
James Booth
bc2784dae6 Removed stanza functions from xmpp.h 2013-02-02 20:07:44 +00:00
James Booth
1d3739bb79 Added xmpp subdir to source 2013-02-02 19:47:41 +00:00