1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

1872 Commits

Author SHA1 Message Date
James Booth
3967b26aea Added otr to /account clear properties 2014-05-11 15:32:38 +01:00
James Booth
d44e954f6b Added otr property to /account help 2014-05-11 15:26:45 +01:00
James Booth
6a38d57a0a Override global OTR policy with account OTR policy 2014-05-11 15:20:24 +01:00
James Booth
e8d84abb46 Moved OTR policy check to otr module 2014-05-11 15:03:10 +01:00
James Booth
95ff13136b Added OTR policy account preference 2014-05-11 14:13:15 +01:00
James Booth
f2ebbdb8de Added autocompletion for /account set <account> otr <policy> 2014-05-11 13:48:41 +01:00
James Booth
015780662e Added /prefs otr 2014-05-11 13:32:59 +01:00
James Booth
ddbb4872b3 Moved global OTR settings to [otr] group 2014-05-11 13:13:25 +01:00
James Booth
7e359c171c Added autocomplete for bookmark options 2014-05-11 00:17:10 +01:00
James Booth
c0fc4256de Highlight active rooms in bookmark list 2014-05-10 01:05:03 +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
a519d25e4b Fixed potential segfaults on autocomplete 2014-05-08 20:49:41 +01:00
James Booth
dfb1e1c4a2 Added help for shared secret and question answer otr verification 2014-05-07 21:28:36 +01:00
James Booth
c6ba84096d Added question answer messages for libotr 4.0.0 2014-05-07 21:15:28 +01:00
James Booth
1e4fc2ce79 Added UI messages for smp question/answer result 2014-05-07 20:41:05 +01:00
James Booth
9fd9871ee9 Merge branch 'master' into otrsmp 2014-05-07 19:32:25 +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
f247f367e9 Handle room subject and broadcasts sent before roster received
Issue #341
2014-05-05 20:13:22 +01:00
James Booth
aa0d4fe892 Merge branch 'master' into otrsmp
Conflicts:
	install-all.sh
2014-05-02 00:59:40 +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
a077d2008a Added question answer authentication (libotr 3.2.x) 2014-04-30 23:59:40 +01:00
James Booth
eaa19598c1 Added ui functions for otr authentication 2014-04-30 22:41:53 +01:00
James Booth
8994b3769c Removed debug 2014-04-30 22:01:37 +01:00
James Booth
1155ceabbc Attempt at shared secret authentication for libotr 4.0.0
Bug exists where second attempt always gets stuck
2014-04-28 22:23:39 +01:00
James Booth
da4dfe251d Added SMP secret libotr 4.0.0 handlers 2014-04-27 18:46:40 +01:00
James Booth
183c373c66 Fixed error on SMP authentication fail 2014-04-27 02:04:05 +01:00
James Booth
2bc19f4669 Added SMP secret authentication success message 2014-04-27 01:17:38 +01:00
James Booth
c39c093fa5 Tidied UI messages for SMP shared secret authentication 2014-04-27 00:32:04 +01:00
James Booth
84c7fc9ae0 Added SMP ui events 2014-04-26 23:29:05 +01:00
James Booth
aff9eee433 Handle SMP secret response 2014-04-26 22:52:25 +01:00
James Booth
06d81ed9ce Send SMP init message with /otr secret 2014-04-26 22:08:53 +01:00
James Booth
d6e92f62dc Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
James Booth
ab4ea80a70 Added open xml console 2014-04-25 00:04:01 +01:00
James Booth
f8b2e009ed Fixed /wins swap help 2014-04-24 23:09:04 +01:00
James Booth
e9ddbab585 Allow /wins swap to move to empty position 2014-04-24 23:06:42 +01:00
James Booth
547b6cf4da Added command /wins swap 2014-04-24 21:50:59 +01:00
James Booth
034a98587c Added -a (--account) option to man page 2014-04-23 22:43:05 +01:00
James Booth
c7b3ff02ff Rejoin private rooms after reconnecting 2014-04-23 22:19:14 +01:00
James Booth
4384a1f468 Tidied jabber_process_events 2014-04-23 20:51:57 +01:00
James Booth
1706980fd7 Merge remote-tracking branch 'lucian/master'
Conflicts:
	src/server_events.c
2014-04-23 00:20:34 +01:00
James Booth
4d8caee483 Added /otr policy autocompletion 2014-04-23 00:01:18 +01:00
lightb
e08ee67f5f Bugfix: Because whitespace was removed, last check OTR always, didn't work, now it works. 2014-04-22 18:53:48 -04:00
James Booth
1a0f12b0e6 Merge remote-tracking branch 'lucian/master' 2014-04-22 23:53:15 +01:00
lightb
5a5ad31edf Added new functionality to OTR always policy
If policy is set to always, and unencrypted message is received it will try to start an otr session.

