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

6038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vetter
68685aaadf
Merge pull request #1276 from wstrm/fix-formatting 
Improve formatting for some help instructions
 2020-02-25 11:27:56 +01:00
William Wennerström
24293ec47e
Improve formatting for some help instructions 
Some instructions were missing whitespace or punctuation.
 2020-02-24 14:39:23 +01:00
Dmitry Podgorny
6c649a9de8 Fix memory leak of presence object 
The memory leak happens when a presence is received for a MUC room. The
JID is not present in the roster, so updating its status is ignored. We
have to free resource in this case, because it has no owner and is lost
otherwise.

==25736== 47 (32 direct, 15 indirect) bytes in 1 blocks are definitely lost in loss record 1,625 of 3,399
==25736==    at 0x4A330FF: malloc (vg_replace_malloc.c:309)
==25736==    by 0x13A962: resource_new (resource.c:47)
==25736==    by 0x145501: _available_handler (presence.c:665)
==25736==    by 0x145501: _presence_handler (presence.c:399)
==25736==    by 0x145501: _presence_handler (presence.c:358)
==25736==    by 0x80D5F34: handler_fire_stanza (in /usr/lib64/libstrophe.so.0.0.0)
==25736==    by 0x80D2B49: _handle_stream_stanza (in /usr/lib64/libstrophe.so.0.0.0)
==25736==    by 0x80E15CE: _end_element (in /usr/lib64/libstrophe.so.0.0.0)
==25736==    by 0x843EE9B: doContent (in /usr/lib64/libexpat.so.1.6.10)
==25736==    by 0x843F94B: contentProcessor (in /usr/lib64/libexpat.so.1.6.10)
==25736==    by 0x8441E77: XML_ParseBuffer (in /usr/lib64/libexpat.so.1.6.10)
==25736==    by 0x80D586B: xmpp_run_once (in /usr/lib64/libstrophe.so.0.0.0)
==25736==    by 0x13E07E: connection_check_events (connection.c:119)
==25736==    by 0x13869C: prof_run (profanity.c:129)

Fixes #1279.
 2020-02-23 08:51:36 +02:00
Michael Vetter
c08d0e9ce8 Fix errors in log.c 2020-02-22 09:27:04 +01:00
Michael Vetter
f055faf31c Fix log test stub 2020-02-21 21:29:14 +01:00
Michael Vetter
55f49f1259 get_log_file_location () should return const char* 
Make clear that result should never be freed.
 2020-02-21 21:19:54 +01:00
Michael Vetter
75cfe38808 Allow setting custom log file via -f FILENAME 
`profanity -f TEST` will use `~/.local/share/profanity/logs/TEST.log` as
the log file.
 2020-02-21 21:10:00 +01:00
Michael Vetter
99dc1c9494 Rename separator to trackbar 2020-02-21 19:17:12 +01:00
Michael Vetter
4b1b035654 Fix test stub 
Change done in eb2fbdba2e
 2020-02-21 19:16:52 +01:00
Michael Vetter
6dbbbe11e5 Make trackbar color configurable 
Use `main.trackbar` in themes.
 2020-02-21 19:12:16 +01:00
Michael Vetter
eb2fbdba2e Dont filter out own MUC messages if muc history is set to 'regular' 
We use the same incoming function as for regular incoming text here. But
don't want to filter out our own messages since we didn't print them
during sending.

Follow up to 8ee2cdadc8
 2020-02-21 18:46:09 +01:00
Michael Vetter
669de0ca52 Improve setting encryption char error handling 2020-02-21 14:51:19 +01:00
Michael Vetter
2a952cb4c5 Expand omemo error message 2020-02-21 10:30:09 +01:00
Michael Vetter
fd04727212 pref: Use helper functions for setting/getting the encryption char 
Dont duplicate code.
 2020-02-21 09:51:40 +01:00
Michael Vetter
7fdc4ed7f6 win_print_incoming() strdup the charactar 
Fix bug introduced in 1f8b1eb740.
Forgot to strdup() here.
 2020-02-21 08:02:11 +01:00
Michael Vetter
c13553bfcb Fix missing change from last commit 2020-02-20 23:43:35 +01:00
Michael Vetter
1f8b1eb740 Allow utf8 symbols as omemo/pgp/otr indicator char 
Fix https://github.com/profanity-im/profanity/issues/1264
 2020-02-20 23:36:10 +01:00
Michael Vetter
280b718cfb Fix theme setting correction char 
Copy paste error. We actually set the omemo char..
 2020-02-20 16:50:17 +01:00
Michael Vetter
3ab4ae45f0 Merge branch 'master' of github.com:profanity-im/profanity 2020-02-20 10:29:11 +01:00
Michael Vetter
8ee2cdadc8 Parse mentions and triggers in muc history if display is 'regular' 
Fix https://github.com/profanity-im/profanity/issues/1261
 2020-02-20 10:28:24 +01:00
Michael Vetter
1ddac7b9c6 Put getting mentions in own function 
So we can use it somewhere else too.

Regards https://github.com/profanity-im/profanity/issues/1261
 2020-02-20 10:03:36 +01:00
Michael Vetter
80dd3fdbb2 Add option to color MUC history like regular messages 
`/logging group color` has:
* `unanimous` which will color it with one unanimous color. Like it was
done always.
* `regular` which colors it like regular incoming messages.

Regards https://github.com/profanity-im/profanity/issues/1261
 2020-02-20 08:11:58 +01:00
