about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1397 from wstrm/doc-pre-push-hookMichael Vetter2020-07-071-1/+17
|\ | | | | Tip about pre-push hook in contribution guidelines
| * Add highlightingWilliam Wennerström2020-07-071-2/+2
| |
| * Tip about pre-push hook in contribution guidelinesWilliam Wennerström2020-07-071-0/+16
|/
* Add pre-commit hook clang-format exampleMichael Vetter2020-07-071-0/+11
| | | | Regards https://github.com/profanity-im/profanity/issues/1396
* Apply coding styleMichael Vetter2020-07-07214-17648/+19638
| | | | Regards https://github.com/profanity-im/profanity/issues/1396
* Add clang-format fileMichael Vetter2020-07-073-0/+48
| | | | | People should run `make format` before doing a commit. Fix https://github.com/profanity-im/profanity/issues/1396
* Tests: Add ox_announce_public_key stubMichael Vetter2020-07-062-0/+10
|
* OX: Announce public key on PEPDebXWoody2020-07-067-2/+396
| | | | | | | | | | | | | | | 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
* Merge pull request #1394 from wstrm/fix-log-errors-call-externalMichael Vetter2020-07-061-1/+2
|\ | | | | Log errors from eval_password
| * Log errors from eval_passwordWilliam Wennerström2020-07-061-1/+2
|/ | | | | All errors were discarded to /dev/null if the error_ptr was set to NULL.
* Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-062-4/+5
|\
| * Merge pull request #1386 from DebXWoody/masterMichael Vetter2020-07-062-4/+5
| |\ | | | | | | Rework logging
| | * Rework loggingStefan Kropp2020-07-032-4/+5
| | | | | | | | | | | | | | | | | | Changed default logging from INFO to WARN. Issue: #1353
* | | Plain chat messages not workingDebXWoody2020-07-061-4/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-041-11/+13
|\ \
| * \ Merge pull request #1387 from DebXWoody/bugfix/1332-omemoMichael Vetter2020-07-041-11/+13
| |\ \ | | | | | | | | Request Device and Key, when OMEMO is in use
| | * | Request Device and Key, when OMEMO is in useDebXWoody2020-06-041-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Profanity requests the device list and keys for contacts, also when the user hasn't generated the OMEMO key. If the user has no OMEMO key, there is no need to request OMEMO information. Issue: #1332
* | | | Merge branch 'omemofix'Michael Vetter2020-07-042-21/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Messages are not shown in ChatSecureDebXWoody2020-07-042-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #1383 from profanity-im/cleanup/messagecMichael Vetter2020-07-041-116/+73
|\ \ \ \ | | | | | | | | | | Cleanup carbons/chat handling in message.c
| * | | | message.c: Use message->to_jid instead of to_jidMichael Vetter2020-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | This one will always be set.
| * | | | message.c: _handle_carbons() check from field outside of functionMichael Vetter2020-07-031-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | So that we don't have to pass the wrapping stanza and can handle the error nicer.
| * | | | message.c: Dont duplicate code in _handle_carbon and _handle_chatMichael Vetter2020-07-031-111/+66
|/ / / / | | | | | | | | | | | | | | | | Trying to simplify the conditions so we don't have duplicate code in both of those functions.
* | | | message.c: Remove from/to setting out of conditionMichael Vetter2020-07-031-6/+3
| | | | | | | | | | | | | | | | Since its done in both cases.
* | | | message.c: Small code improvementsMichael Vetter2020-07-031-16/+16
| | | |
* | | | message.c: Put XEP-0085 code in helper functionMichael Vetter2020-07-031-18/+25
| | | |
* | | | Change formattingMichael Vetter2020-07-031-1/+2
| | | |
* | | | handle_headline(): Free text correctlyMichael Vetter2020-07-031-0/+2
| | | |
* | | | Handle headline stanzaStefan Kropp2020-07-031-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #1382 from wstrm/fix-missing-omut-flagMichael Vetter2020-07-021-1/+1
|\ \ \ \ | | | | | | | | | | Add missing -o flag for omut example
| * | | | Add missing -o flag for omut exampleWilliam Wennerström2020-07-021-1/+1
|/ / / /
* | | | Merge pull request #1381 from wstrm/fix-no-messageMichael Vetter2020-07-021-1/+0
|\ \ \ \ | |_|_|/ |/| | | Fix messages with receipt request not displayed
| * | | Fix messages with receipt request not displayedWilliam Wennerström2020-07-021-1/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | Messages from Conversations contains: <request xmlns='urn:xmpp:receipts'/> And would not be displayed in Profanity as it never reached _handle_chat(..).
* | | message.c: Put plugin handler code in helper functionMichael Vetter2020-07-021-7/+14
| | |
* | | message.c: Log invalid message typeMichael Vetter2020-07-021-14/+14
| | | | | | | | | | | | | | | So far we logged when we receive a message without a type. Which is actually quite common and makes no sense.
* | | message.c: Check for message typeMichael Vetter2020-07-022-8/+5
| | | | | | | | | | | | | | | RFC 6121 allows only few types. So we can also remove that check in _handle_chat().
* | | message.c: Remove handled cases form _handle_chat()Michael Vetter2020-07-021-7/+0
| | | | | | | | | | | | Both cases are tested before entering that function.
* | | message.c: Break out of _message_handler() after handling codeMichael Vetter2020-07-021-0/+4
| | | | | | | | | | | | | | | AFAIK it can only be one. Except at STANZA_NS_MUC_USER which is used in several cases.
* | | Add HEADLINE stanza defineMichael Vetter2020-07-021-0/+1
| | |
* | | message.c: Parse incoming message stanzas according to typeMichael Vetter2020-07-021-31/+34
| | |
* | | message.c: Add pubsub helper functionMichael Vetter2020-07-021-13/+19
| | |
* | | message.c: Add XEP informationMichael Vetter2020-07-021-1/+6
| | |
* | | message.c: Add my copyrightMichael Vetter2020-07-021-0/+1
| | |
* | | message.c: Make several functions staticMichael Vetter2020-07-021-3/+3
| | |
* | | message.c: Adjust function formattingMichael Vetter2020-07-021-8/+12
| | |
* | | gpg.c: _ox_key_is_usable() simplify if conditionMichael Vetter2020-07-021-3/+3
| | |
* | | gpg.c: Format new ox function headsMichael Vetter2020-07-021-7/+26
| | |
* | | log.c: Format codeMichael Vetter2020-07-021-7/+9
| | |
* | | cmd_funcs.c: Remove not needed variableMichael Vetter2020-07-021-2/+1
| | |
* | | log.c: Use gchar* instead of GString for mainlogfileMichael Vetter2020-07-021-10/+9
| | |