aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code
7,464 Commits 31 Branches 59 Tags 24 MiB
master
Commit Graph

370 Commits

Author SHA1 Message Date
Paul Fariello
3e325a61c3 Add support for OMEMO, OTR, PGP built together 2019-04-10 17:12:31 +02:00
Paul Fariello
9b8c1d7d2c Add support for encrypted carbon 
Fix {signed,}_pre_key store
 2019-04-10 16:31:45 +02:00
Paul Fariello
421d1b1560 Add OMEMO identity materials long term storage 2019-04-10 16:31:39 +02:00
Paul Fariello
810ea32223 Follow normal workflow for OMEMO message reception 
We try to decrypt all messages, if it's successful we use
sv_ev_incoming_message even for OMEMO messages. We pass an OMEMO
boolean to let UI be aware that message were encrypted.
 2019-04-10 16:03:50 +02:00
Paul Fariello
0fb27dc496 Add OMEMO message encryption and decryption 2019-04-10 16:03:50 +02:00
Michael Vetter
6034b833be Redraw screen after entry of PGP secret key 
After specifying the PGP key ID with pgp.keyid within the accounts file on startup profanity asks for the secret key passphrase. It then doesn't redraw the screen, leaving it in an odd looking state.

This probably only happens with pinentry-curses since it draws in
screen.

We need this fix for cli only environments.

Fixes https://github.com/boothj5/profanity/issues/906 reported by Bob
Mottram.
Based on https://github.com/boothj5/profanity/pull/908 by Bob Mottram

Bob removed his GitHub account, so GitHub created a ghost placeholder
user for him, which unfortunately makes it impossible to cherry-pick
this commit. To more or less preserve authorship I added him as
co-author.

Commit picked and message edited by jubalh.

Co-authored-by: Bob Mottram <bob@freedombone.net>
 2019-02-20 12:03:23 +01:00
Michael Vetter
706af9a900 Update copyright to include 2019 2019-01-22 11:31:45 +01:00
Michael Vetter
811b3ba857
Merge pull request #926 from msantos/null-pointer-dereference 
server_events: fix potential NULL pointer deref
 2018-07-30 12:23:53 +02:00
James Booth
59382984c0 Add preferences for tab display 2018-03-09 21:15:27 +00:00
James Booth
119c5650cf Show name in statusbar tabs WIP 2018-03-08 20:01:36 +00:00
James Booth
cba17faf3d Add /rooms service autocompletion 2018-02-05 21:40:32 +00:00
James Booth
250e972b7a Update copyright 2018-01-21 15:00:02 +00:00
Michael Santos
db18ba8bdf server_events: fix potential NULL pointer deref 2017-04-12 10:20:22 -04:00
James Booth
68a3daedb9 Update Copyright 2017-01-28 17:24:22 +00:00
James Booth
83385cdbc0 Add pre chat and room message blocking 2017-01-22 18:09:04 +00:00
James Booth
0d0578b625 Fix compile 2017-01-16 00:07:17 +00:00
James Booth
2b7894ccff Remove status from cl_ev_presence_send 
fixes #888
 2017-01-15 23:59:31 +00:00
James Booth
e043029a50 Allow clearing account resource 
issue #880
 2016-11-22 00:39:52 +00:00
James Booth
eac6b52e05 Fix typo 2016-10-29 13:06:50 +01:00
James Booth
8f1d3ab55c Add win_print 2016-10-15 18:29:02 +01:00
James Booth
864939b809 Use win_printf_line instead of win_println 2016-10-15 17:03:30 +01:00
James Booth
f6e9ff5b9b Fix missing params 2016-09-03 22:53:32 +01:00
Dmitry Podgorny
6090f76f72 Add missed argument 2016-09-02 20:56:20 +03:00
James Booth
47a1a62009 Add sv_ev_bookmark_autojoin 2016-08-28 22:42:09 +01:00
James Booth
a978bb12bf Send receipt request only when receiver supports feature 
issue #829
 2016-08-18 22:53:23 +01:00
