aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #392 from ToxicFrog/toxicfrog/fix-testsBen Kelly2017-07-133-2/+11
|\ | | | | Fix the tests
| * Fix the testsBen Kelly2017-07-123-2/+11
|/ | | | | | | | | | Not everything that needed to be mocked out was, and there was also an issue with every instance of PluginConfig sharing the same mutable settings field and thus stomping on each other if you initialized more than one in the same test. Signed-off-by: Ben Kelly <bk@ancilla.ca> Signed-off-by: Ben Kelly <btk@google.com>
* Merge pull request #372 from ToxicFrog/toxicfrog/setting-descBen Kelly2017-07-121-26/+97
|\ | | | | Add descriptions for weeslack plugin settings.
| * Add descriptions for weeslack plugin settings.Ben Kelly2017-07-121-26/+97
|/ | | | | Signed-off-by: Ben Kelly <btk@google.com> Signed-off-by: Ben Kelly <bk@ancilla.ca>
* Merge pull request #350 from ToxicFrog/toxicfrog/italicsBen Kelly2017-07-121-12/+27
|\ | | | | Add italic support, and settings to switch between italic and underline
| * Add italic support, and settings to switch between italic and underlineBen Kelly2017-04-151-12/+27
| | | | | | | | | | Signed-off-by: Ben Kelly <btk@google.com> Signed-off-by: Ben Kelly <bk@ancilla.ca>
* | Merge pull request #391 from trygveaa/fix/nick-coloringBen Kelly2017-07-122-14/+11
|\ \ | | | | | | Fix nick coloring in weechat < 1.5
| * | Remove documentation for colorize_nicksTrygve Aaberge2017-07-121-10/+0
| | | | | | | | | | | | | | | | | | This option was removed in 925278f, in favor of using weechat's color handling. I.e. you now set this with weechat's core options instead of a specific option for this script.
| * | Get nick color name correctly in weechat < 1.5Trygve Aaberge2017-07-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | In weechat 1.5, the info name 'irc_nick_color_name' was renamed to 'nick_color_name'. Since we want to support weechat < 1.5 and don't want deprecation warnings in >= 1.5, we need to check the version and use the appropriate name. Fixes #364
| * | Rename version variable to weechat_versionTrygve Aaberge2017-07-121-2/+2
|/ / | | | | | | | | This is going to be used another place in the script in the next commit, so set a more verbose name so it's not confused with the script version.
* | Merge pull request #384 from cmatheson/fix-349Ryan Huber2017-07-111-1/+2
|\ \ | | | | | | Stop polling dead websockets.
| * | Stop polling dead websockets. Fixes #349Cameron Matheson2017-07-051-1/+2
|/ /
* | Correct URL in READMETollef Fog Heen2017-05-021-2/+2
| |
* | Merge pull request #351 from wee-slack/settings_cleanupRyan Huber2017-04-211-10/+0
|\ \ | | | | | | Clean up a little bit
| * | Remove colorize_messages settingTollef Fog Heen2017-04-161-1/+0
| | | | | | | | | | | | This doesn't seem to be used, so just remove it.
| * | Remove dead code related to cacheTollef Fog Heen2017-04-161-9/+0
| | | | | | | | | | | | The cache is gone, remove some related code.
* | | Merge pull request #356 from ToxicFrog/toxicfrog/missing-textRyan Huber2017-04-211-2/+2
|\ \ \ | | | | | | | | Fix channel history not appearing when an earlier message has 'text': None
| * | | Fix channel history not appearing when an earlier message has 'text': NoneBen Kelly2017-04-211-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today I learned that sometimes, rather than the key missing, it has the value None. In this case, (key in dict) is true! This fixes an issue where, if the backscroll of a channel contained such a message, it would throw while fetching the backscroll and cut off without fetching all of it. Signed-off-by: Ben Kelly <btk@google.com> Signed-off-by: Ben Kelly <bk@ancilla.ca>
* | | Merge pull request #347 from V13Axel/status_commandRyan Huber2017-04-182-0/+38
|\ \ \ | | | | | | | | Add command for setting Slack Status
| * | | Remove redundant team reference retrievalV13Axel2017-04-171-1/+0
| | | |
| * | | Add command for setting Slack StatusV13Axel2017-04-132-0/+39
| | | |
* | | | Merge pull request #348 from trygveaa/fix/unicodeTollef Fog Heen2017-04-181-59/+133
|\ \ \ \ | | | | | | | | | | Proper support for unicode
| * | | | Decode arguments sent to callback functionsTrygve Aaberge2017-04-151-0/+36
| | | | |
| * | | | Do encode/decode in websocket and urllib callsTrygve Aaberge2017-04-151-3/+3
| | | | |
| * | | | Create a wrapper around weechat which handles encodingTrygve Aaberge2017-04-151-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This encodes everything sent into weechat, and decodes the return values, so we don't have to do it every place we call weechat. We still have to decode the arguments in all of the callback functions though. The encode_to_utf8 and decode_from_utf8 functions traverses data structures and encodes/decodes all of the strings inside the structures.
| * | | | Remove all calls to encode and decodeTrygve Aaberge2017-04-151-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | We will readd these in the appropriate places, as described two commits ago.
| * | | | Remove utf8 argument from get_senderTrygve Aaberge2017-04-151-5/+2
| | | | | | | | | | | | | | | | | | | | This was not used anywhere.
| * | | | Use unicode literals everywhereTrygve Aaberge2017-04-151-30/+32
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes all strings to be unicode strings in an attempt to handle unicode better. The idea is to use unicode everywhere internally in wee_slack and decode/encode where data is received/sent to/from wee-slack. That means we have to decode strings received from weechat or slack and encode strings we send to them. This way encoding and decoding is done on specific places, and if done everywhere, we should not get any unicode errors.
* | | | Merge pull request #353 from deepy/documentationTollef Fog Heen2017-04-181-7/+7
|\ \ \ \ | |/ / / |/| | | Updates README to give correct instructions for settings.
| * | | Changes aliases example to have multiple entries.Alex Nordlund2017-04-181-1/+1
| | | |
| * | | Adds key:value to aliases. Closes #337Alex Nordlund2017-04-181-1/+1
| | | |
| * | | Corrects server_alias -> server_aliases.Alex Nordlund2017-04-181-1/+1
| | | |
| * | | Updates README to give correct instructions for settings.Alex Nordlund2017-04-181-7/+7
|/ / /
* | | Merge pull request #344 from wee-slack/pep8Ryan Huber2017-04-141-168/+374
|\ \ \ | |/ / |/| | PEP8 fixups
| * | PEP8 fixupsTollef Fog Heen2017-04-131-168/+374
|/ / | | | | | | Lots of missing whitespace and other minor fixups.
* | Merge pull request #342 from wee-slack/show_channels_with_hash_symbol_properlyRyan Huber2017-04-131-1/+3
|\ \ | |/ |/| do it for channels but not users, hence new elif
| * do it for channels but not users, hence new elifRyan Huber2017-04-131-1/+3
|/
* Merge pull request #341 from wee-slack/actually_unfurl_againRyan Huber2017-04-131-13/+13
|\ | | | | yay for unfurls
| * yay for unfurlsRyan Huber2017-04-131-13/+13
|/
* Merge pull request #340 from wee-slack/fix_joinRyan Huber2017-04-131-1/+1
|\ | | | | 🤳
| * wrong var nameRyan Huber2017-04-131-1/+1
|/
* Merge pull request #336 from bronzehedwick/patch-2Ryan Huber2017-04-131-6/+6
|\ | | | | Fix readme markdown
| * Fix readme markdownChris DeLuca2017-04-131-6/+6
| | | | | | Github changed their markdown parser, and broke a bunch of readmes.
* | Merge pull request #339 from ToxicFrog/toxicfrog/nick-coloursRyan Huber2017-04-131-11/+7
|\ \ | | | | | | Defer nick colourization to weechat's built in support
| * | Defer nick colourization to weechat's built in supportBen Kelly2017-04-131-11/+7
| |/ | | | | | | Signed-off-by: Ben Kelly <btk@google.com>
* | Merge pull request #338 from ToxicFrog/toxicfrog/formattingRyan Huber2017-04-131-1/+5
|\ \ | | | | | | Translate slack formatting codes to/from IRC formatting codes
| * | Translate slack formatting codes to/from IRC formatting codesBen Kelly2017-04-131-1/+5
| |/ | | | | | | Signed-off-by: Ben Kelly <btk@google.com>
* | Merge pull request #287 from ToxicFrog/toxicfrog/action-supportRyan Huber2017-04-132-7/+17
|\ \ | |/ |/| Fix /me handling for sent and received messages
| * Handling incoming me_message subtypes.Ben Kelly2017-04-132-7/+17
|/ | | | Signed-off-by: Ben Kelly <btk@google.com>
* Merge pull request #320 from oschwald/patch-11.0-RC1Ryan Huber2017-04-131-1/+1
|\ | | | | Update token link