Note: Fully tested with pidgin, is now working (opportunistic and always)
2014-04-22 18:07:53 -04:00
lightb
1192e67cf7 Strip whitespace from otr tagged message for proper display.
Will handle BASE + OTRV1TAG/OTRV2TAG or BASE + OTRV1TAG + OTRV2TAG
or BASE + OTRV2TAG + OTRV1TAG
2014-04-22 16:55:28 -04:00
lightb
1bd617d389 Small modification, should check for whitespace pattern even if policy is always. 2014-04-22 16:26:45 -04:00
lightb
6450e2a704 Added OTR opportunistic pattern intercept.
When a message is received, OTRL_MESSAGE_TAG_BASE + OTRL_MESSAGE_TAG_V1 or OTRL_MESSAGE_TAG_V2
is searched for, if it is, the client attempts to start an OTR session.

Tested between profanity clients: WORKED
Tested between profanity and pidgin: NOT WORKING (not sure if pidgin checks for the whitespace)
2014-04-22 16:01:57 -04:00
lightb
f95ae8b0dd Modified otrlibv4 and otrlibv4 to add informative message when starting OTR conversation. 2014-04-22 13:07:19 -04:00
lightb
36c6dbda86 Compilation v4 fix 2014-04-21 18:08:38 -04:00
lightb
da89e24172 Added opportunistic send functionality to cmd_msg
If policy is set to 'opportunistic' then when the user executes cmd_msg it will append the otr whitespace tag to the message

The other client should start AKE once it receives the message.

TODO: Analyze incoming messages for whitespace tag
2014-04-21 18:03:07 -04: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
lightb
a687e3f6b4 Added /otr policy to commands (still need to add autocomplete stuff?) 2014-04-19 04:18:53 -04:00
lightb
02b77cfa4e Added PREF_OTR_POLICY to preferences.c -> key -> otr.policy
Added default value "manual" to PREF_OTR_POLICy -> preferences.c
Modified help string to reflect otr_policy, started checks on cmd_otr
2014-04-19 04:00:41 -04:00
lightb
3303376b42 Added PREF_OTR_POLICY - should be default global policy and set to MANUAL 2014-04-19 03:12:22 -04:00
James Booth
e830e2a06a Show message in console when contact starts OTR session 2014-04-19 00:56:57 +01:00
James Booth
71aea78e90 Open new window when otr session started by contact
fixes #331
2014-04-19 00:03:36 +01:00
James Booth
8f2c0a66bf Handle subscription on otr message sends 2014-04-18 23:40:35 +01:00
James Booth
fadad0aeba OTR end messages are now send to recipients not in the roster.
fixes #333
2014-04-18 23:29:22 +01:00
James Booth
df345a2cfb Merge remote-tracking branch 'pasis/iss323' 2014-04-18 21:41:05 +01:00
James Booth
d3a23d42e4 Fixed compile error when using libotr 4.0.0 2014-04-16 20:52:14 +01:00
James Booth
ef776e52ca Tidied xmlconsole 2014-04-15 23:45:17 +01:00
James Booth
e6e0a13e89 Added XML Console window 2014-04-15 13:16:32 +01:00
James Booth
bf185d9907 Added simple stanza logging to main console 2014-04-15 01:08:41 +01:00
James Booth
40759eddbf Simplified parse_options to take first option as argument 2014-04-15 00:27:55 +01:00
James Booth
4425aba1f2 Simplified parse_options to take gchar** 2014-04-15 00:13:32 +01:00
James Booth
79088d0150 Clean up keys after using parse_options 2014-04-14 23:41:45 +01:00
James Booth
3e69d6b71e Refactored cmd_join to use parse_options 2014-04-14 23:36:00 +01:00
James Booth
428d9eb936 Refactored cmd_connect to use parse_options 2014-04-14 23:15:39 +01:00
James Booth
2419737006 Check for duplicate options in option parser 2014-04-14 23:01:57 +01:00
James Booth
8d77930ece Added parse_options 2014-04-14 22:48:18 +01:00
James Booth
cc68fc5e9a Show console message on room autojoin 2014-04-14 20:32:51 +01:00
James Booth
67a109927c Added /log where command 2014-04-13 22:20:15 +01:00
James Booth
c3418a2909 Added /log shared setting
Issue #170
2014-04-13 21:56:51 +01:00
James Booth
a4a23fdf68 Added /log rotate option 2014-04-13 20:41:11 +01:00
James Booth
bc6f8ceb3a Fixed handling of room subject 2014-04-13 03:11:46 +01:00
James Booth
99592e2779 Show message when no bookmarks found
Issue #194
2014-04-13 02:57:11 +01:00
James Booth
71180f66d7 Added focus param to ui_room_join, not set for bookmark autojoin
Issue #194
2014-04-13 02:52:25 +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
0b2f810431 Added bookmark autocomplete to /join
Issue #194
2014-04-13 01:20:36 +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
132976d85e Revert "Added ui_unknown_command"
This reverts commit 714ee24863.
2014-04-12 15:20:31 +01:00
James Booth
2fafcf0013 Revert "Added ui_already_connected"
This reverts commit e97ec56fce.
2014-04-12 15:20:19 +01:00
James Booth
e97ec56fce Added ui_already_connected 2014-04-09 22:29:38 +01:00
James Booth
714ee24863 Added ui_unknown_command 2014-04-09 22:13:01 +01:00
James Booth
b9aac28ccc Refactored invalid command usage 2014-04-09 22:05:31 +01:00
James Booth
26216f6c17 Refactored cmd_execute 2014-04-09 21:38:57 +01:00
James Booth
c3e3759256 Command argument parsers set result argument 2014-04-09 21:31:43 +01:00
Dmitry Podgorny
aa6e2284fc config/theme: search for system-wide themes
Search for system-wide themes (usually /usr/share/profanity/themes) if
not found in user's home directory.

