aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code
6,178 Commits 31 Branches 59 Tags 24 MiB
f12161f190
Commit Graph

6178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vetter
95015cec56 clang-format: Dont sort includes 2020-07-07 14:18:37 +02:00
Michael Vetter
bddbfa58c0 OX: Fix tests 
Fix:
```
/usr/bin/ld: src/xmpp/ox.o: in function `ox_announce_public_key':
src/xmpp/ox.c:90: undefined reference to `p_ox_gpg_readkey'
```
 2020-07-07 14:07:38 +02:00
Michael Vetter
a4cadf78fa Revert "Apply coding style" 
This reverts commit 9b55f2dec0.

Sorting the includes creates some problems.
 2020-07-07 13:53:30 +02:00
Michael Vetter
28fde3cd01
Merge pull request #1397 from wstrm/doc-pre-push-hook 
Tip about pre-push hook in contribution guidelines
 2020-07-07 10:45:22 +02:00
William Wennerström
815a655768
Add highlighting 2020-07-07 10:11:31 +02:00
William Wennerström
d1bf922b1a
Tip about pre-push hook in contribution guidelines 2020-07-07 10:06:47 +02:00
Michael Vetter
1bbb819dac Add pre-commit hook clang-format example 
Regards https://github.com/profanity-im/profanity/issues/1396
 2020-07-07 09:51:47 +02:00
Michael Vetter
9b55f2dec0 Apply coding style 
Regards https://github.com/profanity-im/profanity/issues/1396
 2020-07-07 09:43:28 +02:00
Michael Vetter
66f9a6b721 Add clang-format file 
People should run `make format` before doing a commit.
Fix https://github.com/profanity-im/profanity/issues/1396
 2020-07-07 09:42:00 +02:00
Michael Vetter
87ddb8081e Tests: Add ox_announce_public_key stub 2020-07-06 15:03:13 +02:00
DebXWoody
5a17957253 OX: Announce public key on PEP 
src/pgp/gpg.c:p_ox_gpg_readkey

Used to read a public key from a file. The function will return the fingerprint
of the file and the base64 encoded key.

src/xmpp/ox.[hc]

ox_announce_public_key(const char* const filename) can be called from the /ox
announce <filename> command. The key within the file will be pushed on PEP and
the Metadata node will be set.

Issue: #1331
 2020-07-06 13:19:18 +02:00
Michael Vetter
5e87b0dc51
Merge pull request #1394 from wstrm/fix-log-errors-call-external 
Log errors from eval_password
 2020-07-06 11:06:24 +02:00
William Wennerström
deb0818a1b
Log errors from eval_password 
All errors were discarded to /dev/null if the error_ptr was set to
NULL.
 2020-07-06 11:02:04 +02:00
Michael Vetter
0a23de061a Merge branch 'master' of github.com:profanity-im/profanity 2020-07-06 10:52:46 +02:00
Michael Vetter
6113dfcb73
Merge pull request #1386 from DebXWoody/master 
Rework logging
 2020-07-06 10:45:43 +02:00
DebXWoody
2a50bb6ad7 Plain chat messages not working 
Plain chat messages not working for non-carbon + no OTR support.

On master we did some clean-up. The problem is at https://github.com/profanity-im/profanity/blob/0.9.patch/src/event/server_events.c#L625 (0.9.0). The implementation looks like:

- HAVE_LIBOTR is set - _sv_ev_incoming_otr
- HAVE_LIBOTR is not set - _sv_ev_incoming_plain

I think the `_sv_ev_incoming_otr` can handle otr and plain, because I didn't find a `_sv_ev_incoming_plain` if `HAVE_LIBOTR` is set.

On master for 0.10.0 the implementation is much better:
https://github.com/profanity-im/profanity/blob/master/src/event/server_events.c#L623

But, we just call `_sv_ev_incoming_otr` independent of `HAVE_LIBOTR`.
Unfortunately, `_sv_ev_incoming_otr` is doing nothing if `HAVE_LIBOTR` is not set:
https://github.com/profanity-im/profanity/blob/master/src/event/server_events.c#L538

I did some more clean-up at sv_ev_incoming_message and changed the implementation of `_sv_ev_incoming_otr`.

```
static void
_sv_ev_incoming_otr(ProfChatWin *chatwin, gboolean new_win, ProfMessage *message)
{
  // OTR or plain
        plain
}
```

The caller do not take care of `HAVE_LIBOTR`, call `_sv_ev_incoming_plain` if you are sure it's a plain message or call `_sv_ev_incoming_otr`. `_sv_ev_incoming_otr` can be used for otr / plain or for plain only.
 2020-07-06 10:36:03 +02:00
Michael Vetter
d2c3aa566b Merge branch 'master' of github.com:profanity-im/profanity 2020-07-04 17:41:56 +02:00
Michael Vetter
193282a4fc
Merge pull request #1387 from DebXWoody/bugfix/1332-omemo 
Request Device and Key, when OMEMO is in use
 2020-07-04 17:41:20 +02:00
Michael Vetter
bf170d6c91 Merge branch 'omemofix' 2020-07-04 17:38:44 +02:00
DebXWoody
54667c022f Messages are not shown in ChatSecure 
In 0.9.x we fixed an issue, because OMEMO devices should be defined in "item"
with id "current". This should work, but it won't work if there is no "current".
If there is no "current" we will just use the first item.

