aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check that the bot_id exists before using itTrygve Aaberge2017-08-171-1/+1
| | | | | | | | | | | | | | | | | Instead of just checking that bot_id is not None, check that it exists in the list of bots. This prevents a KeyError when trying to access a bot that doesn't exist in the list. This KeyError would happen if you use a reminder. The message from slackbot then has bot_id B01 which is not in the list of bots from rtm.start and gives bot_not_found if trying to look it up with the bots.info API endpoint. By ignoring the bot_id we fall back to the user/username, which in the case of reminders is slackbot, so the name appears just as the other messages from slackbot. Fixes #420
* Merge pull request #417 from trygveaa/fix-html-entity-encodingTollef Fog Heen2017-08-012-4/+13
|\ | | | | Fix HTML entity-encoding of outgoing messages
| * Fix HTML entity-encoding of outgoing messagesTrygve Aaberge2017-08-012-4/+13
|/ | | | | | We have to replace the & before we replace < and >, otherwise the & in &lt; and &gt; are going to be replaced. Additionally, we need to end the sequences with ; which was missing.
* Merge remote-tracking branch 'origin/nicklist-presence-groups'Tollef Fog Heen2017-07-281-1/+12
|\
| * Merge pull request #403 from marceldev89/nicklist-presence-groupsTollef Fog Heen2017-07-281-1/+12
| |\ | | | | | | Update nicklist when team member presence changes
| | * Move presence change to a SlackTeam methodMarcel de Vries2017-07-241-6/+9
| | |
| | * Update nicklist when team member presence changesMarcel de Vries2017-07-231-1/+9
| |/
* | Remove /slack join command from README.mdTollef Fog Heen2017-07-281-1/+0
| | | | | | | | Fixes: #362
* | Decode the basic HTML entities in topic handlingTollef Fog Heen2017-07-281-6/+9
| | | | | | | | Closes: #315
* | Merge pull request #399 from wee-slack/nicklist-presence-groupsTollef Fog Heen2017-07-281-11/+15
|\| | | | | Put users in groups according to presence
| * Put users in groups according to presenceTollef Fog Heen2017-07-191-11/+15
| | | | | | | | Fixes #398
* | Merge pull request #408 from auscompgeek/fix-status-cmdTollef Fog Heen2017-07-281-1/+1
|\ \ | | | | | | Fix AttributeError on /slack status in team buffer
| * | Fix AttributeError on /slack status in team bufferDavid Vo2017-07-271-1/+1
| | |
* | | Merge pull request #412 from trygveaa/set-correct-unread-countTollef Fog Heen2017-07-281-1/+1
|\ \ \ | | | | | | | | Set correct number of unread messages in hotlist
| * | | Set correct number of unread messages in hotlistTrygve Aaberge2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While the commit 6718e2f fixed buffers not appearing in the hotlist, after it the number of new messages for each buffer was gone. This makes the number of messages for each buffer shown again.
* | | | Merge pull request #411 from auscompgeek/fix-open-threadTollef Fog Heen2017-07-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix opening thread buffers
| * | | | Fix opening thread buffersDavid Vo2017-07-281-1/+1
| |/ / /
* | | | Add support for editing other messages than just the last oneTollef Fog Heen2017-07-282-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar syntax as for adding reactions: 3s/foo/bar/ Fixes: #153
* | | | Fix return codes in buffer_input_callbackTollef Fog Heen2017-07-281-2/+2
|/ / / | | | | | | | | | Not sure this actually matters as weechat seemed happy with the wrong return codes too
* | | Merge pull request #406 from ToxicFrog/toxicfrog/escapeBen Kelly2017-07-261-0/+7
|\ \ \ | |/ / |/| | Properly escape <&> when sending messages to Slack.
| * | Properly escape <&> when sending messages to Slack.Ben Kelly2017-07-251-0/+7
|/ / | | | | | | | | Signed-off-by: Ben Kelly <bk@ancilla.ca> Signed-off-by: Ben Kelly <btk@google.com>
* | Merge pull request #394 from ToxicFrog/toxicfrog/typing-notificationsBen Kelly2017-07-211-1/+1
|\ \ | | | | | | Don't send typing notifications for threads, since Slack doesn't like that
| * | Don't send typing notifications for threads, since Slack doesn't like that.Ben Kelly2017-07-131-1/+1
| | | | | | | | | | | | Signed-off-by: Ben Kelly <btk@google.com>
* | | Re-add setting of localvar_set_nickTollef Fog Heen2017-07-211-0/+3
| | | | | | | | | | | | Fixes #80 (again)
* | | Handle /msg * foo correctlyTollef Fog Heen2017-07-211-1/+4
| | | | | | | | | | | | | | | | | | Send * to the current channel. Fixes: #191
* | | Fix use-before-assignment when fetching channel to send toTollef Fog Heen2017-07-211-1/+1
| |/ |/|
* | Merge pull request #397 from gilbertw1/feature-set-channel-unread-countTollef Fog Heen2017-07-191-19/+41
|\ \ | |/ |/| | | | | Use channel.open and im.open to get unread counts. Fixes #396
| * restore call to update_nicklist() (accidental removal)Bryan Gilbert2017-07-191-0/+1
| |
| * use im.open endpoint to properly update unread count for ims on startupBryan Gilbert2017-07-191-6/+17
| |
| * add group info request and handler to set unread count and update hotlistBryan Gilbert2017-07-171-0/+9
| |
| * call channel info on channel open to set unread count and update hotlistBryan Gilbert2017-07-161-19/+20
|/
* Merge pull request #371 from ToxicFrog/toxicfrog/mrkdwnBen Kelly2017-07-131-8/+13
|\ | | | | Disable formatting for messages with `mrkdwn` unset
| * Disable formatting for messages with `mrkdwn` unsetBen Kelly2017-07-121-8/+13
| | | | | | | | | | Signed-off-by: Ben Kelly <btk@google.com> Signed-off-by: Ben Kelly <bk@ancilla.ca>
* | 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