Not tested yet.
2014-04-09 21:42:14 +03:00
James Booth
6275644de4 Fixed spelling in comment 2014-04-07 22:43:02 +01:00
James Booth
a05b63f7a5 Removed unused inputwin module init 2014-04-07 22:01:50 +01:00
James Booth
9aa282f6de Removed inputwin functions from ui.h 2014-04-07 21:50:28 +01:00
James Booth
e2443511b6 Tidied new headers, added defines 2014-04-07 21:19:35 +01:00
James Booth
f0f0dbfdac Removed statusbar functions from ui.h 2014-04-07 21:12:30 +01:00
James Booth
fc40637789 Removed titlebar functions from ui.h 2014-04-07 20:41:06 +01:00
James Booth
c7e214860c Removed create_title_bar from ui.h 2014-04-07 20:00:11 +01:00
James Booth
aa2a87d162 Tidied ui dependencies 2014-04-06 21:35:17 +01:00
James Booth
ccfea12674 Inlined wins_update_virtual_console and wins_update_virtual_current 2014-04-06 21:06:50 +01:00
James Booth
6b2d2fd8e4 Removed dirty flag from statusbar 2014-04-06 01:33:00 +01:00
James Booth
c9d28b6999 Inlined status_bar_update_time 2014-04-06 01:14:21 +01:00
James Booth
4248b61a0c Renamed function to draw terminal title 2014-04-06 00:47:14 +01:00
James Booth
561d96c711 Removed titlebar version property and allow disabling of titlebar display 2014-04-03 21:46:43 +01:00
James Booth
95c081666a Clear window title bar on exit 2014-04-03 21:13:59 +01:00
James Booth
e083e20313 Added check on input length 2014-04-02 22:19:27 +01:00
James Booth
a720ef2627 Removed strcpy calls 2014-04-02 21:01:20 +01:00
James Booth
e1db531875 Show recipient not found in console only when no window for recipient 2014-04-02 20:02:46 +01:00
James Booth
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
404dde2810 Renamed refresh functions to update_virtual 2014-04-01 21:52:04 +01:00
James Booth
e8e5ab597a Do not scroll to end when chat room message whilst paging 2014-03-31 21:50:33 +01:00
James Booth
3fdd9944ab Do not scroll to end in message window when paging 2014-03-31 21:44:34 +01:00
James Booth
3d768527c1 Moved ui_current_page_off to ui_incoming_msg 2014-03-31 21:09:24 +01:00
James Booth
b303bdd057 Hooks test commit 2014-03-30 00:35:56 +00: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
9815ef3b02 Change libotr 4.0.0 code to use only OTR spec v2 2014-03-24 21:02:10 +00:00
James Booth
8306d4c244 Commented bookmarks code for 0.4.0 release 2014-03-16 18:20:31 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
James Booth
89f306ceb2 Updated /roster help 2014-03-16 17:59:01 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
05952e8337 Small changes to help 2014-03-16 00:53:46 +00:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +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
James Booth
e9b5d3294b Removed unused variables from cmd_join 2014-03-08 18:32:48 +00:00
James Booth
a94814f0a9 Added invalid jid test for /join 2014-03-08 00:23:52 +00:00
James Booth
2d54c565ce Added test to show usage when no room supplied to /join 2014-03-08 00:19:21 +00:00
James Booth
f3fe1d34d2 Added connection status tests for cmd_join 2014-03-08 00:07:38 +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
James Booth
a9e2028981 Added autocompeleter for /join options 2014-03-05 20:57:59 +00:00
James Booth
65432c8d64 Merge remote-tracking branch 'kmwhite/adding_support_for_private_confs' 2014-03-05 20:29:41 +00:00
Kristofer M White
7c6755b62c Ensuring nick is set when not included in opt args for cmd_join 2014-03-05 19:55:02 +00:00
Kristofer M White
3f18d933ca Removing extra nick = line that broke nick assignment 2014-03-05 17:39:44 +00:00
Kristofer M White
a4e2809756 Removing strdup calls per cmd_connect design 2014-03-05 17:25:26 +00:00
Kristofer M White
28425060bc Parsing optional args for cmd_join 2014-03-05 17:13:42 +00:00
James Booth
b5171cb054 Added configure checks to enable desktop notifications on OSX 2014-03-04 22:59:09 +00:00
James Booth
3f73a55cb0 Log message when cannot send desktop nofication 2014-03-04 20:16:47 +00:00
James Booth
8cfbb72337 Added OSX desktop notifications using terminal-notifier
Requires Xcode
WIP - No configure.ac changes
2014-03-04 20:01:19 +00: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
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00
James Booth
18e0884f5f Fixed issue with /otr myfp when no key loaded 2014-02-23 20:34:27 +00:00
James Booth
66424565dd Show OTR status on /msg usr when usr has already started an OTR session
fixes #308
2014-02-23 01:17:03 +00:00
James Booth
23281d6741 Merge branch 'master' into otr-query 2014-02-23 00:53:22 +00:00
James Booth
118909b07f Removed debug on error messages 2014-02-23 00:48:10 +00:00
James Booth
09472e43c4 Added OTR supported versions in initial start query message 2014-02-18 22:31:27 +00:00
James Booth
82ad0cd306 Added /otr myfp test 2014-02-17 21:52:42 +00:00
James Booth
a21ab6d4c8 Mock otr module for cmd_otr tests 2014-02-16 19:14:15 +00:00
James Booth
7e956fb347 Added tests for /otr warn 2014-02-16 02:22:29 +00:00
James Booth
6295336284 Added cmd_otr tests 2014-02-16 00:04:53 +00:00
James Booth
f010dfb004 Show message on /alias list when no aliases 2014-02-15 21:25:13 +00:00
James Booth
17d3751306 Fixed /alias add, when alias already exists 2014-02-15 21:17:31 +00:00
James Booth
bdfcc81b07 Only show error message when err != 0
fixes #307
2014-02-15 19:47:36 +00:00
James Booth
9ff7a2a1fe Removed free message function from otrlibv3 2014-02-13 23:09:52 +00:00
James Booth
450c01ecb4 Refactored common otr library code 2014-02-13 23:07:09 +00:00
James Booth
4e81707b27 Renamed otr implementations 2014-02-12 23:29:08 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
25131e3f36 Added command to show libotr version 2014-02-11 23:19:09 +00:00
James Booth
42630139c2 Use instag master, and skip fragmentation 2014-02-11 23:03:07 +00:00
James Booth
e07209ec49 Allow V3, use OTRL_INSTAG_BEST, output error event when no message 2014-02-11 21:21:33 +00:00
James Booth
5b260af999 Changed OTR policy for otr4.c 2014-02-10 23:24:07 +00:00
James Booth
88e8c0151d Merge branch 'libotr4' of github.com:boothj5/profanity into libotr4 2014-02-10 23:23:11 +00:00
James Booth
291c977473 Changed OTR policy allow V1 and V2 2014-02-10 23:20:06 +00:00
James Booth
d5ba4dfd38 Changed functions for libotr4 compatibility 2014-02-09 02:53:07 +00:00
James Booth
26e1fd545c Added libotr4 message handlers 2014-02-09 02:24:47 +00:00
James Booth
4bd5cf35ff Added otr4.c 2014-02-09 00:34:00 +00:00
James Booth
fa89e2aa62 Check for libotr version 2014-02-09 00:32:11 +00:00
James Booth
3e02921859 Removed id from bookmarks add 2014-02-03 19:35:26 +00:00
James Booth
0f0cd4cdab Use wnoutrefresh, pnoutrefresh and doupdate
Issue #298
2014-02-02 23:58:01 +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
a8ecbccc9c Added /bookmark remove tests 2014-02-02 00:37:37 +00:00
James Booth
ebafc19220 Added cons message on ./bookmark add 2014-02-02 00:00:08 +00:00
James Booth
af51fa3c68 Added cmd_bookmark tests 2014-02-01 23:48:24 +00:00
James Booth
3d7d070b13 Added test for /bookmark list 2014-02-01 21:18:15 +00:00
James Booth
614ae232ef Fixed cmd_bookmark message when not connected 2014-02-01 16:24:51 +00:00
James Booth
652e99fdd8 Added cmd_bookmark tests 2014-02-01 16:16:56 +00:00
James Booth
0338d136e0 Added presence_error tests, added muc_close() 2014-01-30 23:15:39 +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
9bb1fae291 Close UI windows on /quit
fixes #296
2014-01-30 20:30:35 +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
8f6ead2b7b Changed log level to info for failed connection 2014-01-27 22:50:32 +00:00
James Booth
6dbea7e16f Add level to log output 2014-01-27 22:48:52 +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
4bd06a5d87 Don't allow /alias to overwrite standard command 2014-01-25 01:39:12 +00:00
James Booth
b05e17db3e Added autocomplete for /alias remove 2014-01-25 01:00:51 +00:00
James Booth
cb590dd82c Added help for /alias command 2014-01-25 00:50:07 +00:00
James Booth
5d85974bc0 Added aliases to autocomplete 2014-01-23 23:53:20 +00:00
James Booth
66631308a5 Implemented basic running of alias commands 2014-01-23 23:04:00 +00:00
James Booth
e089ffb15c Show message when alias already exists in /alias add 2014-01-23 22:38:12 +00:00
James Booth
8dbe300d72 Added /alias command, writing aliases to [alias] group in profrc 2014-01-23 22:29:53 +00:00
James Booth
8ba2d26947 Added skeleton /alias command 2014-01-23 19:56:33 +00:00
James Booth
b6c52007ee Removed debug 2014-01-23 19:27:39 +00:00
James Booth
3f31c1a4e7 Encrypt /tiny command when in OTR session
fixes #292
2014-01-23 19:25:53 +00:00
James Booth
21ab182151 Refactored ProfAccount creation 2014-01-22 22:22:01 +00:00
James Booth
bbdf2bea58 Removed unused encode.xml 2014-01-21 22:06:09 +00:00
James Booth
2bc22981fd Fixed memory leaks from str_replace 2014-01-21 21:07:35 +00:00
James Booth
6468f40dd9 Convert name to barejid on retrieving win in titlebar for otr messages
fixes #289
2014-01-21 18:14:20 +00:00
James Booth
7e9c8c02a3 Implemented autocomplete for new /statuses options 2014-01-21 00:28:56 +00:00
James Booth
9549cf431e Tidied /statuses help 2014-01-21 00:20:31 +00:00
James Booth
0e2fbeb350 Added statuses settings to prefs output 2014-01-21 00:16:37 +00:00
James Booth
a8c356e191 Added use of statuses preferences 2014-01-21 00:06:41 +00:00
James Booth
a7a2850637 WIP - /statuses command options 2014-01-20 18:40:48 +00:00
James Booth
3f0addbc99 Added UI presence functions 2014-01-19 18:31:02 +00:00
James Booth
5610f70b35 Inlined ui_contact_online and ui_contact_offline 2014-01-19 17:51:32 +00:00
James Booth
69f2f4a16f Use defaults for /statuses commands 2014-01-19 17:20:31 +00:00
James Booth
79e9ab83b0 Changed /statuses preferences 2014-01-19 16:17:34 +00:00
James Booth
c7325de073 Added cmd_statuses validation tests 2014-01-19 01:25:04 +00:00
James Booth
2f58b2488f Added port to /account show <account> 2014-01-19 00:09:51 +00:00
James Booth
0edfef5612 Added /account set <account> port <port> 2014-01-19 00:05:04 +00:00
James Booth
47fe146a22 Added to and tidied /connect help 2014-01-18 23:49:15 +00:00
James Booth
b32ba75db5 Implemented autocomplete for /connect properties 2014-01-18 23:43:13 +00:00
James Booth
168cb0e557 Moved /connect autocomplete to function 2014-01-18 23:05:35 +00:00
James Booth
91d4097df9 Added cmd_connect test for repeated port property 2014-01-18 22:50:17 +00:00
James Booth
21f0bd04a8 Added cmd_connect test for repeated server property 2014-01-18 22:45:24 +00:00
James Booth
b4e9905db9 Added cmd_connect tests for argument validation 2014-01-18 21:18:25 +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
b1de8a4005 Added OTR remaining system messages and colouring 2014-01-17 00:06:08 +00:00
James Booth
45aee2e778 Tidied OTR messages 2014-01-16 23:16:37 +00:00
James Booth
4f98bc8c25 Show OTR coloured status
Customisable within theme files e.g.:
titlebar.unencrypted=red
titlebar.encrypted=green
titlebar.trusted=red
titlebar.untrusted=green

