aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-15 19:38:07 -04:00
Code
2,321 Commits 31 Branches 59 Tags 24 MiB
7872d8e14f
Commit Graph

1591 Commits

Author SHA1 Message Date
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