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
2,471 Commits 32 Branches 59 Tags 24 MiB
3c00b1e451
Commit Graph

1708 Commits

Author SHA1 Message Date
James Booth
56bbc7e664 Merge branch 'master' into plugins 2014-02-23 21:22:01 +00:00
James Booth
18e0884f5f Fixed issue with /otr myfp when no key loaded 2014-02-23 20:34:27 +00:00
James Booth
b86164d70b Merge branch 'master' into plugins 2014-02-23 01:19:33 +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
b529dffaaf Merge branch 'master' into plugins 2014-02-23 00:55:41 +00:00
James Booth
23281d6741 Merge branch 'master' into otr-query 2014-02-23 00:53:22 +00:00
James Booth
e9b6e277fa Merge branch 'master' into plugins 2014-02-23 00:49:19 +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
f4f1167188 Merge branch 'master' into plugins 2014-02-17 23:10:36 +00:00
James Booth
82ad0cd306 Added /otr myfp test 2014-02-17 21:52:42 +00:00
James Booth
396991c191 Fixed merge 2014-02-16 23:15:51 +00:00
James Booth
4a26c4dd0a Merge branch 'master' into plugins 2014-02-16 23:13:09 +00:00
James Booth
a21ab6d4c8 Mock otr module for cmd_otr tests 2014-02-16 19:14:15 +00:00
James Booth
40ff1a1dee Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
 2014-02-16 02:24:14 +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
0a49fc32c7 Fixed /tiny OTR messages 2014-02-15 21:53:38 +00:00
James Booth
34e4c1c3b2 Merge branch 'master' into plugins 2014-02-15 21:25:47 +00:00
James Booth
f010dfb004 Show message on /alias list when no aliases 2014-02-15 21:25:13 +00:00
James Booth
b981f92c92 Merge branch 'master' into plugins 2014-02-15 21:18:27 +00:00
James Booth
17d3751306 Fixed /alias add, when alias already exists 2014-02-15 21:17:31 +00:00
James Booth
b1290ebe1a Merge branch 'master' into plugins 2014-02-15 19:49:08 +00:00
James Booth
bdfcc81b07 Only show error message when err != 0 
fixes #307
 2014-02-15 19:47:36 +00:00
James Booth
f5dd30c4c6 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
	src/profanity.c
	src/server_events.c
 2014-02-13 23:32:11 +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
819e3f1a8b Merge branch 'master' into plugins 2014-02-11 23:52:08 +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
5e56515f4f Merge branch 'master' into plugins 2014-02-10 23:20:35 +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
fb00889e6b Merge branch 'master' into plugins 2014-02-03 00:00:50 +00:00
James Booth
0f0cd4cdab Use wnoutrefresh, pnoutrefresh and doupdate 
Issue #298
 2014-02-02 23:58:01 +00:00
James Booth
af11eab3f1 Merge branch 'master' into plugins 2014-02-02 02:41:44 +00:00
James Booth
9394091f04 Implemented add bookmark for XEP-0223 
Issue #194
 2014-02-02 02:39:36 +00:00
James Booth
b6d7b4be05 Merge branch 'master' into plugins 2014-02-02 01:07:22 +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
d4f5955518 Merge branch 'master' into plugins 2014-02-02 00:02:05 +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
38f4e76246 Merge branch 'master' into plugins 2014-01-30 23:16:31 +00:00
James Booth
0338d136e0 Added presence_error tests, added muc_close() 2014-01-30 23:15:39 +00:00
James Booth
5e15b4047b Merge branch 'master' into plugins 2014-01-30 22:22: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
0815696094 Merge branch 'master' into plugins 2014-01-30 20:48:44 +00:00
James Booth
9bb1fae291 Close UI windows on /quit 
fixes #296
 2014-01-30 20:30:35 +00:00
James Booth
050d996c1c Merge branch 'master' into plugins 2014-01-28 22:44:52 +00:00
James Booth
5afb296e67 Moved error handling logic to server_events 2014-01-28 22:37:50 +00:00
James Booth
26dc4efdf6 Merge branch 'master' into plugins 2014-01-28 21:16:03 +00:00
James Booth
c3ea8f8d0b Added generated id's to presence stanzas 2014-01-28 20:55:02 +00:00
James Booth
7374d8aa58 Merge branch 'master' into plugins 2014-01-27 22:51:10 +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
18dfef0b83 Merge branch 'master' into plugins 2014-01-27 22:13:27 +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
cc487799cd Merge branch 'master' into plugins 2014-01-26 22:51:36 +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
b92c9540c9 Merge branch 'master' into plugins 2014-01-26 18:31:16 +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
fb3f8aa149 Merge branch 'master' into plugins 2014-01-26 01:07:54 +00:00
James Booth
ae1ccc7bae Add generated id to messages 2014-01-26 01:07:11 +00:00
James Booth
60e2941ce7 Merge branch 'master' into plugins 2014-01-26 00:54:50 +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
4a233856ff Merge branch 'master' into plugins 2014-01-25 23:33:16 +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
24236862e6 Merge branch 'master' into plugins 2014-01-25 01:40:23 +00:00
James Booth
4bd06a5d87 Don't allow /alias to overwrite standard command 2014-01-25 01:39:12 +00:00
James Booth
96bd213823 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.h
 2014-01-25 01:03:15 +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
6fb0ea91a5 Merge branch 'master' into plugins 
Conflicts:
	src/config/preferences.c
	src/profanity.c
 2014-01-24 00:16:25 +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
6fcece3263 Merge branch 'master' into plugins 2014-01-23 19:28:21 +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
632df07671 Merge branch 'master' into plugins 2014-01-22 22:22:55 +00:00
James Booth
21ab182151 Refactored ProfAccount creation 2014-01-22 22:22:01 +00:00
James Booth
7e6e5f520f Merge branch 'master' into plugins 2014-01-21 22:57:05 +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
74898961d4 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/server_events.c
 2014-01-21 00:36:47 +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
692af0e9a0 Merge branch 'master' into plugins 2014-01-19 00:13:42 +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
4a97ec9293 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/command/command.c
	src/command/commands.c
	src/server_events.c
 2014-01-18 00:23:56 +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
360956cca0 Call plugins on /msg command 2014-01-12 21:42:18 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins 
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
 2014-01-12 19:32:08 +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
bd79b97101 Merge branch 'master' into plugins 
Conflicts:
	src/ui/core.c
 2014-01-08 20:47:17 +00:00
James Booth
4cc4461c0f Removed handle error message function from ProfWin 2014-01-08 20:27:18 +00:00