Shows [unencrypted] for all non-OTR chat

Disable with '/otr warn off'
2014-01-16 22:44:23 +00:00
James Booth
6c59bb26da Set boolean when typing in titlebar 2014-01-16 20:37:25 +00:00
James Booth
f0e5e585f8 Removed title_bar_draw from UI module 2014-01-16 20:09:54 +00:00
James Booth
682601d479 Use title_bar_draw in title_bar_refresh 2014-01-16 19:58:21 +00:00
James Booth
69a63bd225 Added constant for console title 2014-01-16 19:47:00 +00:00
James Booth
2911093240 Remove manual memory allocation from titlebar 2014-01-16 19:34:05 +00:00
James Booth
91b5405782 Renamed recipient -> current_recipient in titlebar 2014-01-16 19:21:17 +00:00
James Booth
754ad86e3d Inlined _title_bar_draw_title and _title_bar_draw_presence 2014-01-16 19:06:32 +00:00
James Booth
4792ac8df6 Use title_bar_draw where possible in title bar 2014-01-16 19:03:14 +00:00
James Booth
7c7af7b25f Always erase and refresh titlebar when drawing 2014-01-16 18:58:04 +00:00
James Booth
95b5d141c3 Added _title_bar_draw_title when setting presence 2014-01-16 18:52:27 +00:00
James Booth
fa8801798c Removed _title_bar_show 2014-01-16 18:43:06 +00:00
James Booth
c32caa62e0 Removed title_bar_show from UI module 2014-01-16 18:32:24 +00:00
James Booth
16bf753ad0 Renamed title bar status -> presence 2014-01-16 18:22:50 +00:00
James Booth
9f6d6d44cc Renamed title_bar_set_status -> title_bar_set_presence 2014-01-16 18:13:22 +00:00
James Booth
b0e727a7ef Renamed title_bar -> win 2014-01-16 18:08:00 +00:00
James Booth
0a04ef1510 Renamed title_bar_title -> title_bar_console 2014-01-16 18:04:25 +00:00
James Booth
af1eab7810 Removed dirty flag from titlebar 2014-01-16 17:59:24 +00:00
James Booth
ecf323de31 Implemented chat logging options for OTR messages
on - Log OTR messages as plaintext
off - Do not log OTR messages
redact - Log, but replace the text with '[redacted]'

