about summary refs log tree commit diff stats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* parser.c: Use helper function to reduce duplicate codeMichael Vetter2020-07-211-143/+50
| | | | | | | | | | `parse_args()` and `parse_args_with_freetext()` shared a lot of common code. Let's have a helper function `_parse_args_helper()` for that. The `with_freetext` parameter will make it behave like `parse_args_with_freetext()`. In preparation for https://github.com/profanity-im/profanity/issues/1404
* parse_args(): Call g_free() onceMichael Vetter2020-07-211-3/+2
|
* Use parse_args_with_freetext() for `/correct`Michael Vetter2020-07-202-3/+3
| | | | | | | | | | | | | This commit partly reverts 8f37afcd37ad8663ca36c13ca7fbc4a431119f73 Which was using a wrong approach to achieve this. It changed parse_args() to have a -1 for infinite parameters. But actually parse_args_with_freetext() should have been used exactly for this behaviour. Discovered when checking for https://github.com/profanity-im/profanity/issues/1404
* bookmark_ignore.c: use gchar instead of charMichael Vetter2020-07-201-7/+7
|
* Fix typo in commentMichael Vetter2020-07-151-1/+1
|
* Add comment to easily find where to put the next commandMichael Vetter2020-07-151-0/+2
|
* Format cmd_defsMichael Vetter2020-07-151-1942/+2037
| | | | | Format it more readable and disable clang for this part. Was messed up in 9b55f2dec0ea27a9ce4856e303425e12f866cea2.
* Remove `/tiny` commandMichael Vetter2020-07-105-215/+0
| | | | | | boothj5 gave his okay too. Fix https://github.com/profanity-im/profanity/issues/1370
* Merge pull request #1403 from wstrm/fix-error-no-freeMichael Vetter2020-07-101-0/+4
|\ | | | | Free errors after they have been printed
| * Free errors after they have been printedWilliam Wennerström2020-07-101-0/+4
| |
* | Add forgotten file..Michael Vetter2020-07-101-2/+2
| | | | | | | | Belongs to 95ab7ee062b9fbeea73b90f69c6fef3325f880c9
* | Setting: only write in console upon muc mentionMichael Vetter2020-07-104-5/+16
|/ | | | | | `/console muc mention` additionally to `first|none|all`. Fix https://github.com/profanity-im/profanity/issues/1371
* Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-109-72/+132
|\
| * Pass window to functions so we dont have to call twiceMichael Vetter2020-07-095-18/+17
| |
| * Dont hilight console once all messages have been readMichael Vetter2020-07-097-63/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we receive a message we get: << room message: eagle@conference.anoxinon.me (win 2) Same for private chats and regular chats. And several other kinds of notifications. If we only receive notifications from a chat window it would be nice to also clear the hilight on the console window since we already catched up by reading the actual message in the chat window. Probably not the best description :-) I hope you get it.. Regards https://github.com/profanity-im/profanity/issues/1399
* | ox review: Use english not germanMichael Vetter2020-07-101-5/+5
| |
* | OX: XEP-0373: OpenPGP for XMPP - Version 0.5.0 (2020-06-19)DebXWoody2020-07-106-13/+298
|/ | | | | | | | | | | Discovering Public Keys via PEP * 4.3 Discovering Public Keys of a User * 4.4 Requesting Public Keys * Import Public Keys into GnuPG's local keyring. Issue: #1331
* Make _show_roster_contacts staticMichael Vetter2020-07-091-2/+2
|
* Apply coding styleMichael Vetter2020-07-07147-14632/+14792
|
* OX: Fix testsMichael Vetter2020-07-071-1/+2
| | | | | | | | 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' ```
* Revert "Apply coding style"Michael Vetter2020-07-07148-15136/+14988
| | | | | | This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2. Sorting the includes creates some problems.
* Apply coding styleMichael Vetter2020-07-07148-14988/+15136
| | | | Regards https://github.com/profanity-im/profanity/issues/1396
* OX: Announce public key on PEPDebXWoody2020-07-066-2/+395
| | | | | | | | | | | | | | | 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
* 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
* | | | 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.
* | | | Add missing -o flag for omut exampleWilliam Wennerström2020-07-021-1/+1
| | | |
* | | | 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
| | |