James Booth
5f8ef3816c Free rooms list in sv_ev_login_account_success 2016-07-25 23:11:41 +01:00
James Booth
0a57c4de78 Tidy headers 2016-07-24 15:43:51 +01:00
James Booth
5bc38b6bc2 Moved window_list.c 2016-07-24 15:14:46 +01:00
James Booth
90b9b48ab9 Moved roster_list.c 2016-07-24 15:08:47 +01:00
James Booth
2af0d38e3d Moved muc.c 2016-07-24 15:02:43 +01:00
James Booth
9cff37352a Make header defines consistent 2016-07-24 14:51:39 +01:00
James Booth
25a6252a28 Moved chat_session.c 2016-07-24 14:23:55 +01:00
James Booth
8d8f2f290d Moved chat state handling code to chat_state.c 2016-07-24 13:56:11 +01:00
James Booth
e8fc80f5c1 Update GPL link in headers 2016-07-24 01:14:49 +01:00
James Booth
6559263b2f Option to bookmark room invites 
issue #813
 2016-05-23 23:53:44 +01:00
James Booth
81e95966cf Remove redundant tls secured function 2016-05-06 02:18:31 +01:00
James Booth
d1c71e98f4 Move connection fulljid function 2016-05-06 01:12:54 +01:00
James Booth
88f423afea Rename jabber_ functions 2016-05-06 00:53:03 +01:00
Dmitry Podgorny
efbf233c85 Define stanza's attributes as const char* 
In most get-like funcitons libstrophe returns pointer to a string
that resides in an internal structure (e.g. xmpp_stanza_t). Hence,
Profanity must not change such strings. Define respective variables
as 'const char*' to reduce a chance of error and conform future
libstrophe's interface.

This patch mostly replaces 'char *' with 'const char*', but also
fixes two memory leaks after stanza_get_reason(). Add comment within
stanza_get_reason() to fix conflict with different allocator types.
 2016-04-27 10:31:28 +00:00
Dominik Heidler
1b0ce852bb Implement XEP-0363: HTTP File Upload 2016-04-26 23:50:55 +02:00
James Booth
bdb1287a4f Free mentions list 2016-04-07 01:14:12 +01:00
James Booth
f243e333fc Added whole word matches for room mention 2016-04-07 01:01:27 +01:00
James Booth
afa2c0f5ba Added mention match preferences 2016-04-03 23:33:21 +01:00
James Booth
d9344b00fe Added prof_strstr function 2016-04-03 22:30:24 +01:00
James Booth
9b177a9e01 Removed #AX_PREFIX_CONFIG_H 2016-03-31 21:05:02 +01:00
James Booth
759d9ccb8d Added plugins presence hooks 2016-03-30 23:18:12 +01:00
James Booth
503fc9e393 Update roster count on carbons 2016-03-22 00:28:22 +00:00
James Booth
6f537c3818 Add PGP decryption for incoming/outgoing carbons 2016-03-22 00:20:29 +00:00
James Booth
3705437a60 Removed plugin hook call for MUC history 2016-02-18 22:59:00 +00:00
James Booth
2ac911618a Fix call to plugins_post_chat_message_send 2016-02-16 23:48:47 +00:00
James Booth
1f90aca503 Merge branch 'master' into plugins-c 
Conflicts:
	src/main.c
	src/ui/console.c
 2016-02-14 23:00:52 +00:00
James Booth
e53e94f1e2 Updated copyright 2016-02-14 22:54:46 +00:00
James Booth
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
d7b331874a Fix memory leaks 2016-02-14 01:49:57 +00:00
James Booth
1a3dc91e11 Highlight room trigger terms 2016-02-13 22:46:25 +00:00
James Booth
6702bb9739 Don't show notification reminders for messages the user does not want notifications for 2016-02-04 01:24:37 +00:00
James Booth
e1962261a9 Tidy notify_room_message() 2016-02-04 00:45:37 +00:00
James Booth
77e819e81a Handle self leaving room in private wins 2016-02-03 00:11:38 +00:00
James Booth
292c9cf454 Handle occupant nick change in private wins 2016-02-02 23:25:26 +00:00
James Booth
3ddef99dfe Handle occupant kicked/banned in private chat wins 2016-02-02 22:25:55 +00:00
James Booth
150015fa3d Show message in private windows when user offline 2016-02-02 21:52:13 +00:00
James Booth
08c1e62e3c Colour private chats by presence in roster panel 2016-01-31 23:08:14 +00:00
James Booth
0ae975c27f Added themes for roster room mention and triggers 
closes #718
 2016-01-25 00:19:26 +00:00