Defaults to redact
2014-01-13 20:38:19 +00:00
James Booth
60820007ee Added setting /otr log on|off|redact 2014-01-13 20:17:45 +00:00
James Booth
443b240ce4 Fixed GString freeing before use in otr.c 2014-01-13 19:27:40 +00:00
James Booth
df760bed18 Check for already established but not used OTR session on /otr start <contact>
For example, one may have been established from the other end, without
any messages being sent yet
2014-01-13 19:25:08 +00:00
James Booth
a07880f5c0 Implemented /otr start <contact> 2014-01-13 19:16:46 +00:00
James Booth
bc1d4df230 Open new chat win, or use existing for /otr start <contact> 2014-01-13 19:12:23 +00:00
James Booth
671fa839e8 Added contact autocompletion to /otr start <contact> 2014-01-13 19:00:34 +00:00
James Booth
aa4dede30a Moved otr autocompletion to function 2014-01-13 18:56:04 +00:00
James Booth
beec3d2f1f Removed unused otr callbacks 2014-01-13 18:48:33 +00:00
James Booth
933b56c449 Added /otr to /help chatting 2014-01-12 21:58:29 +00:00
James Booth
3f60a6a80e Removed debug statements 2014-01-12 02:20:03 +00:00
James Booth
264fc55aa2 Added conditionals to makefile for otr support 2014-01-12 02:15:16 +00:00
James Booth
4e97c1e460 Merge branch 'master' into otr 2014-01-12 01:25:35 +00:00
James Booth
462e84ea82 Added /otr trust|untrust commands 2014-01-12 01:20:22 +00:00
James Booth
f14a9ed72d Implemented write fingerprints callback 2014-01-12 00:27:13 +00:00
James Booth
43deea7c05 Added /otr autocompleter and updated help 2014-01-12 00:10:16 +00:00
James Booth
494aaadba4 Added /otr end command 2014-01-11 23:59:20 +00:00
James Booth
a3217bcf8c End OTR session when user closes chat window 2014-01-11 23:28:11 +00:00
James Booth
f35e485bd4 Handle window creation for incoming and outgoing OTR sessions 2014-01-11 21:44:24 +00:00
James Booth
5a7eba518d Show contacts fingerprint on /otr theirfp 2014-01-11 20:02:35 +00:00
James Booth
03086c0384 Added /otr theirfp with hardcoded fingerprint 2014-01-11 19:10:00 +00:00
James Booth
bc8532b79c Renamed fingerprint command, updated help 2014-01-11 18:29:37 +00:00
James Booth
b5469e2e06 Added [OTR] and (trusted/untrusted) to titlebar for OTR sessions 2014-01-11 18:24:44 +00:00
James Booth
bf494b1b07 Refactored setting window recipient 2014-01-11 18:06:46 +00:00
James Booth
d189f7ea43 Use version 1 query to start OTR session 2014-01-11 17:15:07 +00:00
James Booth
9daefe170d Require '/otr start' from both parties before encryption used both ways 2014-01-11 17:03:01 +00:00
James Booth
5c13538e6b Load OTR private key on connect, gen command checks if already generated 2014-01-11 15:48:22 +00:00
James Booth
df8c7dedc1 Implemented message encryption, session started with whitspace tags on first message 2014-01-10 21:57:38 +00:00
James Booth
e294a6db92 Added "/otr fp" to show users fingerprint 2014-01-10 20:20:38 +00:00
James Booth
1b5254010e Show users fingerprint after generating key 2014-01-10 20:12:22 +00:00
James Booth
9fb8281656 Use data home for otr keys and fingerprints files 2014-01-10 19:50:59 +00:00
James Booth
84f1c4b96f WIP - OTR support 2014-01-10 00:08:49 +00:00
James Booth
98b1b96e59 Fixed win_handle_error_message 2014-01-08 22:20:05 +00:00
James Booth
49deb932e6 Merge branch 'master' into otr 2014-01-08 20:50:00 +00:00
James Booth
4cc4461c0f Removed handle error message function from ProfWin 2014-01-08 20:27:18 +00:00
James Booth
d99f1536ec Removed print message function from ProfWin 2014-01-08 20:11:53 +00:00
James Booth
0776c574b6 Merge branch 'master' into otr 2014-01-05 23:58:10 +00:00
James Booth
db973457d0 Refactored roster add/update 2014-01-05 23:54:29 +00:00
James Booth
76484665fd Removed prof_handle group functions 2014-01-05 23:24:48 +00:00
James Booth
1d716e48ad Removed roster_list dependency on xmpp module 2014-01-05 23:08:11 +00:00
James Booth
06ce95f68a Refactored roster_change_name 2014-01-05 22:55:04 +00:00
James Booth
ef920971e0 Removed unused function prototype 2014-01-05 22:03:51 +00:00
James Booth
7802e668b5 Removed unused function prototype 2014-01-05 22:01:39 +00:00
James Booth
468e80fe30 Removed prof_handle_disconnect 2014-01-05 22:00:15 +00:00
James Booth
922230acf5 Removed unused function prototype 2014-01-05 21:57:15 +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
James Booth
f569845b40 Merge branch 'master' into otr
Conflicts:
	.gitignore