Issue #1384
 2020-07-04 17:38:30 +02:00
Michael Vetter
7cd135512b
Merge pull request #1383 from profanity-im/cleanup/messagec 
Cleanup carbons/chat handling in message.c
 2020-07-04 17:35:58 +02:00
Stefan Kropp
b8207207f4
Rework logging 
Changed default logging from INFO to WARN.

Issue: #1353
 2020-07-03 18:47:16 +02:00
Michael Vetter
aecbeff8ba message.c: Use message->to_jid instead of to_jid 
This one will always be set.
 2020-07-03 18:04:07 +02:00
Michael Vetter
b1343cd3ac message.c: _handle_carbons() check from field outside of function 
So that we don't have to pass the wrapping stanza and can handle
the error nicer.
 2020-07-03 17:55:15 +02:00
Michael Vetter
896e6c4e87 message.c: Dont duplicate code in _handle_carbon and _handle_chat 
Trying to simplify the conditions so we don't have duplicate code
in both of those functions.
 2020-07-03 17:51:42 +02:00
Michael Vetter
8ce299838d message.c: Remove from/to setting out of condition 
Since its done in both cases.
 2020-07-03 16:38:05 +02:00
Michael Vetter
0412ec9662 message.c: Small code improvements 2020-07-03 16:26:33 +02:00
Michael Vetter
c66d3c6389 message.c: Put XEP-0085 code in helper function 2020-07-03 16:17:18 +02:00
Michael Vetter
14f33e54f6 Change formatting 2020-07-03 12:35:48 +02:00
Michael Vetter
8d8ef675cd handle_headline(): Free text correctly 2020-07-03 12:05:46 +02:00
Stefan Kropp
3640900cf6 Handle headline stanza 
Authored by DebXWoody in:
https://github.com/profanity-im/profanity/pull/1369

Regards: https://github.com/profanity-im/profanity/issues/1366

Since I'm in the process of cleaning up message.c I take this now
so he doesn't have to rebase.

I also omitted the _handle_normal() case since I'm not sure that would
be correct.

Probably will be addressed again when continuing the cleanup.
 2020-07-03 12:02:41 +02:00
Michael Vetter
83c6aa68f1
Merge pull request #1382 from wstrm/fix-missing-omut-flag 
Add missing -o flag for omut example
 2020-07-02 21:07:49 +02:00
William Wennerström
1b83c0b7b2
Add missing -o flag for omut example 2020-07-02 21:05:11 +02:00
Michael Vetter
4ee05abb9e
Merge pull request #1381 from wstrm/fix-no-message 
Fix messages with receipt request not displayed
 2020-07-02 21:03:39 +02:00
William Wennerström
d5aae08c41
Fix messages with receipt request not displayed 
Messages from Conversations contains:
  <request xmlns='urn:xmpp:receipts'/>

And would not be displayed in Profanity as it never reached
_handle_chat(..).
 2020-07-02 20:50:26 +02:00
Michael Vetter
83ed9ba24b message.c: Put plugin handler code in helper function 2020-07-02 17:53:28 +02:00
Michael Vetter
6be5b51a46 message.c: Log invalid message type 
So far we logged when we receive a message without a type. Which is
actually quite common and makes no sense.
 2020-07-02 17:47:07 +02:00
Michael Vetter
46a00317ee message.c: Check for message type 
RFC 6121 allows only few types.
So we can also remove that check in _handle_chat().
 2020-07-02 17:40:58 +02:00
Michael Vetter
19d9e80a79 message.c: Remove handled cases form _handle_chat() 
Both cases are tested before entering that function.
 2020-07-02 17:32:14 +02:00
Michael Vetter
d9cfa2e48a message.c: Break out of _message_handler() after handling code 
AFAIK it can only be one.
Except at STANZA_NS_MUC_USER which is used in several cases.
 2020-07-02 17:31:56 +02:00
Michael Vetter
ad3dd72325 Add HEADLINE stanza define 2020-07-02 17:17:28 +02:00
Michael Vetter
b14b711492 message.c: Parse incoming message stanzas according to type 2020-07-02 17:15:42 +02:00
Michael Vetter
728cb55b68 message.c: Add pubsub helper function 2020-07-02 16:48:57 +02:00
Michael Vetter
f2b415079a message.c: Add XEP information 2020-07-02 16:37:20 +02:00
Michael Vetter
1f50647865 message.c: Add my copyright 2020-07-02 15:22:58 +02:00
Michael Vetter
3350139ed0 message.c: Make several functions static 2020-07-02 15:21:54 +02:00
Michael Vetter
10190b5fb0 message.c: Adjust function formatting 2020-07-02 15:20:17 +02:00
Michael Vetter
26d4b00d6d gpg.c: _ox_key_is_usable() simplify if condition 2020-07-02 15:11:06 +02:00
Michael Vetter
27f5706e77 gpg.c: Format new ox function heads 2020-07-02 15:09:34 +02:00
Michael Vetter
9c433e3033 log.c: Format code 2020-07-02 15:06:17 +02:00