James Booth
b6e9a09c64 Show console messages for room mention and triggers 
closes #719
 2016-01-24 23:47:17 +00:00
James Booth
5ff9fbd810 Tidy handling room mention and room triggers 2016-01-24 23:06:22 +00:00
James Booth
67abfaa21e Added private chat to roster rooms 2016-01-24 00:33:24 +00:00
James Booth
fbc302317a Added roster contact themes 2016-01-14 22:54:50 +00:00
James Booth
51f033ae42 End OTR sessions on lost server connection 2016-01-08 00:22:17 +00:00
James Booth
a90e109f7e Destroy roster after updating UI in server disconnect 2016-01-08 00:13:12 +00:00
James Booth
393e690165 Merge branch 'master' into roster-struct 2016-01-05 01:38:31 +00:00
James Booth
e1e0fda8b3 Call UI disconnect functions before disconnecting with /disconnect 
fixes #703
 2016-01-05 01:30:32 +00:00
James Booth
055a5f71ce Added roster struct, create and destroy roster on connect/disconnect 2016-01-05 00:06:50 +00:00
James Booth
8e9bf08389 Add cl_ev_disconnect 2016-01-03 17:23:36 +00:00
James Booth
a713654f93 Fixed compilation without libotr 2016-01-03 02:01:01 +00:00
James Booth
4f35b11471 End OTR session when recipient goes offline 2016-01-03 01:32:37 +00:00
James Booth
8ca3fe4ea8 Sort roster rooms 2016-01-02 02:41:51 +00:00
James Booth
22a14e1240 Show rooms in roster panel 2016-01-02 01:22:19 +00:00
James Booth
6a8656a06b Added /console command 2015-12-29 23:32:32 +00:00
James Booth
8ea228480c Added console MUC message preference 2015-12-29 23:00:49 +00:00
Dmitry Podgorny
bea246d81b Don't compile pgp code with --disable-pgp 2015-12-21 12:53:41 +02:00
James Booth
1f56c12377 Added cons_show_incoming_room_message() 2015-12-20 00:54:17 +00:00
James Booth
e1f674eca3 Fixed PGP error message 2015-12-19 22:55:33 +00:00
James Booth
88fd2a25ee Show PGP error strings 2015-12-15 00:38:16 +00:00
James Booth
482eea4fcf Moved sending of initial presence to sv_ev_roster_received 2015-12-14 23:57:06 +00:00
James Booth
fcfdc175b6 Allow /quit during TLS certificate verification prompt 2015-11-10 23:14:59 +00:00
James Booth
9302188a32 Show current TLS certificate 2015-11-10 01:20:40 +00:00
James Booth
bee27f4773 Added /tls cert to show current certificate fingerprint 2015-11-09 23:31:21 +00:00
James Booth
4cbfb88814 Store current TLS certificate fingerpint in memory for reconnect 2015-11-09 20:57:26 +00:00
James Booth
60215cdf9d Renamed MUC private window functions 2015-11-08 22:08:29 +00:00
James Booth
8a397263dd ui_incoming_private_msg takes ProfPrivateWin, added asserts 2015-11-08 22:01:51 +00:00
James Booth
2e81a4efa3 mucwin_broadcast takes ProfMucWin 2015-11-02 00:36:25 +00:00
James Booth
23ada0d38b mucwin_subject takes ProfMucWin 2015-11-02 00:29:35 +00:00
James Booth
0592c7f9e9 mucwin_requires_config takes ProfMucWin 2015-11-02 00:26:56 +00:00
James Booth
986741dea8 mucwin_message takes ProfMucWin 2015-11-02 00:24:19 +00:00
James Booth
e68784be43 mucwin_history takes ProfMucWin 2015-11-02 00:19:46 +00:00
James Booth
6ed72d8a35 mucwin_nick_change takes ProfMucWin 2015-11-02 00:17:46 +00:00
James Booth
42643391a4 mucwin_occupant_nick_change takes ProfMucWin 2015-11-02 00:16:01 +00:00
James Booth
b3150ef8e1 mucwin_occupant_presence takes ProfMucWin 2015-11-02 00:14:16 +00:00
James Booth
d505a92d1e mucwin_occupant_online takes ProfMucWin 2015-11-01 23:52:16 +00:00
James Booth
3a98bf315c mucwin_occupant_banned takes ProfMucWin 2015-11-01 23:49:45 +00:00
James Booth
cc498110e2 mucwin_occupant_kicked takes ProfMucWin 2015-11-01 23:47:59 +00:00
James Booth
24f283e960 mucwin_occupant_offline takes ProfMucWin 2015-11-01 23:45:54 +00:00
James Booth
8b4bb1c7f1 mucwin_roster takes ProfMucWin 2015-11-01 23:41:45 +00:00
James Booth
cb587b0772 Tidy sv_ev_muc_occupant_online 2015-11-01 23:26:47 +00:00
James Booth
ed9585376e mucwin_occupant_role_and_affiliation_change takes ProfMucWin 2015-11-01 23:23:49 +00:00
James Booth
799c064dff mucwin_occupant_affiliation_change takes ProfMucWin 2015-11-01 23:14:27 +00:00
James Booth
288c1a9d6e mucwin_occupant_role_change takes ProfMucWin 2015-11-01 23:12:35 +00:00
James Booth
22cd5b433f Tidy sv_ev_muc_self_online 2015-11-01 23:10:07 +00:00
James Booth
6ea9314f98 mucwin_role_and_affiliation_change takes ProfMucWin 2015-11-01 23:08:02 +00:00
James Booth
c0fc7b51e3 mucwin_affiliation_change takes ProfMucWin 2015-11-01 22:46:24 +00:00
James Booth
e547ae0bcc mucwin_role_change takes ProfMucWin 2015-11-01 22:42:31 +00:00
James Booth
b26e606061 Renamed ui_room_broadcast -> mucwin_broadcast 2015-11-01 21:35:15 +00:00
James Booth
25020df0f0 Renamed ui_room_subject -> mucwin_subject 2015-11-01 21:33:16 +00:00
James Booth
bd922a2651 Renamed ui_room_requires_config -> mucwin_requires_config 2015-11-01 21:32:35 +00:00
James Booth
f435d081b0 Renamed ui_room_message -> mucwin_message 2015-11-01 21:31:54 +00:00
James Booth
29af5d4a3b Renamed ui_room_history -> mucwin_history 2015-11-01 21:30:39 +00:00
James Booth
d7c1c6f9bf Renamed ui_room_nick_change -> mucwin_nick_change 2015-11-01 21:29:48 +00:00
James Booth
27632581eb Renamed ui_room_member_nick_change -> mucwin_occupant_nick_change 2015-11-01 21:28:53 +00:00
James Booth
0ea7636db3 Renamed ui_room_member_presence -> mucwin_occupant_presence 2015-11-01 21:27:56 +00:00
James Booth
7821b2261d Renamed ui_room_member_online -> mucwin_occupant_online 2015-11-01 21:27:00 +00:00
James Booth
1e47749f3a Renamed ui_room_member_banned -> mucwin_occupant_banned 2015-11-01 21:25:55 +00:00
James Booth
b8e1e5a546 Renamed ui_room_member_kicked -> mucwin_occupant_kicked 2015-11-01 21:24:49 +00:00
James Booth
445452696e Renamed ui_room_member_offline -> mucwin_occupant_offline 2015-11-01 21:23:37 +00:00
James Booth
51c9d4186e Renamed ui_room_roster -> mucwin_roster 2015-11-01 21:20:11 +00:00
James Booth
94f05ff42f Renamed ui_room_occupant_role_and_affiliation_change -> mucwin_occupant_role_and_affiliation_change 2015-11-01 21:17:13 +00:00
James Booth
88206dc39b Renamed ui_room_occupant_affiliation_change -> mucwin_occupant_affiliation_change 2015-11-01 21:16:22 +00:00
James Booth
eae0b59310 Renamed ui_room_occupant_role_change -> mucwin_occupant_role_change 2015-11-01 21:15:14 +00:00
James Booth
1a87132dc7 Renamed ui_room_role_and_affiliation_change -> mucwin_role_and_affiliation_change 2015-11-01 21:14:01 +00:00
James Booth
d706dcd4bc Renamed ui_room_affiliation_change -> mucwin_affiliation_change 2015-11-01 21:12:53 +00:00
James Booth
75b505cf6a Renamed ui_room_role_change -> mucwin_role_change 2015-11-01 21:11:30 +00:00
James Booth
aa59cf98b8 xmlwin_show takes window as argument 2015-11-01 19:45:35 +00:00
James Booth
db4bcd3e6d Added xmlwin module 2015-11-01 19:39:36 +00:00
James Booth
17488ca346 Added missing config.h includes 2015-10-31 23:38:08 +00:00
James Booth
31016a2150 Tidied chatwin_outgoing_carbon 2015-10-27 23:25:18 +00:00
James Booth
e7148bf82d Renamed ui_outgoing_chat_msg -> chatwin_outgoing_msg 2015-10-27 23:20:03 +00:00
James Booth
af1124f28f Renamed ui_incoming_msg -> chatwin_incoming_msg 2015-10-27 23:18:42 +00:00
James Booth
ae89028772 Renamed ui_recipient_gone -> chatwin_recipeint_gone 2015-10-27 23:06:27 +00:00
James Booth
62c2febc11 Tidied ui_recipient_gone 2015-10-27 23:05:20 +00:00
James Booth
40dcd59727 Renamed chatwin OTR functions 2015-10-27 21:23:56 +00:00
James Booth
0fd616167e Removed ui_events module 2015-10-27 20:49:06 +00:00
James Booth
61bcb59ee9 Removed ui_ev_new_chat_win 2015-10-27 20:45:07 +00:00
James Booth
8087053f49 Removed ui_ev_focus_win 2015-10-27 20:40:42 +00:00
James Booth
2efaa464bf ui_message_receipt takes ProfChatWin 2015-10-26 22:54:06 +00:00
James Booth
8f45f332ad Removed ui_chat_win_exists 2015-10-26 22:43:32 +00:00
James Booth
afbd2693cd Applied coding style to src/event/ 2015-10-25 22:32:46 +00:00
James Booth
6640a0891f Force tls on all connections, add tls policy account property 2015-10-18 03:06:23 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
James Booth
c9165ef9d2 Title bar TLS indicator 
Issue #616
 2015-10-14 00:29:22 +01:00