2014-01-05 01:20:42 +00:00
James Booth
80acfdae9a Added contact presence offline test 2014-01-05 00:43:37 +00:00
James Booth
9da4a6e1b9 Refactored contact display string 2014-01-05 00:38:45 +00:00
Dmitry Podgorny
2fc588be17 fixed segfault when home directory doesn't exist 2014-01-03 20:43:07 +02:00
James Booth
e504c030a6 Merge branch 'master' into otr
Conflicts:
	configure.ac
2014-01-03 17:54:51 +00:00
James Booth
785206a06c Tidied navigation help
Conflicts:

	src/ui/console.c
2014-01-02 18:06:53 +00:00
James Booth
170af88c0d Merge branch 'master' into otr
Conflicts:
	Makefile.am
2014-01-02 01:57:05 +00:00
James Booth
3fbd45bd06 Added full stop to /help help summary
Conflicts:

	src/command/command.c
2014-01-02 01:53:46 +00:00
James Booth
3a57a792e4 Added full stop to /grlog help summary
Conflicts:

	src/command/command.c
2014-01-02 01:52:53 +00:00
James Booth
9823b2fae2 Added full stop to /help service summary 2014-01-02 01:51:46 +00:00
James Booth
8d4bec2d37 Added full stop to /chlog help summary
Conflicts:

	src/command/command.c
