aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into patched-masterMarius Halden2018-01-09-2/+6
|\
| * cmd_chat_list_finish: fix crash when plugins provide NULL room titlesdequis2017-11-23-1/+1
| |
| * jabber: Fix chat joins when ext_jid is provided for your own userdequis2017-11-19-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the presence needed to finalize a join to the channel, the 'from' field is our own user in the context of that channel: <presence to="dx@server/resource" from="channel@gateway.server/dx"> <x xmlns="http://jabber.org/protocol/muc#user"> <status code="110"/> <item jid="~dx@198.51.100.1" affiliation="none" role="participant"/> </x> </presence> Bitlbee takes the stuff to <item jid="..."> as the "real" jid, as it does for non-anonymous MUCs. It sets that to ext_jid, and uses it as the handle internally. In this particular case, that real jid is nonsense for us, so imcb_chat_add_buddy() interprets that as yet another person joining the channel, instead of the expected self-join. This fixes it by checking if the buddy is our own user, and ignoring the provided ext_jid in those cases. Thanks to ivucica for reporting this, who was using Biboumi (a gateway from XMPP to IRC)
| * Handle always_use_nicks more gracefullyValeriy Malov2017-11-19-1/+2
| | | | | | | | Add MUC buddies before applying nick changes
* | Merge branch 'master' into patched-masterMarius Halden2017-10-24-5/+8
|\|
| * travis: require ubuntu precise explicitly, install more depsdequis2017-10-05-1/+4
| |
| * tests: fix build warnings in jabber_buddy_by_jid testsdequis2017-10-05-2/+2
| |
| * Add quotations around <answer> and <secret> in the otr docsTroy Sankey2017-10-04-2/+2
| | | | | | | | | | The user doesn't otherwise know how to type answers or secrets containing spaces.
* | Merge branch 'master' into patched-masterMarius Halden2017-09-06-32/+48
|\|
| * Add datadir to pkgconfig file and config.hdevelopArtem Savkov2017-08-31-0/+2
| | | | | | | | Export datadir through pkgconfig and config.h for later use by plugins.
| * channel operates on channel ids not account idsJesse Kennedy2017-08-26-1/+1
| |
| * Twitter documentation: move commands to a chapterAlex Schroeder2017-08-26-19/+32
| | | | | | | | | | | | The Twitter commands are now documented in their own chapter accessed by `help twitter` instead of being hidden in `help set commands`.
| * Twitter: fix format strings for integersAlex Schroeder2017-08-09-10/+10
| | | | | | | | | | | | | | Silence the following compiler warning: format specifies type 'unsigned long long' but the argument has type 'guint64'. When formatting a json_integer, use PRId64 for int64_t. When formatting ordinary integers, use G_GUINT64_FORMAT for guint64.
| * purple: enable debug during core initializationdequis2017-07-12-1/+3
| | | | | | | | Noisy but often important
| * configure: Don't require python if docs are already builtdequis2017-07-09-1/+1
| |
* | Fix comiler warningMarius Halden2017-07-04-1/+1
| |
* | Merge branch 'master' into patched-masterMarius Halden2017-07-04-1/+2
|\|
| * cygwin: add -no-undefined on our side to fix issues with mac OSdequis2017-05-29-1/+1
| | | | | | | | | | | | | | | | | | | | So cygwin requires -no-undefined and it was supposed to be harmless on platforms other than windows, but mac OS doesn't like it. Instead of adding platform checks to every plugin, i'm going to revert the changes that added -no-undefined to them, and just do what I should have done since the beginning: use the cygwin-specific parts of the pkg-config file to add -no-undefined right next to -lbitlbee
| * cygwin: add a missing mkdir of libdir to the makefiledequis2017-05-18-0/+1
| |
* | Merge branch 'master' into patched-masterMarius Halden2017-05-14-6/+25
|\|
| * cygwin: Export a "libbitlbee.dll.a" to allow plugins to link to itdequis2017-05-13-1/+20
| |
| * Fix status message being set to null accidentallydequis2017-05-07-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In other words, "account jabber set away Message" resulted in away status being set, but not "Message". Fixes trac ticket 1291 This was broken by ac68733ad7a5127395d6367b655a2d9de5d911b5 (3.4.2) That commit added another call of imc_away_state_find() with the fixed string "away", so purple protocols can become away by setting away to any string. But by doing so, it wiped the status message because it's the same as the name of the away state.
| * Move `handle_settings` before `xt_handle`.Fangrui Song2017-04-16-2/+2
| | | | | | | | `utf8_nicks` should be enabled before handling `nick` fields in <setting> because `nick_strip` uses `IRC_UTF8_NICKS` which is only available after calling `handle_settings`.
* | Merge branch 'master' into patched-masterMarius Halden2017-04-25-1/+13
|\|
| * debian: Enable only bitlbee.service, not bitlbee.socket toodequis2017-04-13-1/+2
| | | | | | | | The default was to enable both, which was confusing.
| * init/bitlbee@.service: send stderr to syslog instead of the socketdequis2017-04-13-0/+1
| |
| * twitter: experimental support for place_iddequis2017-04-11-0/+10
| |
* | Merge branch 'master' into patched-masterMarius Halden2017-04-07-112/+331
|\|
| * Merge branch 'develop'dequis2017-04-06-26/+48
| |\
| | * Another instance where PF_UNIX was used and shouldn't.Anthony Molinaro2017-03-12-1/+1
| | | | | | | | | | | | | | | | | | I couldn't find anyplace that actually enables the IPC, but I hand edited the config.h to enable it, and did see the protocol not supported failure, so modified this file and it went away.
| | * The protocol argument to socketpair was incorrect.Anthony Molinaro2017-03-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the protocol was being set to PF_UNIX which is incorrect. According to the man pages and other sources (like Stevens Unix Network Programming), the protocol should be '0' which will use the default for the given domain. This appears to actually work under Linux (which appears to allow 0 or 1 as the protocol without error), but fails under Mac OSX (which only allows 0).
| | * Convert CREDITS from ISO-8859-1 to UTF-8Robert Scheck2017-03-12-1/+1
| | |
| | * configure: respect autotools-like verbose flags for makeTim Harder2017-03-12-0/+13
| | | | | | | | | | | | | | | | | | In other words, running $(make V=1) will force a verbose build while $(make V=0) will force a silent build regardless of the verbose option set by the configure script.
| | * Add --verbose configure option to control verbose build outputTim Harder2017-03-12-23/+32
| | | | | | | | | | | | Defaults to disabled to maintain the status quo.
| * | Move canohost functions (diff licence) to separate file.Wilmer van der Gaast2017-04-06-108/+189
| | |
| * | Remove ip6_*wrap() functions which are no longer needed.Wilmer van der Gaast2017-04-06-48/+0
| | |
| * | Add PROXY command. Not actually an IRC protocol command, it's a HAProxyWilmer van der Gaast2017-04-06-26/+94
| | | | | | | | | | | | | | | trick supported by stunnel to indicate where the connection originally came from. Looks a little better on public servers.
| * | Add reverse_lookup() function which does a more proper (verified) DNSWilmer van der Gaast2017-04-06-12/+109
| |/ | | | | | | | | reverse lookup. (Code copied from OpenSSH instead of redoing it poorly.)
* | Use auto_populate_reply_metadata for twitter replyMarius Halden2017-04-01-4/+12
| |
* | Merge branch 'master' into patched-masterMarius Halden2017-01-30-19/+73
|\|
| * BitlBee 3.5.13.5.1dequis2017-01-30-2/+18
| |
| * purple: Fix crash on ft requests from unknown contactsdequis2017-01-29-0/+4
| | | | | | | | | | Followup to 701ab81 (included in 3.5) which was a partial fix which only improved things for non-libpurple file transfers (that is, just jabber)
| * More troubles because the fix from the Debian bug didn't match the fix3.5-2Wilmer van der Gaast2017-01-28-3/+16
| | | | | | | | | | actually NMU'd. :-( Now this fix really should work. Third time's the charm after all, innit.
| * Few more tweaks to integrate 3.4.2-1.1 back into Debian historyWilmer van der Gaast2017-01-28-6/+10
| | | | | | | | properly.
| * debian: Merge changes from 3.4.2-1.1 NMU into 3.5-1dequis2017-01-26-1/+15
| | | | | | | | | | Because apparently not having build-arch is now a build failure, even though lintian only considered it a warning and a "recommended" target
| * Slight changes for Debian 3.5-1 upload.Wilmer van der Gaast2017-01-24-3/+6
| |
| * Remove dead/now unsupported IM protocols from debian/control.Wilmer van der Gaast2017-01-24-12/+12
| |
| * BitlBee 3.53.5dequis2017-01-08-1/+1
| |
* | Merge branch 'master' into patched-masterMarius Halden2017-01-09-724/+137
|\|
| * Merge debian stuff to prepare for 3.5dequis2017-01-08-722/+61
| |\