Michael Vetter
6aa793fca6 Refactor mucwin_history() 
Just pass ProfMessage.
 2020-02-19 16:57:37 +01:00
Michael Vetter
cf36a92dcb Add define names to comment 2020-02-19 16:36:54 +01:00
Michael Vetter
124cfd73c3
Merge pull request #1273 from wstrm/add-sr.ht-badge 
Add builds.sr.ht badge for Profanity builds
 2020-02-18 17:53:08 +01:00
William Wennerström
5cd6764d6f
Add builds.sr.ht badge for Profanity builds 2020-02-18 17:41:18 +01:00
Michael Vetter
b4c6470df4
Merge pull request #1269 from wstrm/add-sr.ht-ci 
Add builds.sr.ht CI for OpenBSD
 2020-02-17 16:47:52 +01:00
Michael Vetter
0089fbcf0a omemo: switch to 12 byte IV 
We decrypt both 12 and 16 bytes.
And send 12 instead of 16 bytes now.

Close https://github.com/profanity-im/profanity/issues/1272
 2020-02-17 14:04:24 +01:00
Michael Vetter
ea5a947f52 Refactor win_print_history() 
We never use the printf like behaviour anyways.
 2020-02-17 12:05:58 +01:00
Michael Vetter
6e68f1812b Refactor win_print_outgoing_muc_msg() 
We never use the printf like behaviour anyways.
 2020-02-17 12:03:23 +01:00
Michael Vetter
f13ea11f95 Refactor win_println_incoming_muc_msg() 
We never use the printf like behaviour anyways.
 2020-02-17 11:58:36 +01:00
Michael Vetter
69d474b3a7 Refactor win_print_outgoing() 
We never use the printf like behaviour anyways.
 2020-02-17 11:48:50 +01:00
William Wennerström
b267b065f5
Add builds.sr.ht CI for OpenBSD 
* Add .builds/openbsd.yml for builds.sr.ht
* Update travis-build.sh -> ci-build.sh with OpenBSD case
* Fix libdl check in configure.ac (OpenBSD has libdl built-in)
* Fix some minor issues found when compiling on OpenBSD with GCC (e.g.
  uninitialized variables)
 2020-02-17 10:54:15 +01:00
Michael Vetter
92f6930175 Fix typo 2020-02-17 10:09:32 +01:00
Michael Vetter
555e50cc92 Merge branch 'feature/sendfile-enc-warn' 
Close https://github.com/profanity-im/profanity/pull/1270
 2020-02-17 09:01:00 +01:00
Michael Vetter
7955f44262 Mention how to enable unencrypted file transer 
Regards https://github.com/profanity-im/profanity/pull/1270
 2020-02-17 08:59:55 +01:00
Michael Vetter
7d596d8cef Make /sendfile in PGP session configurable 
`/pgp sendfile on` allows unencrypted file transfer in an PGP session.

Regards https://github.com/profanity-im/profanity/pull/1270
 2020-02-17 08:57:35 +01:00
Michael Vetter
86bcadcbe3 Make /sendfile in OTR session configurable 
`/otr sendfile on` allows unencrypted file transfer in an OMEMO session.

Regards https://github.com/profanity-im/profanity/pull/1270
 2020-02-17 08:51:43 +01:00
Michael Vetter
36713a2ed7 Make /sendfile in OMEMO session configurable 
`/omemo sendfile on` allows unencrypted file transfer in an OMEMO
session.

Regards https://github.com/profanity-im/profanity/pull/1270
 2020-02-17 08:31:46 +01:00
moppman
674a8aaf7e Disallow sendfile in e2ee chat sessions 2020-02-17 08:02:00 +01:00
Michael Vetter
ca3afa7e05 test: Init window.layout to make compiler happy 
Fix tests/unittests/test_cmd_otr.c:415: warning: 'window.layout' is used
uninitialized in this function on openbsd (thanks optmzr)
 2020-02-14 14:40:20 +01:00
Michael Vetter
421c67e284 Add workaround for compiler warning 
Regards https://github.com/profanity-im/profanity/issues/1265
 2020-02-14 11:23:19 +01:00
Michael Vetter
59e68f7b7a xep-0308: Add note about tab completion 2020-02-14 11:19:32 +01:00
Michael Vetter
fdffd16126 xep-0308: add note about where corrections are possible 2020-02-14 11:18:23 +01:00
Michael Vetter
edba5c83ff xep-0308: only allow /correct when corrections are enabled 2020-02-14 11:18:16 +01:00
Michael Vetter
c995f3150e
Merge pull request #1267 from profanity-im/feature/xep-0308-lmc 
XEP-0308 Last Message Correction
 2020-02-14 11:09:45 +01:00
Michael Vetter
4241917fba xep-0308: add caution note 
We need to change the buffer structure first, so that we save the from
field there.
 2020-02-14 10:17:07 +01:00
Michael Vetter
fcfb493dfb Rename buffer->from to buffer->display_from 2020-02-14 10:17:07 +01:00
Michael Vetter
e27c414f1f xep-0308: enable for carbon copied messages 
If we are connected with another client and send a message, then correct
it. We now display it correctly in Profanity.

Id wasn't saved for carbon copied messages too so far.
 2020-02-14 10:17:07 +01:00
Michael Vetter
9b3593bdf9 xep-0308: enable correction in outgoing messages with delivery receipts 2020-02-14 10:17:07 +01:00