2014-01-02 01:51:21 +00:00
James Booth
d3fff13255 Added full stop to /about help summary
Conflicts:

	src/command/command.c
2014-01-02 01:49:46 +00:00
James Booth
8840457e19 Merge remote-tracking branch 'louiecaulfield/master' 2013-12-29 15:41:22 +00:00
James Booth
2defeaefe3 Removed wins_refresh_console when not required for /sub command output
Implicitly called by cons_show
2013-12-27 23:38:45 +00:00
Jasper van Bourgognie
4a706f7a80 src/ui/core.c: Removed duplicate const keyword 2013-12-27 20:56:47 +01: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
976f3e303a Added /sub command test 2013-12-27 17:25:30 +00:00
James Booth
6d6bc67d5c Test for presence update when changing priority 2013-12-27 14:17:24 +00:00
James Booth
7a63cf2e22 Changed messages on invalid priorities 2013-12-27 00:29:20 +00:00
James Booth
8685e78c86 Added mock_accounts and fixed tests 2013-12-26 13:37:22 +00:00
James Booth
b83b262d47 Bind remaining ui functions in main.c 2013-12-23 00:23:22 +00:00
James Booth
7fe8f61b9b Bind console functions in main.c 2013-12-23 00:08:45 +00:00
James Booth
a6859354b4 Bind ui core functions in main.c 2013-12-22 23:54:22 +00: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
5a5b1340aa Dynamically load UI functions, fixed tests 2013-12-22 22:14:15 +00:00
James Booth
d56f6dc39b Added mocks and stubs for cons_show 2013-12-19 21:05:39 +00:00
James Booth
81909ef000 Dynamically bind xmpp module api 2013-12-18 20:16:55 +00:00
James Booth
bc700fbfea Merge branch 'master' into otr 2013-12-18 00:36:05 +00:00
James Booth
f47bd58a1c Added tests for setting presence priorities 2013-12-17 23:57:06 +00:00
James Booth
95d08db292 Merge branch 'master' into otr
Conflicts:
	src/command/commands.c