James Booth
075c108e2d Fixed spelling 2015-09-30 00:07:35 +01:00
James Booth
99fc70bd92 Added last activity time format option 2015-09-29 23:30:23 +01:00
James Booth
ac1164a3fa Use more specific messages for last activity responses 2015-09-29 21:51:04 +01:00
James Booth
bfdda17b7f Fix last active query 2015-09-29 00:53:58 +01:00
James Booth
26d160cae8 WIP: Added last activity request and response 2015-09-29 00:01:38 +01:00
James Booth
9593e17c3c Include last activity in initial presence 2015-09-27 23:53:06 +01:00
James Booth
d96e68ea53 Save trusted certificates to tlscerts file with more information 2015-09-24 00:18:18 +01:00
James Booth
40ce5cb0e0 Parse TLS cert subject 2015-09-23 23:01:59 +01:00
James Booth
0321adde3e Fixed spelling 2015-09-23 20:38:52 +01:00
James Booth
bd9c28c100 Tidied output for cert callback 2015-09-23 00:17:10 +01:00
James Booth
a964050b87 Use subject name in cert callback 2015-09-22 23:56:22 +01:00
James Booth
b88885aaae Store trusted TLS cert fingerprints 2015-09-22 22:44:18 +01:00
James Booth
9414ad268d Prompt user to allow or deny untrusted TLS certificates 2015-09-22 21:42:05 +01:00
James Booth
74151e6419 Added TLS cert fail callback 2015-09-22 20:55:41 +01:00
James Booth
b266e4d035 Pass delay timestamp to all incoming chat events 2015-09-08 20:18:31 +01:00
James Booth
b4722632b6 Split PGP incoming and outgoing message handling 2015-08-30 01:32:13 +01:00
James Booth
1484e94b35 Fixed OTR decryption check 2015-08-27 00:37:48 +01:00
James Booth
55158767cc Renamed enc_message parameter for incoming messages 2015-08-26 23:23:12 +01:00
James Booth
4b90a53566 Tidied sv_ev_incoming_message 2015-08-26 23:15:10 +01:00
James Booth
fc60c9fbf1 Fixed OTR char display 2015-08-26 21:42:16 +01:00
James Booth
5e962fe0f5 Fixed compile when no OTR or PGP support 2015-08-26 01:48:21 +01:00
James Booth
f998ab8f3b Display special char for encrypted messages 2015-08-26 00:42:56 +01:00
James Booth
525876770a Removed unused barejid argument from PGP decryption 2015-08-24 00:13:57 +01:00
James Booth
2af5c151a0 Tidied pgp memory allocations 2015-08-11 01:00:23 +01:00
James Booth
8ec931eb84 Added cons_show_padded 2015-07-29 23:48:28 +01:00
James Booth
dd206ef637 WIP fix for #516, needs memory cleanup 2015-06-29 23:48:41 +01:00
James Booth
524c7a8671 Free account on pgp presence send 2015-06-24 22:02:29 +01:00
James Booth
d89a9862b1 Merge remote-tracking branch 'pasis/pgp-without-otr-fix' 2015-06-23 23:32:41 +01:00
James Booth
358e9d6af0 Added /pgp setkey command 2015-06-23 23:29:10 +01:00
Dmitry Podgorny
6a73ca1b52 pgp: Fixed compilation error when libotr is not supported 2015-06-23 22:13:50 +00:00
James Booth
3d2f999efb Added PGP logging preferences 2015-06-21 21:42:58 +01:00
James Booth
446027b950 Moved setting otr.warn -> enc.warn 2015-06-21 21:07:57 +01:00
James Booth
e72ddf5488 Show message when contact ends PGP 2015-06-21 20:27:56 +01:00
James Booth
5669799690 Encryption modes for sv_ev_incoming_message 2015-06-21 20:08:46 +01:00
James Booth
03a4aa4408 Tidied OTR and PGP combinations in client_events.c 2015-06-21 19:29:23 +01:00
James Booth
13a612cbc2 Moved window creation to sv_ev_incoming_message 2015-06-21 18:29:20 +01:00
James Booth
8d2d923603 Moved message display logic to sv_ev_incoming_message 2015-06-21 18:00:57 +01:00
James Booth
e45afd5c09 Added pgp checks for message sending 2015-06-21 01:48:25 +01:00
James Booth
edbb3d938e Merge branch 'master' into openpgp 2015-06-19 00:15:40 +01:00
James Booth
e117c0368f Added missing include client_events.c 2015-06-19 00:14:48 +01:00
James Booth
c76692516a Merge branch 'master' into openpgp 2015-06-15 20:39:17 +01:00
James Booth
38ed9188d3 Moved ui/windows -> window_list 2015-06-15 19:26:28 +01:00
James Booth
9aff8abd2e Merge branch 'master' into openpgp 
Conflicts:
	.travis.yml
 2015-06-05 23:02:56 +01:00
James Booth
80665ea051 Added rooms iq test 2015-05-24 04:13:28 +01:00
James Booth
acd2d2309f Moved pgp signature generation to cl_ev_presence_send 2015-05-08 00:07:21 +01:00
James Booth
0db7bcbdcd Merge branch 'master' into openpgp 2015-05-07 23:23:45 +01:00
James Booth
d853284f92 Added cl_ev_presence_send 2015-05-07 23:21:48 +01:00
James Booth
8ebc1d4ac1 Moved pgp signature verification to sv_ev_contact_online 2015-05-07 22:22:28 +01:00
James Booth
a2c6211732 Added ui_contact_online 2015-05-07 22:05:36 +01:00
James Booth
4dc9033472 Use null check convention in server_events.c 2015-05-04 22:51:15 +01:00
James Booth
c8eaaa0ce9 Added ui_ev_new_private_win to ui events 2015-05-04 01:31:27 +01:00
James Booth
b1dd1e2726 cl_ev_send_muc_msg takes ProfMucWin as arg 2015-05-04 01:06:12 +01:00