2013-12-16 01:11:36 +00:00
James Booth
6d75ebb8e9 Test account free'd after connect 2013-12-15 22:00:42 +00:00
James Booth
5e739cbfb7 Moved fulljid logic to accounts 2013-12-15 20:32:30 +00:00
James Booth
079ea5304b Moved _ask_password to UI module 2013-12-15 19:38:23 +00:00
James Booth
2470f642c7 Merge branch 'master' into otr
Conflicts:
	src/command/command.c
2013-12-15 17:19:01 +00:00
James Booth
2490f5b417 Seperated command functions into module 2013-12-15 16:10:32 +00:00
James Booth
3a403046ff Moved autocomplete tests to cmocka 2013-12-14 16:16:46 +00:00
James Booth
107fdd355e Added simple mock test, refactored roster 2013-12-14 15:34:17 +00:00
James Booth
3f6b40246a Merge branch 'master' into refactor 2013-12-10 22:15:28 +00:00
James Booth
06367723d7 Merge branch 'master' into otr 2013-12-10 22:13:21 +00:00
James Booth
2fe258ad1b Implemented autocomplete for /account command <setting> parameter
fixes #260
2013-12-10 22:11:48 +00:00
James Booth
ce75d58830 Merge branch 'master' into refactor 2013-12-10 00:17:14 +00:00
James Booth
5eb0cf9f35 Merge branch 'master' into otr 2013-12-10 00:13:49 +00:00
James Booth
e27061b131 Added comments to autocomplete.h 2013-12-10 00:06:00 +00:00
James Booth
67dead32af Tidy autocomplete.h 2013-12-09 23:53:52 +00:00
James Booth
0de1ff9b4d Removed unused boolean result from autocomplete add and remove 2013-12-09 23:51:13 +00:00
James Booth
ef6515f078 Removed unused prototypes from autocomplete.h 2013-12-09 23:44:11 +00:00
James Booth
d17cd3f573 Merge branch 'master' into refactor 2013-12-08 23:48:07 +00:00
James Booth
c3b391d06f Merge branch 'master' into otr 2013-12-08 23:42:17 +00:00
James Booth
1c2661f1c3 Added clear command to /account for password clearing
fixes #267
2013-12-08 23:36:00 +00:00
James Booth
6bba79eed4 Merge branch 'master' into refactor 2013-12-08 22:08:45 +00:00
James Booth
b7a5179fa6 Merge branch 'master' into otr 2013-12-08 22:06:06 +00:00
James Booth
3ce0d0f877 Added command parameter to /autoconnect (set, off)
fixes #261
2013-12-08 21:49:34 +00:00
James Booth
8c97658b8d Merge branch 'master' into refactor2
Conflicts:
	src/ui/core.c
2013-11-11 20:51:35 +00:00
James Booth
528562b603 Merge branch 'master' into otr 2013-11-10 18:49:59 +00:00
James Booth
c5f76721ce Fixed compile error for -Wduplicate-decl-specifier on OSX 2013-11-10 18:48:55 +00:00
James Booth
d9395daa2f Added /otr command 2013-11-08 00:17:27 +00:00
James Booth
599bee2ce8 Create fingerprints file, callbacks, and message send 2013-11-08 00:17:27 +00:00
James Booth
3fce5572ea Generate privatekey 2013-11-08 00:17:02 +00:00
James Booth
bdcc70f36d Load keys and fingerprints for account on connect 2013-11-08 00:17:02 +00:00
James Booth
bd1c139429 Added libotr 2013-11-08 00:17:02 +00:00
James Booth
be653667e4 Added /account set <account> password <password> 2013-11-07 23:36:04 +00:00
James Booth
2b0108e6cc Allow "account" setting in [connection] to autconnect the account
closes #251
2013-11-07 23:04:12 +00:00
James Booth
2fa8da493e Use correct type in account rename for priorities
fixes #250
2013-11-07 22:20:30 +00:00
James Booth
99d3322834 Added MAX_PASSWORD_SIZE set to 64
fixes #245
2013-11-07 22:15:43 +00:00
James Booth
1248f49cfa Merge remote-tracking branch 'tsenart/connect-on-startup' 2013-11-07 21:57:41 +00:00
James Booth
4abdb02396 Merge remote-tracking branch 'tsenart/passwords-on-accounts-file' 2013-11-07 21:43:11 +00:00
Tomás Senart
ac7ec7f2d1 Connect to an account on start-up
This commit enables connecting to an account on startup which enables
the use case of having different pre-configured scripts which start
different profanity processes for different accounts. This only makes
sense in the light of not supporting many accounts connected per
process.
2013-10-14 21:22:46 +02: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
3e86d108a3 Removed usages of ui_current_print_line from ui/core.c 2013-10-07 01:39:05 +01:00
James Booth
067c26eeea Tidy _ui_draw_win_title 2013-10-07 01:35:20 +01:00
James Booth
4cbfd5f0f9 Removed _win_show_error_msg 2013-10-07 01:30:20 +01:00