Release v1.16.0

GetChannelId will support names generated from query groups when a team is not set,
but not when a team is set since it falls through to getChannelIdTeam which has a different inner loop. i
This pull makes the two implementations do the same thing.

.fixmie.yml

@@ -0,0 +1,3 @@
+go:
+  comments:
+    disabled: true

README.md

@@ -3,32 +3,35 @@
 # matterbridge
 
 ![Matterbridge Logo](img/matterbridge-notext.gif)<br />
-   **A simple chat bridge**<br />
+**A simple chat bridge**<br />
-   Letting people be where they want to be.<br />
+Letting people be where they want to be.<br />
-   <sub>Bridges between a growing number of protocols. Click below to demo or join the development chat.</sub>
+<sub>Bridges between a growing number of protocols. Click below to demo or join the development chat.</sub>
 
    <sup>
 
-   [Gitter][mb-gitter] |
+[Gitter][mb-gitter] |
-   [IRC][mb-irc] |
+[IRC][mb-irc] |
-      [Discord][mb-discord] |
+[Discord][mb-discord] |
-      [Matrix][mb-matrix] |
+[Matrix][mb-matrix] |
-      [Slack][mb-slack] |
+[Slack][mb-slack] |
-      [Mattermost][mb-mattermost] |
+[Mattermost][mb-mattermost] |
-      [Rocket.Chat][mb-rocketchat] |
+[Rocket.Chat][mb-rocketchat] |
-      [XMPP][mb-xmpp] |
+[XMPP][mb-xmpp] |
-      [Twitch][mb-twitch] |
+[Twitch][mb-twitch] |
-      [WhatsApp][mb-whatsapp] |
+[WhatsApp][mb-whatsapp] |
-      [Zulip][mb-zulip] |
+[Zulip][mb-zulip] |
-      [Telegram][mb-telegram] |
+[Telegram][mb-telegram] |
-      And more...
+[Keybase][mb-keybase] |
-   </sup>
+And more...
+</sup>
+
+---
 
-----
 [![Download stable](https://img.shields.io/github/release/42wim/matterbridge.svg?label=download%20stable)](https://github.com/42wim/matterbridge/releases/latest)
-   [![Download dev](https://img.shields.io/bintray/v/42wim/nightly/Matterbridge.svg?label=download%20dev&colorB=007ec6)](https://bintray.com/42wim/nightly/Matterbridge/_latestVersion)
+[![Download dev](https://img.shields.io/bintray/v/42wim/nightly/Matterbridge.svg?label=download%20dev&colorB=007ec6)](https://bintray.com/42wim/nightly/Matterbridge/_latestVersion)
-   [![Maintainability](https://api.codeclimate.com/v1/badges/82dff70ef2ba85a6173a/maintainability)](https://codeclimate.com/github/42wim/matterbridge/maintainability)
+[![Maintainability](https://api.codeclimate.com/v1/badges/82dff70ef2ba85a6173a/maintainability)](https://codeclimate.com/github/42wim/matterbridge/maintainability)
-   [![Test Coverage](https://api.codeclimate.com/v1/badges/82dff70ef2ba85a6173a/test_coverage)](https://codeclimate.com/github/42wim/matterbridge/test_coverage)<br />
+[![Test Coverage](https://api.codeclimate.com/v1/badges/82dff70ef2ba85a6173a/test_coverage)](https://codeclimate.com/github/42wim/matterbridge/test_coverage)<br />
+
   <hr />
 </div>
 <div align="right"><sup>
@@ -42,108 +45,118 @@
 </p>
 
 ### Table of Contents
- * [Features](https://github.com/42wim/matterbridge/wiki/Features)
+
-   * [Natively supported](#natively-supported)
+- [Features](https://github.com/42wim/matterbridge/wiki/Features)
-   * [3rd party via matterbridge api](#3rd-party-via-matterbridge-api)
+  - [Natively supported](#natively-supported)
-   * [API](#API)
+  - [3rd party via matterbridge api](#3rd-party-via-matterbridge-api)
- * [Chat with us](#chat-with-us)
+  - [API](#API)
- * [Screenshots](https://github.com/42wim/matterbridge/wiki/)
+- [Chat with us](#chat-with-us)
- * [Installing/upgrading](#installing--upgrading)
+- [Screenshots](https://github.com/42wim/matterbridge/wiki/)
-   * [Binaries](#binaries)
+- [Installing/upgrading](#installing--upgrading)
- * [Building](#building)
+  - [Binaries](#binaries)
- * [Configuration](#configuration)
+- [Building](#building)
-   * [Howto](https://github.com/42wim/matterbridge/wiki/How-to-create-your-config)
+- [Configuration](#configuration)
-   * [Settings](#settings)
+  - [Howto](https://github.com/42wim/matterbridge/wiki/How-to-create-your-config)
-   * [Examples](#examples)
+  - [Settings](#settings)
- * [Running](#running)
+  - [Examples](#examples)
-   * [Docker](#docker)
+- [Running](#running)
- * [Changelog](#changelog)
+  - [Docker](#docker)
- * [FAQ](#faq)
+- [Changelog](#changelog)
- * [Related projects](#related-projects)
+- [FAQ](#faq)
- * [Articles](#articles)
+- [Related projects](#related-projects)
- * [Thanks](#thanks)
+- [Articles](#articles)
+- [Thanks](#thanks)
 
 ## Features
-* [Support bridging between any protocols](https://github.com/42wim/matterbridge/wiki/Features#support-bridging-between-any-protocols)
+
-* [Support multiple gateways(bridges) for your protocols](https://github.com/42wim/matterbridge/wiki/Features#support-multiple-gatewaysbridges-for-your-protocols)
+- [Support bridging between any protocols](https://github.com/42wim/matterbridge/wiki/Features#support-bridging-between-any-protocols)
-* [Message edits and deletes](https://github.com/42wim/matterbridge/wiki/Features#message-edits-and-deletes)
+- [Support multiple gateways(bridges) for your protocols](https://github.com/42wim/matterbridge/wiki/Features#support-multiple-gatewaysbridges-for-your-protocols)
-* Preserves threading when possible
+- [Message edits and deletes](https://github.com/42wim/matterbridge/wiki/Features#message-edits-and-deletes)
-* [Attachment / files handling](https://github.com/42wim/matterbridge/wiki/Features#attachment--files-handling)
+- Preserves threading when possible
-* [Username and avatar spoofing](https://github.com/42wim/matterbridge/wiki/Features#username-and-avatar-spoofing)
+- [Attachment / files handling](https://github.com/42wim/matterbridge/wiki/Features#attachment--files-handling)
-* [Private groups](https://github.com/42wim/matterbridge/wiki/Features#private-groups)
+- [Username and avatar spoofing](https://github.com/42wim/matterbridge/wiki/Features#username-and-avatar-spoofing)
-* [API](https://github.com/42wim/matterbridge/wiki/Features#api)
+- [Private groups](https://github.com/42wim/matterbridge/wiki/Features#private-groups)
+- [API](https://github.com/42wim/matterbridge/wiki/Features#api)
 
 ### Natively supported
 
-* [Mattermost](https://github.com/mattermost/mattermost-server/) 4.x, 5.x
+- [Mattermost](https://github.com/mattermost/mattermost-server/) 4.x, 5.x
-* [IRC](http://www.mirc.com/servers.html)
+- [IRC](http://www.mirc.com/servers.html)
-* [XMPP](https://xmpp.org)
+- [XMPP](https://xmpp.org)
-* [Gitter](https://gitter.im)
+- [Gitter](https://gitter.im)
-* [Slack](https://slack.com)
+- [Slack](https://slack.com)
-* [Discord](https://discordapp.com)
+- [Discord](https://discordapp.com)
-* [Telegram](https://telegram.org)
+- [Telegram](https://telegram.org)
-* [Rocket.chat](https://rocket.chat)
+- [Rocket.chat](https://rocket.chat)
-* [Matrix](https://matrix.org)
+- [Matrix](https://matrix.org)
-* [Steam](https://store.steampowered.com/)
+- [Steam](https://store.steampowered.com/)
-* [Twitch](https://twitch.tv)
+- [Twitch](https://twitch.tv)
-* [Ssh-chat](https://github.com/shazow/ssh-chat)
+- [Ssh-chat](https://github.com/shazow/ssh-chat)
-* [WhatsApp](https://www.whatsapp.com/)
+- [WhatsApp](https://www.whatsapp.com/)
-* [Zulip](https://zulipchat.com)
+- [Zulip](https://zulipchat.com)
+- [Keybase](https://keybase.io)
 
 ### 3rd party via matterbridge api
-* [Minecraft](https://github.com/elytra/MatterLink)
+
-* [Reddit](https://github.com/bonehurtingjuice/mattereddit)
+- [Minecraft](https://github.com/elytra/MatterLink)
-* [Facebook messenger](https://github.com/VictorNine/fbridge)
+- [Reddit](https://github.com/bonehurtingjuice/mattereddit)
-* [Discourse](https://github.com/DeclanHoare/matterbabble)
+- [Facebook messenger](https://github.com/VictorNine/fbridge)
+- [Discourse](https://github.com/DeclanHoare/matterbabble)
 
 ### API
+
 The API is basic at the moment.
 More info and examples on the [wiki](https://github.com/42wim/matterbridge/wiki/Api).
 
 Used by the projects below. Feel free to make a PR to add your project to this list.
 
-* [MatterLink](https://github.com/elytra/MatterLink) (Matterbridge link for Minecraft Server chat)
+- [MatterLink](https://github.com/elytra/MatterLink) (Matterbridge link for Minecraft Server chat)
-* [pyCord](https://github.com/NikkyAI/pyCord) (crossplatform chatbot)
+- [pyCord](https://github.com/NikkyAI/pyCord) (crossplatform chatbot)
-* [Mattereddit](https://github.com/bonehurtingjuice/mattereddit) (Reddit chat support)
+- [Mattereddit](https://github.com/bonehurtingjuice/mattereddit) (Reddit chat support)
-* [fbridge](https://github.com/VictorNine/fbridge) (Facebook messenger support)
+- [fbridge](https://github.com/VictorNine/fbridge) (Facebook messenger support)
-* [matterbabble](https://github.com/DeclanHoare/matterbabble) (Discourse support)
+- [matterbabble](https://github.com/DeclanHoare/matterbabble) (Discourse support)
 
 ## Chat with us
 
 Questions or want to test on your favorite platform? Join below:
 
-* [Gitter][mb-gitter]
+- [Gitter][mb-gitter]
-* [IRC][mb-irc]
+- [IRC][mb-irc]
-* [Discord][mb-discord]
+- [Discord][mb-discord]
-* [Matrix][mb-matrix]
+- [Matrix][mb-matrix]
-* [Slack][mb-slack]
+- [Slack][mb-slack]
-* [Mattermost][mb-mattermost]
+- [Mattermost][mb-mattermost]
-* [Rocket.Chat][mb-rocketchat]
+- [Rocket.Chat][mb-rocketchat]
-* [XMPP][mb-xmpp] (matterbridge@conference.jabber.de)
+- [XMPP][mb-xmpp] (matterbridge@conference.jabber.de)
-* [Twitch][mb-twitch]
+- [Twitch][mb-twitch]
-* [Zulip][mb-zulip]
+- [Zulip][mb-zulip]
-* [Telegram][mb-telegram]
+- [Telegram][mb-telegram]
 
 ## Screenshots
+
 See https://github.com/42wim/matterbridge/wiki
 
 ## Installing / upgrading
+
 ### Binaries
-* Latest stable release [v1.15.1](https://github.com/42wim/matterbridge/releases/latest)
+
-* Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
+- Latest stable release [v1.16.0](https://github.com/42wim/matterbridge/releases/latest)
+- Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
 
 To install or upgrade just download the latest [binary](https://github.com/42wim/matterbridge/releases/latest) and follow the instructions on the [howto](https://github.com/42wim/matterbridge/wiki/How-to-create-your-config) for a step by step walkthrough for creating your configuration.
 
 ### Packages
-* [Overview](https://repology.org/metapackage/matterbridge/versions)
+
+- [Overview](https://repology.org/metapackage/matterbridge/versions)
 
 ## Building
+
 Most people just want to use binaries, you can find those [here](https://github.com/42wim/matterbridge/releases/latest)
 
 If you really want to build from source, follow these instructions:
 Go 1.9+ is required. Make sure you have [Go](https://golang.org/doc/install) properly installed, including setting up your [GOPATH](https://golang.org/doc/code.html#GOPATH).
 
-After Go is setup, download matterbridge to your $GOPATH directory.
+After Go is setup, download matterbridge to your \$GOPATH directory.
 
 ```
 cd $GOPATH
@@ -158,17 +171,23 @@ matterbridge
 ```
 
 ## Configuration
+
 ### Basic configuration
+
 See [howto](https://github.com/42wim/matterbridge/wiki/How-to-create-your-config) for a step by step walkthrough for creating your configuration.
 
 ### Settings
+
 All possible [settings](https://github.com/42wim/matterbridge/wiki/Settings) for each bridge.
 
 ### Advanced configuration
-* [matterbridge.toml.sample](https://github.com/42wim/matterbridge/blob/master/matterbridge.toml.sample) for documentation and an example.
+
+- [matterbridge.toml.sample](https://github.com/42wim/matterbridge/blob/master/matterbridge.toml.sample) for documentation and an example.
 
 ### Examples
+
 #### Bridge mattermost (off-topic) - irc (#testing)
+
 ```toml
 [irc]
     [irc.freenode]
@@ -197,6 +216,7 @@ enable=true
 ```
 
 #### Bridge slack (#general) - discord (general)
+
 ```toml
 [slack]
 [slack.test]
@@ -241,12 +261,15 @@ Usage of ./matterbridge:
 ```
 
 ### Docker
+
 Create your matterbridge.toml file locally eg in `/tmp/matterbridge.toml`
+
 ```
 docker run -ti -v /tmp/matterbridge.toml:/matterbridge.toml 42wim/matterbridge
 ```
 
 ## Changelog
+
 See [changelog.md](https://github.com/42wim/matterbridge/blob/master/changelog.md)
 
 ## FAQ
@@ -254,28 +277,30 @@ See [changelog.md](https://github.com/42wim/matterbridge/blob/master/changelog.m
 See [FAQ](https://github.com/42wim/matterbridge/wiki/FAQ)
 
 ## Related projects
-* [FOSSRIT/infrastructure - roles/matterbridge](https://github.com/FOSSRIT/infrastructure/tree/master/roles/matterbridge) (Ansible role used to automate deployments of Matterbridge)
+
-* [matterbridge autoconfig](https://github.com/patcon/matterbridge-autoconfig)
+- [FOSSRIT/infrastructure - roles/matterbridge](https://github.com/FOSSRIT/infrastructure/tree/master/roles/matterbridge) (Ansible role used to automate deployments of Matterbridge)
-* [matterbridge config viewer](https://github.com/patcon/matterbridge-heroku-viewer)
+- [matterbridge autoconfig](https://github.com/patcon/matterbridge-autoconfig)
-* [matterbridge-heroku](https://github.com/cadecairos/matterbridge-heroku)
+- [matterbridge config viewer](https://github.com/patcon/matterbridge-heroku-viewer)
-* [mattereddit](https://github.com/bonehurtingjuice/mattereddit)
+- [matterbridge-heroku](https://github.com/cadecairos/matterbridge-heroku)
-* [matterlink](https://github.com/elytra/MatterLink)
+- [mattereddit](https://github.com/bonehurtingjuice/mattereddit)
-* [mattermost-plugin](https://github.com/matterbridge/mattermost-plugin) - Run matterbridge as a plugin in mattermost
+- [matterlink](https://github.com/elytra/MatterLink)
-* [pyCord](https://github.com/NikkyAI/pyCord) (crossplatform chatbot)
+- [mattermost-plugin](https://github.com/matterbridge/mattermost-plugin) - Run matterbridge as a plugin in mattermost
-* [fbridge](https://github.com/VictorNine/fbridge) (Facebook messenger support)
+- [pyCord](https://github.com/NikkyAI/pyCord) (crossplatform chatbot)
-* [isla](https://github.com/alphachung/isla) (Bot for Discord-Telegram groups used alongside matterbridge)
+- [fbridge](https://github.com/VictorNine/fbridge) (Facebook messenger support)
-* [matterbabble](https://github.com/DeclanHoare/matterbabble) (Connect Discourse threads to Matterbridge)
+- [isla](https://github.com/alphachung/isla) (Bot for Discord-Telegram groups used alongside matterbridge)
+- [matterbabble](https://github.com/DeclanHoare/matterbabble) (Connect Discourse threads to Matterbridge)
 
 ## Articles
-* [matterbridge on kubernetes](https://medium.freecodecamp.org/using-kubernetes-to-deploy-a-chat-gateway-or-when-technology-works-like-its-supposed-to-a169a8cd69a3)
+
-* https://mattermost.com/blog/connect-irc-to-mattermost/
+- [matterbridge on kubernetes](https://medium.freecodecamp.org/using-kubernetes-to-deploy-a-chat-gateway-or-when-technology-works-like-its-supposed-to-a169a8cd69a3)
-* https://blog.valvin.fr/2016/09/17/mattermost-et-un-channel-irc-cest-possible/
+- https://mattermost.com/blog/connect-irc-to-mattermost/
-* https://blog.brightscout.com/top-10-mattermost-integrations/
+- https://blog.valvin.fr/2016/09/17/mattermost-et-un-channel-irc-cest-possible/
-* http://bencey.co.nz/2018/09/17/bridge/
+- https://blog.brightscout.com/top-10-mattermost-integrations/
-* https://www.algoo.fr/blog/2018/01/19/recouvrez-votre-liberte-en-quittant-slack-pour-un-mattermost-auto-heberge/
+- http://bencey.co.nz/2018/09/17/bridge/
-* https://kopano.com/blog/matterbridge-bridging-mattermost-chat/
+- https://www.algoo.fr/blog/2018/01/19/recouvrez-votre-liberte-en-quittant-slack-pour-un-mattermost-auto-heberge/
-* https://www.stitcher.com/s/?eid=52382713
+- https://kopano.com/blog/matterbridge-bridging-mattermost-chat/
-* https://daniele.tech/2019/02/how-to-use-matterbridge-to-connect-2-different-slack-workspaces/
+- https://www.stitcher.com/s/?eid=52382713
+- https://daniele.tech/2019/02/how-to-use-matterbridge-to-connect-2-different-slack-workspaces/
 
 ## Thanks
 
@@ -287,34 +312,37 @@ See [FAQ](https://github.com/42wim/matterbridge/wiki/FAQ)
 </p>
 
 Matterbridge wouldn't exist without these libraries:
-* discord - https://github.com/bwmarrin/discordgo
+
-* echo - https://github.com/labstack/echo
+- discord - https://github.com/bwmarrin/discordgo
-* gitter - https://github.com/sromku/go-gitter
+- echo - https://github.com/labstack/echo
-* gops - https://github.com/google/gops
+- gitter - https://github.com/sromku/go-gitter
-* gozulipbot - https://github.com/ifo/gozulipbot
+- gops - https://github.com/google/gops
-* irc - https://github.com/lrstanley/girc
+- gozulipbot - https://github.com/ifo/gozulipbot
-* mattermost - https://github.com/mattermost/mattermost-server
+- irc - https://github.com/lrstanley/girc
-* matrix - https://github.com/matrix-org/gomatrix
+- mattermost - https://github.com/mattermost/mattermost-server
-* sshchat - https://github.com/shazow/ssh-chat
+- matrix - https://github.com/matrix-org/gomatrix
-* slack - https://github.com/nlopes/slack
+- sshchat - https://github.com/shazow/ssh-chat
-* steam - https://github.com/Philipp15b/go-steam
+- slack - https://github.com/nlopes/slack
-* telegram - https://github.com/go-telegram-bot-api/telegram-bot-api
+- steam - https://github.com/Philipp15b/go-steam
-* xmpp - https://github.com/mattn/go-xmpp
+- telegram - https://github.com/go-telegram-bot-api/telegram-bot-api
-* whatsapp - https://github.com/Rhymen/go-whatsapp/
+- xmpp - https://github.com/mattn/go-xmpp
-* zulip - https://github.com/ifo/gozulipbot
+- whatsapp - https://github.com/Rhymen/go-whatsapp/
-* tengo - https://github.com/d5/tengo
+- zulip - https://github.com/ifo/gozulipbot
+- tengo - https://github.com/d5/tengo
+- keybase - https://github.com/keybase/go-keybase-chat-bot
 
 <!-- Links -->
 
-   [mb-gitter]: https://gitter.im/42wim/matterbridge
+[mb-gitter]: https://gitter.im/42wim/matterbridge
-   [mb-irc]: https://webchat.freenode.net/?channels=matterbridgechat
+[mb-irc]: https://webchat.freenode.net/?channels=matterbridgechat
-   [mb-discord]: https://discord.gg/AkKPtrQ
+[mb-discord]: https://discord.gg/AkKPtrQ
-   [mb-matrix]: https://riot.im/app/#/room/#matterbridge:matrix.org
+[mb-matrix]: https://riot.im/app/#/room/#matterbridge:matrix.org
-   [mb-slack]: https://join.slack.com/matterbridgechat/shared_invite/MjEwODMxNjU1NDMwLTE0OTk2MTU3NTMtMzZkZmRiNDZhOA
+[mb-slack]: https://join.slack.com/matterbridgechat/shared_invite/MjEwODMxNjU1NDMwLTE0OTk2MTU3NTMtMzZkZmRiNDZhOA
-   [mb-mattermost]: https://framateam.org/signup_user_complete/?id=tfqm33ggop8x3qgu4boeieta6e
+[mb-mattermost]: https://framateam.org/signup_user_complete/?id=tfqm33ggop8x3qgu4boeieta6e
-   [mb-rocketchat]: https://open.rocket.chat/channel/matterbridge
+[mb-rocketchat]: https://open.rocket.chat/channel/matterbridge
-   [mb-xmpp]: https://inverse.chat/
+[mb-xmpp]: https://inverse.chat/
-   [mb-twitch]: https://www.twitch.tv/matterbridge
+[mb-twitch]: https://www.twitch.tv/matterbridge
-   [mb-whatsapp]: https://www.whatsapp.com/
+[mb-whatsapp]: https://www.whatsapp.com/
-   [mb-zulip]: https://matterbridge.zulipchat.com/register/
+[mb-keybase]: https://keybase.io
-   [mb-telegram]: https://t.me/Matterbridge
+[mb-zulip]: https://matterbridge.zulipchat.com/register/
+[mb-telegram]: https://t.me/Matterbridge

bridge/config/config.go

@@ -131,7 +131,7 @@ type Protocol struct {
 	StripNick              bool       // all protocols
 	SyncTopic              bool       // slack
 	TengoModifyMessage     string     // general
-	Team                   string     // mattermost
+	Team                   string     // mattermost, keybase
 	Token                  string     // gitter, slack, discord, api
 	Topic                  string     // zulip
 	URL                    string     // mattermost, slack // DEPRECATED
@@ -198,6 +198,7 @@ type BridgeValues struct {
 	SSHChat            map[string]Protocol
 	WhatsApp           map[string]Protocol // TODO is this struct used? Search for "SlackLegacy" for example didn't return any results
 	Zulip              map[string]Protocol
+	Keybase            map[string]Protocol
 	General            Protocol
 	Tengo              Tengo
 	Gateway            []Gateway

bridge/discord/discord.go

@@ -237,8 +237,10 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) {
 				}
 			}
 		}
+
 		// skip empty messages
-		if msg.Text == "" {
+		if msg.Text == "" && (msg.Extra == nil || len(msg.Extra["file"]) == 0) {
+			b.Log.Debugf("Skipping empty message %#v", msg)
 			return "", nil
 		}
 
@@ -261,16 +263,16 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) {
 				return "", err
 			}
 		}
-		msg, err := b.webhookExecute(
+		b.Log.Debugf("Processing webhook sending for message %#v", msg)
-			wID,
+		msg, err := b.webhookSend(&msg, wID, wToken)
-			wToken,
+		if err != nil {
-			true,
+			b.Log.Errorf("Could not broadcast via webook for message %#v: %s", msg, err)
-			&discordgo.WebhookParams{
+			return "", err
-				Content:   msg.Text,
+		}
-				Username:  msg.Username,
+		if msg == nil {
-				AvatarURL: msg.Avatar,
+			return "", nil
-			})
+		}
-		return msg.ID, err
+		return msg.ID, nil
 	}
 
 	b.Log.Debugf("Broadcasting using token (API)")
@@ -312,7 +314,7 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return res.ID, err
+	return res.ID, nil
 }
 
 // useWebhook returns true if we have a webhook defined somewhere
@@ -376,3 +378,57 @@ func (b *Bdiscord) handleUploadFile(msg *config.Message, channelID string) (stri
 	}
 	return "", nil
 }
+
+// webhookSend send one or more message via webhook, taking care of file
+// uploads (from slack, telegram or mattermost).
+// Returns messageID and error.
+func (b *Bdiscord) webhookSend(msg *config.Message, webhookID, token string) (*discordgo.Message, error) {
+	var (
+		res *discordgo.Message
+		err error
+	)
+
+	// WebhookParams can have either `Content` or `File`.
+
+	// We can't send empty messages.
+	if msg.Text != "" {
+		res, err = b.c.WebhookExecute(
+			webhookID,
+			token,
+			true,
+			&discordgo.WebhookParams{
+				Content:   msg.Text,
+				Username:  msg.Username,
+				AvatarURL: msg.Avatar,
+			},
+		)
+		if err != nil {
+			b.Log.Errorf("Could not send text (%s) for message %#v: %s", msg.Text, msg, err)
+		}
+	}
+
+	if msg.Extra != nil {
+		for _, f := range msg.Extra["file"] {
+			fi := f.(config.FileInfo)
+			file := discordgo.File{
+				Name:        fi.Name,
+				ContentType: "",
+				Reader:      bytes.NewReader(*fi.Data),
+			}
+			_, e2 := b.c.WebhookExecute(
+				webhookID,
+				token,
+				false,
+				&discordgo.WebhookParams{
+					Username:  msg.Username,
+					AvatarURL: msg.Avatar,
+					File:      &file,
+				},
+			)
+			if e2 != nil {
+				b.Log.Errorf("Could not send file %#v for message %#v: %s", file, msg, e2)
+			}
+		}
+	}
+	return res, err
+}

bridge/discord/helpers.go

@@ -1,7 +1,6 @@
 package bdiscord
 
 import (
-	"encoding/json"
 	"errors"
 	"regexp"
 	"strings"
@@ -26,7 +25,7 @@ func (b *Bdiscord) getNick(user *discordgo.User) string {
 	// If we didn't find nick, search for it.
 	member, err := b.c.GuildMember(b.guildID, user.ID)
 	if err != nil {
-		b.Log.Warnf("Failed to fetch information for member %#v: %s", user, err)
+		b.Log.Warnf("Failed to fetch information for member %#v on guild %#v: %s", user, b.guildID, err)
 		return user.Username
 	} else if member == nil {
 		b.Log.Warnf("Got no information for member %#v", user)
@@ -183,7 +182,7 @@ func (b *Bdiscord) stripCustomoji(text string) string {
 
 func (b *Bdiscord) replaceAction(text string) (string, bool) {
 	if strings.HasPrefix(text, "_") && strings.HasSuffix(text, "_") {
-		return text[1:], true
+		return text[1 : len(text)-1], true
 	}
 	return text, false
 }
@@ -236,26 +235,3 @@ func enumerateUsernames(s string) []string {
 	}
 	return usernames
 }
-
-// webhookExecute executes a webhook.
-// webhookID: The ID of a webhook.
-// token    : The auth token for the webhook
-// wait	    : Waits for server confirmation of message send and ensures that the return struct is populated (it is nil otherwise)
-func (b *Bdiscord) webhookExecute(webhookID, token string, wait bool, data *discordgo.WebhookParams) (st *discordgo.Message, err error) {
-	uri := discordgo.EndpointWebhookToken(webhookID, token)
-
-	if wait {
-		uri += "?wait=true"
-	}
-	response, err := b.c.RequestWithBucketID("POST", uri, data, discordgo.EndpointWebhookToken("", ""))
-	if !wait || err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(response, &st)
-	if err != nil {
-		return nil, discordgo.ErrJSONUnmarshal
-	}
-
-	return st, nil
-}

bridge/keybase/handlers.go

@@ -0,0 +1,59 @@
+package bkeybase
+
+import (
+	"strconv"
+
+	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/keybase/go-keybase-chat-bot/kbchat"
+)
+
+func (b *Bkeybase) handleKeybase() {
+	sub, err := b.kbc.ListenForNewTextMessages()
+	if err != nil {
+		b.Log.Errorf("Error listening: %s", err.Error())
+	}
+
+	go func() {
+		for {
+			msg, err := sub.Read()
+			if err != nil {
+				b.Log.Errorf("failed to read message: %s", err.Error())
+			}
+
+			if msg.Message.Content.Type != "text" {
+				continue
+			}
+
+			if msg.Message.Sender.Username == b.kbc.GetUsername() {
+				continue
+			}
+
+			b.handleMessage(msg.Message)
+
+		}
+	}()
+}
+
+func (b *Bkeybase) handleMessage(msg kbchat.Message) {
+	b.Log.Debugf("== Receiving event: %#v", msg)
+	if msg.Channel.TopicName != b.channel || msg.Channel.Name != b.team {
+		return
+	}
+
+	if msg.Sender.Username != b.kbc.GetUsername() {
+
+		// TODO download avatar
+
+		// Create our message
+		rmsg := config.Message{Username: msg.Sender.Username, Text: msg.Content.Text.Body, UserID: msg.Sender.Uid, Channel: msg.Channel.TopicName, ID: strconv.Itoa(msg.MsgID), Account: b.Account}
+
+		// Text must be a string
+		if msg.Content.Type != "text" {
+			b.Log.Errorf("message is not text")
+			return
+		}
+
+		b.Log.Debugf("<= Sending message from %s on %s to gateway", msg.Sender.Username, msg.Channel.Name)
+		b.Remote <- rmsg
+	}
+}

bridge/keybase/keybase.go

@@ -0,0 +1,82 @@
+package bkeybase
+
+import (
+	"strconv"
+
+	"github.com/42wim/matterbridge/bridge"
+	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/keybase/go-keybase-chat-bot/kbchat"
+)
+
+// Bkeybase bridge structure
+type Bkeybase struct {
+	kbc     *kbchat.API
+	user    string
+	channel string
+	team    string
+	*bridge.Config
+}
+
+// New initializes Bkeybase object and sets team
+func New(cfg *bridge.Config) bridge.Bridger {
+	b := &Bkeybase{Config: cfg}
+	b.team = b.Config.GetString("Team")
+	return b
+}
+
+// Connect starts keybase API and listener loop
+func (b *Bkeybase) Connect() error {
+	var err error
+	b.Log.Infof("Connecting %s", b.GetString("Team"))
+
+	// use default keybase location (`keybase`)
+	b.kbc, err = kbchat.Start(kbchat.RunOptions{})
+	if err != nil {
+		return err
+	}
+	b.user = b.kbc.GetUsername()
+	b.Log.Info("Connection succeeded")
+	go b.handleKeybase()
+	return nil
+}
+
+// Disconnect doesn't do anything for now
+func (b *Bkeybase) Disconnect() error {
+	return nil
+}
+
+// JoinChannel sets channel name in struct
+func (b *Bkeybase) JoinChannel(channel config.ChannelInfo) error {
+	if _, err := b.kbc.JoinChannel(b.team, channel.Name); err != nil {
+		return err
+	}
+	b.channel = channel.Name
+	return nil
+}
+
+// Send receives bridge messages and sends them to Keybase chat room
+func (b *Bkeybase) Send(msg config.Message) (string, error) {
+	b.Log.Debugf("=> Receiving %#v", msg)
+
+	// Handle /me events
+	if msg.Event == config.EventUserAction {
+		msg.Text = "_" + msg.Text + "_"
+	}
+
+	// Delete message if we have an ID
+	// Delete message not supported by keybase go library yet
+
+	// Upload a file if it exists
+	// kbchat lib does not support attachments yet
+
+	// Edit message if we have an ID
+	// kbchat lib does not support message editing yet
+
+	// Send regular message
+	resp, err := b.kbc.SendMessageByTeamName(b.team, msg.Username+msg.Text, &b.channel)
+	if err != nil {
+		return "", err
+	}
+
+	return strconv.Itoa(resp.Result.MsgID), err
+}

bridge/steam/handlers.go

@@ -85,7 +85,7 @@ func (b *Bsteam) handleEvents() {
 
 func (b *Bsteam) handleLogOnFailed(e *steam.LogOnFailedEvent, myLoginInfo *steam.LogOnDetails) error {
 	switch e.Result {
-	case steamlang.EResult_AccountLogonDeniedNeedTwoFactorCode:
+	case steamlang.EResult_AccountLoginDeniedNeedTwoFactor:
 		b.Log.Info("Steam guard isn't letting me in! Enter 2FA code:")
 		var code string
 		fmt.Scanf("%s", &code)

bridge/xmpp/xmpp.go

@@ -107,6 +107,9 @@ func (b *Bxmpp) Send(msg config.Message) (string, error) {
 }
 
 func (b *Bxmpp) createXMPP() error {
+	if !strings.Contains(b.GetString("Jid"), "@") {
+		return fmt.Errorf("the Jid %s doesn't contain an @", b.GetString("Jid"))
+	}
 	tc := &tls.Config{
 		ServerName:         strings.Split(b.GetString("Jid"), "@")[1],
 		InsecureSkipVerify: b.GetBool("SkipTLSVerify"), // nolint: gosec

changelog.md

@@ -1,15 +1,39 @@
-# dev
+# v1.16.0
+
+## New features
+
+* keybase: new protocol added. Add initial Keybase Chat support #877 Thanks to @hyperobject
+* discord: Support webhook files in discord #872
+
+## Enhancements
+
+* general: update dependencies
+
+## Bugfix
+
+* discord: Underscores from Discord don't arrive correctly #864
+* xmpp: Fix possible panic at startup of the XMPP bridge #869
+* mattermost: Make getChannelIdTeam behave like GetChannelId for groups (mattermost) #873
 
 # v1.15.1
+
+## New features
+* discord: Support webhook message deletions (discord) (#853)
+
 ## Enhancements
+
 * discord: Support bulk deletions #851
 * discord: Support channels in categories #863 (use category/channel. See matterbridge.toml.sample for more info)
 * mattermost: Add an option to skip the Mattermost server version check #849
 
 ## Bugfix
+
 * xmpp: fix segfault when disconnected/reconnected #856
 * telegram: fix panic in handleEntities #858
 
+This release couldn't exist without the following contributors:
+@42wim, @qaisjp, @joohoi
+
 # v1.15.0
 ## New features
 * Add scripting (tengo) support for every outgoing message (#806)
@@ -17,21 +41,21 @@
   https://github.com/42wim/matterbridge/wiki/Settings#outmessage for more information
 * Add tengo support to RemoteNickFormat (#793)
   See https://github.com/42wim/matterbridge/wiki/Settings#remotenickformat-2
-* Deprecated `Message` under `[tengo]` to `InMessage`
+  * Deprecated `Message` under `[tengo]` to `InMessage`
 
 ## Enhancements
-* general: Forward only user-typing messages if supported by protocol (#832)
+  * general: Forward only user-typing messages if supported by protocol (#832)
-* general: updated wiki with all possible settings: https://github.com/42wim/matterbridge/wiki/Settings
+  * general: updated wiki with all possible settings: https://github.com/42wim/matterbridge/wiki/Settings
-* tengo: Add msg event to tengo
+  * tengo: Add msg event to tengo
-* xmpp: Verify TLS against JID domain, not the host. (xmpp) (#834)
+  * xmpp: Verify TLS against JID domain, not the host. (xmpp) (#834)
-* xmpp: Allow messages with timestamp (xmpp). Fixes #835 (#847)
+  * xmpp: Allow messages with timestamp (xmpp). Fixes #835 (#847)
-* irc: Add verbose IRC joins/parts (ident@host) (#805)
+  * irc: Add verbose IRC joins/parts (ident@host) (#805)
   See https://github.com/42wim/matterbridge/wiki/Settings#verbosejoinpart
-* rocketchat: Add useraction support (rocketchat). Closes #772 (#794)
+  * rocketchat: Add useraction support (rocketchat). Closes #772 (#794)
 
 ## Bugfix
-* slack: Fix regression in autojoining with legacy tokens (slack). Fixes #651 (#848)
+  * slack: Fix regression in autojoining with legacy tokens (slack). Fixes #651 (#848)
-* xmpp: Revert xmpp to orig behaviour. Closes #844
+  * xmpp: Revert xmpp to orig behaviour. Closes #844
 * whatsapp: Update github.com/Rhymen/go-whatsapp vendor. Fixes #843
 * mattermost: Update channels of all teams (mattermost)
 

ci/lint.sh

@@ -9,9 +9,9 @@ fi
 # Run the linter.
 golangci-lint run
 
-if [[ "${GO111MODULE-off}" == "on" ]]; then
+# if [[ "${GO111MODULE-off}" == "on" ]]; then
-  # If Go modules are active then check that dependencies are correctly maintained.
+#   # If Go modules are active then check that dependencies are correctly maintained.
-  go mod tidy
+#   go mod tidy
-  go mod vendor
+#   go mod vendor
-  git diff --exit-code --quiet || (echo "Please run 'go mod tidy' to clean up the 'go.mod' and 'go.sum' files."; false)
+#   git diff --exit-code --quiet || (echo "Please run 'go mod tidy' to clean up the 'go.mod' and 'go.sum' files."; false)
-fi
+# fi

contrib/outmessage-irccolornick.tengo

@@ -0,0 +1,14 @@
+// See https://github.com/42wim/matterbridge/issues/881
+// Generates a colored nick for each msgUsername, with example to filter specific codes 
+
+text := import("text")
+fmt := import("fmt")
+if outProtocol == "irc" {
+    // generate a color for a nick, make sure it isn't 0 or 15
+    colorCode := len(msgUsername)+bytes(msgUsername)[0]%14 + 2
+    // example if we want to use colorCode 3 when we have calculated colorcode 14
+    if colorCode == 14 {
+        colorCode = 3
+    }
+    msgUsername=fmt.sprintf("\x03%02d%s\x0F", colorCode, msgUsername)
+}

gateway/bridgemap/bridgemap.go

@@ -6,6 +6,7 @@ import (
 	bdiscord "github.com/42wim/matterbridge/bridge/discord"
 	bgitter "github.com/42wim/matterbridge/bridge/gitter"
 	birc "github.com/42wim/matterbridge/bridge/irc"
+	bkeybase "github.com/42wim/matterbridge/bridge/keybase"
 	bmatrix "github.com/42wim/matterbridge/bridge/matrix"
 	bmattermost "github.com/42wim/matterbridge/bridge/mattermost"
 	brocketchat "github.com/42wim/matterbridge/bridge/rocketchat"
@@ -35,6 +36,7 @@ var (
 		"whatsapp":     bwhatsapp.New,
 		"xmpp":         bxmpp.New,
 		"zulip":        bzulip.New,
+		"keybase":      bkeybase.New,
 	}
 
 	UserTypingSupport = map[string]struct{}{

go.mod

@@ -4,10 +4,11 @@ require (
 	github.com/42wim/go-gitter v0.0.0-20170828205020-017310c2d557
 	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
 	github.com/Jeffail/gabs v1.1.1 // indirect
-	github.com/Philipp15b/go-steam v1.0.1-0.20180818081528-681bd9573329
+	github.com/Philipp15b/go-steam v1.0.1-0.20190816133340-b04c5a83c1c0
-	github.com/Rhymen/go-whatsapp v0.0.2
+	github.com/Rhymen/go-whatsapp v0.0.3-0.20190729104911-5c79b2cf277a
 	github.com/bwmarrin/discordgo v0.19.0
-	github.com/d5/tengo v1.24.1
+	// github.com/bwmarrin/discordgo v0.19.0
+	github.com/d5/tengo v1.24.3
 	github.com/dfordsoft/golib v0.0.0-20180902042739-76ee6ab99bec
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/go-telegram-bot-api/telegram-bot-api v4.6.5-0.20181225215658-ec221ba9ea45+incompatible
@@ -15,15 +16,14 @@ require (
 	github.com/gopackage/ddp v0.0.0-20170117053602-652027933df4 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f // indirect
 	github.com/gorilla/schema v1.1.0
-	github.com/gorilla/websocket v1.4.0
+	github.com/gorilla/websocket v1.4.1
-	github.com/hashicorp/golang-lru v0.5.1
+	github.com/hashicorp/golang-lru v0.5.3
 	github.com/hpcloud/tail v1.0.0 // indirect
 	github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7
 	github.com/jtolds/gls v4.2.1+incompatible // indirect
-	github.com/labstack/echo/v4 v4.1.6
+	github.com/keybase/go-keybase-chat-bot v0.0.0-20190816161829-561f10822eb2
-	github.com/lrstanley/girc v0.0.0-20190210212025-51b8e096d398
+	github.com/labstack/echo/v4 v4.1.10
-	github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect
+	github.com/lrstanley/girc v0.0.0-20190801035559-4fc93959e1a7
-	github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 // indirect
 	github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20190210153444-cc9d05784d5d
 	github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91
 	github.com/matterbridge/gomatrix v0.0.0-20190102230110-6f9631ca6dea
@@ -35,7 +35,7 @@ require (
 	github.com/mrexodia/wray v0.0.0-20160318003008-78a2c1f284ff // indirect
 	github.com/nelsonken/gomf v0.0.0-20180504123937-a9dd2f9deae9
 	github.com/nicksnyder/go-i18n v1.4.0 // indirect
-	github.com/nlopes/slack v0.5.0
+	github.com/nlopes/slack v0.6.0
 	github.com/onsi/ginkgo v1.6.0 // indirect
 	github.com/onsi/gomega v1.4.1 // indirect
 	github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
@@ -45,11 +45,12 @@ require (
 	github.com/russross/blackfriday v1.5.2
 	github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca
 	github.com/shazow/ssh-chat v0.0.0-20190125184227-81d7e1686296
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v0.0.0-20180803164922-886ec427f6b9 // indirect
 	github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a // indirect
 	github.com/spf13/viper v1.4.0
-	github.com/stretchr/testify v1.3.0
+	github.com/stretchr/testify v1.4.0
 	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
 	github.com/zfjagann/golang-ring v0.0.0-20190304061218-d34796e0a6c2
@@ -59,8 +60,18 @@ require (
 	gitlab.com/golang-commonmark/mdurl v0.0.0-20180912090424-e5bce34c34f2 // indirect
 	gitlab.com/golang-commonmark/puny v0.0.0-20180912090636-2cd490539afe // indirect
 	gitlab.com/opennota/wd v0.0.0-20180912061657-c5d65f63c638 // indirect
-	golang.org/x/image v0.0.0-20190616094056-33659d3de4f5
+	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
+	golang.org/x/image v0.0.0-20190902063713-cb417be4ba39
+	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect
+	golang.org/x/text v0.3.2 // indirect
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/russross/blackfriday.v2 v2.0.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 )
+
+replace github.com/bwmarrin/discordgo v0.19.0 => github.com/matterbridge/discordgo v0.0.0-20190818085008-57c6e0fc2f40
+
+replace gopkg.in/russross/blackfriday.v2 v2.0.1 => github.com/russross/blackfriday/v2 v2.0.1
+
+go 1.13

go.sum

@@ -8,15 +8,16 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
 github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/Philipp15b/go-steam v1.0.1-0.20180818081528-681bd9573329 h1:xZBoq249G9MSt+XuY7sVQzcfONJ6IQuwpCK+KAaOpnY=
+github.com/Philipp15b/go-steam v1.0.1-0.20190816133340-b04c5a83c1c0 h1:TO7d4rocnNFng6ZQrPe7U6WqHtK5eHEMrgrnnM/72IQ=
-github.com/Philipp15b/go-steam v1.0.1-0.20180818081528-681bd9573329/go.mod h1:HuVM+sZFzumUdKPWiz+IlCMb4RdsKdT3T+nQBKL+sYg=
+github.com/Philipp15b/go-steam v1.0.1-0.20190816133340-b04c5a83c1c0/go.mod h1:HuVM+sZFzumUdKPWiz+IlCMb4RdsKdT3T+nQBKL+sYg=
 github.com/Rhymen/go-whatsapp v0.0.0/go.mod h1:rdQr95g2C1xcOfM7QGOhza58HeI3I+tZ/bbluv7VazA=
-github.com/Rhymen/go-whatsapp v0.0.2 h1:MelwdquHuuNObBGV7CpXbky2aVdilx/CwiXMwZvS74U=
+github.com/Rhymen/go-whatsapp v0.0.3-0.20190729104911-5c79b2cf277a h1:umvfZW+YE+ynhYwsyheyunB/3xRK68kNFMRNUMQxzJI=
-github.com/Rhymen/go-whatsapp v0.0.2/go.mod h1:qf/2PQi82Okxw/igghu/oMGzTeUYuKBq1JNo3tdQyNg=
+github.com/Rhymen/go-whatsapp v0.0.3-0.20190729104911-5c79b2cf277a/go.mod h1:qf/2PQi82Okxw/igghu/oMGzTeUYuKBq1JNo3tdQyNg=
 github.com/Rhymen/go-whatsapp/examples/echo v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:zgCiQtBtZ4P4gFWvwl9aashsdwOcbb/EHOGRmSzM8ME=
 github.com/Rhymen/go-whatsapp/examples/restoreSession v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:5sCUSpG616ZoSJhlt9iBNI/KXBqrVLcNUJqg7J9+8pU=
 github.com/Rhymen/go-whatsapp/examples/sendImage v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:RdiyhanVEGXTam+mZ3k6Y3VDCCvXYCwReOoxGozqhHw=
 github.com/Rhymen/go-whatsapp/examples/sendTextMessages v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:suwzklatySS3Q0+NCxCDh5hYfgXdQUWU1DNcxwAxStM=
+github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e h1:IHXQQIpxASe3m0Jtcd3XongL+lxHNd5nUmvHxJARUmg=
 github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -24,8 +25,6 @@ github.com/alexcesaro/log v0.0.0-20150915221235-61e686294e58/go.mod h1:YNfsMyWSs
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/bwmarrin/discordgo v0.19.0 h1:kMED/DB0NR1QhRcalb85w0Cu3Ep2OrGAqZH1R5awQiY=
-github.com/bwmarrin/discordgo v0.19.0/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -33,8 +32,8 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/d5/tengo v1.24.1 h1:b+epGF5Qi0XUkYUUl8y6hVzLxg/eu9FYUAdb4H/KieY=
+github.com/d5/tengo v1.24.3 h1:wp44VW7fdfzMzIDT19tT5uNeGnm2UMd6s3TLAahrwSU=
-github.com/d5/tengo v1.24.1/go.mod h1:gsbjo7lBXzBIWBd6NQp1lRKqqiDDANqBOyhW8rTlFsY=
+github.com/d5/tengo v1.24.3/go.mod h1:VhLq8Q2QFhCIJO3NhvM934qOThykMqJi9y9Siqd1ocQ=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -49,6 +48,7 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-telegram-bot-api/telegram-bot-api v4.6.5-0.20181225215658-ec221ba9ea45+incompatible h1:i64CCJcSqkRIkm5OSdZQjZq84/gJsk2zNwHWIRYWlKE=
@@ -73,13 +73,16 @@ github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f h1:FDM3EtwZLyhW4
 github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/schema v1.1.0 h1:CamqUDOFUBqzrvxuz2vEwo8+SUdwsluFh7IlzJh30LY=
 github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
+github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
@@ -94,6 +97,8 @@ github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVY
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/keybase/go-keybase-chat-bot v0.0.0-20190816161829-561f10822eb2 h1:zacJswvfPqUSGdcBXJzKvLN/dB1UjDGDvDesMBBzoA4=
+github.com/keybase/go-keybase-chat-bot v0.0.0-20190816161829-561f10822eb2/go.mod h1:vNc28YFzigVJod0j5EbuTtRIe7swx8vodh2yA4jZ2s8=
 github.com/keybase/go-ps v0.0.0-20161005175911-668c8856d999 h1:2d+FLQbz4xRTi36DO1qYNUwfORax9XcQ0jhbO81Vago=
 github.com/keybase/go-ps v0.0.0-20161005175911-668c8856d999/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
@@ -106,20 +111,18 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/labstack/echo/v4 v4.1.6 h1:WOvLa4T1KzWCRpANwz0HGgWDelXSSGwIKtKBbFdHTv4=
+github.com/labstack/echo/v4 v4.1.10 h1:/yhIpO50CBInUbE/nHJtGIyhBv0dJe2cDAYxc3V3uMo=
-github.com/labstack/echo/v4 v4.1.6/go.mod h1:kU/7PwzgNxZH4das4XNsSpBSOD09XIF5YEPzjpkGnGE=
+github.com/labstack/echo/v4 v4.1.10/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
-github.com/labstack/gommon v0.2.9 h1:heVeuAYtevIQVYkGj6A41dtfT91LrvFG220lavpWhrU=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
-github.com/labstack/gommon v0.2.9/go.mod h1:E8ZTmW9vw5az5/ZyHWCp0Lw4OH2ecsaBP1C/NKavGG4=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
-github.com/lrstanley/girc v0.0.0-20190210212025-51b8e096d398 h1:a40kRmhA1p2XFJ6gqXfCExSyuDDCp/U9LA8ZY27u2Lk=
+github.com/lrstanley/girc v0.0.0-20190801035559-4fc93959e1a7 h1:BS9tqL0OCiOGuy/CYYk2gc33fxqaqh5/rhqMKu4tcYA=
-github.com/lrstanley/girc v0.0.0-20190210212025-51b8e096d398/go.mod h1:7cRs1SIBfKQ7e3Tam6GKTILSNHzR862JD0JpINaZoJk=
+github.com/lrstanley/girc v0.0.0-20190801035559-4fc93959e1a7/go.mod h1:liX5MxHPrwgHaKowoLkYGwbXfYABh1jbZ6FpElbGF1I=
-github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 h1:AsEBgzv3DhuYHI/GiQh2HxvTP71HCCE9E/tzGUzGdtU=
-github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5/go.mod h1:c2mYKRyMb1BPkO5St0c/ps62L4S0W2NAkaTXj9qEI+0=
-github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 h1:iOAVXzZyXtW408TMYejlUPo6BIn92HmOacWtIfNyYns=
-github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6/go.mod h1:sFlOUpQL1YcjhFVXhg1CG8ZASEs/Mf1oVb6H75JL/zg=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20190210153444-cc9d05784d5d h1:F+Sr+C0ojSlYQ37BLylQtSFmyQULe3jbAygcyXQ9mVs=
 github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20190210153444-cc9d05784d5d/go.mod h1:c6MxwqHD+0HvtAJjsHMIdPCiAwGiQwPRPTp69ACMg8A=
+github.com/matterbridge/discordgo v0.0.0-20190818085008-57c6e0fc2f40 h1:OJmjOa1ry5IZzFowLhAZ8b3bFPWFFNUbqGxs9pNqgEU=
+github.com/matterbridge/discordgo v0.0.0-20190818085008-57c6e0fc2f40/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
 github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91 h1:KzDEcy8eDbTx881giW8a6llsAck3e2bJvMyKvh1IK+k=
 github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91/go.mod h1:ECDRehsR9TYTKCAsRS8/wLeOk6UUqDydw47ln7wG41Q=
 github.com/matterbridge/gomatrix v0.0.0-20190102230110-6f9631ca6dea h1:kaADGqpK4gGO2BpzEyJrBxq2Jc57Rsar4i2EUxcACUc=
@@ -138,6 +141,8 @@ github.com/mattn/go-isatty v0.0.5 h1:tHXDdz1cpzGaovsTB+TVB8q90WEokoVmfMqoVcrLUgw
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -152,8 +157,8 @@ github.com/nelsonken/gomf v0.0.0-20180504123937-a9dd2f9deae9 h1:mp6tU1r0xLostUGL
 github.com/nelsonken/gomf v0.0.0-20180504123937-a9dd2f9deae9/go.mod h1:A5SRAcpTemjGgIuBq6Kic2yHcoeUFWUinOAlMP/i9xo=
 github.com/nicksnyder/go-i18n v1.4.0 h1:AgLl+Yq7kg5OYlzCgu9cKTZOyI4tD/NgukKqLqC8E+I=
 github.com/nicksnyder/go-i18n v1.4.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
-github.com/nlopes/slack v0.5.0 h1:NbIae8Kd0NpqaEI3iUrsuS0KbcEDhzhc939jLW5fNm0=
+github.com/nlopes/slack v0.6.0 h1:jt0jxVQGhssx1Ib7naAOZEZcGdtIhTzkP0nopK0AsRA=
-github.com/nlopes/slack v0.5.0/go.mod h1:jVI4BBK3lSktibKahxBF74txcK2vyvkza1z/+rRnVAM=
+github.com/nlopes/slack v0.6.0/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -186,6 +191,8 @@ github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
 github.com/shazow/rateio v0.0.0-20150116013248-e8e00881e5c1 h1:Lx3BlDGFElJt4u/zKc9A3BuGYbQAGlEFyPuUA3jeMD0=
@@ -194,7 +201,10 @@ github.com/shazow/ssh-chat v0.0.0-20190125184227-81d7e1686296 h1:8RLq547MSVc6vhO
 github.com/shazow/ssh-chat v0.0.0-20190125184227-81d7e1686296/go.mod h1:1GLXsL4esywkpNId3v4QWuMf3THtWGitWvtQ/L3aSA4=
 github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7 h1:80VN+vGkqM773Br/uNNTSheo3KatTgV8IpjIKjvVLng=
 github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -218,11 +228,9 @@ github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM=
 github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -263,10 +271,11 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5 h1:58fnuSXlxZmFdJyvtTFVmVhcMLU6v5fEb/ok4wyqtNU=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
-golang.org/x/image v0.0.0-20190616094056-33659d3de4f5 h1:ngW7cqsJcNIFizl289rKwy+nVvw7TQS8z3ejrra6syo=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/image v0.0.0-20190616094056-33659d3de4f5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20190902063713-cb417be4ba39 h1:4dQcAORh9oYBwVSBVIkP489LUPC+f1HBkTYXgmqfR+o=
+golang.org/x/image v0.0.0-20190902063713-cb417be4ba39/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -276,15 +285,13 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190607181551-461777fb6f67 h1:rJJxsykSlULwd2P2+pg/rtnwN2FrWp4IuCxOSyS0V00=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
-golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20171017063910-8dbc5d05d6ed/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -294,9 +301,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
-golang.org/x/sys v0.0.0-20190609082536-301114b31cce h1:CQakrGkKbydnUmt7cFIlmQ4lNQiqdTPt6xzXij4nYCc=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190609082536-301114b31cce/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -306,7 +312,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

matterbridge.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	version = "1.15.1"
+	version = "1.16.0"
 	githash string
 
 	flagConfig  = flag.String("conf", "matterbridge.toml", "config file")

matterbridge.toml.sample

@@ -522,6 +522,29 @@ StripNick=false
 #OPTIONAL (default false)
 ShowTopicChange=false
 
+###################################################################
+#
+# Keybase
+# You should have a separate bridge account on Keybase
+# (it also needs to be logged in on the system you're running the bridge on)
+#
+###################################################################
+
+[keybase.myteam]
+
+# RemoteNickFormat defines how remote users appear on this bridge 
+# See [general] config section for default options
+RemoteNickFormat="{NICK} ({PROTOCOL}): "
+
+# extra label that can be used in the RemoteNickFormat
+# optional (default empty)
+Label=""
+
+# Your team on Keybase.
+# The bot user MUST be a member of this team
+# REQUIRED
+Team="myteam"
+
 ###################################################################
 #slack section
 ###################################################################

matterclient/channels.go

@@ -36,6 +36,16 @@ func (m *MMClient) GetChannelHeader(channelId string) string { //nolint:golint
 	return ""
 }
 
+func getNormalisedName(channel *model.Channel) string {
+	if channel.Type == model.CHANNEL_GROUP {
+		// (deprecated in favor of ReplaceAll in go 1.12)
+		res := strings.Replace(channel.DisplayName, ", ", "-", -1) //nolint: gocritic
+		res = strings.Replace(res, " ", "_", -1)                   //nolint: gocritic
+		return res
+	}
+	return channel.Name
+}
+
 func (m *MMClient) GetChannelId(name string, teamId string) string { //nolint:golint
 	m.RLock()
 	defer m.RUnlock()
@@ -45,13 +55,7 @@ func (m *MMClient) GetChannelId(name string, teamId string) string { //nolint:go
 
 	for _, t := range m.OtherTeams {
 		for _, channel := range append(t.Channels, t.MoreChannels...) {
-			if channel.Type == model.CHANNEL_GROUP {
+			if getNormalisedName(channel) == name {
-				res := strings.Replace(channel.DisplayName, ", ", "-", -1)
-				res = strings.Replace(res, " ", "_", -1)
-				if res == name {
-					return channel.Id
-				}
-			} else if channel.Name == name {
 				return channel.Id
 			}
 		}
@@ -63,7 +67,7 @@ func (m *MMClient) getChannelIdTeam(name string, teamId string) string { //nolin
 	for _, t := range m.OtherTeams {
 		if t.Id == teamId {
 			for _, channel := range append(t.Channels, t.MoreChannels...) {
-				if channel.Name == name {
+				if getNormalisedName(channel) == name {
 					return channel.Id
 				}
 			}
@@ -81,12 +85,7 @@ func (m *MMClient) GetChannelName(channelId string) string { //nolint:golint
 		}
 		for _, channel := range append(t.Channels, t.MoreChannels...) {
 			if channel.Id == channelId {
-				if channel.Type == model.CHANNEL_GROUP {
+				return getNormalisedName(channel)
-					res := strings.Replace(channel.DisplayName, ", ", "-", -1)
-					res = strings.Replace(res, " ", "_", -1)
-					return res
-				}
-				return channel.Name
 			}
 		}
 	}

vendor/github.com/Philipp15b/go-steam/README.md

@@ -45,20 +45,11 @@ Whether you want to develop your own Steam bot or directly work on go-steam itse
 
 ## Updating go-steam to a new SteamKit version
 
-To update go-steam to a new version of SteamKit, do the following:
+Go source code is generated with code in the `generator` directory.
+Look at `generator/README.md` for more information on how to use the generator.
 
-	go get github.com/golang/protobuf/protoc-gen-go/
+Then, after generating new Go source files, update `go-steam` as necessary.
-    git submodule init && git submodule update
-    cd generator
-    go run generator.go clean proto steamlang
-
-Make sure that `$GOPATH/bin` / `protoc-gen-go` is in your `$PATH`. You'll also need [`protoc`](https://developers.google.com/protocol-buffers/docs/downloads), the protocol buffer compiler. At the moment, we use Protocol Buffers 2.6.1 with `proco-gen-go`-[2402d76](https://github.com/golang/protobuf/tree/2402d76f3d41f928c7902a765dfc872356dd3aad).
-
-To compile the Steam Language files, you also need the [.NET Framework](https://www.microsoft.com/net/downloads)
-on Windows or [mono](http://www.go-mono.com/mono-downloads/download.html) on other operating systems.
-
-Apply the protocol changes where necessary.
 
 ## License
 
-Steam for Go is licensed under the New BSD License. More information can be found in LICENSE.txt.
+Steam for Go is licensed under the New BSD License. More information can be found in LICENSE.txt.

vendor/github.com/Philipp15b/go-steam/auth.go

@@ -94,9 +94,6 @@ func (a *Auth) HandlePacket(packet *Packet) {
 		a.handleUpdateMachineAuth(packet)
 	case EMsg_ClientAccountInfo:
 		a.handleAccountInfo(packet)
-	case EMsg_ClientWalletInfoUpdate:
-	case EMsg_ClientRequestWebAPIAuthenticateUserNonceResponse:
-	case EMsg_ClientMarketingMessageUpdate:
 	}
 }
 

vendor/github.com/Philipp15b/go-steam/client.go

@@ -133,11 +133,17 @@ func (c *Client) Connected() bool {
 // If you want to connect to a specific server, use `ConnectTo`.
 func (c *Client) Connect() *netutil.PortAddr {
 	var server *netutil.PortAddr
+
+	// try to initialize the directory cache
+	if !steamDirectoryCache.IsInitialized() {
+		_ = steamDirectoryCache.Initialize()
+	}
 	if steamDirectoryCache.IsInitialized() {
 		server = steamDirectoryCache.GetRandomCM()
 	} else {
 		server = GetRandomCM()
 	}
+
 	c.ConnectTo(server)
 	return server
 }

vendor/github.com/Philipp15b/go-steam/protocol/internal.go

@@ -1,6 +1,7 @@
 package protocol
 
 import (
+	"encoding/hex"
 	"io"
 	"math"
 	"strconv"
@@ -42,6 +43,7 @@ const EClientPersonaStateFlag_DefaultInfoRequest = EClientPersonaStateFlag_Playe
 
 const DefaultAvatar = "fef49e7fa7e1997310d705b2a6158ff8dc1cdfeb"
 
-func ValidAvatar(avatar string) bool {
+func ValidAvatar(avatar []byte) bool {
-	return !(avatar == "0000000000000000000000000000000000000000" || len(avatar) != 40)
+	str := hex.EncodeToString(avatar)
+	return !(str == "0000000000000000000000000000000000000000" || len(str) != 40)
 }

vendor/github.com/Philipp15b/go-steam/protocol/protobuf/app_ticket.pb.go

@@ -1,31 +1,60 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: encrypted_app_ticket.proto
-// DO NOT EDIT!
 
 package protobuf
 
-import proto "github.com/golang/protobuf/proto"
+import (
-import fmt "fmt"
+	fmt "fmt"
-import math "math"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package protobuf is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package protobuf to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
 type EncryptedAppTicket struct {
-	TicketVersionNo               *uint32 `protobuf:"varint,1,opt,name=ticket_version_no" json:"ticket_version_no,omitempty"`
+	TicketVersionNo               *uint32  `protobuf:"varint,1,opt,name=ticket_version_no" json:"ticket_version_no,omitempty"`
-	CrcEncryptedticket            *uint32 `protobuf:"varint,2,opt,name=crc_encryptedticket" json:"crc_encryptedticket,omitempty"`
+	CrcEncryptedticket            *uint32  `protobuf:"varint,2,opt,name=crc_encryptedticket" json:"crc_encryptedticket,omitempty"`
-	CbEncrypteduserdata           *uint32 `protobuf:"varint,3,opt,name=cb_encrypteduserdata" json:"cb_encrypteduserdata,omitempty"`
+	CbEncrypteduserdata           *uint32  `protobuf:"varint,3,opt,name=cb_encrypteduserdata" json:"cb_encrypteduserdata,omitempty"`
-	CbEncryptedAppownershipticket *uint32 `protobuf:"varint,4,opt,name=cb_encrypted_appownershipticket" json:"cb_encrypted_appownershipticket,omitempty"`
+	CbEncryptedAppownershipticket *uint32  `protobuf:"varint,4,opt,name=cb_encrypted_appownershipticket" json:"cb_encrypted_appownershipticket,omitempty"`
-	EncryptedTicket               []byte  `protobuf:"bytes,5,opt,name=encrypted_ticket" json:"encrypted_ticket,omitempty"`
+	EncryptedTicket               []byte   `protobuf:"bytes,5,opt,name=encrypted_ticket" json:"encrypted_ticket,omitempty"`
-	XXX_unrecognized              []byte  `json:"-"`
+	XXX_NoUnkeyedLiteral          struct{} `json:"-"`
+	XXX_unrecognized              []byte   `json:"-"`
+	XXX_sizecache                 int32    `json:"-"`
 }
 
-func (m *EncryptedAppTicket) Reset()                    { *m = EncryptedAppTicket{} }
+func (m *EncryptedAppTicket) Reset()         { *m = EncryptedAppTicket{} }
-func (m *EncryptedAppTicket) String() string            { return proto.CompactTextString(m) }
+func (m *EncryptedAppTicket) String() string { return proto.CompactTextString(m) }
-func (*EncryptedAppTicket) ProtoMessage()               {}
+func (*EncryptedAppTicket) ProtoMessage()    {}
-func (*EncryptedAppTicket) Descriptor() ([]byte, []int) { return app_ticket_fileDescriptor0, []int{0} }
+func (*EncryptedAppTicket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_c6d69fd1cac4e8d5, []int{0}
+}
+
+func (m *EncryptedAppTicket) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_EncryptedAppTicket.Unmarshal(m, b)
+}
+func (m *EncryptedAppTicket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_EncryptedAppTicket.Marshal(b, m, deterministic)
+}
+func (m *EncryptedAppTicket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_EncryptedAppTicket.Merge(m, src)
+}
+func (m *EncryptedAppTicket) XXX_Size() int {
+	return xxx_messageInfo_EncryptedAppTicket.Size(m)
+}
+func (m *EncryptedAppTicket) XXX_DiscardUnknown() {
+	xxx_messageInfo_EncryptedAppTicket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_EncryptedAppTicket proto.InternalMessageInfo
 
 func (m *EncryptedAppTicket) GetTicketVersionNo() uint32 {
 	if m != nil && m.TicketVersionNo != nil {
@@ -66,17 +95,19 @@ func init() {
 	proto.RegisterType((*EncryptedAppTicket)(nil), "EncryptedAppTicket")
 }
 
-var app_ticket_fileDescriptor0 = []byte{
+func init() { proto.RegisterFile("encrypted_app_ticket.proto", fileDescriptor_c6d69fd1cac4e8d5) }
-	// 162 bytes of a gzipped FileDescriptorProto
+
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xcd, 0x4b, 0x2e,
+var fileDescriptor_c6d69fd1cac4e8d5 = []byte{
+	// 164 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xcd, 0x4b, 0x2e,
 	0xaa, 0x2c, 0x28, 0x49, 0x4d, 0x89, 0x4f, 0x2c, 0x28, 0x88, 0x2f, 0xc9, 0x4c, 0xce, 0x4e, 0x2d,
 	0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x57, 0x5a, 0xcb, 0xc8, 0x25, 0xe4, 0x0a, 0x93, 0x76, 0x2c,
 	0x28, 0x08, 0x01, 0x4b, 0x0a, 0x49, 0x72, 0x09, 0x42, 0x94, 0xc5, 0x97, 0xa5, 0x16, 0x15, 0x67,
 	0xe6, 0xe7, 0xc5, 0xe7, 0xe5, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x0a, 0x49, 0x73, 0x09, 0x27,
 	0x17, 0x25, 0xc7, 0xc3, 0xcd, 0x84, 0xa8, 0x93, 0x60, 0x02, 0x4b, 0xca, 0x70, 0x89, 0x24, 0x27,
 	0x21, 0xe4, 0x4a, 0x8b, 0x53, 0x8b, 0x52, 0x12, 0x4b, 0x12, 0x25, 0x98, 0xc1, 0xb2, 0xea, 0x5c,
-	0xf2, 0xc8, 0xb2, 0x20, 0xd7, 0xe4, 0x97, 0xe7, 0x01, 0x2d, 0xc8, 0xc8, 0x2c, 0x80, 0x1a, 0xc3,
+	0xf2, 0xc8, 0xb2, 0x20, 0xd7, 0xe4, 0x97, 0xe7, 0xa5, 0x16, 0x15, 0x67, 0x64, 0x16, 0x40, 0x8d,
-	0x02, 0x56, 0x28, 0xc1, 0x25, 0x80, 0x50, 0x05, 0x95, 0x61, 0x05, 0xca, 0xf0, 0x38, 0xb1, 0x7a,
+	0x61, 0x01, 0x2b, 0x94, 0xe0, 0x12, 0x40, 0xa8, 0x82, 0xca, 0xb0, 0x2a, 0x30, 0x6a, 0xf0, 0x38,
-	0x30, 0x36, 0x30, 0x32, 0x00, 0x02, 0x00, 0x00, 0xff, 0xff, 0x03, 0x8c, 0xdb, 0x92, 0xd3, 0x00,
+	0xb1, 0x7a, 0x30, 0x36, 0x30, 0x32, 0x00, 0x02, 0x00, 0x00, 0xff, 0xff, 0x03, 0x8c, 0xdb, 0x92,
-	0x00, 0x00,
+	0xd3, 0x00, 0x00, 0x00,
 }

vendor/github.com/Philipp15b/go-steam/protocol/protobuf/client_site_license.pb.go

@@ -0,0 +1,397 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: steammessages_sitelicenseclient.proto
+
+package protobuf
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package protobuf is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package protobuf to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type CMsgClientSiteInfo struct {
+	SiteId                 *uint64  `protobuf:"varint,1,opt,name=site_id" json:"site_id,omitempty"`
+	SiteName               *string  `protobuf:"bytes,2,opt,name=site_name" json:"site_name,omitempty"`
+	AllowCachedCredentials *bool    `protobuf:"varint,3,opt,name=allow_cached_credentials" json:"allow_cached_credentials,omitempty"`
+	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
+	XXX_unrecognized       []byte   `json:"-"`
+	XXX_sizecache          int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteInfo) Reset()         { *m = CMsgClientSiteInfo{} }
+func (m *CMsgClientSiteInfo) String() string { return proto.CompactTextString(m) }
+func (*CMsgClientSiteInfo) ProtoMessage()    {}
+func (*CMsgClientSiteInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{0}
+}
+
+func (m *CMsgClientSiteInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteInfo.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteInfo.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteInfo.Merge(m, src)
+}
+func (m *CMsgClientSiteInfo) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteInfo.Size(m)
+}
+func (m *CMsgClientSiteInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteInfo proto.InternalMessageInfo
+
+func (m *CMsgClientSiteInfo) GetSiteId() uint64 {
+	if m != nil && m.SiteId != nil {
+		return *m.SiteId
+	}
+	return 0
+}
+
+func (m *CMsgClientSiteInfo) GetSiteName() string {
+	if m != nil && m.SiteName != nil {
+		return *m.SiteName
+	}
+	return ""
+}
+
+func (m *CMsgClientSiteInfo) GetAllowCachedCredentials() bool {
+	if m != nil && m.AllowCachedCredentials != nil {
+		return *m.AllowCachedCredentials
+	}
+	return false
+}
+
+type CMsgClientSiteLicenseCheckout struct {
+	Appid                *uint32  `protobuf:"varint,1,opt,name=appid" json:"appid,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteLicenseCheckout) Reset()         { *m = CMsgClientSiteLicenseCheckout{} }
+func (m *CMsgClientSiteLicenseCheckout) String() string { return proto.CompactTextString(m) }
+func (*CMsgClientSiteLicenseCheckout) ProtoMessage()    {}
+func (*CMsgClientSiteLicenseCheckout) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{1}
+}
+
+func (m *CMsgClientSiteLicenseCheckout) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteLicenseCheckout.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteLicenseCheckout) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteLicenseCheckout.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteLicenseCheckout) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteLicenseCheckout.Merge(m, src)
+}
+func (m *CMsgClientSiteLicenseCheckout) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteLicenseCheckout.Size(m)
+}
+func (m *CMsgClientSiteLicenseCheckout) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteLicenseCheckout.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteLicenseCheckout proto.InternalMessageInfo
+
+func (m *CMsgClientSiteLicenseCheckout) GetAppid() uint32 {
+	if m != nil && m.Appid != nil {
+		return *m.Appid
+	}
+	return 0
+}
+
+type CMsgClientSiteLicenseCheckoutResponse struct {
+	Eresult              *int32   `protobuf:"varint,1,opt,name=eresult,def=2" json:"eresult,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteLicenseCheckoutResponse) Reset()         { *m = CMsgClientSiteLicenseCheckoutResponse{} }
+func (m *CMsgClientSiteLicenseCheckoutResponse) String() string { return proto.CompactTextString(m) }
+func (*CMsgClientSiteLicenseCheckoutResponse) ProtoMessage()    {}
+func (*CMsgClientSiteLicenseCheckoutResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{2}
+}
+
+func (m *CMsgClientSiteLicenseCheckoutResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteLicenseCheckoutResponse.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteLicenseCheckoutResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteLicenseCheckoutResponse.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteLicenseCheckoutResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteLicenseCheckoutResponse.Merge(m, src)
+}
+func (m *CMsgClientSiteLicenseCheckoutResponse) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteLicenseCheckoutResponse.Size(m)
+}
+func (m *CMsgClientSiteLicenseCheckoutResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteLicenseCheckoutResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteLicenseCheckoutResponse proto.InternalMessageInfo
+
+const Default_CMsgClientSiteLicenseCheckoutResponse_Eresult int32 = 2
+
+func (m *CMsgClientSiteLicenseCheckoutResponse) GetEresult() int32 {
+	if m != nil && m.Eresult != nil {
+		return *m.Eresult
+	}
+	return Default_CMsgClientSiteLicenseCheckoutResponse_Eresult
+}
+
+type CMsgClientSiteLicenseGetAvailableSeats struct {
+	Appid                *uint32  `protobuf:"varint,1,opt,name=appid" json:"appid,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteLicenseGetAvailableSeats) Reset() {
+	*m = CMsgClientSiteLicenseGetAvailableSeats{}
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeats) String() string { return proto.CompactTextString(m) }
+func (*CMsgClientSiteLicenseGetAvailableSeats) ProtoMessage()    {}
+func (*CMsgClientSiteLicenseGetAvailableSeats) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{3}
+}
+
+func (m *CMsgClientSiteLicenseGetAvailableSeats) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeats.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeats.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeats) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeats.Merge(m, src)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeats) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeats.Size(m)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeats) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeats.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeats proto.InternalMessageInfo
+
+func (m *CMsgClientSiteLicenseGetAvailableSeats) GetAppid() uint32 {
+	if m != nil && m.Appid != nil {
+		return *m.Appid
+	}
+	return 0
+}
+
+type CMsgClientSiteLicenseGetAvailableSeatsResponse struct {
+	Eresult              *int32   `protobuf:"varint,1,opt,name=eresult,def=2" json:"eresult,omitempty"`
+	Seats                *uint32  `protobuf:"varint,2,opt,name=seats" json:"seats,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) Reset() {
+	*m = CMsgClientSiteLicenseGetAvailableSeatsResponse{}
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) String() string {
+	return proto.CompactTextString(m)
+}
+func (*CMsgClientSiteLicenseGetAvailableSeatsResponse) ProtoMessage() {}
+func (*CMsgClientSiteLicenseGetAvailableSeatsResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{4}
+}
+
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeatsResponse.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeatsResponse.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeatsResponse.Merge(m, src)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeatsResponse.Size(m)
+}
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeatsResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteLicenseGetAvailableSeatsResponse proto.InternalMessageInfo
+
+const Default_CMsgClientSiteLicenseGetAvailableSeatsResponse_Eresult int32 = 2
+
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) GetEresult() int32 {
+	if m != nil && m.Eresult != nil {
+		return *m.Eresult
+	}
+	return Default_CMsgClientSiteLicenseGetAvailableSeatsResponse_Eresult
+}
+
+func (m *CMsgClientSiteLicenseGetAvailableSeatsResponse) GetSeats() uint32 {
+	if m != nil && m.Seats != nil {
+		return *m.Seats
+	}
+	return 0
+}
+
+type CMsgClientSiteLicenseGetContentCacheInfo struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) Reset() {
+	*m = CMsgClientSiteLicenseGetContentCacheInfo{}
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) String() string { return proto.CompactTextString(m) }
+func (*CMsgClientSiteLicenseGetContentCacheInfo) ProtoMessage()    {}
+func (*CMsgClientSiteLicenseGetContentCacheInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{5}
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfo.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfo.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfo.Merge(m, src)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfo.Size(m)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfo proto.InternalMessageInfo
+
+type CMsgClientSiteLicenseGetContentCacheInfoResponse struct {
+	UseCache             *bool    `protobuf:"varint,1,opt,name=use_cache" json:"use_cache,omitempty"`
+	Ipv4Address          *uint32  `protobuf:"varint,2,opt,name=ipv4_address" json:"ipv4_address,omitempty"`
+	PortNumber           *uint32  `protobuf:"varint,3,opt,name=port_number" json:"port_number,omitempty"`
+	P2PGroup             *uint32  `protobuf:"varint,4,opt,name=p2p_group" json:"p2p_group,omitempty"`
+	IpAddress            *string  `protobuf:"bytes,5,opt,name=ip_address" json:"ip_address,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) Reset() {
+	*m = CMsgClientSiteLicenseGetContentCacheInfoResponse{}
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) String() string {
+	return proto.CompactTextString(m)
+}
+func (*CMsgClientSiteLicenseGetContentCacheInfoResponse) ProtoMessage() {}
+func (*CMsgClientSiteLicenseGetContentCacheInfoResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_0a32817a56a37a6e, []int{6}
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfoResponse.Unmarshal(m, b)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfoResponse.Marshal(b, m, deterministic)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfoResponse.Merge(m, src)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) XXX_Size() int {
+	return xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfoResponse.Size(m)
+}
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfoResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CMsgClientSiteLicenseGetContentCacheInfoResponse proto.InternalMessageInfo
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) GetUseCache() bool {
+	if m != nil && m.UseCache != nil {
+		return *m.UseCache
+	}
+	return false
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) GetIpv4Address() uint32 {
+	if m != nil && m.Ipv4Address != nil {
+		return *m.Ipv4Address
+	}
+	return 0
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) GetPortNumber() uint32 {
+	if m != nil && m.PortNumber != nil {
+		return *m.PortNumber
+	}
+	return 0
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) GetP2PGroup() uint32 {
+	if m != nil && m.P2PGroup != nil {
+		return *m.P2PGroup
+	}
+	return 0
+}
+
+func (m *CMsgClientSiteLicenseGetContentCacheInfoResponse) GetIpAddress() string {
+	if m != nil && m.IpAddress != nil {
+		return *m.IpAddress
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CMsgClientSiteInfo)(nil), "CMsgClientSiteInfo")
+	proto.RegisterType((*CMsgClientSiteLicenseCheckout)(nil), "CMsgClientSiteLicenseCheckout")
+	proto.RegisterType((*CMsgClientSiteLicenseCheckoutResponse)(nil), "CMsgClientSiteLicenseCheckoutResponse")
+	proto.RegisterType((*CMsgClientSiteLicenseGetAvailableSeats)(nil), "CMsgClientSiteLicenseGetAvailableSeats")
+	proto.RegisterType((*CMsgClientSiteLicenseGetAvailableSeatsResponse)(nil), "CMsgClientSiteLicenseGetAvailableSeatsResponse")
+	proto.RegisterType((*CMsgClientSiteLicenseGetContentCacheInfo)(nil), "CMsgClientSiteLicenseGetContentCacheInfo")
+	proto.RegisterType((*CMsgClientSiteLicenseGetContentCacheInfoResponse)(nil), "CMsgClientSiteLicenseGetContentCacheInfoResponse")
+}
+
+func init() {
+	proto.RegisterFile("steammessages_sitelicenseclient.proto", fileDescriptor_0a32817a56a37a6e)
+}
+
+var fileDescriptor_0a32817a56a37a6e = []byte{
+	// 335 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x4b, 0xfb, 0x40,
+	0x14, 0xc4, 0xff, 0xfb, 0xb7, 0xa1, 0xed, 0xd3, 0x20, 0x5d, 0x3d, 0x04, 0x41, 0x08, 0x81, 0x4a,
+	0xf0, 0x50, 0xa4, 0x08, 0x82, 0x9e, 0x34, 0x07, 0x15, 0xf4, 0x62, 0x6f, 0x5e, 0xc2, 0x36, 0x79,
+	0xb6, 0x8b, 0x9b, 0xdd, 0x25, 0x6f, 0x53, 0xaf, 0x7e, 0x0b, 0xbf, 0xae, 0x64, 0x5b, 0x0a, 0x15,
+	0x2d, 0xbd, 0xee, 0xce, 0x6f, 0x66, 0x98, 0x07, 0x43, 0x72, 0x28, 0xaa, 0x0a, 0x89, 0xc4, 0x0c,
+	0x29, 0x27, 0xe9, 0x50, 0xc9, 0x02, 0x35, 0x61, 0xa1, 0x24, 0x6a, 0x37, 0xb2, 0xb5, 0x71, 0xe6,
+	0x24, 0xda, 0x94, 0x4d, 0x05, 0xe1, 0xf2, 0x27, 0x79, 0x05, 0x9e, 0x3d, 0xd3, 0x2c, 0xf3, 0xea,
+	0x89, 0x74, 0xf8, 0xa8, 0xdf, 0x0c, 0x3f, 0x84, 0x6e, 0x6b, 0x95, 0xcb, 0x32, 0x62, 0x31, 0x4b,
+	0x3b, 0x7c, 0x00, 0x7d, 0xff, 0xa0, 0x45, 0x85, 0xd1, 0xff, 0x98, 0xa5, 0x7d, 0x1e, 0x43, 0x24,
+	0x94, 0x32, 0x1f, 0x79, 0x21, 0x8a, 0x39, 0x96, 0x79, 0x51, 0x63, 0x89, 0xda, 0x49, 0xa1, 0x28,
+	0xda, 0x8b, 0x59, 0xda, 0x4b, 0x46, 0x70, 0xba, 0xe9, 0xfd, 0xb4, 0xac, 0x96, 0xcd, 0xb1, 0x78,
+	0x37, 0x8d, 0xe3, 0x21, 0x04, 0xc2, 0xda, 0x55, 0x48, 0x98, 0xdc, 0xc0, 0x70, 0xab, 0xfe, 0x05,
+	0xc9, 0x1a, 0x4d, 0xc8, 0x39, 0x74, 0xb1, 0x46, 0x6a, 0x94, 0xf3, 0x64, 0x70, 0xcd, 0xc6, 0xc9,
+	0x15, 0x9c, 0xfd, 0x0a, 0xdf, 0xa3, 0xbb, 0x5d, 0x08, 0xa9, 0xc4, 0x54, 0xe1, 0x04, 0x85, 0xa3,
+	0x9f, 0xa9, 0x13, 0x18, 0xed, 0x06, 0x6e, 0x8b, 0x6f, 0x4d, 0xa9, 0x15, 0xf9, 0x71, 0xc2, 0xe4,
+	0x1c, 0xd2, 0xbf, 0x4c, 0x33, 0xa3, 0x1d, 0x6a, 0x97, 0xb5, 0xab, 0xb5, 0x63, 0x27, 0x5f, 0x0c,
+	0x2e, 0x76, 0x15, 0xaf, 0x3b, 0x0c, 0xa0, 0xdf, 0x10, 0x2e, 0xb7, 0xf7, 0x2d, 0x7a, 0xfc, 0x18,
+	0x0e, 0xa4, 0x5d, 0x5c, 0xe6, 0xa2, 0x2c, 0x6b, 0xa4, 0x55, 0x13, 0x7e, 0x04, 0xfb, 0xd6, 0xd4,
+	0x2e, 0xd7, 0x4d, 0x35, 0xc5, 0xda, 0x5f, 0x26, 0x6c, 0x69, 0x3b, 0xb6, 0xf9, 0xac, 0x36, 0x8d,
+	0x8d, 0x3a, 0xfe, 0x89, 0x03, 0x48, 0xbb, 0x66, 0x83, 0xf6, 0xc4, 0x77, 0xc1, 0x03, 0xfb, 0x64,
+	0xff, 0xbe, 0x03, 0x00, 0x00, 0xff, 0xff, 0x09, 0x2f, 0x9f, 0xe9, 0x65, 0x02, 0x00, 0x00,
+}

vendor/github.com/Philipp15b/go-steam/protocol/protobuf/content_manifest.pb.go

@@ -1,27 +1,56 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: content_manifest.proto
-// DO NOT EDIT!
 
 package protobuf
 
-import proto "github.com/golang/protobuf/proto"
+import (
-import fmt "fmt"
+	fmt "fmt"
-import math "math"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package protobuf is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package protobuf to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
 type ContentManifestPayload struct {
-	Mappings         []*ContentManifestPayload_FileMapping `protobuf:"bytes,1,rep,name=mappings" json:"mappings,omitempty"`
+	Mappings             []*ContentManifestPayload_FileMapping `protobuf:"bytes,1,rep,name=mappings" json:"mappings,omitempty"`
-	XXX_unrecognized []byte                                `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}                              `json:"-"`
+	XXX_unrecognized     []byte                                `json:"-"`
+	XXX_sizecache        int32                                 `json:"-"`
 }
 
-func (m *ContentManifestPayload) Reset()                    { *m = ContentManifestPayload{} }
+func (m *ContentManifestPayload) Reset()         { *m = ContentManifestPayload{} }
-func (m *ContentManifestPayload) String() string            { return proto.CompactTextString(m) }
+func (m *ContentManifestPayload) String() string { return proto.CompactTextString(m) }
-func (*ContentManifestPayload) ProtoMessage()               {}
+func (*ContentManifestPayload) ProtoMessage()    {}
-func (*ContentManifestPayload) Descriptor() ([]byte, []int) { return content_manifest_fileDescriptor0, []int{0} }
+func (*ContentManifestPayload) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e3cda137a29253ba, []int{0}
+}
+
+func (m *ContentManifestPayload) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentManifestPayload.Unmarshal(m, b)
+}
+func (m *ContentManifestPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentManifestPayload.Marshal(b, m, deterministic)
+}
+func (m *ContentManifestPayload) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentManifestPayload.Merge(m, src)
+}
+func (m *ContentManifestPayload) XXX_Size() int {
+	return xxx_messageInfo_ContentManifestPayload.Size(m)
+}
+func (m *ContentManifestPayload) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentManifestPayload.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentManifestPayload proto.InternalMessageInfo
 
 func (m *ContentManifestPayload) GetMappings() []*ContentManifestPayload_FileMapping {
 	if m != nil {
@@ -31,23 +60,43 @@ func (m *ContentManifestPayload) GetMappings() []*ContentManifestPayload_FileMap
 }
 
 type ContentManifestPayload_FileMapping struct {
-	Filename         *string                                         `protobuf:"bytes,1,opt,name=filename" json:"filename,omitempty"`
+	Filename             *string                                         `protobuf:"bytes,1,opt,name=filename" json:"filename,omitempty"`
-	Size             *uint64                                         `protobuf:"varint,2,opt,name=size" json:"size,omitempty"`
+	Size                 *uint64                                         `protobuf:"varint,2,opt,name=size" json:"size,omitempty"`
-	Flags            *uint32                                         `protobuf:"varint,3,opt,name=flags" json:"flags,omitempty"`
+	Flags                *uint32                                         `protobuf:"varint,3,opt,name=flags" json:"flags,omitempty"`
-	ShaFilename      []byte                                          `protobuf:"bytes,4,opt,name=sha_filename" json:"sha_filename,omitempty"`
+	ShaFilename          []byte                                          `protobuf:"bytes,4,opt,name=sha_filename" json:"sha_filename,omitempty"`
-	ShaContent       []byte                                          `protobuf:"bytes,5,opt,name=sha_content" json:"sha_content,omitempty"`
+	ShaContent           []byte                                          `protobuf:"bytes,5,opt,name=sha_content" json:"sha_content,omitempty"`
-	Chunks           []*ContentManifestPayload_FileMapping_ChunkData `protobuf:"bytes,6,rep,name=chunks" json:"chunks,omitempty"`
+	Chunks               []*ContentManifestPayload_FileMapping_ChunkData `protobuf:"bytes,6,rep,name=chunks" json:"chunks,omitempty"`
-	Linktarget       *string                                         `protobuf:"bytes,7,opt,name=linktarget" json:"linktarget,omitempty"`
+	Linktarget           *string                                         `protobuf:"bytes,7,opt,name=linktarget" json:"linktarget,omitempty"`
-	XXX_unrecognized []byte                                          `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}                                        `json:"-"`
+	XXX_unrecognized     []byte                                          `json:"-"`
+	XXX_sizecache        int32                                           `json:"-"`
 }
 
 func (m *ContentManifestPayload_FileMapping) Reset()         { *m = ContentManifestPayload_FileMapping{} }
 func (m *ContentManifestPayload_FileMapping) String() string { return proto.CompactTextString(m) }
 func (*ContentManifestPayload_FileMapping) ProtoMessage()    {}
 func (*ContentManifestPayload_FileMapping) Descriptor() ([]byte, []int) {
-	return content_manifest_fileDescriptor0, []int{0, 0}
+	return fileDescriptor_e3cda137a29253ba, []int{0, 0}
 }
 
+func (m *ContentManifestPayload_FileMapping) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentManifestPayload_FileMapping.Unmarshal(m, b)
+}
+func (m *ContentManifestPayload_FileMapping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentManifestPayload_FileMapping.Marshal(b, m, deterministic)
+}
+func (m *ContentManifestPayload_FileMapping) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentManifestPayload_FileMapping.Merge(m, src)
+}
+func (m *ContentManifestPayload_FileMapping) XXX_Size() int {
+	return xxx_messageInfo_ContentManifestPayload_FileMapping.Size(m)
+}
+func (m *ContentManifestPayload_FileMapping) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentManifestPayload_FileMapping.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentManifestPayload_FileMapping proto.InternalMessageInfo
+
 func (m *ContentManifestPayload_FileMapping) GetFilename() string {
 	if m != nil && m.Filename != nil {
 		return *m.Filename
@@ -98,12 +147,14 @@ func (m *ContentManifestPayload_FileMapping) GetLinktarget() string {
 }
 
 type ContentManifestPayload_FileMapping_ChunkData struct {
-	Sha              []byte  `protobuf:"bytes,1,opt,name=sha" json:"sha,omitempty"`
+	Sha                  []byte   `protobuf:"bytes,1,opt,name=sha" json:"sha,omitempty"`
-	Crc              *uint32 `protobuf:"fixed32,2,opt,name=crc" json:"crc,omitempty"`
+	Crc                  *uint32  `protobuf:"fixed32,2,opt,name=crc" json:"crc,omitempty"`
-	Offset           *uint64 `protobuf:"varint,3,opt,name=offset" json:"offset,omitempty"`
+	Offset               *uint64  `protobuf:"varint,3,opt,name=offset" json:"offset,omitempty"`
-	CbOriginal       *uint32 `protobuf:"varint,4,opt,name=cb_original" json:"cb_original,omitempty"`
+	CbOriginal           *uint32  `protobuf:"varint,4,opt,name=cb_original" json:"cb_original,omitempty"`
-	CbCompressed     *uint32 `protobuf:"varint,5,opt,name=cb_compressed" json:"cb_compressed,omitempty"`
+	CbCompressed         *uint32  `protobuf:"varint,5,opt,name=cb_compressed" json:"cb_compressed,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *ContentManifestPayload_FileMapping_ChunkData) Reset() {
@@ -114,9 +165,27 @@ func (m *ContentManifestPayload_FileMapping_ChunkData) String() string {
 }
 func (*ContentManifestPayload_FileMapping_ChunkData) ProtoMessage() {}
 func (*ContentManifestPayload_FileMapping_ChunkData) Descriptor() ([]byte, []int) {
-	return content_manifest_fileDescriptor0, []int{0, 0, 0}
+	return fileDescriptor_e3cda137a29253ba, []int{0, 0, 0}
 }
 
+func (m *ContentManifestPayload_FileMapping_ChunkData) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentManifestPayload_FileMapping_ChunkData.Unmarshal(m, b)
+}
+func (m *ContentManifestPayload_FileMapping_ChunkData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentManifestPayload_FileMapping_ChunkData.Marshal(b, m, deterministic)
+}
+func (m *ContentManifestPayload_FileMapping_ChunkData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentManifestPayload_FileMapping_ChunkData.Merge(m, src)
+}
+func (m *ContentManifestPayload_FileMapping_ChunkData) XXX_Size() int {
+	return xxx_messageInfo_ContentManifestPayload_FileMapping_ChunkData.Size(m)
+}
+func (m *ContentManifestPayload_FileMapping_ChunkData) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentManifestPayload_FileMapping_ChunkData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentManifestPayload_FileMapping_ChunkData proto.InternalMessageInfo
+
 func (m *ContentManifestPayload_FileMapping_ChunkData) GetSha() []byte {
 	if m != nil {
 		return m.Sha
@@ -153,22 +222,44 @@ func (m *ContentManifestPayload_FileMapping_ChunkData) GetCbCompressed() uint32
 }
 
 type ContentManifestMetadata struct {
-	DepotId            *uint32 `protobuf:"varint,1,opt,name=depot_id" json:"depot_id,omitempty"`
+	DepotId              *uint32  `protobuf:"varint,1,opt,name=depot_id" json:"depot_id,omitempty"`
-	GidManifest        *uint64 `protobuf:"varint,2,opt,name=gid_manifest" json:"gid_manifest,omitempty"`
+	GidManifest          *uint64  `protobuf:"varint,2,opt,name=gid_manifest" json:"gid_manifest,omitempty"`
-	CreationTime       *uint32 `protobuf:"varint,3,opt,name=creation_time" json:"creation_time,omitempty"`
+	CreationTime         *uint32  `protobuf:"varint,3,opt,name=creation_time" json:"creation_time,omitempty"`
-	FilenamesEncrypted *bool   `protobuf:"varint,4,opt,name=filenames_encrypted" json:"filenames_encrypted,omitempty"`
+	FilenamesEncrypted   *bool    `protobuf:"varint,4,opt,name=filenames_encrypted" json:"filenames_encrypted,omitempty"`
-	CbDiskOriginal     *uint64 `protobuf:"varint,5,opt,name=cb_disk_original" json:"cb_disk_original,omitempty"`
+	CbDiskOriginal       *uint64  `protobuf:"varint,5,opt,name=cb_disk_original" json:"cb_disk_original,omitempty"`
-	CbDiskCompressed   *uint64 `protobuf:"varint,6,opt,name=cb_disk_compressed" json:"cb_disk_compressed,omitempty"`
+	CbDiskCompressed     *uint64  `protobuf:"varint,6,opt,name=cb_disk_compressed" json:"cb_disk_compressed,omitempty"`
-	UniqueChunks       *uint32 `protobuf:"varint,7,opt,name=unique_chunks" json:"unique_chunks,omitempty"`
+	UniqueChunks         *uint32  `protobuf:"varint,7,opt,name=unique_chunks" json:"unique_chunks,omitempty"`
-	CrcEncrypted       *uint32 `protobuf:"varint,8,opt,name=crc_encrypted" json:"crc_encrypted,omitempty"`
+	CrcEncrypted         *uint32  `protobuf:"varint,8,opt,name=crc_encrypted" json:"crc_encrypted,omitempty"`
-	CrcClear           *uint32 `protobuf:"varint,9,opt,name=crc_clear" json:"crc_clear,omitempty"`
+	CrcClear             *uint32  `protobuf:"varint,9,opt,name=crc_clear" json:"crc_clear,omitempty"`
-	XXX_unrecognized   []byte  `json:"-"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ContentManifestMetadata) Reset()                    { *m = ContentManifestMetadata{} }
+func (m *ContentManifestMetadata) Reset()         { *m = ContentManifestMetadata{} }
-func (m *ContentManifestMetadata) String() string            { return proto.CompactTextString(m) }
+func (m *ContentManifestMetadata) String() string { return proto.CompactTextString(m) }
-func (*ContentManifestMetadata) ProtoMessage()               {}
+func (*ContentManifestMetadata) ProtoMessage()    {}
-func (*ContentManifestMetadata) Descriptor() ([]byte, []int) { return content_manifest_fileDescriptor0, []int{1} }
+func (*ContentManifestMetadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e3cda137a29253ba, []int{1}
+}
+
+func (m *ContentManifestMetadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentManifestMetadata.Unmarshal(m, b)
+}
+func (m *ContentManifestMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentManifestMetadata.Marshal(b, m, deterministic)
+}
+func (m *ContentManifestMetadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentManifestMetadata.Merge(m, src)
+}
+func (m *ContentManifestMetadata) XXX_Size() int {
+	return xxx_messageInfo_ContentManifestMetadata.Size(m)
+}
+func (m *ContentManifestMetadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentManifestMetadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentManifestMetadata proto.InternalMessageInfo
 
 func (m *ContentManifestMetadata) GetDepotId() uint32 {
 	if m != nil && m.DepotId != nil {
@@ -234,14 +325,36 @@ func (m *ContentManifestMetadata) GetCrcClear() uint32 {
 }
 
 type ContentManifestSignature struct {
-	Signature        []byte `protobuf:"bytes,1,opt,name=signature" json:"signature,omitempty"`
+	Signature            []byte   `protobuf:"bytes,1,opt,name=signature" json:"signature,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *ContentManifestSignature) Reset()                    { *m = ContentManifestSignature{} }
+func (m *ContentManifestSignature) Reset()         { *m = ContentManifestSignature{} }
-func (m *ContentManifestSignature) String() string            { return proto.CompactTextString(m) }
+func (m *ContentManifestSignature) String() string { return proto.CompactTextString(m) }
-func (*ContentManifestSignature) ProtoMessage()               {}
+func (*ContentManifestSignature) ProtoMessage()    {}
-func (*ContentManifestSignature) Descriptor() ([]byte, []int) { return content_manifest_fileDescriptor0, []int{2} }
+func (*ContentManifestSignature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e3cda137a29253ba, []int{2}
+}
+
+func (m *ContentManifestSignature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentManifestSignature.Unmarshal(m, b)
+}
+func (m *ContentManifestSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentManifestSignature.Marshal(b, m, deterministic)
+}
+func (m *ContentManifestSignature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentManifestSignature.Merge(m, src)
+}
+func (m *ContentManifestSignature) XXX_Size() int {
+	return xxx_messageInfo_ContentManifestSignature.Size(m)
+}
+func (m *ContentManifestSignature) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentManifestSignature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentManifestSignature proto.InternalMessageInfo
 
 func (m *ContentManifestSignature) GetSignature() []byte {
 	if m != nil {
@@ -250,40 +363,184 @@ func (m *ContentManifestSignature) GetSignature() []byte {
 	return nil
 }
 
+type ContentDeltaChunks struct {
+	DepotId              *uint32                          `protobuf:"varint,1,opt,name=depot_id" json:"depot_id,omitempty"`
+	ManifestIdSource     *uint64                          `protobuf:"varint,2,opt,name=manifest_id_source" json:"manifest_id_source,omitempty"`
+	ManifestIdTarget     *uint64                          `protobuf:"varint,3,opt,name=manifest_id_target" json:"manifest_id_target,omitempty"`
+	DeltaChunks          []*ContentDeltaChunks_DeltaChunk `protobuf:"bytes,4,rep,name=deltaChunks" json:"deltaChunks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
+	XXX_unrecognized     []byte                           `json:"-"`
+	XXX_sizecache        int32                            `json:"-"`
+}
+
+func (m *ContentDeltaChunks) Reset()         { *m = ContentDeltaChunks{} }
+func (m *ContentDeltaChunks) String() string { return proto.CompactTextString(m) }
+func (*ContentDeltaChunks) ProtoMessage()    {}
+func (*ContentDeltaChunks) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e3cda137a29253ba, []int{3}
+}
+
+func (m *ContentDeltaChunks) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentDeltaChunks.Unmarshal(m, b)
+}
+func (m *ContentDeltaChunks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentDeltaChunks.Marshal(b, m, deterministic)
+}
+func (m *ContentDeltaChunks) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentDeltaChunks.Merge(m, src)
+}
+func (m *ContentDeltaChunks) XXX_Size() int {
+	return xxx_messageInfo_ContentDeltaChunks.Size(m)
+}
+func (m *ContentDeltaChunks) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentDeltaChunks.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentDeltaChunks proto.InternalMessageInfo
+
+func (m *ContentDeltaChunks) GetDepotId() uint32 {
+	if m != nil && m.DepotId != nil {
+		return *m.DepotId
+	}
+	return 0
+}
+
+func (m *ContentDeltaChunks) GetManifestIdSource() uint64 {
+	if m != nil && m.ManifestIdSource != nil {
+		return *m.ManifestIdSource
+	}
+	return 0
+}
+
+func (m *ContentDeltaChunks) GetManifestIdTarget() uint64 {
+	if m != nil && m.ManifestIdTarget != nil {
+		return *m.ManifestIdTarget
+	}
+	return 0
+}
+
+func (m *ContentDeltaChunks) GetDeltaChunks() []*ContentDeltaChunks_DeltaChunk {
+	if m != nil {
+		return m.DeltaChunks
+	}
+	return nil
+}
+
+type ContentDeltaChunks_DeltaChunk struct {
+	ShaSource            []byte   `protobuf:"bytes,1,opt,name=sha_source" json:"sha_source,omitempty"`
+	ShaTarget            []byte   `protobuf:"bytes,2,opt,name=sha_target" json:"sha_target,omitempty"`
+	SizeOriginal         *uint32  `protobuf:"varint,3,opt,name=size_original" json:"size_original,omitempty"`
+	PatchMethod          *uint32  `protobuf:"varint,4,opt,name=patch_method" json:"patch_method,omitempty"`
+	Chunk                []byte   `protobuf:"bytes,5,opt,name=chunk" json:"chunk,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ContentDeltaChunks_DeltaChunk) Reset()         { *m = ContentDeltaChunks_DeltaChunk{} }
+func (m *ContentDeltaChunks_DeltaChunk) String() string { return proto.CompactTextString(m) }
+func (*ContentDeltaChunks_DeltaChunk) ProtoMessage()    {}
+func (*ContentDeltaChunks_DeltaChunk) Descriptor() ([]byte, []int) {
+	return fileDescriptor_e3cda137a29253ba, []int{3, 0}
+}
+
+func (m *ContentDeltaChunks_DeltaChunk) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ContentDeltaChunks_DeltaChunk.Unmarshal(m, b)
+}
+func (m *ContentDeltaChunks_DeltaChunk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ContentDeltaChunks_DeltaChunk.Marshal(b, m, deterministic)
+}
+func (m *ContentDeltaChunks_DeltaChunk) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ContentDeltaChunks_DeltaChunk.Merge(m, src)
+}
+func (m *ContentDeltaChunks_DeltaChunk) XXX_Size() int {
+	return xxx_messageInfo_ContentDeltaChunks_DeltaChunk.Size(m)
+}
+func (m *ContentDeltaChunks_DeltaChunk) XXX_DiscardUnknown() {
+	xxx_messageInfo_ContentDeltaChunks_DeltaChunk.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ContentDeltaChunks_DeltaChunk proto.InternalMessageInfo
+
+func (m *ContentDeltaChunks_DeltaChunk) GetShaSource() []byte {
+	if m != nil {
+		return m.ShaSource
+	}
+	return nil
+}
+
+func (m *ContentDeltaChunks_DeltaChunk) GetShaTarget() []byte {
+	if m != nil {
+		return m.ShaTarget
+	}
+	return nil
+}
+
+func (m *ContentDeltaChunks_DeltaChunk) GetSizeOriginal() uint32 {
+	if m != nil && m.SizeOriginal != nil {
+		return *m.SizeOriginal
+	}
+	return 0
+}
+
+func (m *ContentDeltaChunks_DeltaChunk) GetPatchMethod() uint32 {
+	if m != nil && m.PatchMethod != nil {
+		return *m.PatchMethod
+	}
+	return 0
+}
+
+func (m *ContentDeltaChunks_DeltaChunk) GetChunk() []byte {
+	if m != nil {
+		return m.Chunk
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*ContentManifestPayload)(nil), "ContentManifestPayload")
 	proto.RegisterType((*ContentManifestPayload_FileMapping)(nil), "ContentManifestPayload.FileMapping")
 	proto.RegisterType((*ContentManifestPayload_FileMapping_ChunkData)(nil), "ContentManifestPayload.FileMapping.ChunkData")
 	proto.RegisterType((*ContentManifestMetadata)(nil), "ContentManifestMetadata")
 	proto.RegisterType((*ContentManifestSignature)(nil), "ContentManifestSignature")
+	proto.RegisterType((*ContentDeltaChunks)(nil), "ContentDeltaChunks")
+	proto.RegisterType((*ContentDeltaChunks_DeltaChunk)(nil), "ContentDeltaChunks.DeltaChunk")
 }
 
-var content_manifest_fileDescriptor0 = []byte{
+func init() { proto.RegisterFile("content_manifest.proto", fileDescriptor_e3cda137a29253ba) }
-	// 409 bytes of a gzipped FileDescriptorProto
+
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x91, 0xbd, 0x8e, 0xd4, 0x30,
+var fileDescriptor_e3cda137a29253ba = []byte{
-	0x14, 0x85, 0xc9, 0xfc, 0x26, 0x37, 0x09, 0x5a, 0xbc, 0xb0, 0x58, 0x43, 0x83, 0x96, 0x66, 0x9b,
+	// 508 bytes of a gzipped FileDescriptorProto
-	0x4d, 0x81, 0x44, 0x49, 0xc3, 0x22, 0x44, 0x33, 0x12, 0x12, 0x0f, 0x10, 0x5d, 0x1c, 0x27, 0x6b,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x8e, 0xd3, 0x30,
-	0x4d, 0x62, 0x07, 0xdb, 0x29, 0x96, 0x8a, 0x17, 0xe1, 0x0d, 0x91, 0x78, 0x05, 0x6c, 0x27, 0x99,
+	0x10, 0xc7, 0x49, 0xbf, 0x3b, 0x6d, 0x50, 0xf1, 0xb2, 0x8b, 0x55, 0x24, 0x54, 0x95, 0x4b, 0x2f,
-	0x1d, 0x8d, 0x28, 0x28, 0xcf, 0xf1, 0xb5, 0xcf, 0x77, 0x8f, 0xe1, 0x8a, 0x29, 0x69, 0xb9, 0xb4,
+	0x9b, 0x03, 0x88, 0x23, 0x17, 0x76, 0x85, 0xb8, 0x54, 0x42, 0xe2, 0x01, 0x2c, 0xd7, 0x76, 0x53,
-	0x65, 0x87, 0x52, 0xd4, 0xdc, 0xd8, 0xa2, 0xd7, 0xca, 0xaa, 0xeb, 0x3f, 0x0b, 0xb8, 0xba, 0x1b,
+	0xab, 0x89, 0x1d, 0x6c, 0xe7, 0xb0, 0x9c, 0xb8, 0xf0, 0x18, 0xbc, 0x21, 0x12, 0xaf, 0x80, 0xec,
-	0x8f, 0xf6, 0xd3, 0xc9, 0x17, 0x7c, 0x68, 0x15, 0x56, 0xe4, 0x1d, 0xc4, 0x1d, 0xf6, 0xbd, 0x90,
+	0x38, 0x4d, 0x55, 0xf6, 0xb0, 0xb7, 0xcc, 0x47, 0x3c, 0xbf, 0xf9, 0xcf, 0x1f, 0x6e, 0x98, 0x56,
-	0x8d, 0xa1, 0xd1, 0xeb, 0xe5, 0x4d, 0xfa, 0xf6, 0x4d, 0xf1, 0xef, 0xd1, 0xe2, 0x93, 0x68, 0xf9,
+	0x4e, 0x28, 0x47, 0x4a, 0xaa, 0xe4, 0x5e, 0x58, 0x97, 0x55, 0x46, 0x3b, 0xbd, 0xfe, 0xdb, 0x83,
-	0x7e, 0x9c, 0xdd, 0xfd, 0x5a, 0x40, 0x7a, 0xa2, 0xc9, 0x05, 0xc4, 0xb5, 0x93, 0x12, 0x3b, 0xee,
+	0x9b, 0xbb, 0xa6, 0xb4, 0x8d, 0x95, 0xaf, 0xf4, 0xa1, 0xd0, 0x94, 0xa3, 0x0f, 0x30, 0x29, 0x69,
-	0x9e, 0x89, 0x6e, 0x12, 0x92, 0xc1, 0xca, 0x88, 0x1f, 0x9c, 0x2e, 0x9c, 0x5a, 0x91, 0x1c, 0xd6,
+	0x55, 0x49, 0x95, 0x5b, 0x9c, 0xac, 0xfa, 0x9b, 0xd9, 0xbb, 0xb7, 0xd9, 0xe3, 0xad, 0xd9, 0x67,
-	0x75, 0x8b, 0x2e, 0x63, 0xe9, 0x64, 0x4e, 0x9e, 0x43, 0x66, 0xee, 0xb1, 0x3c, 0x5e, 0x59, 0x39,
+	0x59, 0x88, 0x6d, 0xd3, 0xbb, 0xfc, 0xdd, 0x83, 0xd9, 0x59, 0x8c, 0x16, 0x30, 0xd9, 0xcb, 0x42,
-	0x37, 0x23, 0x97, 0x90, 0x7a, 0x77, 0x5a, 0x82, 0xae, 0x83, 0xf9, 0x1e, 0x36, 0xec, 0x7e, 0x90,
+	0x28, 0x5a, 0x0a, 0x9c, 0xac, 0x92, 0xcd, 0x14, 0xcd, 0x61, 0x60, 0xe5, 0x0f, 0x81, 0x7b, 0xab,
-	0x07, 0x43, 0x37, 0x01, 0xef, 0xf6, 0x3f, 0xf0, 0x8a, 0x3b, 0x7f, 0xe3, 0x23, 0x5a, 0x24, 0x04,
+	0x64, 0x33, 0x40, 0x29, 0x0c, 0xf7, 0x05, 0xcd, 0x2d, 0xee, 0xaf, 0x92, 0x4d, 0x8a, 0x5e, 0xc2,
-	0xa0, 0x15, 0xf2, 0x60, 0x51, 0x37, 0xdc, 0xd2, 0xad, 0x47, 0xdb, 0x21, 0x24, 0x8f, 0x03, 0x29,
+	0xdc, 0x1e, 0x28, 0x39, 0xfd, 0x32, 0x58, 0x25, 0x9b, 0x39, 0xba, 0x82, 0x99, 0xcf, 0xc6, 0x25,
-	0x2c, 0x5d, 0x68, 0x80, 0xce, 0xbc, 0x60, 0x9a, 0x05, 0xe6, 0x2d, 0x79, 0x0a, 0x1b, 0x55, 0xd7,
+	0xf0, 0x30, 0x24, 0x3f, 0xc2, 0x88, 0x1d, 0x6a, 0x75, 0xb4, 0x78, 0x14, 0xf0, 0x6e, 0x9f, 0x80,
-	0xc6, 0x5d, 0x5b, 0x86, 0x1d, 0x1c, 0x1e, 0xfb, 0x56, 0x2a, 0x2d, 0x1a, 0x21, 0xb1, 0x0d, 0xcc,
+	0x97, 0xdd, 0xf9, 0x3f, 0xee, 0xa9, 0xa3, 0x08, 0x01, 0x14, 0x52, 0x1d, 0x1d, 0x35, 0xb9, 0x70,
-	0x39, 0x79, 0x01, 0xb9, 0x33, 0x99, 0xea, 0x7a, 0xcd, 0x8d, 0xe1, 0x55, 0xa0, 0xce, 0xaf, 0x7f,
+	0x78, 0xec, 0xd1, 0x96, 0x14, 0xa6, 0x5d, 0xc3, 0x0c, 0xfa, 0xf6, 0x40, 0x03, 0xf4, 0xdc, 0x07,
-	0x47, 0xf0, 0xf2, 0x8c, 0x73, 0xcf, 0x2d, 0x56, 0x3e, 0xd1, 0x75, 0x55, 0xf1, 0x5e, 0xd9, 0x52,
+	0xcc, 0xb0, 0xc0, 0x3c, 0x46, 0xcf, 0x61, 0xa4, 0xf7, 0x7b, 0x2b, 0x5c, 0x80, 0x1e, 0x78, 0x3c,
-	0x54, 0x21, 0x36, 0xd4, 0xd1, 0x88, 0xea, 0xf8, 0x6b, 0x53, 0x67, 0xfe, 0x69, 0xcd, 0xd1, 0x0a,
+	0xb6, 0x23, 0xda, 0xc8, 0x5c, 0x2a, 0x5a, 0x04, 0xe6, 0x14, 0x5d, 0x43, 0xca, 0x76, 0x84, 0xe9,
-	0x25, 0x4b, 0x2b, 0x5c, 0x4b, 0x63, 0x77, 0xaf, 0xe0, 0x72, 0xee, 0xcd, 0x94, 0x5c, 0x32, 0xfd,
+	0xb2, 0x32, 0xc2, 0x5a, 0xc1, 0x03, 0x75, 0xba, 0xfe, 0x93, 0xc0, 0xab, 0x0b, 0xce, 0xad, 0x70,
-	0xd0, 0x5b, 0x97, 0xeb, 0x71, 0x62, 0x42, 0xe1, 0xc2, 0xe1, 0x54, 0xc2, 0x1c, 0x1e, 0x41, 0xd7,
+	0x94, 0xfb, 0x89, 0x0b, 0x98, 0x70, 0x51, 0x69, 0x47, 0x24, 0x0f, 0x63, 0x83, 0x1c, 0xb9, 0xe4,
-	0xe1, 0xb5, 0x1d, 0x90, 0xf9, 0xe4, 0x84, 0x76, 0x33, 0x27, 0x0d, 0x52, 0x7c, 0x1f, 0x78, 0x39,
+	0xa7, 0xab, 0x45, 0xcd, 0xfc, 0xd3, 0x46, 0x50, 0x27, 0xb5, 0x22, 0x4e, 0x96, 0x22, 0x6a, 0xf7,
-	0x55, 0xbd, 0x3d, 0xee, 0xa6, 0xd9, 0x49, 0x46, 0x1c, 0xec, 0x67, 0x90, 0x78, 0x9b, 0xb5, 0x1c,
+	0x1a, 0xae, 0x5a, 0xdd, 0x2c, 0x11, 0x8a, 0x99, 0x87, 0xca, 0x09, 0x1e, 0x70, 0x26, 0x08, 0xc3,
-	0x35, 0x4d, 0xc2, 0xba, 0xb7, 0x40, 0xcf, 0xb6, 0xfd, 0x2a, 0x1a, 0x89, 0x76, 0xd0, 0xdc, 0x8f,
+	0x82, 0xed, 0x08, 0x97, 0xf6, 0xd8, 0x81, 0x0e, 0xc3, 0x6b, 0x4b, 0x40, 0x6d, 0xe5, 0x8c, 0x76,
-	0x9b, 0x59, 0x8c, 0x35, 0x7f, 0x58, 0x7f, 0x8e, 0x7e, 0x46, 0x4f, 0xfe, 0x06, 0x00, 0x00, 0xff,
+	0xd4, 0x4e, 0xaa, 0x95, 0xfc, 0x5e, 0x0b, 0x12, 0xa5, 0x1e, 0x9f, 0x76, 0x33, 0xec, 0x6c, 0xc6,
-	0xff, 0xc6, 0x87, 0xdb, 0xe6, 0xaf, 0x02, 0x00, 0x00,
+	0x24, 0xa4, 0x5f, 0xc0, 0xd4, 0xa7, 0x59, 0x21, 0xa8, 0xc1, 0xd3, 0xb0, 0xee, 0x2d, 0xe0, 0x8b,
+	0x6d, 0xbf, 0xc9, 0x5c, 0x51, 0x57, 0x1b, 0xe1, 0xdb, 0x6d, 0x1b, 0x34, 0x32, 0xaf, 0x7f, 0xf5,
+	0x00, 0xc5, 0xfe, 0x7b, 0x51, 0x38, 0x1a, 0xae, 0x61, 0x1f, 0x11, 0x66, 0x09, 0xa8, 0x15, 0x85,
+	0x48, 0x4e, 0xac, 0xae, 0x0d, 0x6b, 0x2d, 0x75, 0x51, 0x8b, 0x17, 0x6e, 0x4e, 0xf5, 0x1e, 0x66,
+	0xbc, 0x7b, 0x18, 0x0f, 0x82, 0x73, 0xde, 0x64, 0xff, 0xcf, 0xcc, 0xba, 0xef, 0x65, 0x05, 0xd0,
+	0x45, 0xde, 0x38, 0xde, 0x8c, 0x71, 0x64, 0x63, 0x8f, 0x98, 0x8b, 0xa3, 0x7a, 0x21, 0x77, 0x0d,
+	0xa9, 0xf7, 0x79, 0x27, 0xf7, 0xc9, 0xe1, 0x15, 0x75, 0xec, 0x40, 0x4a, 0xe1, 0x0e, 0x9a, 0x47,
+	0xb7, 0xa4, 0x30, 0x0c, 0x0a, 0x37, 0xde, 0xfe, 0x34, 0xfc, 0x92, 0xfc, 0x4c, 0x9e, 0xfd, 0x0b,
+	0x00, 0x00, 0xff, 0xff, 0x00, 0x92, 0x22, 0xd7, 0xb7, 0x03, 0x00, 0x00,
 }

vendor/github.com/Philipp15b/go-steam/protocol/steamlang/messages.go

@@ -723,7 +723,7 @@ func (d *MsgClientNewLoginKeyAccepted) Deserialize(r io.Reader) error {
 
 const (
 	MsgClientLogon_ObfuscationMask                                      uint32 = 0xBAADF00D
-	MsgClientLogon_CurrentProtocol                                      uint32 = 65579
+	MsgClientLogon_CurrentProtocol                                      uint32 = 65580
 	MsgClientLogon_ProtocolVerMajorMask                                 uint32 = 0xFFFF0000
 	MsgClientLogon_ProtocolVerMinorMask                                 uint32 = 0xFFFF
 	MsgClientLogon_ProtocolVerMinorMinGameServers                       uint16 = 4
@@ -744,7 +744,11 @@ const (
 	MsgClientLogon_ProtocolVerMinorMinForMachineAuth                    uint16 = 33
 	MsgClientLogon_ProtocolVerMinorMinForSessionIDLastAnon              uint16 = 36
 	MsgClientLogon_ProtocolVerMinorMinForEnhancedAppList                uint16 = 40
+	MsgClientLogon_ProtocolVerMinorMinForSteamGuardNotificationUI       uint16 = 41
+	MsgClientLogon_ProtocolVerMinorMinForProtoBufServiceModuleCalls     uint16 = 42
 	MsgClientLogon_ProtocolVerMinorMinForGzipMultiMessages              uint16 = 43
+	MsgClientLogon_ProtocolVerMinorMinForNewVoiceCallAuthorize          uint16 = 44
+	MsgClientLogon_ProtocolVerMinorMinForClientInstanceIDs              uint16 = 44
 )
 
 type MsgClientLogon struct {
@@ -1976,64 +1980,6 @@ func (d *MsgClientChatRoomInfo) Deserialize(r io.Reader) error {
 	return err
 }
 
-type MsgClientGetNumberOfCurrentPlayers struct {
-	GameID uint64
-}
-
-func NewMsgClientGetNumberOfCurrentPlayers() *MsgClientGetNumberOfCurrentPlayers {
-	return &MsgClientGetNumberOfCurrentPlayers{}
-}
-
-func (d *MsgClientGetNumberOfCurrentPlayers) GetEMsg() EMsg {
-	return EMsg_ClientGetNumberOfCurrentPlayers
-}
-
-func (d *MsgClientGetNumberOfCurrentPlayers) Serialize(w io.Writer) error {
-	var err error
-	err = binary.Write(w, binary.LittleEndian, d.GameID)
-	return err
-}
-
-func (d *MsgClientGetNumberOfCurrentPlayers) Deserialize(r io.Reader) error {
-	var err error
-	d.GameID, err = rwu.ReadUint64(r)
-	return err
-}
-
-type MsgClientGetNumberOfCurrentPlayersResponse struct {
-	Result     EResult
-	NumPlayers uint32
-}
-
-func NewMsgClientGetNumberOfCurrentPlayersResponse() *MsgClientGetNumberOfCurrentPlayersResponse {
-	return &MsgClientGetNumberOfCurrentPlayersResponse{}
-}
-
-func (d *MsgClientGetNumberOfCurrentPlayersResponse) GetEMsg() EMsg {
-	return EMsg_ClientGetNumberOfCurrentPlayersResponse
-}
-
-func (d *MsgClientGetNumberOfCurrentPlayersResponse) Serialize(w io.Writer) error {
-	var err error
-	err = binary.Write(w, binary.LittleEndian, d.Result)
-	if err != nil {
-		return err
-	}
-	err = binary.Write(w, binary.LittleEndian, d.NumPlayers)
-	return err
-}
-
-func (d *MsgClientGetNumberOfCurrentPlayersResponse) Deserialize(r io.Reader) error {
-	var err error
-	t0, err := rwu.ReadInt32(r)
-	if err != nil {
-		return err
-	}
-	d.Result = EResult(t0)
-	d.NumPlayers, err = rwu.ReadUint32(r)
-	return err
-}
-
 type MsgClientSetIgnoreFriend struct {
 	MySteamId     steamid.SteamId
 	SteamIdFriend steamid.SteamId
@@ -2079,8 +2025,8 @@ func (d *MsgClientSetIgnoreFriend) Deserialize(r io.Reader) error {
 }
 
 type MsgClientSetIgnoreFriendResponse struct {
-	Unknown uint64
+	FriendId steamid.SteamId
-	Result  EResult
+	Result   EResult
 }
 
 func NewMsgClientSetIgnoreFriendResponse() *MsgClientSetIgnoreFriendResponse {
@@ -2093,7 +2039,7 @@ func (d *MsgClientSetIgnoreFriendResponse) GetEMsg() EMsg {
 
 func (d *MsgClientSetIgnoreFriendResponse) Serialize(w io.Writer) error {
 	var err error
-	err = binary.Write(w, binary.LittleEndian, d.Unknown)
+	err = binary.Write(w, binary.LittleEndian, d.FriendId)
 	if err != nil {
 		return err
 	}
@@ -2103,12 +2049,13 @@ func (d *MsgClientSetIgnoreFriendResponse) Serialize(w io.Writer) error {
 
 func (d *MsgClientSetIgnoreFriendResponse) Deserialize(r io.Reader) error {
 	var err error
-	d.Unknown, err = rwu.ReadUint64(r)
+	t0, err := rwu.ReadUint64(r)
 	if err != nil {
 		return err
 	}
-	t0, err := rwu.ReadInt32(r)
+	d.FriendId = steamid.SteamId(t0)
-	d.Result = EResult(t0)
+	t1, err := rwu.ReadInt32(r)
+	d.Result = EResult(t1)
 	return err
 }
 
@@ -2226,73 +2173,6 @@ func (d *MsgClientLogOnResponse) Deserialize(r io.Reader) error {
 	return err
 }
 
-type MsgClientSendGuestPass struct {
-	GiftId    uint64
-	GiftType  uint8
-	AccountId uint32
-}
-
-func NewMsgClientSendGuestPass() *MsgClientSendGuestPass {
-	return &MsgClientSendGuestPass{}
-}
-
-func (d *MsgClientSendGuestPass) GetEMsg() EMsg {
-	return EMsg_ClientSendGuestPass
-}
-
-func (d *MsgClientSendGuestPass) Serialize(w io.Writer) error {
-	var err error
-	err = binary.Write(w, binary.LittleEndian, d.GiftId)
-	if err != nil {
-		return err
-	}
-	err = binary.Write(w, binary.LittleEndian, d.GiftType)
-	if err != nil {
-		return err
-	}
-	err = binary.Write(w, binary.LittleEndian, d.AccountId)
-	return err
-}
-
-func (d *MsgClientSendGuestPass) Deserialize(r io.Reader) error {
-	var err error
-	d.GiftId, err = rwu.ReadUint64(r)
-	if err != nil {
-		return err
-	}
-	d.GiftType, err = rwu.ReadUint8(r)
-	if err != nil {
-		return err
-	}
-	d.AccountId, err = rwu.ReadUint32(r)
-	return err
-}
-
-type MsgClientSendGuestPassResponse struct {
-	Result EResult
-}
-
-func NewMsgClientSendGuestPassResponse() *MsgClientSendGuestPassResponse {
-	return &MsgClientSendGuestPassResponse{}
-}
-
-func (d *MsgClientSendGuestPassResponse) GetEMsg() EMsg {
-	return EMsg_ClientSendGuestPassResponse
-}
-
-func (d *MsgClientSendGuestPassResponse) Serialize(w io.Writer) error {
-	var err error
-	err = binary.Write(w, binary.LittleEndian, d.Result)
-	return err
-}
-
-func (d *MsgClientSendGuestPassResponse) Deserialize(r io.Reader) error {
-	var err error
-	t0, err := rwu.ReadInt32(r)
-	d.Result = EResult(t0)
-	return err
-}
-
 type MsgClientServerUnavailable struct {
 	JobidSent              uint64
 	EMsgSent               uint32

vendor/github.com/Philipp15b/go-steam/servers.go

@@ -8,135 +8,116 @@ import (
 )
 
 // CMServers contains a list of worlwide servers
-var CMServers = [][]string{
+var CMServers = []string{
-	{ // North American Servers
+	"155.133.248.52:27018",
-		// Chicago
+	"162.254.197.40:27018",
-		"162.254.193.44:27018",
+	"162.254.197.180:27019",
-		"162.254.193.44:27019",
+	"155.133.248.50:27019",
-		"162.254.193.44:27020",
+	"162.254.197.181:27017",
-		"162.254.193.44:27021",
+	"162.254.197.42:27019",
-		"162.254.193.45:27017",
+	"162.254.197.180:27017",
-		"162.254.193.45:27018",
+	"162.254.197.181:27018",
-		"162.254.193.45:27019",
+	"162.254.197.42:27018",
-		"162.254.193.45:27021",
+	"155.133.248.50:27017",
-		"162.254.193.46:27017",
+	"155.133.248.52:27019",
-		"162.254.193.46:27018",
+	"155.133.248.51:27019",
-		"162.254.193.46:27019",
+	"155.133.248.53:27019",
-		"162.254.193.46:27020",
+	"155.133.248.51:27017",
-		"162.254.193.46:27021",
+	"155.133.248.53:27017",
-		"162.254.193.47:27019",
+	"155.133.248.52:27017",
-		"162.254.193.47:27020",
+	"155.133.248.50:27018",
-
+	"162.254.197.180:27018",
-		// Ashburn
+	"162.254.197.40:27017",
-		"208.78.164.9:27017",
+	"162.254.197.40:27019",
-		"208.78.164.9:27018",
+	"162.254.197.42:27017",
-		"208.78.164.9:27019",
+	"162.254.197.181:27019",
-		"208.78.164.10:27017",
+	"155.133.248.53:27018",
-		"208.78.164.10:27018",
+	"155.133.248.51:27018",
-		"208.78.164.10:27019",
+	"146.66.152.11:27017",
-		"208.78.164.11:27017",
+	"146.66.152.10:27019",
-		"208.78.164.11:27018",
+	"146.66.152.10:27017",
-		"208.78.164.11:27019",
+	"146.66.152.10:27018",
-		"208.78.164.12:27017",
+	"146.66.152.11:27019",
-		"208.78.164.12:27018",
+	"162.254.198.133:27017",
-		"208.78.164.12:27019",
+	"162.254.198.133:27018",
-		"208.78.164.13:27017",
+	"162.254.198.130:27019",
-		"208.78.164.13:27018",
+	"162.254.198.130:27017",
-		"208.78.164.13:27019",
+	"162.254.198.132:27018",
-		"208.78.164.14:27017",
+	"162.254.198.130:27018",
-		"208.78.164.14:27018",
+	"162.254.198.132:27017",
-		"208.78.164.14:27019",
+	"162.254.198.132:27019",
-	},
+	"162.254.198.131:27019",
-	{ // Europe Servers
+	"162.254.198.131:27017",
-		// Luxembourg
+	"146.66.152.11:27018",
-		"146.66.152.10:27017",
+	"162.254.198.131:27018",
-		"146.66.152.10:27018",
+	"162.254.198.133:27019",
-		"146.66.152.10:27019",
+	"185.25.182.77:27017",
-		"146.66.152.10:27020",
+	"185.25.182.76:27018",
-		"146.66.152.11:27017",
+	"185.25.182.76:27019",
-		"146.66.152.11:27018",
+	"185.25.182.77:27018",
-		"146.66.152.11:27019",
+	"185.25.182.76:27017",
-		"146.66.152.11:27020",
+	"185.25.182.77:27019",
-
+	"162.254.196.67:27019",
-		// Poland
+	"162.254.196.67:27018",
-		"155.133.242.8:27017",
+	"162.254.196.83:27018",
-		"155.133.242.8:27018",
+	"162.254.196.84:27018",
-		"155.133.242.8:27019",
+	"162.254.196.83:27017",
-		"155.133.242.8:27020",
+	"162.254.196.84:27017",
-		"155.133.242.9:27017",
+	"162.254.196.68:27019",
-		"155.133.242.9:27018",
+	"162.254.196.68:27017",
-		"155.133.242.9:27019",
+	"162.254.196.84:27019",
-		"155.133.242.9:27020",
+	"162.254.196.67:27017",
-
+	"162.254.196.83:27019",
-		// Vienna
+	"162.254.196.68:27018",
-		"146.66.155.8:27017",
+	"146.66.155.101:27017",
-		"146.66.155.8:27018",
+	"146.66.155.101:27018",
-		"146.66.155.8:27019",
+	"146.66.155.100:27017",
-		"146.66.155.8:27020",
+	"146.66.155.100:27018",
-		"185.25.182.10:27017",
+	"146.66.155.101:27019",
-		"185.25.182.10:27018",
+	"146.66.155.100:27019",
-		"185.25.182.10:27019",
+	"155.133.230.50:27017",
-		"185.25.182.10:27020",
+	"155.133.230.34:27018",
-
+	"155.133.230.34:27017",
-		// London
+	"155.133.230.50:27019",
-		"162.254.196.40:27017",
+	"155.133.230.34:27019",
-		"162.254.196.40:27018",
+	"155.133.230.50:27018",
-		"162.254.196.40:27019",
+	"162.254.192.100:27017",
-		"162.254.196.40:27020",
+	"162.254.192.108:27017",
-		"162.254.196.40:27021",
+	"155.133.246.68:27017",
-		"162.254.196.41:27017",
+	"155.133.246.68:27018",
-		"162.254.196.41:27018",
+	"155.133.246.68:27019",
-		"162.254.196.41:27019",
+	"155.133.246.69:27019",
-		"162.254.196.41:27020",
+	"155.133.246.69:27017",
-		"162.254.196.41:27021",
+	"155.133.246.69:27018",
-		"162.254.196.42:27017",
+	"162.254.192.108:27018",
-		"162.254.196.42:27018",
+	"162.254.192.101:27018",
-		"162.254.196.42:27019",
+	"162.254.192.101:27019",
-		"162.254.196.42:27020",
+	"162.254.192.109:27018",
-		"162.254.196.42:27021",
+	"162.254.192.100:27018",
-		"162.254.196.43:27017",
+	"162.254.192.109:27017",
-		"162.254.196.43:27018",
+	"162.254.192.109:27019",
-		"162.254.196.43:27019",
+	"162.254.192.108:27019",
-		"162.254.196.43:27020",
+	"162.254.192.101:27017",
-		"162.254.196.43:27021",
+	"162.254.192.100:27019",
-
+	"162.254.193.46:27019",
-		// Stockholm
+	"162.254.193.6:27018",
-		"185.25.180.14:27017",
+	"162.254.193.47:27018",
-		"185.25.180.14:27018",
+	"162.254.193.6:27019",
-		"185.25.180.14:27019",
+	"162.254.193.7:27018",
-		"185.25.180.14:27020",
+	"162.254.193.7:27017",
-		"185.25.180.15:27017",
+	"162.254.193.7:27019",
-		"185.25.180.15:27018",
+	"162.254.193.47:27017",
-		"185.25.180.15:27019",
+	"162.254.193.47:27019",
-		"185.25.180.15:27020",
+	"162.254.193.46:27018",
-	},
 }
 
-// GetRandomCM returns back a random server anywhere
+// GetRandomCM returns a random server from a built-in IP list.
+//
+// Prefer Client.Connect(), which uses IPs from the Steam Directory,
+// which is always more up-to-date.
 func GetRandomCM() *netutil.PortAddr {
 	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-	servers := append(CMServers[0], CMServers[1]...)
+	addr := netutil.ParsePortAddr(CMServers[rng.Int31n(int32(len(CMServers)))])
-	addr := netutil.ParsePortAddr(servers[rng.Int31n(int32(len(servers)))])
-	if addr == nil {
-		panic("invalid address in CMServers slice")
-	}
-	return addr
-}
-
-// GetRandomNorthAmericaCM returns back a random server in north america
-func GetRandomNorthAmericaCM() *netutil.PortAddr {
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-	addr := netutil.ParsePortAddr(CMServers[0][rng.Int31n(int32(len(CMServers[0])))])
-	if addr == nil {
-		panic("invalid address in CMServers slice")
-	}
-	return addr
-}
-
-// GetRandomEuropeCM returns back a random server in europe
-func GetRandomEuropeCM() *netutil.PortAddr {
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-	addr := netutil.ParsePortAddr(CMServers[1][rng.Int31n(int32(len(CMServers[1])))])
 	if addr == nil {
 		panic("invalid address in CMServers slice")
 	}

vendor/github.com/Philipp15b/go-steam/social.go

@@ -3,7 +3,10 @@ package steam
 import (
 	"bytes"
 	"encoding/binary"
-	"encoding/hex"
+	"io"
+	"sync"
+	"time"
+
 	. "github.com/Philipp15b/go-steam/protocol"
 	. "github.com/Philipp15b/go-steam/protocol/protobuf"
 	. "github.com/Philipp15b/go-steam/protocol/steamlang"
@@ -11,9 +14,6 @@ import (
 	"github.com/Philipp15b/go-steam/socialcache"
 	. "github.com/Philipp15b/go-steam/steamid"
 	"github.com/golang/protobuf/proto"
-	"io"
-	"sync"
-	"time"
 )
 
 // Provides access to social aspects of Steam.
@@ -21,7 +21,7 @@ type Social struct {
 	mutex sync.RWMutex
 
 	name         string
-	avatar       string
+	avatar       []byte
 	personaState EPersonaState
 
 	Friends *socialcache.FriendsList
@@ -41,7 +41,7 @@ func newSocial(client *Client) *Social {
 }
 
 // Gets the local user's avatar
-func (s *Social) GetAvatar() string {
+func (s *Social) GetAvatar() []byte {
 	s.mutex.RLock()
 	defer s.mutex.RUnlock()
 	return s.avatar
@@ -156,7 +156,7 @@ func (s *Social) RequestProfileInfo(id SteamId) {
 
 // Requests all offline messages and marks them as read
 func (s *Social) RequestOfflineMessages() {
-	s.client.Write(NewClientMsgProtobuf(EMsg_ClientFSGetFriendMessageHistoryForOfflineMessages, &CMsgClientFSGetFriendMessageHistoryForOfflineMessages{}))
+	s.client.Write(NewClientMsgProtobuf(EMsg_ClientChatGetFriendMessageHistoryForOfflineMessages, &CMsgClientChatGetFriendMessageHistoryForOfflineMessages{}))
 }
 
 // Attempts to join a chat room
@@ -307,7 +307,7 @@ func (s *Social) handlePersonaState(packet *Packet) {
 			if friend.GetPlayerName() != "" {
 				s.name = friend.GetPlayerName()
 			}
-			avatar := hex.EncodeToString(friend.GetAvatarHash())
+			avatar := friend.GetAvatarHash()
 			if ValidAvatar(avatar) {
 				s.avatar = avatar
 			}
@@ -319,7 +319,7 @@ func (s *Social) handlePersonaState(packet *Packet) {
 				}
 			}
 			if (flags & EClientPersonaStateFlag_Presence) == EClientPersonaStateFlag_Presence {
-				avatar := hex.EncodeToString(friend.GetAvatarHash())
+				avatar := friend.GetAvatarHash()
 				if ValidAvatar(avatar) {
 					s.Friends.SetAvatar(id, avatar)
 				}
@@ -338,7 +338,7 @@ func (s *Social) handlePersonaState(packet *Packet) {
 				}
 			}
 			if (flags & EClientPersonaStateFlag_Presence) == EClientPersonaStateFlag_Presence {
-				avatar := hex.EncodeToString(friend.GetAvatarHash())
+				avatar := friend.GetAvatarHash()
 				if ValidAvatar(avatar) {
 					s.Groups.SetAvatar(id, avatar)
 				}
@@ -358,7 +358,7 @@ func (s *Social) handlePersonaState(packet *Packet) {
 			SourceSteamId:          SteamId(friend.GetSteamidSource()),
 			GameDataBlob:           friend.GetGameDataBlob(),
 			Name:                   friend.GetPlayerName(),
-			Avatar:                 hex.EncodeToString(friend.GetAvatarHash()),
+			Avatar:                 friend.GetAvatarHash(),
 			LastLogOff:             friend.GetLastLogoff(),
 			LastLogOn:              friend.GetLastLogon(),
 			ClanRank:               friend.GetClanRank(),
@@ -366,8 +366,6 @@ func (s *Social) handlePersonaState(packet *Packet) {
 			OnlineSessionInstances: friend.GetOnlineSessionInstances(),
 			PublishedSessionId:     friend.GetPublishedInstanceId(),
 			PersonaSetByUser:       friend.GetPersonaSetByUser(),
-			FacebookName:           friend.GetFacebookName(),
-			FacebookId:             friend.GetFacebookId(),
 		})
 	}
 }
@@ -376,10 +374,10 @@ func (s *Social) handleClanState(packet *Packet) {
 	body := new(CMsgClientClanState)
 	packet.ReadProtoMsg(body)
 	var name string
-	var avatar string
+	var avatar []byte
 	if body.GetNameInfo() != nil {
 		name = body.GetNameInfo().GetClanName()
-		avatar = hex.EncodeToString(body.GetNameInfo().GetShaAvatar())
+		avatar = body.GetNameInfo().GetShaAvatar()
 	}
 	var totalCount, onlineCount, chattingCount, ingameCount uint32
 	if body.GetUserCounts() != nil {
@@ -408,18 +406,13 @@ func (s *Social) handleClanState(packet *Packet) {
 			JustPosted: announce.GetJustPosted(),
 		})
 	}
-	flags := EClientPersonaStateFlag(body.GetMUnStatusFlags())
+
 	//Add stuff to group
 	clanid := SteamId(body.GetSteamidClan())
-	if (flags & EClientPersonaStateFlag_PlayerName) == EClientPersonaStateFlag_PlayerName {
+	if body.NameInfo != nil {
-		if name != "" {
+		info := body.NameInfo
-			s.Groups.SetName(clanid, name)
+		s.Groups.SetName(clanid, info.GetClanName())
-		}
+		s.Groups.SetAvatar(clanid, info.GetShaAvatar())
-	}
-	if (flags & EClientPersonaStateFlag_Presence) == EClientPersonaStateFlag_Presence {
-		if ValidAvatar(avatar) {
-			s.Groups.SetAvatar(clanid, avatar)
-		}
 	}
 	if body.GetUserCounts() != nil {
 		s.Groups.SetMemberTotalCount(clanid, totalCount)
@@ -428,8 +421,7 @@ func (s *Social) handleClanState(packet *Packet) {
 		s.Groups.SetMemberInGameCount(clanid, ingameCount)
 	}
 	s.client.Emit(&ClanStateEvent{
-		ClandId:             clanid,
+		ClanId:              clanid,
-		StateFlags:          EClientPersonaStateFlag(body.GetMUnStatusFlags()),
 		AccountFlags:        EAccountFlags(body.GetClanAccountFlags()),
 		ClanName:            name,
 		Avatar:              avatar,
@@ -606,7 +598,7 @@ func (s *Social) handleProfileInfoResponse(packet *Packet) {
 }
 
 func (s *Social) handleFriendMessageHistoryResponse(packet *Packet) {
-	body := new(CMsgClientFSGetFriendMessageHistoryResponse)
+	body := new(CMsgClientChatGetFriendMessageHistoryResponse)
 	packet.ReadProtoMsg(body)
 	steamid := SteamId(body.GetSteamid())
 	for _, message := range body.GetMessages() {

vendor/github.com/Philipp15b/go-steam/social_events.go

@@ -1,9 +1,10 @@
 package steam
 
 import (
+	"time"
+
 	. "github.com/Philipp15b/go-steam/protocol/steamlang"
 	. "github.com/Philipp15b/go-steam/steamid"
-	"time"
 )
 
 type FriendsListEvent struct{}
@@ -41,7 +42,7 @@ type PersonaStateEvent struct {
 	SourceSteamId          SteamId `json:",string"`
 	GameDataBlob           []byte
 	Name                   string
-	Avatar                 string
+	Avatar                 []byte
 	LastLogOff             uint32
 	LastLogOn              uint32
 	ClanRank               uint32
@@ -49,17 +50,14 @@ type PersonaStateEvent struct {
 	OnlineSessionInstances uint32
 	PublishedSessionId     uint32
 	PersonaSetByUser       bool
-	FacebookName           string
-	FacebookId             uint64 `json:",string"`
 }
 
 // Fired when a clan's state has been changed
 type ClanStateEvent struct {
-	ClandId             SteamId `json:",string"`
+	ClanId              SteamId `json:",string"`
-	StateFlags          EClientPersonaStateFlag
 	AccountFlags        EAccountFlags
 	ClanName            string
-	Avatar              string
+	Avatar              []byte
 	MemberTotalCount    uint32
 	MemberOnlineCount   uint32
 	MemberChattingCount uint32

vendor/github.com/Philipp15b/go-steam/socialcache/friends.go

@@ -2,9 +2,10 @@ package socialcache
 
 import (
 	"errors"
+	"sync"
+
 	. "github.com/Philipp15b/go-steam/protocol/steamlang"
 	. "github.com/Philipp15b/go-steam/steamid"
-	"sync"
 )
 
 // Friends list is a thread safe map
@@ -76,7 +77,7 @@ func (list *FriendsList) SetName(id SteamId, name string) {
 	}
 }
 
-func (list *FriendsList) SetAvatar(id SteamId, hash string) {
+func (list *FriendsList) SetAvatar(id SteamId, hash []byte) {
 	list.mutex.Lock()
 	defer list.mutex.Unlock()
 	if val, ok := list.byId[id]; ok {
@@ -136,7 +137,7 @@ func (list *FriendsList) SetGameName(id SteamId, name string) {
 type Friend struct {
 	SteamId           SteamId `json:",string"`
 	Name              string
-	Avatar            string
+	Avatar            []byte
 	Relationship      EFriendRelationship
 	PersonaState      EPersonaState
 	PersonaStateFlags EPersonaStateFlag

vendor/github.com/Philipp15b/go-steam/socialcache/groups.go

@@ -2,9 +2,10 @@ package socialcache
 
 import (
 	"errors"
+	"sync"
+
 	. "github.com/Philipp15b/go-steam/protocol/steamlang"
 	. "github.com/Philipp15b/go-steam/steamid"
-	"sync"
 )
 
 // Groups list is a thread safe map
@@ -78,7 +79,7 @@ func (list *GroupsList) SetName(id SteamId, name string) {
 	}
 }
 
-func (list *GroupsList) SetAvatar(id SteamId, hash string) {
+func (list *GroupsList) SetAvatar(id SteamId, hash []byte) {
 	list.mutex.Lock()
 	defer list.mutex.Unlock()
 	id = id.ChatToClan()
@@ -136,7 +137,7 @@ func (list *GroupsList) SetMemberInGameCount(id SteamId, count uint32) {
 type Group struct {
 	SteamId             SteamId `json:",string"`
 	Name                string
-	Avatar              string
+	Avatar              []byte
 	Relationship        EClanRelationship
 	MemberTotalCount    uint32
 	MemberOnlineCount   uint32

vendor/github.com/Rhymen/go-whatsapp/README.md

@@ -50,17 +50,25 @@ func (myHandler) HandleImageMessage(message whatsapp.ImageMessage) {
 	fmt.Println(message)
 }
 
+func (myHandler) HandleDocumentMessage(message whatsapp.DocumentMessage) {
+	fmt.Println(message)
+}
+
 func (myHandler) HandleVideoMessage(message whatsapp.VideoMessage) {
 	fmt.Println(message)
 }
 
+func (myHandler) HandleAudioMessage(message whatsapp.AudioMessage){	
+	fmt.Println(message)
+}
+
 func (myHandler) HandleJsonMessage(message string) {
 	fmt.Println(message)
 }
 
 wac.AddHandler(myHandler{})
 ```
-The message handlers are all optional, you don't need to implement anything but the error handler to implement the interface. The ImageMessage and VideoMessage provide a Download function to get the media data.
+The message handlers are all optional, you don't need to implement anything but the error handler to implement the interface. The ImageMessage, VideoMessage, AudioMessage and DocumentMessage provide a Download function to get the media data.
 
 ### Sending text messages
 ```go

vendor/github.com/Rhymen/go-whatsapp/chat_history.go

@@ -0,0 +1,183 @@
+package whatsapp
+
+import (
+	"github.com/Rhymen/go-whatsapp/binary"
+	"github.com/Rhymen/go-whatsapp/binary/proto"
+	"log"
+	"strconv"
+	"time"
+)
+
+type MessageOffsetInfo struct {
+	FirstMessageId    string
+	FirstMessageOwner bool
+}
+
+func decodeMessages(n *binary.Node) []*proto.WebMessageInfo {
+
+	var messages = make([]*proto.WebMessageInfo, 0)
+
+	if n == nil || n.Attributes == nil || n.Content == nil {
+		return messages
+	}
+
+	for _, msg := range n.Content.([]interface{}) {
+		switch msg.(type) {
+		case *proto.WebMessageInfo:
+			messages = append(messages, msg.(*proto.WebMessageInfo))
+		default:
+			log.Println("decodeMessages: Non WebMessage encountered")
+		}
+	}
+
+	return messages
+}
+
+// LoadChatMessages is useful to "scroll" messages, loading by count at a time
+// if handlers == nil the func will use default handlers
+// if after == true LoadChatMessages will load messages after the specified messageId, otherwise it will return
+// message before the messageId
+func (wac *Conn) LoadChatMessages(jid string, count int, messageId string, owner bool, after bool, handlers ...Handler) error {
+	if count <= 0 {
+		return nil
+	}
+
+	if handlers == nil {
+		handlers = wac.handler
+	}
+
+	kind := "before"
+	if after {
+		kind = "after"
+	}
+
+	node, err := wac.query("message", jid, messageId, kind,
+		strconv.FormatBool(owner), "", count, 0)
+
+	if err != nil {
+		wac.handleWithCustomHandlers(err, handlers)
+		return err
+	}
+
+	for _, msg := range decodeMessages(node) {
+		wac.handleWithCustomHandlers(ParseProtoMessage(msg), handlers)
+		wac.handleWithCustomHandlers(msg, handlers)
+	}
+	return nil
+
+}
+
+// LoadFullChatHistory loads full chat history for the given jid
+// chunkSize = how many messages to load with one query; if handlers == nil the func will use default handlers;
+// pauseBetweenQueries = how much time to sleep between queries
+func (wac *Conn) LoadFullChatHistory(jid string, chunkSize int,
+	pauseBetweenQueries time.Duration, handlers ...Handler) {
+	if chunkSize <= 0 {
+		return
+	}
+
+	if handlers == nil {
+		handlers = wac.handler
+	}
+
+	beforeMsg := ""
+	beforeMsgIsOwner := true
+
+	for {
+		node, err := wac.query("message", jid, beforeMsg, "before",
+			strconv.FormatBool(beforeMsgIsOwner), "", chunkSize, 0)
+
+		if err != nil {
+			wac.handleWithCustomHandlers(err, handlers)
+		} else {
+
+			msgs := decodeMessages(node)
+			for _, msg := range msgs {
+				wac.handleWithCustomHandlers(ParseProtoMessage(msg), handlers)
+				wac.handleWithCustomHandlers(msg, handlers)
+			}
+
+			if len(msgs) == 0 {
+				break
+			}
+
+			beforeMsg = *msgs[0].Key.Id
+			beforeMsgIsOwner = msgs[0].Key.FromMe != nil && *msgs[0].Key.FromMe
+		}
+
+		<-time.After(pauseBetweenQueries)
+
+	}
+
+}
+
+// LoadFullChatHistoryAfter loads all messages after the specified messageId
+// useful to "catch up" with the message history after some specified message
+func (wac *Conn) LoadFullChatHistoryAfter(jid string, messageId string, chunkSize int,
+	pauseBetweenQueries time.Duration, handlers ...Handler) {
+
+	if chunkSize <= 0 {
+		return
+	}
+
+	if handlers == nil {
+		handlers = wac.handler
+	}
+
+	msgOwner := true
+	prevNotFound := false
+
+	for {
+		node, err := wac.query("message", jid, messageId, "after",
+			strconv.FormatBool(msgOwner), "", chunkSize, 0)
+
+		if err != nil {
+
+			// Whatsapp will return 404 status when there is wrong owner flag on the requested message id
+			if err == ErrServerRespondedWith404 {
+
+				// this will detect two consecutive "not found" errors.
+				// this is done to prevent infinite loop when wrong message id supplied
+				if prevNotFound {
+					log.Println("LoadFullChatHistoryAfter: could not retrieve any messages, wrong message id?")
+					return
+				}
+				prevNotFound = true
+
+				// try to reverse the owner flag and retry
+				if msgOwner {
+					// reverse initial msgOwner value and retry
+					msgOwner = false
+
+					<-time.After(time.Second)
+					continue
+				}
+
+			}
+
+			// if the error isn't a 404 error, pass it to the error handler
+			wac.handleWithCustomHandlers(err, handlers)
+		} else {
+
+			msgs := decodeMessages(node)
+			for _, msg := range msgs {
+				wac.handleWithCustomHandlers(ParseProtoMessage(msg), handlers)
+				wac.handleWithCustomHandlers(msg, handlers)
+			}
+
+			if len(msgs) != chunkSize {
+				break
+			}
+
+			messageId = *msgs[0].Key.Id
+			msgOwner = msgs[0].Key.FromMe != nil && *msgs[0].Key.FromMe
+		}
+
+		// message was found
+		prevNotFound = false
+
+		<-time.After(pauseBetweenQueries)
+
+	}
+
+}

vendor/github.com/Rhymen/go-whatsapp/conn.go

@@ -89,6 +89,8 @@ type Conn struct {
 
 	longClientName  string
 	shortClientName string
+
+	loginSessionLock sync.RWMutex
 }
 
 type websocketWrapper struct {
@@ -191,6 +193,19 @@ func (wac *Conn) Disconnect() (Session, error) {
 	return *wac.session, err
 }
 
+func (wac *Conn) AdminTest() (bool, error) {
+	if !wac.connected {
+		return false, ErrNotConnected
+	}
+
+	if !wac.loggedIn {
+		return false, ErrInvalidSession
+	}
+
+	result, err := wac.sendAdminTest()			
+	return result, err
+}
+
 func (wac *Conn) keepAlive(minIntervalMs int, maxIntervalMs int) {
 	defer wac.wg.Done()
 

vendor/github.com/Rhymen/go-whatsapp/errors.go

@@ -6,15 +6,18 @@ import (
 )
 
 var (
-	ErrAlreadyConnected  = errors.New("already connected")
+	ErrAlreadyConnected       = errors.New("already connected")
-	ErrAlreadyLoggedIn   = errors.New("already logged in")
+	ErrAlreadyLoggedIn        = errors.New("already logged in")
-	ErrInvalidSession    = errors.New("invalid session")
+	ErrInvalidSession         = errors.New("invalid session")
-	ErrLoginInProgress   = errors.New("login or restore already running")
+	ErrLoginInProgress        = errors.New("login or restore already running")
-	ErrNotConnected      = errors.New("not connected")
+	ErrNotConnected           = errors.New("not connected")
-	ErrInvalidWsData     = errors.New("received invalid data")
+	ErrInvalidWsData          = errors.New("received invalid data")
-	ErrConnectionTimeout = errors.New("connection timed out")
+	ErrInvalidWsState         = errors.New("can't handle binary data when not logged in")
-	ErrMissingMessageTag = errors.New("no messageTag specified or to short")
+	ErrConnectionTimeout      = errors.New("connection timed out")
-	ErrInvalidHmac       = errors.New("invalid hmac")
+	ErrMissingMessageTag      = errors.New("no messageTag specified or to short")
+	ErrInvalidHmac            = errors.New("invalid hmac")
+	ErrInvalidServerResponse  = errors.New("invalid response received from server")
+	ErrServerRespondedWith404 = errors.New("server responded with status 404")
 )
 
 type ErrConnectionFailed struct {

vendor/github.com/Rhymen/go-whatsapp/handler.go

@@ -20,6 +20,11 @@ type Handler interface {
 	HandleError(err error)
 }
 
+type SyncHandler interface {
+	Handler
+	ShouldCallSynchronously() bool
+}
+
 /*
 The TextMessageHandler interface needs to be implemented to receive text messages dispatched by the dispatcher.
 */
@@ -60,6 +65,22 @@ type DocumentMessageHandler interface {
 	HandleDocumentMessage(message DocumentMessage)
 }
 
+/*
+The LiveLocationMessageHandler interface needs to be implemented to receive live location messages dispatched by the dispatcher.
+*/
+type LiveLocationMessageHandler interface {
+	Handler
+	HandleLiveLocationMessage(message LiveLocationMessage)
+}
+
+/*
+The LocationMessageHandler interface needs to be implemented to receive location messages dispatched by the dispatcher.
+*/
+type LocationMessageHandler interface {
+	Handler
+	HandleLocationMessage(message LocationMessage)
+}
+
 /*
 The JsonMessageHandler interface needs to be implemented to receive json messages dispatched by the dispatcher.
 These json messages contain status updates of every kind sent by WhatsAppWeb servers. WhatsAppWeb uses these messages
@@ -127,52 +148,113 @@ func (wac *Conn) RemoveHandlers() {
 	wac.handler = make([]Handler, 0)
 }
 
+func (wac *Conn) shouldCallSynchronously(handler Handler) bool {
+	sh, ok := handler.(SyncHandler)
+	return ok && sh.ShouldCallSynchronously()
+}
+
 func (wac *Conn) handle(message interface{}) {
+	wac.handleWithCustomHandlers(message, wac.handler)
+}
+
+func (wac *Conn) handleWithCustomHandlers(message interface{}, handlers []Handler) {
 	switch m := message.(type) {
 	case error:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
-			go h.HandleError(m)
+			if wac.shouldCallSynchronously(h) {
+				h.HandleError(m)
+			} else {
+				go h.HandleError(m)
+			}
 		}
 	case string:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(JsonMessageHandler); ok {
-				go x.HandleJsonMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleJsonMessage(m)
+				} else {
+					go x.HandleJsonMessage(m)
+				}
 			}
 		}
 	case TextMessage:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(TextMessageHandler); ok {
-				go x.HandleTextMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleTextMessage(m)
+				} else {
+					go x.HandleTextMessage(m)
+				}
 			}
 		}
 	case ImageMessage:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(ImageMessageHandler); ok {
-				go x.HandleImageMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleImageMessage(m)
+				} else {
+					go x.HandleImageMessage(m)
+				}
 			}
 		}
 	case VideoMessage:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(VideoMessageHandler); ok {
-				go x.HandleVideoMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleVideoMessage(m)
+				} else {
+					go x.HandleVideoMessage(m)
+				}
 			}
 		}
 	case AudioMessage:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(AudioMessageHandler); ok {
-				go x.HandleAudioMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleAudioMessage(m)
+				} else {
+					go x.HandleAudioMessage(m)
+				}
 			}
 		}
 	case DocumentMessage:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(DocumentMessageHandler); ok {
-				go x.HandleDocumentMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleDocumentMessage(m)
+				} else {
+					go x.HandleDocumentMessage(m)
+				}
+			}
+		}
+	case LocationMessage:
+		for _, h := range handlers {
+			if x, ok := h.(LocationMessageHandler); ok {
+				if wac.shouldCallSynchronously(h) {
+					x.HandleLocationMessage(m)
+				} else {
+					go x.HandleLocationMessage(m)
+				}
+			}
+		}
+	case LiveLocationMessage:
+		for _, h := range handlers {
+			if x, ok := h.(LiveLocationMessageHandler); ok {
+				if wac.shouldCallSynchronously(h) {
+					x.HandleLiveLocationMessage(m)
+				} else {
+					go x.HandleLiveLocationMessage(m)
+				}
 			}
 		}
 	case *proto.WebMessageInfo:
-		for _, h := range wac.handler {
+		for _, h := range handlers {
 			if x, ok := h.(RawMessageHandler); ok {
-				go x.HandleRawMessage(m)
+				if wac.shouldCallSynchronously(h) {
+					x.HandleRawMessage(m)
+				} else {
+					go x.HandleRawMessage(m)
+				}
 			}
 		}
 	}
@@ -201,7 +283,11 @@ func (wac *Conn) handleContacts(contacts interface{}) {
 	}
 	for _, h := range wac.handler {
 		if x, ok := h.(ContactListHandler); ok {
-			go x.HandleContactList(contactList)
+			if wac.shouldCallSynchronously(h) {
+				x.HandleContactList(contactList)
+			} else {
+				go x.HandleContactList(contactList)
+			}
 		}
 	}
 }
@@ -230,7 +316,11 @@ func (wac *Conn) handleChats(chats interface{}) {
 	}
 	for _, h := range wac.handler {
 		if x, ok := h.(ChatListHandler); ok {
-			go x.HandleChatList(chatList)
+			if wac.shouldCallSynchronously(h) {
+				x.HandleChatList(chatList)
+			} else {
+				go x.HandleChatList(chatList)
+			}
 		}
 	}
 }
@@ -247,7 +337,7 @@ func (wac *Conn) dispatch(msg interface{}) {
 				for a := range con {
 					if v, ok := con[a].(*proto.WebMessageInfo); ok {
 						wac.handle(v)
-						wac.handle(parseProtoMessage(v))
+						wac.handle(ParseProtoMessage(v))
 					}
 				}
 			}

vendor/github.com/Rhymen/go-whatsapp/media.go

@@ -8,8 +8,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/Rhymen/go-whatsapp/crypto/cbc"
-	"github.com/Rhymen/go-whatsapp/crypto/hkdf"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
@@ -17,6 +15,9 @@ import (
 	"os"
 	"strings"
 	"time"
+
+	"github.com/Rhymen/go-whatsapp/crypto/cbc"
+	"github.com/Rhymen/go-whatsapp/crypto/hkdf"
 )
 
 func Download(url string, mediaKey []byte, appInfo MediaType, fileLength int) ([]byte, error) {
@@ -73,17 +74,18 @@ func downloadMedia(url string) (file []byte, mac []byte, err error) {
 		return nil, nil, err
 	}
 	if resp.StatusCode != 200 {
-		return nil, nil, fmt.Errorf("download failed")
+		return nil, nil, fmt.Errorf("download failed with status code %d", resp.StatusCode)
 	}
 	defer resp.Body.Close()
 	if resp.ContentLength <= 10 {
 		return nil, nil, fmt.Errorf("file to short")
 	}
 	data, err := ioutil.ReadAll(resp.Body)
-	n := len(data)
 	if err != nil {
 		return nil, nil, err
 	}
+
+	n := len(data)
 	return data[:n-10], data[n-10 : n], nil
 }
 
@@ -142,7 +144,7 @@ func (wac *Conn) Upload(reader io.Reader, appInfo MediaType) (url string, mediaK
 	select {
 	case r := <-ch:
 		if err = json.Unmarshal([]byte(r), &resp); err != nil {
-			return "", nil, nil, nil, 0, fmt.Errorf("error decoding upload response: %v\n", err)
+			return "", nil, nil, nil, 0, fmt.Errorf("error decoding upload response: %v", err)
 		}
 	case <-time.After(wac.msgTimeout):
 		return "", nil, nil, nil, 0, fmt.Errorf("restore session init timed out")

vendor/github.com/Rhymen/go-whatsapp/message.go

@@ -68,6 +68,14 @@ func (wac *Conn) Send(msg interface{}) (string, error) {
 		msgProto = getAudioProto(m)
 		msgInfo = getMessageInfo(msgProto)
 		ch, err = wac.sendProto(msgProto)
+	case LocationMessage:
+		msgProto = GetLocationProto(m)
+		msgInfo = getMessageInfo(msgProto)
+		ch, err = wac.sendProto(msgProto)
+	case LiveLocationMessage:
+		msgProto = GetLiveLocationProto(m)
+		msgInfo = getMessageInfo(msgProto)
+		ch, err = wac.sendProto(msgProto)
 	default:
 		return "ERROR", fmt.Errorf("cannot match type %T, use message types declared in the package", msg)
 	}
@@ -269,6 +277,7 @@ type VideoMessage struct {
 	Length        uint32
 	Type          string
 	Content       io.Reader
+	GifPlayback   bool
 	url           string
 	mediaKey      []byte
 	fileEncSha256 []byte
@@ -282,6 +291,7 @@ func getVideoMessage(msg *proto.WebMessageInfo) VideoMessage {
 		Info:          getMessageInfo(msg),
 		Caption:       vid.GetCaption(),
 		Thumbnail:     vid.GetJpegThumbnail(),
+		GifPlayback:   vid.GetGifPlayback(),
 		url:           vid.GetUrl(),
 		mediaKey:      vid.GetMediaKey(),
 		Length:        vid.GetSeconds(),
@@ -299,6 +309,7 @@ func getVideoProto(msg VideoMessage) *proto.WebMessageInfo {
 			Caption:       &msg.Caption,
 			JpegThumbnail: msg.Thumbnail,
 			Url:           &msg.url,
+			GifPlayback:   &msg.GifPlayback,
 			MediaKey:      msg.mediaKey,
 			Seconds:       &msg.Length,
 			FileEncSha256: msg.fileEncSha256,
@@ -431,7 +442,95 @@ func (m *DocumentMessage) Download() ([]byte, error) {
 	return Download(m.url, m.mediaKey, MediaDocument, int(m.fileLength))
 }
 
-func parseProtoMessage(msg *proto.WebMessageInfo) interface{} {
+/*
+LocationMessage represents a location message
+*/
+type LocationMessage struct {
+	Info             MessageInfo
+	DegreesLatitude  float64
+	DegreesLongitude float64
+	Name             string
+	Address          string
+	Url              string
+	JpegThumbnail    []byte
+}
+
+func GetLocationMessage(msg *proto.WebMessageInfo) LocationMessage {
+	loc := msg.GetMessage().GetLocationMessage()
+	return LocationMessage{
+		Info:             getMessageInfo(msg),
+		DegreesLatitude:  loc.GetDegreesLatitude(),
+		DegreesLongitude: loc.GetDegreesLongitude(),
+		Name:             loc.GetName(),
+		Address:          loc.GetAddress(),
+		Url:              loc.GetUrl(),
+		JpegThumbnail:    loc.GetJpegThumbnail(),
+	}
+}
+
+func GetLocationProto(msg LocationMessage) *proto.WebMessageInfo {
+	p := getInfoProto(&msg.Info)
+	p.Message = &proto.Message{
+		LocationMessage: &proto.LocationMessage{
+			DegreesLatitude:  &msg.DegreesLatitude,
+			DegreesLongitude: &msg.DegreesLongitude,
+			Name:             &msg.Name,
+			Address:          &msg.Address,
+			Url:              &msg.Url,
+			JpegThumbnail:    msg.JpegThumbnail,
+		},
+	}
+	return p
+}
+
+/*
+LiveLocationMessage represents a live location message
+*/
+type LiveLocationMessage struct {
+	Info                              MessageInfo
+	DegreesLatitude                   float64
+	DegreesLongitude                  float64
+	AccuracyInMeters                  uint32
+	SpeedInMps                        float32
+	DegreesClockwiseFromMagneticNorth uint32
+	Caption                           string
+	SequenceNumber                    int64
+	JpegThumbnail                     []byte
+}
+
+func GetLiveLocationMessage(msg *proto.WebMessageInfo) LiveLocationMessage {
+	loc := msg.GetMessage().GetLiveLocationMessage()
+	return LiveLocationMessage{
+		Info:                              getMessageInfo(msg),
+		DegreesLatitude:                   loc.GetDegreesLatitude(),
+		DegreesLongitude:                  loc.GetDegreesLongitude(),
+		AccuracyInMeters:                  loc.GetAccuracyInMeters(),
+		SpeedInMps:                        loc.GetSpeedInMps(),
+		DegreesClockwiseFromMagneticNorth: loc.GetDegreesClockwiseFromMagneticNorth(),
+		Caption:                           loc.GetCaption(),
+		SequenceNumber:                    loc.GetSequenceNumber(),
+		JpegThumbnail:                     loc.GetJpegThumbnail(),
+	}
+}
+
+func GetLiveLocationProto(msg LiveLocationMessage) *proto.WebMessageInfo {
+	p := getInfoProto(&msg.Info)
+	p.Message = &proto.Message{
+		LiveLocationMessage: &proto.LiveLocationMessage{
+			DegreesLatitude:                   &msg.DegreesLatitude,
+			DegreesLongitude:                  &msg.DegreesLongitude,
+			AccuracyInMeters:                  &msg.AccuracyInMeters,
+			SpeedInMps:                        &msg.SpeedInMps,
+			DegreesClockwiseFromMagneticNorth: &msg.DegreesClockwiseFromMagneticNorth,
+			Caption:                           &msg.Caption,
+			SequenceNumber:                    &msg.SequenceNumber,
+			JpegThumbnail:                     msg.JpegThumbnail,
+		},
+	}
+	return p
+}
+
+func ParseProtoMessage(msg *proto.WebMessageInfo) interface{} {
 	switch {
 
 	case msg.GetMessage().GetAudioMessage() != nil:
@@ -452,6 +551,12 @@ func parseProtoMessage(msg *proto.WebMessageInfo) interface{} {
 	case msg.GetMessage().GetExtendedTextMessage() != nil:
 		return getTextMessage(msg)
 
+	case msg.GetMessage().GetLocationMessage() != nil:
+		return GetLocationMessage(msg)
+
+	case msg.GetMessage().GetLiveLocationMessage() != nil:
+		return GetLiveLocationMessage(msg)
+
 	default:
 		//cannot match message
 	}

vendor/github.com/Rhymen/go-whatsapp/read.go

@@ -3,6 +3,8 @@ package whatsapp
 import (
 	"crypto/hmac"
 	"crypto/sha256"
+	"encoding/json"
+	"fmt"
 	"github.com/Rhymen/go-whatsapp/binary"
 	"github.com/Rhymen/go-whatsapp/crypto/cbc"
 	"github.com/gorilla/websocket"
@@ -75,7 +77,13 @@ func (wac *Conn) processReadData(msgType int, msg []byte) error {
 		wac.listener.Lock()
 		delete(wac.listener.m, data[0])
 		wac.listener.Unlock()
-	} else if msgType == websocket.BinaryMessage && wac.loggedIn {
+	} else if msgType == websocket.BinaryMessage {
+		wac.loginSessionLock.RLock()
+		sess := wac.session
+		wac.loginSessionLock.RUnlock()
+		if sess == nil || sess.MacKey == nil || sess.EncKey == nil {
+			return ErrInvalidWsState
+		}
 		message, err := wac.decryptBinaryMessage([]byte(data[1]))
 		if err != nil {
 			return errors.Wrap(err, "error decoding binary")
@@ -90,6 +98,21 @@ func (wac *Conn) processReadData(msgType int, msg []byte) error {
 func (wac *Conn) decryptBinaryMessage(msg []byte) (*binary.Node, error) {
 	//message validation
 	h2 := hmac.New(sha256.New, wac.session.MacKey)
+	if len(msg) < 33 {
+		var response struct {
+			Status int `json:"status"`
+		}
+		err := json.Unmarshal(msg, &response)
+		if err == nil {
+			if response.Status == 404 {
+				return nil, ErrServerRespondedWith404
+			}
+			return nil, errors.New(fmt.Sprintf("server responded with %d", response.Status))
+		} else {
+			return nil, ErrInvalidServerResponse
+		}
+
+	}
 	h2.Write([]byte(msg[32:]))
 	if !hmac.Equal(h2.Sum(nil), msg[:32]) {
 		return nil, ErrInvalidHmac

vendor/github.com/Rhymen/go-whatsapp/session.go

@@ -100,6 +100,14 @@ func (wac *Conn) SetClientName(long, short string) error {
 	return nil
 }
 
+/*
+SetClientVersion sets WhatsApp client version
+Default value is 0.3.3324
+*/
+func (wac *Conn) SetClientVersion(major int, minor int, patch int) {
+	waVersion = []int{major, minor, patch}
+}
+
 /*
 Login is the function that creates a new whatsapp session and logs you in. If you do not want to scan the qr code
 every time, you should save the returned session and use RestoreWithSession the next time. Login takes a writable channel
@@ -187,6 +195,8 @@ func (wac *Conn) Login(qrChan chan<- string) (Session, error) {
 	var resp2 []interface{}
 	select {
 	case r1 := <-s1:
+		wac.loginSessionLock.Lock()
+		defer wac.loginSessionLock.Unlock()
 		if err := json.Unmarshal([]byte(r1), &resp2); err != nil {
 			return session, fmt.Errorf("error decoding qr code resp: %v", err)
 		}

vendor/github.com/Rhymen/go-whatsapp/write.go

@@ -78,6 +78,36 @@ func (wac *Conn) sendKeepAlive() error {
 	return nil
 }
 
+/* 
+	When phone is unreachable, WhatsAppWeb sends ["admin","test"] time after time to try a successful contact.
+	Tested with Airplane mode and no connection at all.
+*/
+func (wac *Conn) sendAdminTest() (bool, error) {
+	data := []interface{}{"admin", "test"}
+	
+	r, err := wac.writeJson(data)
+	if err != nil {
+		return false, errors.Wrap(err, "error sending admin test")
+	}
+
+	var response []interface{}
+
+	select {
+	case resp := <-r:
+		if err := json.Unmarshal([]byte(resp), &response); err != nil {
+			return false, fmt.Errorf("error decoding response message: %v\n", err)
+		}
+	case <-time.After(wac.msgTimeout):
+		return false, ErrConnectionTimeout
+	}
+
+	if len(response) == 2 && response[0].(string) == "Pong" && response[1].(bool) == true {
+		return true, nil
+	} else{
+		return false, nil
+	}	
+}
+
 func (wac *Conn) write(messageType int, answerMessageTag string, data []byte) (<-chan string, error) {
 	var ch chan string
 	if answerMessageTag != "" {

vendor/github.com/bwmarrin/discordgo/restapi.go

@@ -675,7 +675,7 @@ func (s *Session) GuildLeave(guildID string) (err error) {
 	return
 }
 
-// GuildBans returns an array of User structures for all bans of a
+// GuildBans returns an array of GuildBan structures for all bans of a
 // given guild.
 // guildID   : The ID of a Guild.
 func (s *Session) GuildBans(guildID string) (st []*GuildBan, err error) {
@@ -2067,15 +2067,80 @@ func (s *Session) WebhookDeleteWithToken(webhookID, token string) (st *Webhook,
 // WebhookExecute executes a webhook.
 // webhookID: The ID of a webhook.
 // token    : The auth token for the webhook
-func (s *Session) WebhookExecute(webhookID, token string, wait bool, data *WebhookParams) (err error) {
+// wait     : Wait for server to confirm the message arrival
+//
+// If `wait` is `false`, the returned *Message is always empty, because server
+// does not provide the response data.
+func (s *Session) WebhookExecute(webhookID, token string, wait bool, data *WebhookParams) (st *Message, err error) {
 	uri := EndpointWebhookToken(webhookID, token)
 
 	if wait {
 		uri += "?wait=true"
 	}
 
-	_, err = s.RequestWithBucketID("POST", uri, data, EndpointWebhookToken("", ""))
+	var response []byte
+	if data.File != nil {
+		body := &bytes.Buffer{}
+		bodywriter := multipart.NewWriter(body)
 
+		var payload []byte
+		payload, err = json.Marshal(data)
+		if err != nil {
+			return
+		}
+
+		var p io.Writer
+
+		h := make(textproto.MIMEHeader)
+		h.Set("Content-Disposition", `form-data; name="payload_json"`)
+		h.Set("Content-Type", "application/json")
+
+		p, err = bodywriter.CreatePart(h)
+		if err != nil {
+			return
+		}
+
+		if _, err = p.Write(payload); err != nil {
+			return
+		}
+
+		{
+			file := data.File
+			h := make(textproto.MIMEHeader)
+			h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="file"; filename="%s"`, quoteEscaper.Replace(file.Name)))
+			contentType := file.ContentType
+			if contentType == "" {
+				contentType = "application/octet-stream"
+			}
+			h.Set("Content-Type", contentType)
+
+			p, err = bodywriter.CreatePart(h)
+			if err != nil {
+				return
+			}
+
+			if _, err = io.Copy(p, file.Reader); err != nil {
+				return
+			}
+		}
+
+		err = bodywriter.Close()
+		if err != nil {
+			return
+		}
+
+		response, err = s.request("POST", uri, bodywriter.FormDataContentType(), body.Bytes(), EndpointWebhookToken("", ""), 0)
+	} else {
+		response, err = s.RequestWithBucketID("POST", uri, data, EndpointWebhookToken("", ""))
+	}
+	if err != nil {
+		return
+	}
+	if !wait {
+		return
+	}
+
+	err = unmarshal(response, &st)
 	return
 }
 

vendor/github.com/bwmarrin/discordgo/structs.go

@@ -832,7 +832,7 @@ type WebhookParams struct {
 	Username  string          `json:"username,omitempty"`
 	AvatarURL string          `json:"avatar_url,omitempty"`
 	TTS       bool            `json:"tts,omitempty"`
-	File      string          `json:"file,omitempty"`
+	File      *File           `json:"-"`
 	Embeds    []*MessageEmbed `json:"embeds,omitempty"`
 }
 

vendor/github.com/d5/tengo/.travis.yml

@@ -1,13 +1,13 @@
 language: go
 
 go:
-  - 1.9
+  - "1.12"
 
 install:
-  - go get -u golang.org/x/lint/golint
+  - env GO111MODULE=on go get -u golang.org/x/lint/golint
 
 script:
-  - make test
+  - env GO111MODULE=on make test
 
 deploy:
   - provider: script

vendor/github.com/d5/tengo/go.mod

@@ -0,0 +1,3 @@
+module github.com/d5/tengo
+
+go 1.12

vendor/github.com/d5/tengo/stdlib/gensrcmods.go

@@ -1,53 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"bytes"
-	"io/ioutil"
-	"log"
-	"regexp"
-	"strconv"
-)
-
-var tengoModFileRE = regexp.MustCompile(`^srcmod_(\w+).tengo$`)
-
-func main() {
-	modules := make(map[string]string)
-
-	// enumerate all Tengo module files
-	files, err := ioutil.ReadDir(".")
-	if err != nil {
-		log.Fatal(err)
-	}
-	for _, file := range files {
-		m := tengoModFileRE.FindStringSubmatch(file.Name())
-		if m != nil {
-			modName := m[1]
-
-			src, err := ioutil.ReadFile(file.Name())
-			if err != nil {
-				log.Fatalf("file '%s' read error: %s", file.Name(), err.Error())
-			}
-
-			modules[modName] = string(src)
-		}
-	}
-
-	var out bytes.Buffer
-	out.WriteString(`// Code generated using gensrcmods.go; DO NOT EDIT.
-
-package stdlib
-
-// SourceModules are source type standard library modules.
-var SourceModules = map[string]string{` + "\n")
-	for modName, modSrc := range modules {
-		out.WriteString("\t\"" + modName + "\": " + strconv.Quote(modSrc) + ",\n")
-	}
-	out.WriteString("}\n")
-
-	const target = "source_modules.go"
-	if err := ioutil.WriteFile(target, out.Bytes(), 0644); err != nil {
-		log.Fatal(err)
-	}
-}

vendor/github.com/gorilla/websocket/.travis.yml

@@ -1,19 +0,0 @@
-language: go
-sudo: false
-
-matrix:
-  include:
-    - go: 1.7.x
-    - go: 1.8.x
-    - go: 1.9.x
-    - go: 1.10.x
-    - go: 1.11.x
-    - go: tip
-  allow_failures:
-    - go: tip
-
-script:
-  - go get -t -v ./...
-  - diff -u <(echo -n) <(gofmt -d .)
-  - go vet $(go list ./... | grep -v /vendor/)
-  - go test -v -race ./...

vendor/github.com/gorilla/websocket/README.md

@@ -1,11 +1,11 @@
 # Gorilla WebSocket
 
+[![GoDoc](https://godoc.org/github.com/gorilla/websocket?status.svg)](https://godoc.org/github.com/gorilla/websocket)
+[![CircleCI](https://circleci.com/gh/gorilla/websocket.svg?style=svg)](https://circleci.com/gh/gorilla/websocket)
+
 Gorilla WebSocket is a [Go](http://golang.org/) implementation of the
 [WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol.
 
-[![Build Status](https://travis-ci.org/gorilla/websocket.svg?branch=master)](https://travis-ci.org/gorilla/websocket)
-[![GoDoc](https://godoc.org/github.com/gorilla/websocket?status.svg)](https://godoc.org/github.com/gorilla/websocket)
-
 ### Documentation
 
 * [API Reference](http://godoc.org/github.com/gorilla/websocket)
@@ -27,7 +27,7 @@ package API is stable.
 ### Protocol Compliance
 
 The Gorilla WebSocket package passes the server tests in the [Autobahn Test
-Suite](http://autobahn.ws/testsuite) using the application in the [examples/autobahn
+Suite](https://github.com/crossbario/autobahn-testsuite) using the application in the [examples/autobahn
 subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn).
 
 ### Gorilla WebSocket compared with other packages
@@ -40,7 +40,7 @@ subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn
 </tr>
 <tr>
 <tr><td colspan="3"><a href="http://tools.ietf.org/html/rfc6455">RFC 6455</a> Features</td></tr>
-<tr><td>Passes <a href="http://autobahn.ws/testsuite/">Autobahn Test Suite</a></td><td><a href="https://github.com/gorilla/websocket/tree/master/examples/autobahn">Yes</a></td><td>No</td></tr>
+<tr><td>Passes <a href="https://github.com/crossbario/autobahn-testsuite">Autobahn Test Suite</a></td><td><a href="https://github.com/gorilla/websocket/tree/master/examples/autobahn">Yes</a></td><td>No</td></tr>
 <tr><td>Receive <a href="https://tools.ietf.org/html/rfc6455#section-5.4">fragmented</a> message<td>Yes</td><td><a href="https://code.google.com/p/go/issues/detail?id=7632">No</a>, see note 1</td></tr>
 <tr><td>Send <a href="https://tools.ietf.org/html/rfc6455#section-5.5.1">close</a> message</td><td><a href="http://godoc.org/github.com/gorilla/websocket#hdr-Control_Messages">Yes</a></td><td><a href="https://code.google.com/p/go/issues/detail?id=4588">No</a></td></tr>
 <tr><td>Send <a href="https://tools.ietf.org/html/rfc6455#section-5.5.2">pings</a> and receive <a href="https://tools.ietf.org/html/rfc6455#section-5.5.3">pongs</a></td><td><a href="http://godoc.org/github.com/gorilla/websocket#hdr-Control_Messages">Yes</a></td><td>No</td></tr>

vendor/github.com/gorilla/websocket/client.go

@@ -70,7 +70,7 @@ type Dialer struct {
 	// HandshakeTimeout specifies the duration for the handshake to complete.
 	HandshakeTimeout time.Duration
 
-	// ReadBufferSize and WriteBufferSize specify I/O buffer sizes. If a buffer
+	// ReadBufferSize and WriteBufferSize specify I/O buffer sizes in bytes. If a buffer
 	// size is zero, then a useful default size is used. The I/O buffer sizes
 	// do not limit the size of the messages that can be sent or received.
 	ReadBufferSize, WriteBufferSize int
@@ -140,7 +140,7 @@ var nilDialer = *DefaultDialer
 // Use the response.Header to get the selected subprotocol
 // (Sec-WebSocket-Protocol) and cookies (Set-Cookie).
 //
-// The context will be used in the request and in the Dialer
+// The context will be used in the request and in the Dialer.
 //
 // If the WebSocket handshake fails, ErrBadHandshake is returned along with a
 // non-nil *http.Response so that callers can handle redirects, authentication,

vendor/github.com/gorilla/websocket/conn.go

@@ -260,10 +260,12 @@ type Conn struct {
 	newCompressionWriter   func(io.WriteCloser, int) io.WriteCloser
 
 	// Read fields
-	reader        io.ReadCloser // the current reader returned to the application
+	reader  io.ReadCloser // the current reader returned to the application
-	readErr       error
+	readErr error
-	br            *bufio.Reader
+	br      *bufio.Reader
-	readRemaining int64 // bytes remaining in current frame.
+	// bytes remaining in current frame.
+	// set setReadRemaining to safely update this value and prevent overflow
+	readRemaining int64
 	readFinal     bool  // true the current message has more frames.
 	readLength    int64 // Message size.
 	readLimit     int64 // Maximum message size.
@@ -320,6 +322,17 @@ func newConn(conn net.Conn, isServer bool, readBufferSize, writeBufferSize int,
 	return c
 }
 
+// setReadRemaining tracks the number of bytes remaining on the connection. If n
+// overflows, an ErrReadLimit is returned.
+func (c *Conn) setReadRemaining(n int64) error {
+	if n < 0 {
+		return ErrReadLimit
+	}
+
+	c.readRemaining = n
+	return nil
+}
+
 // Subprotocol returns the negotiated protocol for the connection.
 func (c *Conn) Subprotocol() string {
 	return c.subprotocol
@@ -451,7 +464,8 @@ func (c *Conn) WriteControl(messageType int, data []byte, deadline time.Time) er
 	return err
 }
 
-func (c *Conn) prepWrite(messageType int) error {
+// beginMessage prepares a connection and message writer for a new message.
+func (c *Conn) beginMessage(mw *messageWriter, messageType int) error {
 	// Close previous writer if not already closed by the application. It's
 	// probably better to return an error in this situation, but we cannot
 	// change this without breaking existing applications.
@@ -471,6 +485,10 @@ func (c *Conn) prepWrite(messageType int) error {
 		return err
 	}
 
+	mw.c = c
+	mw.frameType = messageType
+	mw.pos = maxFrameHeaderSize
+
 	if c.writeBuf == nil {
 		wpd, ok := c.writePool.Get().(writePoolData)
 		if ok {
@@ -491,16 +509,11 @@ func (c *Conn) prepWrite(messageType int) error {
 // All message types (TextMessage, BinaryMessage, CloseMessage, PingMessage and
 // PongMessage) are supported.
 func (c *Conn) NextWriter(messageType int) (io.WriteCloser, error) {
-	if err := c.prepWrite(messageType); err != nil {
+	var mw messageWriter
+	if err := c.beginMessage(&mw, messageType); err != nil {
 		return nil, err
 	}
-
+	c.writer = &mw
-	mw := &messageWriter{
-		c:         c,
-		frameType: messageType,
-		pos:       maxFrameHeaderSize,
-	}
-	c.writer = mw
 	if c.newCompressionWriter != nil && c.enableWriteCompression && isData(messageType) {
 		w := c.newCompressionWriter(c.writer, c.compressionLevel)
 		mw.compress = true
@@ -517,10 +530,16 @@ type messageWriter struct {
 	err       error
 }
 
-func (w *messageWriter) fatal(err error) error {
+func (w *messageWriter) endMessage(err error) error {
 	if w.err != nil {
-		w.err = err
+		return err
-		w.c.writer = nil
+	}
+	c := w.c
+	w.err = err
+	c.writer = nil
+	if c.writePool != nil {
+		c.writePool.Put(writePoolData{buf: c.writeBuf})
+		c.writeBuf = nil
 	}
 	return err
 }
@@ -534,7 +553,7 @@ func (w *messageWriter) flushFrame(final bool, extra []byte) error {
 	// Check for invalid control frames.
 	if isControl(w.frameType) &&
 		(!final || length > maxControlFramePayloadSize) {
-		return w.fatal(errInvalidControlFrame)
+		return w.endMessage(errInvalidControlFrame)
 	}
 
 	b0 := byte(w.frameType)
@@ -579,7 +598,7 @@ func (w *messageWriter) flushFrame(final bool, extra []byte) error {
 		copy(c.writeBuf[maxFrameHeaderSize-4:], key[:])
 		maskBytes(key, 0, c.writeBuf[maxFrameHeaderSize:w.pos])
 		if len(extra) > 0 {
-			return c.writeFatal(errors.New("websocket: internal error, extra used in client mode"))
+			return w.endMessage(c.writeFatal(errors.New("websocket: internal error, extra used in client mode")))
 		}
 	}
 
@@ -600,15 +619,11 @@ func (w *messageWriter) flushFrame(final bool, extra []byte) error {
 	c.isWriting = false
 
 	if err != nil {
-		return w.fatal(err)
+		return w.endMessage(err)
 	}
 
 	if final {
-		c.writer = nil
+		w.endMessage(errWriteClosed)
-		if c.writePool != nil {
-			c.writePool.Put(writePoolData{buf: c.writeBuf})
-			c.writeBuf = nil
-		}
 		return nil
 	}
 
@@ -706,11 +721,7 @@ func (w *messageWriter) Close() error {
 	if w.err != nil {
 		return w.err
 	}
-	if err := w.flushFrame(true, nil); err != nil {
+	return w.flushFrame(true, nil)
-		return err
-	}
-	w.err = errWriteClosed
-	return nil
 }
 
 // WritePreparedMessage writes prepared message into connection.
@@ -742,10 +753,10 @@ func (c *Conn) WriteMessage(messageType int, data []byte) error {
 	if c.isServer && (c.newCompressionWriter == nil || !c.enableWriteCompression) {
 		// Fast path with no allocations and single frame.
 
-		if err := c.prepWrite(messageType); err != nil {
+		var mw messageWriter
+		if err := c.beginMessage(&mw, messageType); err != nil {
 			return err
 		}
-		mw := messageWriter{c: c, frameType: messageType, pos: maxFrameHeaderSize}
 		n := copy(c.writeBuf[mw.pos:], data)
 		mw.pos += n
 		data = data[n:]
@@ -792,7 +803,7 @@ func (c *Conn) advanceFrame() (int, error) {
 	final := p[0]&finalBit != 0
 	frameType := int(p[0] & 0xf)
 	mask := p[1]&maskBit != 0
-	c.readRemaining = int64(p[1] & 0x7f)
+	c.setReadRemaining(int64(p[1] & 0x7f))
 
 	c.readDecompress = false
 	if c.newDecompressionReader != nil && (p[0]&rsv1Bit) != 0 {
@@ -826,7 +837,17 @@ func (c *Conn) advanceFrame() (int, error) {
 		return noFrame, c.handleProtocolError("unknown opcode " + strconv.Itoa(frameType))
 	}
 
-	// 3. Read and parse frame length.
+	// 3. Read and parse frame length as per
+	// https://tools.ietf.org/html/rfc6455#section-5.2
+	//
+	// The length of the "Payload data", in bytes: if 0-125, that is the payload
+	// length.
+	// - If 126, the following 2 bytes interpreted as a 16-bit unsigned
+	// integer are the payload length.
+	// - If 127, the following 8 bytes interpreted as
+	// a 64-bit unsigned integer (the most significant bit MUST be 0) are the
+	// payload length. Multibyte length quantities are expressed in network byte
+	// order.
 
 	switch c.readRemaining {
 	case 126:
@@ -834,13 +855,19 @@ func (c *Conn) advanceFrame() (int, error) {
 		if err != nil {
 			return noFrame, err
 		}
-		c.readRemaining = int64(binary.BigEndian.Uint16(p))
+
+		if err := c.setReadRemaining(int64(binary.BigEndian.Uint16(p))); err != nil {
+			return noFrame, err
+		}
 	case 127:
 		p, err := c.read(8)
 		if err != nil {
 			return noFrame, err
 		}
-		c.readRemaining = int64(binary.BigEndian.Uint64(p))
+
+		if err := c.setReadRemaining(int64(binary.BigEndian.Uint64(p))); err != nil {
+			return noFrame, err
+		}
 	}
 
 	// 4. Handle frame masking.
@@ -863,6 +890,12 @@ func (c *Conn) advanceFrame() (int, error) {
 	if frameType == continuationFrame || frameType == TextMessage || frameType == BinaryMessage {
 
 		c.readLength += c.readRemaining
+		// Don't allow readLength to overflow in the presence of a large readRemaining
+		// counter.
+		if c.readLength < 0 {
+			return noFrame, ErrReadLimit
+		}
+
 		if c.readLimit > 0 && c.readLength > c.readLimit {
 			c.WriteControl(CloseMessage, FormatCloseMessage(CloseMessageTooBig, ""), time.Now().Add(writeWait))
 			return noFrame, ErrReadLimit
@@ -876,7 +909,7 @@ func (c *Conn) advanceFrame() (int, error) {
 	var payload []byte
 	if c.readRemaining > 0 {
 		payload, err = c.read(int(c.readRemaining))
-		c.readRemaining = 0
+		c.setReadRemaining(0)
 		if err != nil {
 			return noFrame, err
 		}
@@ -949,6 +982,7 @@ func (c *Conn) NextReader() (messageType int, r io.Reader, err error) {
 			c.readErr = hideTempErr(err)
 			break
 		}
+
 		if frameType == TextMessage || frameType == BinaryMessage {
 			c.messageReader = &messageReader{c}
 			c.reader = c.messageReader
@@ -989,7 +1023,9 @@ func (r *messageReader) Read(b []byte) (int, error) {
 			if c.isServer {
 				c.readMaskPos = maskBytes(c.readMaskKey, c.readMaskPos, b[:n])
 			}
-			c.readRemaining -= int64(n)
+			rem := c.readRemaining
+			rem -= int64(n)
+			c.setReadRemaining(rem)
 			if c.readRemaining > 0 && c.readErr == io.EOF {
 				c.readErr = errUnexpectedEOF
 			}
@@ -1041,7 +1077,7 @@ func (c *Conn) SetReadDeadline(t time.Time) error {
 	return c.conn.SetReadDeadline(t)
 }
 
-// SetReadLimit sets the maximum size for a message read from the peer. If a
+// SetReadLimit sets the maximum size in bytes for a message read from the peer. If a
 // message exceeds the limit, the connection sends a close message to the peer
 // and returns ErrReadLimit to the application.
 func (c *Conn) SetReadLimit(limit int64) {

vendor/github.com/gorilla/websocket/doc.go

@@ -151,6 +151,53 @@
 // checking. The application is responsible for checking the Origin header
 // before calling the Upgrade function.
 //
+// Buffers
+//
+// Connections buffer network input and output to reduce the number
+// of system calls when reading or writing messages.
+//
+// Write buffers are also used for constructing WebSocket frames. See RFC 6455,
+// Section 5 for a discussion of message framing. A WebSocket frame header is
+// written to the network each time a write buffer is flushed to the network.
+// Decreasing the size of the write buffer can increase the amount of framing
+// overhead on the connection.
+//
+// The buffer sizes in bytes are specified by the ReadBufferSize and
+// WriteBufferSize fields in the Dialer and Upgrader. The Dialer uses a default
+// size of 4096 when a buffer size field is set to zero. The Upgrader reuses
+// buffers created by the HTTP server when a buffer size field is set to zero.
+// The HTTP server buffers have a size of 4096 at the time of this writing.
+//
+// The buffer sizes do not limit the size of a message that can be read or
+// written by a connection.
+//
+// Buffers are held for the lifetime of the connection by default. If the
+// Dialer or Upgrader WriteBufferPool field is set, then a connection holds the
+// write buffer only when writing a message.
+//
+// Applications should tune the buffer sizes to balance memory use and
+// performance. Increasing the buffer size uses more memory, but can reduce the
+// number of system calls to read or write the network. In the case of writing,
+// increasing the buffer size can reduce the number of frame headers written to
+// the network.
+//
+// Some guidelines for setting buffer parameters are:
+//
+// Limit the buffer sizes to the maximum expected message size. Buffers larger
+// than the largest message do not provide any benefit.
+//
+// Depending on the distribution of message sizes, setting the buffer size to
+// to a value less than the maximum expected message size can greatly reduce
+// memory use with a small impact on performance. Here's an example: If 99% of
+// the messages are smaller than 256 bytes and the maximum message size is 512
+// bytes, then a buffer size of 256 bytes will result in 1.01 more system calls
+// than a buffer size of 512 bytes. The memory savings is 50%.
+//
+// A write buffer pool is useful when the application has a modest number
+// writes over a large number of connections. when buffers are pooled, a larger
+// buffer size has a reduced impact on total memory use and has the benefit of
+// reducing system calls and frame overhead.
+//
 // Compression EXPERIMENTAL
 //
 // Per message compression extensions (RFC 7692) are experimentally supported

vendor/github.com/gorilla/websocket/go.mod

@@ -0,0 +1,3 @@
+module github.com/gorilla/websocket
+
+go 1.12

vendor/github.com/gorilla/websocket/go.sum

@@ -0,0 +1,2 @@
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=

vendor/github.com/gorilla/websocket/join.go

@@ -0,0 +1,42 @@
+// Copyright 2019 The Gorilla WebSocket Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package websocket
+
+import (
+	"io"
+	"strings"
+)
+
+// JoinMessages concatenates received messages to create a single io.Reader.
+// The string term is appended to each message. The returned reader does not
+// support concurrent calls to the Read method.
+func JoinMessages(c *Conn, term string) io.Reader {
+	return &joinReader{c: c, term: term}
+}
+
+type joinReader struct {
+	c    *Conn
+	term string
+	r    io.Reader
+}
+
+func (r *joinReader) Read(p []byte) (int, error) {
+	if r.r == nil {
+		var err error
+		_, r.r, err = r.c.NextReader()
+		if err != nil {
+			return 0, err
+		}
+		if r.term != "" {
+			r.r = io.MultiReader(r.r, strings.NewReader(r.term))
+		}
+	}
+	n, err := r.r.Read(p)
+	if err == io.EOF {
+		err = nil
+		r.r = nil
+	}
+	return n, err
+}

vendor/github.com/gorilla/websocket/proxy.go

@@ -22,18 +22,18 @@ func (fn netDialerFunc) Dial(network, addr string) (net.Conn, error) {
 
 func init() {
 	proxy_RegisterDialerType("http", func(proxyURL *url.URL, forwardDialer proxy_Dialer) (proxy_Dialer, error) {
-		return &httpProxyDialer{proxyURL: proxyURL, fowardDial: forwardDialer.Dial}, nil
+		return &httpProxyDialer{proxyURL: proxyURL, forwardDial: forwardDialer.Dial}, nil
 	})
 }
 
 type httpProxyDialer struct {
-	proxyURL   *url.URL
+	proxyURL    *url.URL
-	fowardDial func(network, addr string) (net.Conn, error)
+	forwardDial func(network, addr string) (net.Conn, error)
 }
 
 func (hpd *httpProxyDialer) Dial(network string, addr string) (net.Conn, error) {
 	hostPort, _ := hostPortNoPort(hpd.proxyURL)
-	conn, err := hpd.fowardDial(network, hostPort)
+	conn, err := hpd.forwardDial(network, hostPort)
 	if err != nil {
 		return nil, err
 	}

vendor/github.com/gorilla/websocket/server.go

@@ -27,7 +27,7 @@ type Upgrader struct {
 	// HandshakeTimeout specifies the duration for the handshake to complete.
 	HandshakeTimeout time.Duration
 
-	// ReadBufferSize and WriteBufferSize specify I/O buffer sizes. If a buffer
+	// ReadBufferSize and WriteBufferSize specify I/O buffer sizes in bytes. If a buffer
 	// size is zero, then buffers allocated by the HTTP server are used. The
 	// I/O buffer sizes do not limit the size of the messages that can be sent
 	// or received.
@@ -153,7 +153,7 @@ func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeade
 
 	challengeKey := r.Header.Get("Sec-Websocket-Key")
 	if challengeKey == "" {
-		return u.returnError(w, r, http.StatusBadRequest, "websocket: not a websocket handshake: `Sec-WebSocket-Key' header is missing or blank")
+		return u.returnError(w, r, http.StatusBadRequest, "websocket: not a websocket handshake: 'Sec-WebSocket-Key' header is missing or blank")
 	}
 
 	subprotocol := u.selectSubprotocol(r, responseHeader)

vendor/github.com/gorilla/websocket/util.go

@@ -31,68 +31,113 @@ func generateChallengeKey() (string, error) {
 	return base64.StdEncoding.EncodeToString(p), nil
 }
 
-// Octet types from RFC 2616.
+// Token octets per RFC 2616.
-var octetTypes [256]byte
+var isTokenOctet = [256]bool{
-
+	'!':  true,
-const (
+	'#':  true,
-	isTokenOctet = 1 << iota
+	'$':  true,
-	isSpaceOctet
+	'%':  true,
-)
+	'&':  true,
-
+	'\'': true,
-func init() {
+	'*':  true,
-	// From RFC 2616
+	'+':  true,
-	//
+	'-':  true,
-	// OCTET      = <any 8-bit sequence of data>
+	'.':  true,
-	// CHAR       = <any US-ASCII character (octets 0 - 127)>
+	'0':  true,
-	// CTL        = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+	'1':  true,
-	// CR         = <US-ASCII CR, carriage return (13)>
+	'2':  true,
-	// LF         = <US-ASCII LF, linefeed (10)>
+	'3':  true,
-	// SP         = <US-ASCII SP, space (32)>
+	'4':  true,
-	// HT         = <US-ASCII HT, horizontal-tab (9)>
+	'5':  true,
-	// <">        = <US-ASCII double-quote mark (34)>
+	'6':  true,
-	// CRLF       = CR LF
+	'7':  true,
-	// LWS        = [CRLF] 1*( SP | HT )
+	'8':  true,
-	// TEXT       = <any OCTET except CTLs, but including LWS>
+	'9':  true,
-	// separators = "(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\" | <">
+	'A':  true,
-	//              | "/" | "[" | "]" | "?" | "=" | "{" | "}" | SP | HT
+	'B':  true,
-	// token      = 1*<any CHAR except CTLs or separators>
+	'C':  true,
-	// qdtext     = <any TEXT except <">>
+	'D':  true,
-
+	'E':  true,
-	for c := 0; c < 256; c++ {
+	'F':  true,
-		var t byte
+	'G':  true,
-		isCtl := c <= 31 || c == 127
+	'H':  true,
-		isChar := 0 <= c && c <= 127
+	'I':  true,
-		isSeparator := strings.IndexRune(" \t\"(),/:;<=>?@[]\\{}", rune(c)) >= 0
+	'J':  true,
-		if strings.IndexRune(" \t\r\n", rune(c)) >= 0 {
+	'K':  true,
-			t |= isSpaceOctet
+	'L':  true,
-		}
+	'M':  true,
-		if isChar && !isCtl && !isSeparator {
+	'N':  true,
-			t |= isTokenOctet
+	'O':  true,
-		}
+	'P':  true,
-		octetTypes[c] = t
+	'Q':  true,
-	}
+	'R':  true,
+	'S':  true,
+	'T':  true,
+	'U':  true,
+	'W':  true,
+	'V':  true,
+	'X':  true,
+	'Y':  true,
+	'Z':  true,
+	'^':  true,
+	'_':  true,
+	'`':  true,
+	'a':  true,
+	'b':  true,
+	'c':  true,
+	'd':  true,
+	'e':  true,
+	'f':  true,
+	'g':  true,
+	'h':  true,
+	'i':  true,
+	'j':  true,
+	'k':  true,
+	'l':  true,
+	'm':  true,
+	'n':  true,
+	'o':  true,
+	'p':  true,
+	'q':  true,
+	'r':  true,
+	's':  true,
+	't':  true,
+	'u':  true,
+	'v':  true,
+	'w':  true,
+	'x':  true,
+	'y':  true,
+	'z':  true,
+	'|':  true,
+	'~':  true,
 }
 
+// skipSpace returns a slice of the string s with all leading RFC 2616 linear
+// whitespace removed.
 func skipSpace(s string) (rest string) {
 	i := 0
 	for ; i < len(s); i++ {
-		if octetTypes[s[i]]&isSpaceOctet == 0 {
+		if b := s[i]; b != ' ' && b != '\t' {
 			break
 		}
 	}
 	return s[i:]
 }
 
+// nextToken returns the leading RFC 2616 token of s and the string following
+// the token.
 func nextToken(s string) (token, rest string) {
 	i := 0
 	for ; i < len(s); i++ {
-		if octetTypes[s[i]]&isTokenOctet == 0 {
+		if !isTokenOctet[s[i]] {
 			break
 		}
 	}
 	return s[:i], s[i:]
 }
 
+// nextTokenOrQuoted returns the leading token or quoted string per RFC 2616
+// and the string following the token or quoted string.
 func nextTokenOrQuoted(s string) (value string, rest string) {
 	if !strings.HasPrefix(s, "\"") {
 		return nextToken(s)
@@ -128,7 +173,8 @@ func nextTokenOrQuoted(s string) (value string, rest string) {
 	return "", ""
 }
 
-// equalASCIIFold returns true if s is equal to t with ASCII case folding.
+// equalASCIIFold returns true if s is equal to t with ASCII case folding as
+// defined in RFC 4790.
 func equalASCIIFold(s, t string) bool {
 	for s != "" && t != "" {
 		sr, size := utf8.DecodeRuneInString(s)

vendor/github.com/hashicorp/golang-lru/go.mod

@@ -1 +1,3 @@
 module github.com/hashicorp/golang-lru
+
+go 1.12

vendor/github.com/hashicorp/golang-lru/lru.go

@@ -86,17 +86,35 @@ func (c *Cache) ContainsOrAdd(key, value interface{}) (ok, evicted bool) {
 }
 
 // Remove removes the provided key from the cache.
-func (c *Cache) Remove(key interface{}) {
+func (c *Cache) Remove(key interface{}) (present bool) {
 	c.lock.Lock()
-	c.lru.Remove(key)
+	present = c.lru.Remove(key)
 	c.lock.Unlock()
+	return
+}
+
+// Resize changes the cache size.
+func (c *Cache) Resize(size int) (evicted int) {
+	c.lock.Lock()
+	evicted = c.lru.Resize(size)
+	c.lock.Unlock()
+	return evicted
 }
 
 // RemoveOldest removes the oldest item from the cache.
-func (c *Cache) RemoveOldest() {
+func (c *Cache) RemoveOldest() (key interface{}, value interface{}, ok bool) {
 	c.lock.Lock()
-	c.lru.RemoveOldest()
+	key, value, ok = c.lru.RemoveOldest()
 	c.lock.Unlock()
+	return
+}
+
+// GetOldest returns the oldest entry
+func (c *Cache) GetOldest() (key interface{}, value interface{}, ok bool) {
+	c.lock.Lock()
+	key, value, ok = c.lru.GetOldest()
+	c.lock.Unlock()
+	return
 }
 
 // Keys returns a slice of the keys in the cache, from oldest to newest.

vendor/github.com/hashicorp/golang-lru/simplelru/lru.go

@@ -73,6 +73,9 @@ func (c *LRU) Add(key, value interface{}) (evicted bool) {
 func (c *LRU) Get(key interface{}) (value interface{}, ok bool) {
 	if ent, ok := c.items[key]; ok {
 		c.evictList.MoveToFront(ent)
+		if ent.Value.(*entry) == nil {
+			return nil, false
+		}
 		return ent.Value.(*entry).value, true
 	}
 	return
@@ -142,6 +145,19 @@ func (c *LRU) Len() int {
 	return c.evictList.Len()
 }
 
+// Resize changes the cache size.
+func (c *LRU) Resize(size int) (evicted int) {
+	diff := c.Len() - size
+	if diff < 0 {
+		diff = 0
+	}
+	for i := 0; i < diff; i++ {
+		c.removeOldest()
+	}
+	c.size = size
+	return diff
+}
+
 // removeOldest removes the oldest item from the cache.
 func (c *LRU) removeOldest() {
 	ent := c.evictList.Back()

vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go

@@ -10,7 +10,7 @@ type LRUCache interface {
 	// updates the "recently used"-ness of the key. #value, isFound
 	Get(key interface{}) (value interface{}, ok bool)
 
-	// Check if a key exsists in cache without updating the recent-ness.
+	// Checks if a key exists in cache without updating the recent-ness.
 	Contains(key interface{}) (ok bool)
 
 	// Returns key's value without updating the "recently used"-ness of the key.
@@ -31,6 +31,9 @@ type LRUCache interface {
 	// Returns the number of items in the cache.
 	Len() int
 
-	// Clear all cache entries
+	// Clears all cache entries.
 	Purge()
+
+  // Resizes cache, returning number evicted
+  Resize(int) int
 }

vendor/github.com/keybase/go-keybase-chat-bot/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2017, Keybase
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of keybase nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

vendor/github.com/keybase/go-keybase-chat-bot/kbchat/kbchat.go

@@ -0,0 +1,693 @@
+package kbchat
+
+import (
+	"bufio"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"os/exec"
+	"strings"
+	"sync"
+	"time"
+)
+
+// API is the main object used for communicating with the Keybase JSON API
+type API struct {
+	sync.Mutex
+	apiInput  io.Writer
+	apiOutput *bufio.Reader
+	apiCmd    *exec.Cmd
+	username  string
+	runOpts   RunOptions
+}
+
+func getUsername(runOpts RunOptions) (username string, err error) {
+	p := runOpts.Command("status")
+	output, err := p.StdoutPipe()
+	if err != nil {
+		return "", err
+	}
+	if err = p.Start(); err != nil {
+		return "", err
+	}
+
+	doneCh := make(chan error)
+	go func() {
+		scanner := bufio.NewScanner(output)
+		if !scanner.Scan() {
+			doneCh <- errors.New("unable to find Keybase username")
+			return
+		}
+		toks := strings.Fields(scanner.Text())
+		if len(toks) != 2 {
+			doneCh <- errors.New("invalid Keybase username output")
+			return
+		}
+		username = toks[1]
+		doneCh <- nil
+	}()
+
+	select {
+	case err = <-doneCh:
+		if err != nil {
+			return "", err
+		}
+	case <-time.After(5 * time.Second):
+		return "", errors.New("unable to run Keybase command")
+	}
+
+	return username, nil
+}
+
+type OneshotOptions struct {
+	Username string
+	PaperKey string
+}
+
+type RunOptions struct {
+	KeybaseLocation string
+	HomeDir         string
+	Oneshot         *OneshotOptions
+	StartService    bool
+}
+
+func (r RunOptions) Location() string {
+	if r.KeybaseLocation == "" {
+		return "keybase"
+	}
+	return r.KeybaseLocation
+}
+
+func (r RunOptions) Command(args ...string) *exec.Cmd {
+	var cmd []string
+	if r.HomeDir != "" {
+		cmd = append(cmd, "--home", r.HomeDir)
+	}
+	cmd = append(cmd, args...)
+	return exec.Command(r.Location(), cmd...)
+}
+
+// Start fires up the Keybase JSON API in stdin/stdout mode
+func Start(runOpts RunOptions) (*API, error) {
+	api := &API{
+		runOpts: runOpts,
+	}
+	if err := api.startPipes(); err != nil {
+		return nil, err
+	}
+	return api, nil
+}
+
+func (a *API) auth() (string, error) {
+	username, err := getUsername(a.runOpts)
+	if err == nil {
+		return username, nil
+	}
+	if a.runOpts.Oneshot == nil {
+		return "", err
+	}
+	username = ""
+	// If a paper key is specified, then login with oneshot mode (logout first)
+	if a.runOpts.Oneshot != nil {
+		if username == a.runOpts.Oneshot.Username {
+			// just get out if we are on the desired user already
+			return username, nil
+		}
+		if err := a.runOpts.Command("logout", "-f").Run(); err != nil {
+			return "", err
+		}
+		if err := a.runOpts.Command("oneshot", "--username", a.runOpts.Oneshot.Username, "--paperkey",
+			a.runOpts.Oneshot.PaperKey).Run(); err != nil {
+			return "", err
+		}
+		username = a.runOpts.Oneshot.Username
+		return username, nil
+	}
+	return "", errors.New("unable to auth")
+}
+
+func (a *API) startPipes() (err error) {
+	a.Lock()
+	defer a.Unlock()
+	if a.apiCmd != nil {
+		a.apiCmd.Process.Kill()
+	}
+	a.apiCmd = nil
+
+	if a.runOpts.StartService {
+		a.runOpts.Command("service").Start()
+	}
+
+	if a.username, err = a.auth(); err != nil {
+		return err
+	}
+	a.apiCmd = a.runOpts.Command("chat", "api")
+	if a.apiInput, err = a.apiCmd.StdinPipe(); err != nil {
+		return err
+	}
+	output, err := a.apiCmd.StdoutPipe()
+	if err != nil {
+		return err
+	}
+	if err := a.apiCmd.Start(); err != nil {
+		return err
+	}
+	a.apiOutput = bufio.NewReader(output)
+	return nil
+}
+
+var errAPIDisconnected = errors.New("chat API disconnected")
+
+func (a *API) getAPIPipesLocked() (io.Writer, *bufio.Reader, error) {
+	// this should only be called inside a lock
+	if a.apiCmd == nil {
+		return nil, nil, errAPIDisconnected
+	}
+	return a.apiInput, a.apiOutput, nil
+}
+
+// GetConversations reads all conversations from the current user's inbox.
+func (a *API) GetConversations(unreadOnly bool) ([]Conversation, error) {
+	apiInput := fmt.Sprintf(`{"method":"list", "params": { "options": { "unread_only": %v}}}`, unreadOnly)
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return nil, err
+	}
+
+	var inbox Inbox
+	if err := json.Unmarshal(output, &inbox); err != nil {
+		return nil, err
+	}
+	return inbox.Result.Convs, nil
+}
+
+// GetTextMessages fetches all text messages from a given channel. Optionally can filter
+// ont unread status.
+func (a *API) GetTextMessages(channel Channel, unreadOnly bool) ([]Message, error) {
+	channelBytes, err := json.Marshal(channel)
+	if err != nil {
+		return nil, err
+	}
+	apiInput := fmt.Sprintf(`{"method": "read", "params": {"options": {"channel": %s}}}`, string(channelBytes))
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return nil, err
+	}
+
+	var thread Thread
+
+	if err := json.Unmarshal(output, &thread); err != nil {
+		return nil, fmt.Errorf("unable to decode thread: %s", err.Error())
+	}
+
+	var res []Message
+	for _, msg := range thread.Result.Messages {
+		if msg.Msg.Content.Type == "text" {
+			res = append(res, msg.Msg)
+		}
+	}
+
+	return res, nil
+}
+
+type sendMessageBody struct {
+	Body string
+}
+
+type sendMessageOptions struct {
+	Channel        Channel         `json:"channel,omitempty"`
+	ConversationID string          `json:"conversation_id,omitempty"`
+	Message        sendMessageBody `json:",omitempty"`
+	Filename       string          `json:"filename,omitempty"`
+	Title          string          `json:"title,omitempty"`
+	MsgID          int             `json:"message_id,omitempty"`
+}
+
+type sendMessageParams struct {
+	Options sendMessageOptions
+}
+
+type sendMessageArg struct {
+	Method string
+	Params sendMessageParams
+}
+
+func (a *API) doSend(arg interface{}) (response SendResponse, err error) {
+	a.Lock()
+	defer a.Unlock()
+
+	bArg, err := json.Marshal(arg)
+	if err != nil {
+		return SendResponse{}, err
+	}
+	input, output, err := a.getAPIPipesLocked()
+	if err != nil {
+		return SendResponse{}, err
+	}
+	if _, err := io.WriteString(input, string(bArg)); err != nil {
+		return SendResponse{}, err
+	}
+	responseRaw, err := output.ReadBytes('\n')
+	if err != nil {
+		return SendResponse{}, err
+	}
+	if err := json.Unmarshal(responseRaw, &response); err != nil {
+		return SendResponse{}, fmt.Errorf("failed to decode API response: %s", err)
+	}
+	return response, nil
+}
+
+func (a *API) doFetch(apiInput string) ([]byte, error) {
+	a.Lock()
+	defer a.Unlock()
+
+	input, output, err := a.getAPIPipesLocked()
+	if err != nil {
+		return nil, err
+	}
+	if _, err := io.WriteString(input, apiInput); err != nil {
+		return nil, err
+	}
+	byteOutput, err := output.ReadBytes('\n')
+	if err != nil {
+		return nil, err
+	}
+
+	return byteOutput, nil
+}
+
+func (a *API) SendMessage(channel Channel, body string) (SendResponse, error) {
+	arg := sendMessageArg{
+		Method: "send",
+		Params: sendMessageParams{
+			Options: sendMessageOptions{
+				Channel: channel,
+				Message: sendMessageBody{
+					Body: body,
+				},
+			},
+		},
+	}
+	return a.doSend(arg)
+}
+
+func (a *API) SendMessageByConvID(convID string, body string) (SendResponse, error) {
+	arg := sendMessageArg{
+		Method: "send",
+		Params: sendMessageParams{
+			Options: sendMessageOptions{
+				ConversationID: convID,
+				Message: sendMessageBody{
+					Body: body,
+				},
+			},
+		},
+	}
+	return a.doSend(arg)
+}
+
+// SendMessageByTlfName sends a message on the given TLF name
+func (a *API) SendMessageByTlfName(tlfName string, body string) (SendResponse, error) {
+	arg := sendMessageArg{
+		Method: "send",
+		Params: sendMessageParams{
+			Options: sendMessageOptions{
+				Channel: Channel{
+					Name: tlfName,
+				},
+				Message: sendMessageBody{
+					Body: body,
+				},
+			},
+		},
+	}
+	return a.doSend(arg)
+}
+
+func (a *API) SendMessageByTeamName(teamName string, body string, inChannel *string) (SendResponse, error) {
+	channel := "general"
+	if inChannel != nil {
+		channel = *inChannel
+	}
+	arg := sendMessageArg{
+		Method: "send",
+		Params: sendMessageParams{
+			Options: sendMessageOptions{
+				Channel: Channel{
+					MembersType: "team",
+					Name:        teamName,
+					TopicName:   channel,
+				},
+				Message: sendMessageBody{
+					Body: body,
+				},
+			},
+		},
+	}
+	return a.doSend(arg)
+}
+
+func (a *API) SendAttachmentByTeam(teamName string, filename string, title string, inChannel *string) (SendResponse, error) {
+	channel := "general"
+	if inChannel != nil {
+		channel = *inChannel
+	}
+	arg := sendMessageArg{
+		Method: "attach",
+		Params: sendMessageParams{
+			Options: sendMessageOptions{
+				Channel: Channel{
+					MembersType: "team",
+					Name:        teamName,
+					TopicName:   channel,
+				},
+				Filename: filename,
+				Title:    title,
+			},
+		},
+	}
+	return a.doSend(arg)
+}
+
+type reactionOptions struct {
+	ConversationID string `json:"conversation_id"`
+	Message        sendMessageBody
+	MsgID          int     `json:"message_id"`
+	Channel        Channel `json:"channel"`
+}
+
+type reactionParams struct {
+	Options reactionOptions
+}
+
+type reactionArg struct {
+	Method string
+	Params reactionParams
+}
+
+func newReactionArg(options reactionOptions) reactionArg {
+	return reactionArg{
+		Method: "reaction",
+		Params: reactionParams{Options: options},
+	}
+}
+
+func (a *API) ReactByChannel(channel Channel, msgID int, reaction string) (SendResponse, error) {
+	arg := newReactionArg(reactionOptions{
+		Message: sendMessageBody{Body: reaction},
+		MsgID:   msgID,
+		Channel: channel,
+	})
+	return a.doSend(arg)
+}
+
+func (a *API) ReactByConvID(convID string, msgID int, reaction string) (SendResponse, error) {
+	arg := newReactionArg(reactionOptions{
+		Message:        sendMessageBody{Body: reaction},
+		MsgID:          msgID,
+		ConversationID: convID,
+	})
+	return a.doSend(arg)
+}
+
+type advertiseParams struct {
+	Options Advertisement
+}
+
+type advertiseMsgArg struct {
+	Method string
+	Params advertiseParams
+}
+
+func newAdvertiseMsgArg(ad Advertisement) advertiseMsgArg {
+	return advertiseMsgArg{
+		Method: "advertisecommands",
+		Params: advertiseParams{
+			Options: ad,
+		},
+	}
+}
+
+func (a *API) AdvertiseCommands(ad Advertisement) (SendResponse, error) {
+	return a.doSend(newAdvertiseMsgArg(ad))
+}
+
+func (a *API) Username() string {
+	return a.username
+}
+
+// SubscriptionMessage contains a message and conversation object
+type SubscriptionMessage struct {
+	Message      Message
+	Conversation Conversation
+}
+
+type SubscriptionWalletEvent struct {
+	Payment Payment
+}
+
+// NewSubscription has methods to control the background message fetcher loop
+type NewSubscription struct {
+	newMsgsCh   <-chan SubscriptionMessage
+	newWalletCh <-chan SubscriptionWalletEvent
+	errorCh     <-chan error
+	shutdownCh  chan struct{}
+}
+
+// Read blocks until a new message arrives
+func (m NewSubscription) Read() (SubscriptionMessage, error) {
+	select {
+	case msg := <-m.newMsgsCh:
+		return msg, nil
+	case err := <-m.errorCh:
+		return SubscriptionMessage{}, err
+	}
+}
+
+// Read blocks until a new message arrives
+func (m NewSubscription) ReadWallet() (SubscriptionWalletEvent, error) {
+	select {
+	case msg := <-m.newWalletCh:
+		return msg, nil
+	case err := <-m.errorCh:
+		return SubscriptionWalletEvent{}, err
+	}
+}
+
+// Shutdown terminates the background process
+func (m NewSubscription) Shutdown() {
+	m.shutdownCh <- struct{}{}
+}
+
+type ListenOptions struct {
+	Wallet bool
+}
+
+// ListenForNewTextMessages proxies to Listen without wallet events
+func (a *API) ListenForNewTextMessages() (NewSubscription, error) {
+	opts := ListenOptions{Wallet: false}
+	return a.Listen(opts)
+}
+
+// Listen fires of a background loop and puts chat messages and wallet
+// events into channels
+func (a *API) Listen(opts ListenOptions) (NewSubscription, error) {
+	newMsgCh := make(chan SubscriptionMessage, 100)
+	newWalletCh := make(chan SubscriptionWalletEvent, 100)
+	errorCh := make(chan error, 100)
+	shutdownCh := make(chan struct{})
+	done := make(chan struct{})
+
+	sub := NewSubscription{
+		newMsgsCh:   newMsgCh,
+		newWalletCh: newWalletCh,
+		shutdownCh:  shutdownCh,
+		errorCh:     errorCh,
+	}
+	pause := 2 * time.Second
+	readScanner := func(boutput *bufio.Scanner) {
+		for {
+			boutput.Scan()
+			t := boutput.Text()
+			var typeHolder TypeHolder
+			if err := json.Unmarshal([]byte(t), &typeHolder); err != nil {
+				errorCh <- err
+				break
+			}
+			switch typeHolder.Type {
+			case "chat":
+				var holder MessageHolder
+				if err := json.Unmarshal([]byte(t), &holder); err != nil {
+					errorCh <- err
+					break
+				}
+				subscriptionMessage := SubscriptionMessage{
+					Message: holder.Msg,
+					Conversation: Conversation{
+						ID:      holder.Msg.ConversationID,
+						Channel: holder.Msg.Channel,
+					},
+				}
+				newMsgCh <- subscriptionMessage
+			case "wallet":
+				var holder PaymentHolder
+				if err := json.Unmarshal([]byte(t), &holder); err != nil {
+					errorCh <- err
+					break
+				}
+				subscriptionPayment := SubscriptionWalletEvent{
+					Payment: holder.Payment,
+				}
+				newWalletCh <- subscriptionPayment
+			default:
+				continue
+			}
+		}
+		done <- struct{}{}
+	}
+
+	attempts := 0
+	maxAttempts := 1800
+	go func() {
+		for {
+			if attempts >= maxAttempts {
+				panic("Listen: failed to auth, giving up")
+			}
+			attempts++
+			if _, err := a.auth(); err != nil {
+				log.Printf("Listen: failed to auth: %s", err)
+				time.Sleep(pause)
+				continue
+			}
+			cmdElements := []string{"chat", "api-listen"}
+			if opts.Wallet {
+				cmdElements = append(cmdElements, "--wallet")
+			}
+			p := a.runOpts.Command(cmdElements...)
+			output, err := p.StdoutPipe()
+			if err != nil {
+				log.Printf("Listen: failed to listen: %s", err)
+				time.Sleep(pause)
+				continue
+			}
+			boutput := bufio.NewScanner(output)
+			if err := p.Start(); err != nil {
+				log.Printf("Listen: failed to make listen scanner: %s", err)
+				time.Sleep(pause)
+				continue
+			}
+			attempts = 0
+			go readScanner(boutput)
+			<-done
+			p.Wait()
+			time.Sleep(pause)
+		}
+	}()
+	return sub, nil
+}
+
+func (a *API) GetUsername() string {
+	return a.username
+}
+
+func (a *API) ListChannels(teamName string) ([]string, error) {
+	apiInput := fmt.Sprintf(`{"method": "listconvsonname", "params": {"options": {"topic_type": "CHAT", "members_type": "team", "name": "%s"}}}`, teamName)
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return nil, err
+	}
+
+	var channelsList ChannelsList
+	if err := json.Unmarshal(output, &channelsList); err != nil {
+		return nil, err
+	}
+
+	var channels []string
+	for _, conv := range channelsList.Result.Convs {
+		channels = append(channels, conv.Channel.TopicName)
+	}
+	return channels, nil
+}
+
+func (a *API) JoinChannel(teamName string, channelName string) (JoinChannelResult, error) {
+	empty := JoinChannelResult{}
+
+	apiInput := fmt.Sprintf(`{"method": "join", "params": {"options": {"channel": {"name": "%s", "members_type": "team", "topic_name": "%s"}}}}`, teamName, channelName)
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return empty, err
+	}
+
+	joinChannel := JoinChannel{}
+	err = json.Unmarshal(output, &joinChannel)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if joinChannel.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", joinChannel.Error.Message)
+	}
+
+	return joinChannel.Result, nil
+}
+
+func (a *API) LeaveChannel(teamName string, channelName string) (LeaveChannelResult, error) {
+	empty := LeaveChannelResult{}
+
+	apiInput := fmt.Sprintf(`{"method": "leave", "params": {"options": {"channel": {"name": "%s", "members_type": "team", "topic_name": "%s"}}}}`, teamName, channelName)
+	output, err := a.doFetch(apiInput)
+	if err != nil {
+		return empty, err
+	}
+
+	leaveChannel := LeaveChannel{}
+	err = json.Unmarshal(output, &leaveChannel)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if leaveChannel.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", leaveChannel.Error.Message)
+	}
+
+	return leaveChannel.Result, nil
+}
+
+func (a *API) LogSend(feedback string) error {
+	feedback = "go-keybase-chat-bot log send\n" +
+		"username: " + a.GetUsername() + "\n" +
+		feedback
+
+	args := []string{
+		"log", "send",
+		"--no-confirm",
+		"--feedback", feedback,
+	}
+
+	// We're determining whether the service is already running by running status
+	// with autofork disabled.
+	if err := a.runOpts.Command("--no-auto-fork", "status"); err != nil {
+		// Assume that there's no service running, so log send as standalone
+		args = append([]string{"--standalone"}, args...)
+	}
+
+	return a.runOpts.Command(args...).Run()
+}
+
+func (a *API) Shutdown() error {
+	if a.runOpts.Oneshot != nil {
+		err := a.runOpts.Command("logout", "--force").Run()
+		if err != nil {
+			return err
+		}
+	}
+
+	if a.runOpts.StartService {
+		err := a.runOpts.Command("ctl", "stop", "--shutdown").Run()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

vendor/github.com/keybase/go-keybase-chat-bot/kbchat/team.go

@@ -0,0 +1,89 @@
+package kbchat
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+type ListTeamMembers struct {
+	Result ListTeamMembersResult `json:"result"`
+	Error  Error             `json:"error"`
+}
+
+type ListTeamMembersResult struct {
+	Members ListTeamMembersResultMembers `json:"members"`
+}
+
+type ListTeamMembersResultMembers struct {
+	Owners  []ListMembersOutputMembersCategory `json:"owners"`
+	Admins  []ListMembersOutputMembersCategory `json:"admins"`
+	Writers []ListMembersOutputMembersCategory `json:"writers"`
+	Readers []ListMembersOutputMembersCategory `json:"readers"`
+}
+
+type ListMembersOutputMembersCategory struct {
+	Username string `json:"username"`
+	FullName string `json:"fullName"`
+}
+
+type ListUserMemberships struct {
+	Result ListUserMembershipsResult `json:"result"`
+	Error  Error             `json:"error"`
+}
+
+type ListUserMembershipsResult struct {
+	Teams []ListUserMembershipsResultTeam `json:"teams"`
+}
+
+type ListUserMembershipsResultTeam struct {
+	TeamName string `json:"fq_name"`
+	IsImplicitTeam bool `json:"is_implicit_team"`
+	IsOpenTeam bool `json:"is_open_team"`
+	Role int `json:"role"`
+	MemberCount int `json:"member_count"`
+}
+
+func (a *API) ListMembersOfTeam(teamName string) (ListTeamMembersResultMembers, error) {
+	empty := ListTeamMembersResultMembers{}
+
+	apiInput := fmt.Sprintf(`{"method": "list-team-memberships", "params": {"options": {"team": "%s"}}}`, teamName)
+	cmd := a.runOpts.Command("team", "api")
+	cmd.Stdin = strings.NewReader(apiInput)
+	bytes, err := cmd.CombinedOutput()
+	if err != nil {
+		return empty, fmt.Errorf("failed to call keybase team api: %v", err)
+	}
+
+	members := ListTeamMembers{}
+	err = json.Unmarshal(bytes, &members)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if members.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", members.Error.Message)
+	}
+	return members.Result.Members, nil
+}
+
+func (a *API) ListUserMemberships(username string) ([]ListUserMembershipsResultTeam, error) {
+	empty := []ListUserMembershipsResultTeam{}
+
+	apiInput := fmt.Sprintf(`{"method": "list-user-memberships", "params": {"options": {"username": "%s"}}}`, username)
+	cmd := a.runOpts.Command("team", "api")
+	cmd.Stdin = strings.NewReader(apiInput)
+	bytes, err := cmd.CombinedOutput()
+	if err != nil {
+		return empty, fmt.Errorf("failed to call keybase team api: %v", err)
+	}
+
+	members := ListUserMemberships{}
+	err = json.Unmarshal(bytes, &members)
+	if err != nil {
+		return empty, fmt.Errorf("failed to parse output from keybase team api: %v", err)
+	}
+	if members.Error.Message != "" {
+		return empty, fmt.Errorf("received error from keybase team api: %s", members.Error.Message)
+	}
+	return members.Result.Teams, nil
+}

vendor/github.com/keybase/go-keybase-chat-bot/kbchat/test_config.example.yaml

@@ -0,0 +1,16 @@
+# Rename this file to `test_config.yaml`
+
+config:
+  bots:
+    alice:
+      username: "alice"
+      paperkey: "foo bar car..."
+    bob:
+      username: "bob"
+      paperkey: "one two three four..."
+  teams:
+    acme:
+      # A real team that you add your alice1 and bob1 into
+      name: "acme"
+      # The channel to use
+      topicname: "mysupercoolchannel"

vendor/github.com/keybase/go-keybase-chat-bot/kbchat/test_utils.go

@@ -0,0 +1,54 @@
+package kbchat
+
+import (
+	"crypto/rand"
+	"encoding/hex"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func randomString(t *testing.T) string {
+	bytes := make([]byte, 16)
+	_, err := rand.Read(bytes)
+	require.NoError(t, err)
+	return hex.EncodeToString(bytes)
+}
+
+func randomTempDir(t *testing.T) string {
+	return path.Join(os.TempDir(), "keybase_bot_"+randomString(t))
+}
+
+func whichKeybase(t *testing.T) string {
+	cmd := exec.Command("which", "keybase")
+	out, err := cmd.Output()
+	require.NoError(t, err)
+	location := strings.TrimSpace(string(out))
+	return location
+}
+
+func copyFile(t *testing.T, source, dest string) {
+	sourceData, err := ioutil.ReadFile(source)
+	require.NoError(t, err)
+	err = ioutil.WriteFile(dest, sourceData, 0777)
+	require.NoError(t, err)
+}
+
+// Creates the working directory and copies over the keybase binary in PATH.
+// We do this to avoid any version mismatch issues.
+func prepWorkingDir(t *testing.T, workingDir string) string {
+	kbLocation := whichKeybase(t)
+
+	err := os.Mkdir(workingDir, 0777)
+	require.NoError(t, err)
+	kbDestination := path.Join(workingDir, "keybase")
+
+	copyFile(t, kbLocation, kbDestination)
+
+	return kbDestination
+}

vendor/github.com/keybase/go-keybase-chat-bot/kbchat/types.go

@@ -0,0 +1,159 @@
+package kbchat
+
+type Sender struct {
+	Uid        string `json:"uid"`
+	Username   string `json:"username"`
+	DeviceID   string `json:"device_id"`
+	DeviceName string `json:"device_name"`
+}
+
+type Channel struct {
+	Name        string `json:"name"`
+	Public      bool   `json:"public"`
+	TopicType   string `json:"topic_type"`
+	TopicName   string `json:"topic_name"`
+	MembersType string `json:"members_type"`
+}
+
+type Conversation struct {
+	ID      string  `json:"id"`
+	Unread  bool    `json:"unread"`
+	Channel Channel `json:"channel"`
+}
+
+type PaymentHolder struct {
+	Payment Payment `json:"notification"`
+}
+
+type Payment struct {
+	TxID              string `json:"txID"`
+	StatusDescription string `json:"statusDescription"`
+	FromAccountID     string `json:"fromAccountID"`
+	FromUsername      string `json:"fromUsername"`
+	ToAccountID       string `json:"toAccountID"`
+	ToUsername        string `json:"toUsername"`
+	AmountDescription string `json:"amountDescription"`
+	WorthAtSendTime   string `json:"worthAtSendTime"`
+	ExternalTxURL     string `json:"externalTxURL"`
+}
+
+type Result struct {
+	Convs []Conversation `json:"conversations"`
+}
+
+type Inbox struct {
+	Result Result `json:"result"`
+}
+
+type ChannelsList struct {
+	Result Result `json:"result"`
+}
+
+type MsgPaymentDetails struct {
+	ResultType int    `json:"resultTyp"` // 0 good. 1 error
+	PaymentID  string `json:"sent"`
+}
+
+type MsgPayment struct {
+	Username    string            `json:"username"`
+	PaymentText string            `json:"paymentText"`
+	Details     MsgPaymentDetails `json:"result"`
+}
+
+type Text struct {
+	Body     string       `json:"body"`
+	Payments []MsgPayment `json:"payments"`
+	ReplyTo  int          `json:"replyTo"`
+}
+
+type Content struct {
+	Type string `json:"type"`
+	Text Text   `json:"text"`
+}
+
+type Message struct {
+	Content        Content `json:"content"`
+	Sender         Sender  `json:"sender"`
+	Channel        Channel `json:"channel"`
+	ConversationID string  `json:"conversation_id"`
+	MsgID          int     `json:"id"`
+}
+
+type SendResult struct {
+	MsgID int `json:"id"`
+}
+
+type SendResponse struct {
+	Result SendResult `json:"result"`
+}
+
+type TypeHolder struct {
+	Type string `json:"type"`
+}
+
+type MessageHolder struct {
+	Msg    Message `json:"msg"`
+	Source string  `json:"source"`
+}
+
+type ThreadResult struct {
+	Messages []MessageHolder `json:"messages"`
+}
+
+type Thread struct {
+	Result ThreadResult `json:"result"`
+}
+
+type CommandExtendedDescription struct {
+	Title       string `json:"title"`
+	DesktopBody string `json:"desktop_body"`
+	MobileBody  string `json:"mobile_body"`
+}
+
+type Command struct {
+	Name                string                      `json:"name"`
+	Description         string                      `json:"description"`
+	Usage               string                      `json:"usage"`
+	ExtendedDescription *CommandExtendedDescription `json:"extended_description,omitempty"`
+}
+
+type CommandsAdvertisement struct {
+	Typ      string `json:"type"`
+	Commands []Command
+	TeamName string `json:"team_name,omitempty"`
+}
+
+type Advertisement struct {
+	Alias          string `json:"alias,omitempty"`
+	Advertisements []CommandsAdvertisement
+}
+
+type Error struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type JoinChannel struct {
+	Error  Error             `json:"error"`
+	Result JoinChannelResult `json:"result"`
+}
+
+type JoinChannelResult struct {
+	RateLimit []RateLimit `json:"ratelimits"`
+}
+
+type LeaveChannel struct {
+	Error  Error              `json:"error"`
+	Result LeaveChannelResult `json:"result"`
+}
+
+type LeaveChannelResult struct {
+	RateLimit []RateLimit `json:"ratelimits"`
+}
+
+type RateLimit struct {
+	Tank     string `json:"tank"`
+	Capacity int    `json:"capacity"`
+	Reset    int    `json:"reset"`
+	Gas      int    `json:"gas"`
+}

vendor/github.com/keybase/go-keybase-chat-bot/kbchat/wallet.go

@@ -0,0 +1,48 @@
+package kbchat
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+type WalletOutput struct {
+	Result WalletResult `json:"result"`
+}
+
+type WalletResult struct {
+	TxID         string      `json:"txID"`
+	Status       string      `json:"status"`
+	Amount       string      `json:"amount"`
+	Asset        WalletAsset `json:"asset"`
+	FromUsername string      `json:"fromUsername"`
+	ToUsername   string      `json:"toUsername"`
+}
+
+type WalletAsset struct {
+	Type   string `json:"type"`
+	Code   string `json:"code"`
+	Issuer string `json:"issuer"`
+}
+
+func (a *API) GetWalletTxDetails(txID string) (wOut WalletOutput, err error) {
+	a.Lock()
+	defer a.Unlock()
+
+	apiInput := fmt.Sprintf(`{"method": "details", "params": {"options": {"txid": "%s"}}}`, txID)
+	cmd := a.runOpts.Command("wallet", "api")
+	cmd.Stdin = strings.NewReader(apiInput)
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err = cmd.Run()
+	if err != nil {
+		return wOut, err
+	}
+
+	if err := json.Unmarshal(out.Bytes(), &wOut); err != nil {
+		return wOut, fmt.Errorf("unable to decode wallet output: %s", err.Error())
+	}
+
+	return wOut, nil
+}

vendor/github.com/labstack/echo/v4/bind.go

@@ -33,6 +33,17 @@ type (
 // Bind implements the `Binder#Bind` function.
 func (b *DefaultBinder) Bind(i interface{}, c Context) (err error) {
 	req := c.Request()
+
+	names := c.ParamNames()
+	values := c.ParamValues()
+	params := map[string][]string{}
+	for i, name := range names {
+		params[name] = []string{values[i]}
+	}
+	if err := b.bindData(i, params, "param"); err != nil {
+		return NewHTTPError(http.StatusBadRequest, err.Error()).SetInternal(err)
+	}
+
 	if req.ContentLength == 0 {
 		if req.Method == http.MethodGet || req.Method == http.MethodDelete {
 			if err = b.bindData(i, c.QueryParams(), "query"); err != nil {
@@ -77,9 +88,19 @@ func (b *DefaultBinder) Bind(i interface{}, c Context) (err error) {
 }
 
 func (b *DefaultBinder) bindData(ptr interface{}, data map[string][]string, tag string) error {
+	if ptr == nil || len(data) == 0 {
+		return nil
+	}
 	typ := reflect.TypeOf(ptr).Elem()
 	val := reflect.ValueOf(ptr).Elem()
 
+	if m, ok := ptr.(*map[string]interface{}); ok {
+		for k, v := range data {
+			(*m)[k] = v[0]
+		}
+		return nil
+	}
+
 	if typ.Kind() != reflect.Struct {
 		return errors.New("binding element must be a struct")
 	}

vendor/github.com/labstack/echo/v4/context.go

@@ -26,6 +26,9 @@ type (
 		// SetRequest sets `*http.Request`.
 		SetRequest(r *http.Request)
 
+		// SetResponse sets `*Response`.
+		SetResponse(r *Response)
+
 		// Response returns `*Response`.
 		Response() *Response
 
@@ -228,6 +231,10 @@ func (c *context) Response() *Response {
 	return c.response
 }
 
+func (c *context) SetResponse(r *Response) {
+	c.response = r
+}
+
 func (c *context) IsTLS() bool {
 	return c.request.TLS != nil
 }

vendor/github.com/labstack/echo/v4/echo.go

@@ -99,9 +99,9 @@ type (
 
 	// HTTPError represents an error that occurred while handling a request.
 	HTTPError struct {
-		Code     int
+		Code     int         `json:"-"`
-		Message  interface{}
+		Message  interface{} `json:"message"`
-		Internal error // Stores the error returned by an external dependency
+		Internal error       `json:"-"` // Stores the error returned by an external dependency
 	}
 
 	// MiddlewareFunc defines a function to process middleware.
@@ -222,11 +222,12 @@ const (
 	HeaderContentSecurityPolicy           = "Content-Security-Policy"
 	HeaderContentSecurityPolicyReportOnly = "Content-Security-Policy-Report-Only"
 	HeaderXCSRFToken                      = "X-CSRF-Token"
+	HeaderReferrerPolicy                  = "Referrer-Policy"
 )
 
 const (
 	// Version of Echo
-	Version = "4.1.5"
+	Version = "4.1.10"
 	website = "https://echo.labstack.com"
 	// http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo
 	banner = `
@@ -340,32 +341,31 @@ func (e *Echo) Routers() map[string]*Router {
 // DefaultHTTPErrorHandler is the default HTTP error handler. It sends a JSON response
 // with status code.
 func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
-	var (
+	he, ok := err.(*HTTPError)
-		code = http.StatusInternalServerError
+	if ok {
-		msg  interface{}
-	)
-
-	if he, ok := err.(*HTTPError); ok {
-		code = he.Code
-		msg = he.Message
 		if he.Internal != nil {
-			err = fmt.Errorf("%v, %v", err, he.Internal)
+			if herr, ok := he.Internal.(*HTTPError); ok {
+				he = herr
+			}
 		}
-	} else if e.Debug {
-		msg = err.Error()
 	} else {
-		msg = http.StatusText(code)
+		he = &HTTPError{
+			Code:    http.StatusInternalServerError,
+			Message: http.StatusText(http.StatusInternalServerError),
+		}
 	}
-	if _, ok := msg.(string); ok {
+	if e.Debug {
-		msg = Map{"message": msg}
+		he.Message = err.Error()
+	} else if m, ok := he.Message.(string); ok {
+		he.Message = Map{"message": m}
 	}
 
 	// Send response
 	if !c.Response().Committed {
 		if c.Request().Method == http.MethodHead { // Issue #608
-			err = c.NoContent(code)
+			err = c.NoContent(he.Code)
 		} else {
-			err = c.JSON(code, msg)
+			err = c.JSON(he.Code, he.Message)
 		}
 		if err != nil {
 			e.Logger.Error(err)
@@ -748,7 +748,7 @@ func NewHTTPError(code int, message ...interface{}) *HTTPError {
 
 // Error makes it compatible with `error` interface.
 func (he *HTTPError) Error() string {
-	return fmt.Sprintf("code=%d, message=%v", he.Code, he.Message)
+	return fmt.Sprintf("code=%d, message=%v, internal=%v", he.Code, he.Message, he.Internal)
 }
 
 // SetInternal sets error to HTTPError.Internal
@@ -771,6 +771,7 @@ func WrapMiddleware(m func(http.Handler) http.Handler) MiddlewareFunc {
 		return func(c Context) (err error) {
 			m(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				c.SetRequest(r)
+				c.SetResponse(NewResponse(w, c.Echo()))
 				err = next(c)
 			})).ServeHTTP(c.Response(), c.Request())
 			return

vendor/github.com/labstack/echo/v4/go.mod

@@ -4,12 +4,8 @@ go 1.12
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/labstack/gommon v0.2.9
+	github.com/labstack/gommon v0.3.0
-	github.com/stretchr/testify v1.3.0
+	github.com/stretchr/testify v1.4.0
 	github.com/valyala/fasttemplate v1.0.1
-	golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5
+	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
-	golang.org/x/net v0.0.0-20190607181551-461777fb6f67 // indirect
-	golang.org/x/sys v0.0.0-20190609082536-301114b31cce // indirect
-	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3 // indirect
 )

vendor/github.com/labstack/echo/v4/go.sum

@@ -1,53 +1,34 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
-github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
-github.com/labstack/gommon v0.2.9 h1:heVeuAYtevIQVYkGj6A41dtfT91LrvFG220lavpWhrU=
-github.com/labstack/gommon v0.2.9/go.mod h1:E8ZTmW9vw5az5/ZyHWCp0Lw4OH2ecsaBP1C/NKavGG4=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
-github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5 h1:58fnuSXlxZmFdJyvtTFVmVhcMLU6v5fEb/ok4wyqtNU=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190607181551-461777fb6f67 h1:rJJxsykSlULwd2P2+pg/rtnwN2FrWp4IuCxOSyS0V00=
-golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2 h1:T5DasATyLQfmbTpfEXx/IOL9vfjzW6up+ZDkmHvIf2s=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190609082536-301114b31cce/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=

vendor/github.com/labstack/echo/v4/middleware/jwt.go

@@ -25,6 +25,9 @@ type (
 		// ErrorHandler defines a function which is executed for an invalid token.
 		// It may be used to define a custom JWT error.
 		ErrorHandler JWTErrorHandler
+		
+		// ErrorHandlerWithContext is almost identical to ErrorHandler, but it's passed the current context.
+		ErrorHandlerWithContext JWTErrorHandlerWithContext
 
 		// Signing key to validate token. Used as fallback if SigningKeys has length 0.
 		// Required. This or SigningKeys.
@@ -69,6 +72,9 @@ type (
 	// JWTErrorHandler defines a function which is executed for an invalid token.
 	JWTErrorHandler func(error) error
 
+	// JWTErrorHandlerWithContext is almost identical to JWTErrorHandler, but it's passed the current context.
+	JWTErrorHandlerWithContext func(error, echo.Context) error
+	
 	jwtExtractor func(echo.Context) (string, error)
 )
 
@@ -177,6 +183,10 @@ func JWTWithConfig(config JWTConfig) echo.MiddlewareFunc {
 				if config.ErrorHandler != nil {
 					return config.ErrorHandler(err)
 				}
+				
+				if config.ErrorHandlerWithContext != nil {
+					return config.ErrorHandlerWithContext(err, c)
+				}
 				return err
 			}
 			token := new(jwt.Token)
@@ -199,6 +209,9 @@ func JWTWithConfig(config JWTConfig) echo.MiddlewareFunc {
 			if config.ErrorHandler != nil {
 				return config.ErrorHandler(err)
 			}
+			if config.ErrorHandlerWithContext != nil {
+					return config.ErrorHandlerWithContext(err, c)
+			}
 			return &echo.HTTPError{
 				Code:     http.StatusUnauthorized,
 				Message:  "invalid or expired jwt",

vendor/github.com/labstack/echo/v4/middleware/logger.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -74,7 +73,6 @@ var (
 			`"status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}"` +
 			`,"bytes_in":${bytes_in},"bytes_out":${bytes_out}}` + "\n",
 		CustomTimeFormat: "2006-01-02 15:04:05.00000",
-		Output:           os.Stdout,
 		colorer:          color.New(),
 	}
 )
@@ -214,6 +212,10 @@ func LoggerWithConfig(config LoggerConfig) echo.MiddlewareFunc {
 				return
 			}
 
+			if config.Output == nil {
+				_, err = c.Logger().Output().Write(buf.Bytes())
+				return
+			}
 			_, err = config.Output.Write(buf.Bytes())
 			return
 		}

vendor/github.com/labstack/echo/v4/middleware/secure.go

@@ -66,6 +66,11 @@ type (
 		// maintained by Chrome (and used by Firefox and Safari): https://hstspreload.org/
 		// Optional.  Default value false.
 		HSTSPreloadEnabled bool `yaml:"hsts_preload_enabled"`
+
+		// ReferrerPolicy sets the `Referrer-Policy` header providing security against
+		// leaking potentially sensitive request paths to third parties.
+		// Optional. Default value "".
+		ReferrerPolicy string `yaml:"referrer_policy"`
 	}
 )
 
@@ -131,6 +136,9 @@ func SecureWithConfig(config SecureConfig) echo.MiddlewareFunc {
 					res.Header().Set(echo.HeaderContentSecurityPolicy, config.ContentSecurityPolicy)
 				}
 			}
+			if config.ReferrerPolicy != "" {
+				res.Header().Set(echo.HeaderReferrerPolicy, config.ReferrerPolicy)
+			}
 			return next(c)
 		}
 	}

vendor/github.com/labstack/echo/v4/router.go

@@ -20,8 +20,8 @@ type (
 		pnames        []string
 		methodHandler *methodHandler
 	}
-	kind          uint8
+	kind uint8
-	children      []*node
+	children []*node
 	methodHandler struct {
 		connect  HandlerFunc
 		delete   HandlerFunc
@@ -336,10 +336,14 @@ func (r *Router) Find(method, path string, c Context) {
 			}
 		}
 
+
 		if l == pl {
 			// Continue search
 			search = search[l:]
 		} else {
+			if nn == nil { // Issue #1348
+				return // Not found
+			}
 			cn = nn
 			search = ns
 			if nk == pkind {
@@ -347,8 +351,6 @@ func (r *Router) Find(method, path string, c Context) {
 			} else if nk == akind {
 				goto Any
 			}
-			// Not found
-			return
 		}
 
 		if search == "" {
@@ -398,6 +400,9 @@ func (r *Router) Find(method, path string, c Context) {
 			if nn != nil {
 				cn = nn
 				nn = cn.parent // Next (Issue #954)
+				if nn != nil {
+					nk = nn.kind
+				}
 				search = ns
 				if nk == pkind {
 					goto Param
@@ -405,8 +410,7 @@ func (r *Router) Find(method, path string, c Context) {
 					goto Any
 				}
 			}
-			// Not found
+			return // Not found
-			return
 		}
 		pvalues[len(cn.pnames)-1] = search
 		break

vendor/github.com/labstack/gommon/bytes/bytes.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"regexp"
 	"strconv"
+	"strings"
 )
 
 type (
@@ -73,7 +74,7 @@ func (*Bytes) Parse(value string) (i int64, err error) {
 		return 0, fmt.Errorf("error parsing value=%s", value)
 	}
 	bytesString := parts[1]
-	multiple := parts[2]
+	multiple := strings.ToUpper(parts[2])
 	bytes, err := strconv.ParseFloat(bytesString, 64)
 	if err != nil {
 		return

vendor/github.com/lrstanley/girc/builtin.go

@@ -93,7 +93,11 @@ func handleConnect(c *Client, e Event) {
 	}
 
 	time.Sleep(2 * time.Second)
-	c.RunHandlers(&Event{Command: CONNECTED, Params: []string{c.Server()}})
+
+	c.mu.RLock()
+	server := c.server()
+	c.mu.RUnlock()
+	c.RunHandlers(&Event{Command: CONNECTED, Params: []string{server}})
 }
 
 // nickCollisionHandler helps prevent the client from having conflicting

vendor/github.com/lrstanley/girc/cap.go

@@ -5,7 +5,10 @@
 package girc
 
 import (
+	"fmt"
+	"strconv"
 	"strings"
+	"time"
 )
 
 // Something not in the list? Depending on the type of capability, you can
@@ -19,13 +22,20 @@ var possibleCap = map[string][]string{
 	"chghost":           nil,
 	"extended-join":     nil,
 	"invite-notify":     nil,
+	"message-tags":      nil,
+	"msgid":             nil,
 	"multi-prefix":      nil,
 	"server-time":       nil,
 	"userhost-in-names": nil,
 
+	// Supported draft versions, some may be duplicated above, this is for backwards
+	// compatibility.
 	"draft/message-tags-0.2": nil,
 	"draft/msgid":            nil,
 
+	// sts, sasl, etc are enabled dynamically/depending on client configuration,
+	// so aren't included on this list.
+
 	// "echo-message" is supported, but it's not enabled by default. This is
 	// to prevent unwanted confusion and utilize less traffic if it's not needed.
 	// echo messages aren't sent to girc.PRIVMSG and girc.NOTICE handlers,
@@ -51,6 +61,17 @@ func possibleCapList(c *Client) map[string][]string {
 		out["sasl"] = nil
 	}
 
+	if !c.Config.DisableSTS && !c.Config.SSL {
+		// If fallback supported, and we failed recently, don't try negotiating STS.
+		// ONLY do this fallback if we're expired (primarily useful during the first
+		// sts negotation).
+		if time.Since(c.state.sts.lastFailed) < 5*time.Minute && !c.Config.DisableSTSFallback {
+			c.debug.Println("skipping strict transport policy negotiation; failed within the last 5 minutes")
+		} else {
+			out["sts"] = nil
+		}
+	}
+
 	for k := range c.Config.SupportedCaps {
 		out[k] = c.Config.SupportedCaps[k]
 	}
@@ -62,8 +83,8 @@ func possibleCapList(c *Client) map[string][]string {
 	return out
 }
 
-func parseCap(raw string) map[string][]string {
+func parseCap(raw string) map[string]map[string]string {
-	out := make(map[string][]string)
+	out := make(map[string]map[string]string)
 	parts := strings.Split(raw, " ")
 
 	var val int
@@ -78,7 +99,16 @@ func parseCap(raw string) map[string][]string {
 			continue
 		}
 
-		out[parts[i][:val]] = strings.Split(parts[i][val+1:], ",")
+		out[parts[i][:val]] = make(map[string]string)
+		for _, option := range strings.Split(parts[i][val+1:], ",") {
+			j := strings.Index(option, "=")
+
+			if j < 0 {
+				out[parts[i][:val]][option] = ""
+			} else {
+				out[parts[i][:val]][option[:j]] = option[j+1 : len(option)]
+			}
+		}
 	}
 
 	return out
@@ -88,8 +118,15 @@ func parseCap(raw string) map[string][]string {
 // This will lock further registration until we have acknowledged (or denied)
 // the capabilities.
 func handleCAP(c *Client, e Event) {
-	if len(e.Params) >= 2 && (e.Params[1] == CAP_NEW || e.Params[1] == CAP_DEL) {
+	c.state.Lock()
-		c.listCAP()
+	defer c.state.Unlock()
+
+	if len(e.Params) >= 2 && e.Params[1] == CAP_DEL {
+		caps := parseCap(e.Last())
+		for cap := range caps {
+			// TODO: test the deletion.
+			delete(c.state.enabledCap, cap)
+		}
 		return
 	}
 
@@ -101,27 +138,26 @@ func handleCAP(c *Client, e Event) {
 	}
 
 	possible := possibleCapList(c)
-
+	// TODO: test the addition.
-	if len(e.Params) >= 3 && e.Params[1] == CAP_LS {
+	if len(e.Params) >= 3 && (e.Params[1] == CAP_LS || e.Params[1] == CAP_NEW) {
-		c.state.Lock()
-
 		caps := parseCap(e.Last())
 
-		for k := range caps {
+		for capName := range caps {
-			if _, ok := possible[k]; !ok {
+			if _, ok := possible[capName]; !ok {
 				continue
 			}
 
-			if len(possible[k]) == 0 || len(caps[k]) == 0 {
+			if len(possible[capName]) == 0 || len(caps[capName]) == 0 {
-				c.state.tmpCap = append(c.state.tmpCap, k)
+				c.state.tmpCap[capName] = caps[capName]
 				continue
 			}
 
 			var contains bool
-			for i := 0; i < len(caps[k]); i++ {
+
-				for j := 0; j < len(possible[k]); j++ {
+			for capAttr := range caps[capName] {
-					if caps[k][i] == possible[k][j] {
+				for i := 0; i < len(possible[capName]); i++ {
-						// Assume we have a matching split value.
+					if _, ok := caps[capName][capAttr]; ok {
+						// Assuming we have a matching attribute for the capability.
 						contains = true
 						goto checkcontains
 					}
@@ -133,9 +169,8 @@ func handleCAP(c *Client, e Event) {
 				continue
 			}
 
-			c.state.tmpCap = append(c.state.tmpCap, k)
+			c.state.tmpCap[capName] = caps[capName]
 		}
-		c.state.Unlock()
 
 		// Indicates if this is a multi-line LS. (3 args means it's the
 		// last LS).
@@ -147,31 +182,113 @@ func handleCAP(c *Client, e Event) {
 			}
 
 			// Let them know which ones we'd like to enable.
-			c.write(&Event{Command: CAP, Params: []string{CAP_REQ, strings.Join(c.state.tmpCap, " ")}})
+			reqKeys := make([]string, len(c.state.tmpCap))
-
+			i := 0
-			// Re-initialize the tmpCap, so if we get multiple 'CAP LS' requests
+			for k := range c.state.tmpCap {
-			// due to cap-notify, we can re-evaluate what we can support.
+				reqKeys[i] = k
-			c.state.Lock()
+				i++
-			c.state.tmpCap = []string{}
+			}
-			c.state.Unlock()
+			c.write(&Event{Command: CAP, Params: []string{CAP_REQ, strings.Join(reqKeys, " ")}})
 		}
 	}
 
 	if len(e.Params) == 3 && e.Params[1] == CAP_ACK {
-		c.state.Lock()
+		enabled := strings.Split(e.Last(), " ")
-		c.state.enabledCap = strings.Split(e.Last(), " ")
+		for _, cap := range enabled {
-
+			if val, ok := c.state.tmpCap[cap]; ok {
-		// Do we need to do sasl auth?
+				c.state.enabledCap[cap] = val
-		wantsSASL := false
+			} else {
-		for i := 0; i < len(c.state.enabledCap); i++ {
+				c.state.enabledCap[cap] = nil
-			if c.state.enabledCap[i] == "sasl" {
-				wantsSASL = true
-				break
 			}
 		}
-		c.state.Unlock()
 
-		if wantsSASL {
+		// Anything client side that needs to be setup post-capability-acknowledgement,
+		// should be done here.
+
+		// Handle STS, and only if it's something specifically we enabled (client
+		// may choose to disable girc automatic STS, and do it themselves).
+		if sts, sok := c.state.enabledCap["sts"]; sok && !c.Config.DisableSTS {
+			var isError bool
+
+			// Some things are updated in the policy depending on if the current
+			// connection is over tls or not.
+			var hasTLSConnection bool
+			if tlsState, _ := c.TLSConnectionState(); tlsState != nil {
+				hasTLSConnection = true
+			}
+
+			// "This key indicates the port number for making a secure connection.
+			// This key’s value MUST be a single port number. If the client is not
+			// already connected securely to the server at the requested hostname,
+			// it MUST close the insecure connection and reconnect securely on the
+			// stated port.
+			//
+			// To enforce an STS upgrade policy, servers MUST send this key to
+			// insecurely connected clients. Servers MAY send this key to securely
+			// connected clients, but it will be ignored."
+			//
+			// See: https://ircv3.net/specs/extensions/sts#the-port-key
+			if !hasTLSConnection {
+				if port, ok := sts["port"]; ok {
+					c.state.sts.upgradePort, _ = strconv.Atoi(port)
+					if c.state.sts.upgradePort < 21 {
+						isError = true
+					}
+				} else {
+					isError = true
+				}
+			}
+
+			// "This key is used on secure connections to indicate how long clients
+			// MUST continue to use secure connections when connecting to the server
+			// at the requested hostname. The value of this key MUST be given as a
+			// single integer which represents the number of seconds until the persistence
+			// policy expires.
+			//
+			// To enforce an STS persistence policy, servers MUST send this key to
+			// securely connected clients. Servers MAY send this key to all clients,
+			// but insecurely connected clients MUST ignore it."
+			//
+			// See: https://ircv3.net/specs/extensions/sts#the-duration-key
+			if hasTLSConnection {
+				if duration, ok := sts["duration"]; ok {
+					c.state.sts.persistenceDuration, _ = strconv.Atoi(duration)
+					c.state.sts.persistenceReceived = time.Now()
+				} else {
+					isError = true
+				}
+			}
+
+			// See: https://ircv3.net/specs/extensions/sts#the-preload-key
+			if hasTLSConnection {
+				if preload, ok := sts["preload"]; ok {
+					c.state.sts.preload, _ = strconv.ParseBool(preload)
+				}
+			}
+
+			if isError {
+				c.rx <- &Event{Command: ERROR, Params: []string{
+					fmt.Sprintf("closing connection: strict transport policy provided by server is invalid; possible MITM? config: %#v", sts),
+				}}
+				return
+			}
+
+			// Only upgrade if not already upgraded.
+			if !hasTLSConnection {
+				c.state.sts.beginUpgrade = true
+
+				c.RunHandlers(&Event{Command: STS_UPGRADE_INIT})
+				c.debug.Println("strict transport security policy provided by server; closing connection to begin upgrade...")
+				c.Close()
+				return
+			}
+		}
+
+		// Re-initialize the tmpCap, so if we get multiple 'CAP LS' requests
+		// due to cap-notify, we can re-evaluate what we can support.
+		c.state.tmpCap = make(map[string]map[string]string)
+
+		if _, ok := c.state.enabledCap["sasl"]; ok && c.Config.SASL != nil {
 			c.write(&Event{Command: AUTHENTICATE, Params: []string{c.Config.SASL.Method()}})
 			// Don't "CAP END", since we want to authenticate.
 			return

vendor/github.com/lrstanley/girc/cap_tags.go

@@ -38,7 +38,7 @@ const (
 	prefixTagValue byte = '='
 	prefixUserTag  byte = '+'
 	tagSeparator   byte = ';'
-	maxTagLength   int  = 511 // 510 + @ and " " (space), though space usually not included.
+	maxTagLength   int  = 4094 // 4094 + @ and " " (space) = 4096, though space usually not included.
 )
 
 // Tags represents the key-value pairs in IRCv3 message tags. The map contains
@@ -55,6 +55,9 @@ type Tags map[string]string
 //   @aaa=bbb;ccc;example.com/ddd=eee
 // NOT:
 //   @aaa=bbb;ccc;example.com/ddd=eee :nick!ident@host.com PRIVMSG me :Hello
+//
+// Technically, there is a length limit of 4096, but the server should reject
+// tag messages longer than this.
 func ParseTags(raw string) (t Tags) {
 	t = make(Tags)
 
@@ -79,11 +82,11 @@ func ParseTags(raw string) (t Tags) {
 		}
 
 		// Check if tag key or decoded value are invalid.
-		if !validTag(parts[i][:hasValue]) || !validTagValue(tagDecoder.Replace(parts[i][hasValue+1:])) {
+		// if !validTag(parts[i][:hasValue]) || !validTagValue(tagDecoder.Replace(parts[i][hasValue+1:])) {
-			continue
+		// 	continue
-		}
+		// }
 
-		t[parts[i][:hasValue]] = parts[i][hasValue+1:]
+		t[parts[i][:hasValue]] = tagDecoder.Replace(parts[i][hasValue+1:])
 	}
 
 	return t

vendor/github.com/lrstanley/girc/client.go

@@ -12,8 +12,11 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
+	"net"
+	"os"
 	"runtime"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -95,6 +98,16 @@ type Config struct {
 	// configuration (e.g. to not force hostname checking). This only has an
 	// affect during the dial process.
 	SSL bool
+	// DisableSTS disables the use of automatic STS connection upgrades
+	// when the server supports STS. STS can also be disabled using the environment
+	// variable "GIRC_DISABLE_STS=true". As many clients may not propagate options
+	// like this back to the user, this allows to directly disable such automatic
+	// functionality.
+	DisableSTS bool
+	// DisableSTSFallback disables the "fallback" to a non-tls connection if the
+	// strict transport policy expires and the first attempt to reconnect back to
+	// the tls version fails.
+	DisableSTSFallback bool
 	// TLSConfig is an optional user-supplied tls configuration, used during
 	// socket creation to the server. SSL must be enabled for this to be used.
 	// This only has an affect during the dial process.
@@ -146,7 +159,7 @@ type Config struct {
 
 	// disableTracking disables all channel and user-level tracking. Useful
 	// for highly embedded scripts with single purposes. This has an exported
-	// method which enables this and ensures prop cleanup, see
+	// method which enables this and ensures proper cleanup, see
 	// Client.DisableTracking().
 	disableTracking bool
 	// HandleNickCollide when set, allows the client to handle nick collisions
@@ -247,19 +260,34 @@ func New(config Config) *Client {
 		c.Config.PingDelay = 600 * time.Second
 	}
 
+	envDebug, _ := strconv.ParseBool(os.Getenv("GIRC_DEBUG"))
 	if c.Config.Debug == nil {
-		c.debug = log.New(ioutil.Discard, "", 0)
+		if envDebug {
+			c.debug = log.New(os.Stderr, "debug:", log.Ltime|log.Lshortfile)
+		} else {
+			c.debug = log.New(ioutil.Discard, "", 0)
+		}
 	} else {
+		if envDebug {
+			if c.Config.Debug != os.Stdout && c.Config.Debug != os.Stderr {
+				c.Config.Debug = io.MultiWriter(os.Stderr, c.Config.Debug)
+			}
+		}
 		c.debug = log.New(c.Config.Debug, "debug:", log.Ltime|log.Lshortfile)
 		c.debug.Print("initializing debugging")
 	}
 
+	envDisableSTS, _ := strconv.ParseBool((os.Getenv("GIRC_DISABLE_STS")))
+	if envDisableSTS {
+		c.Config.DisableSTS = envDisableSTS
+	}
+
 	// Setup the caller.
 	c.Handlers = newCaller(c.debug)
 
 	// Give ourselves a new state.
 	c.state = &state{}
-	c.state.reset()
+	c.state.reset(true)
 
 	// Register builtin handlers.
 	c.registerBuiltins()
@@ -323,6 +351,18 @@ func (c *Client) Close() {
 	c.mu.RUnlock()
 }
 
+// Quit sends a QUIT message to the server with a given reason to close the
+// connection. Underlying this event being sent, Client.Close() is called as well.
+// This is different than just calling Client.Close() in that it provides a reason
+// as to why the connection was closed (for bots to tell users the bot is restarting,
+// or shutting down, etc).
+//
+// NOTE: servers may delay showing of QUIT reasons, until you've been connected to
+// the server for a certain period of time (e.g. 5 minutes). Keep this in mind.
+func (c *Client) Quit(reason string) {
+	c.Send(&Event{Command: QUIT, Params: []string{reason}})
+}
+
 // ErrEvent is an error returned when the server (or library) sends an ERROR
 // message response. The string returned contains the trailing text from the
 // message.
@@ -400,9 +440,21 @@ func (c *Client) DisableTracking() {
 	c.registerBuiltins()
 }
 
-// Server returns the string representation of host+port pair for net.Conn.
+// Server returns the string representation of host+port pair for the connection.
 func (c *Client) Server() string {
-	return fmt.Sprintf("%s:%d", c.Config.Server, c.Config.Port)
+	c.state.Lock()
+	defer c.state.Lock()
+
+	return c.server()
+}
+
+// server returns the string representation of host+port pair for net.Conn, and
+// takes into consideration STS. Must lock state mu first!
+func (c *Client) server() string {
+	if c.state.sts.enabled() {
+		return net.JoinHostPort(c.Config.Server, strconv.Itoa(c.state.sts.upgradePort))
+	}
+	return net.JoinHostPort(c.Config.Server, strconv.Itoa(c.Config.Port))
 }
 
 // Lifetime returns the amount of time that has passed since the client was
@@ -688,8 +740,9 @@ func (c *Client) HasCapability(name string) (has bool) {
 	name = strings.ToLower(name)
 
 	c.state.RLock()
-	for i := 0; i < len(c.state.enabledCap); i++ {
+	for key := range c.state.enabledCap {
-		if strings.ToLower(c.state.enabledCap[i]) == name {
+		key = strings.ToLower(key)
+		if key == name {
 			has = true
 			break
 		}
@@ -713,3 +766,25 @@ func (c *Client) panicIfNotTracking() {
 
 	panic(fmt.Sprintf("%s used when tracking is disabled (caller %s:%d)", fn.Name(), file, line))
 }
+
+func (c *Client) debugLogEvent(e *Event, dropped bool) {
+	var prefix string
+
+	if dropped {
+		prefix = "dropping event (disconnected):"
+	} else {
+		prefix = ">"
+	}
+
+	if e.Sensitive {
+		c.debug.Printf(prefix, " %s ***redacted***", e.Command)
+	} else {
+		c.debug.Print(prefix, " ", StripRaw(e.String()))
+	}
+
+	if c.Config.Out != nil {
+		if pretty, ok := e.Pretty(); ok {
+			fmt.Fprintln(c.Config.Out, StripRaw(pretty))
+		}
+	}
+}

vendor/github.com/lrstanley/girc/conn.go

@@ -58,7 +58,7 @@ type Dialer interface {
 }
 
 // newConn sets up and returns a new connection to the server.
-func newConn(conf Config, dialer Dialer, addr string) (*ircConn, error) {
+func newConn(conf Config, dialer Dialer, addr string, sts *strictTransport) (*ircConn, error) {
 	if err := conf.isValid(); err != nil {
 		return nil, err
 	}
@@ -83,13 +83,29 @@ func newConn(conf Config, dialer Dialer, addr string) (*ircConn, error) {
 	}
 
 	if conn, err = dialer.Dial("tcp", addr); err != nil {
+		if sts.enabled() {
+			err = &ErrSTSUpgradeFailed{Err: err}
+		}
+
+		if sts.expired() && !conf.DisableSTSFallback {
+			sts.lastFailed = time.Now()
+			sts.reset()
+		}
 		return nil, err
 	}
 
-	if conf.SSL {
+	if conf.SSL || sts.enabled() {
 		var tlsConn net.Conn
 		tlsConn, err = tlsHandshake(conn, conf.TLSConfig, conf.Server, true)
 		if err != nil {
+			if sts.enabled() {
+				err = &ErrSTSUpgradeFailed{Err: err}
+			}
+
+			if sts.expired() && !conf.DisableSTSFallback {
+				sts.lastFailed = time.Now()
+				sts.reset()
+			}
 			return nil, err
 		}
 
@@ -245,6 +261,7 @@ func (c *Client) MockConnect(conn net.Conn) error {
 }
 
 func (c *Client) internalConnect(mock net.Conn, dialer Dialer) error {
+startConn:
 	// We want to be the only one handling connects/disconnects right now.
 	c.mu.Lock()
 
@@ -253,13 +270,20 @@ func (c *Client) internalConnect(mock net.Conn, dialer Dialer) error {
 	}
 
 	// Reset the state.
-	c.state.reset()
+	c.state.reset(false)
+
+	addr := c.server()
 
 	if mock == nil {
 		// Validate info, and actually make the connection.
-		c.debug.Printf("connecting to %s...", c.Server())
+		c.debug.Printf("connecting to %s... (sts: %v, config-ssl: %v)", addr, c.state.sts.enabled(), c.Config.SSL)
-		conn, err := newConn(c.Config, dialer, c.Server())
+		conn, err := newConn(c.Config, dialer, addr, &c.state.sts)
 		if err != nil {
+			if _, ok := err.(*ErrSTSUpgradeFailed); ok {
+				if !c.state.sts.enabled() {
+					c.RunHandlers(&Event{Command: STS_ERR_FALLBACK})
+				}
+			}
 			c.mu.Unlock()
 			return err
 		}
@@ -312,16 +336,18 @@ func (c *Client) internalConnect(mock net.Conn, dialer Dialer) error {
 	c.write(&Event{Command: USER, Params: []string{c.Config.User, "*", "*", c.Config.Name}})
 
 	// Send a virtual event allowing hooks for successful socket connection.
-	c.RunHandlers(&Event{Command: INITIALIZED, Params: []string{c.Server()}})
+	c.RunHandlers(&Event{Command: INITIALIZED, Params: []string{addr}})
 
 	// Wait for the first error.
 	var result error
 	select {
 	case <-ctx.Done():
-		c.debug.Print("received request to close, beginning clean up")
+		if !c.state.sts.beginUpgrade {
-		c.RunHandlers(&Event{Command: CLOSED, Params: []string{c.Server()}})
+			c.debug.Print("received request to close, beginning clean up")
+		}
+		c.RunHandlers(&Event{Command: CLOSED, Params: []string{addr}})
 	case err := <-errs:
-		c.debug.Print("received error, beginning clean up")
+		c.debug.Printf("received error, beginning cleanup: %v", err)
 		result = err
 	}
 
@@ -336,7 +362,7 @@ func (c *Client) internalConnect(mock net.Conn, dialer Dialer) error {
 	c.conn.mu.Unlock()
 	c.mu.RUnlock()
 
-	c.RunHandlers(&Event{Command: DISCONNECTED, Params: []string{c.Server()}})
+	c.RunHandlers(&Event{Command: DISCONNECTED, Params: []string{addr}})
 
 	// Once we have our error/result, let all other functions know we're done.
 	c.debug.Print("waiting for all routines to finish")
@@ -350,6 +376,18 @@ func (c *Client) internalConnect(mock net.Conn, dialer Dialer) error {
 	// clients, not multiple instances of Connect().
 	c.mu.Lock()
 	c.conn = nil
+
+	if result == nil {
+		if c.state.sts.beginUpgrade {
+			c.state.sts.beginUpgrade = false
+			c.mu.Unlock()
+			goto startConn
+		}
+
+		if c.state.sts.enabled() {
+			c.state.sts.persistenceReceived = time.Now()
+		}
+	}
 	c.mu.Unlock()
 
 	return result
@@ -392,8 +430,23 @@ func (c *Client) readLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 // Send sends an event to the server. Use Client.RunHandlers() if you are
 // simply looking to trigger handlers with an event.
 func (c *Client) Send(event *Event) {
+	var delay time.Duration
+
 	if !c.Config.AllowFlood {
-		<-time.After(c.conn.rate(event.Len()))
+		c.mu.RLock()
+
+		// Drop the event early as we're disconnected, this way we don't have to wait
+		// the (potentially long) rate limit delay before dropping.
+		if c.conn == nil {
+			c.debugLogEvent(event, true)
+			c.mu.RUnlock()
+			return
+		}
+
+		c.conn.mu.Lock()
+		delay = c.conn.rate(event.Len())
+		c.conn.mu.Unlock()
+		c.mu.RUnlock()
 	}
 
 	if c.Config.GlobalFormat && len(event.Params) > 0 && event.Params[len(event.Params)-1] != "" &&
@@ -401,12 +454,21 @@ func (c *Client) Send(event *Event) {
 		event.Params[len(event.Params)-1] = Fmt(event.Params[len(event.Params)-1])
 	}
 
+	<-time.After(delay)
 	c.write(event)
 }
 
 // write is the lower level function to write an event. It does not have a
 // write-delay when sending events.
 func (c *Client) write(event *Event) {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
+	if c.conn == nil {
+		// Drop the event if disconnected.
+		c.debugLogEvent(event, true)
+		return
+	}
 	c.tx <- event
 }
 
@@ -415,14 +477,10 @@ func (c *Client) write(event *Event) {
 func (c *ircConn) rate(chars int) time.Duration {
 	_time := time.Second + ((time.Duration(chars) * time.Second) / 100)
 
-	c.mu.Lock()
 	if c.writeDelay += _time - time.Now().Sub(c.lastWrite); c.writeDelay < 0 {
 		c.writeDelay = 0
 	}
-	c.mu.Unlock()
 
-	c.mu.RLock()
-	defer c.mu.RUnlock()
 	if c.writeDelay > (8 * time.Second) {
 		return _time
 	}
@@ -445,7 +503,7 @@ func (c *Client) sendLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 				c.state.RLock()
 				var in bool
 				for i := 0; i < len(c.state.enabledCap); i++ {
-					if c.state.enabledCap[i] == "message-tags" {
+					if _, ok := c.state.enabledCap["message-tags"]; ok {
 						in = true
 						break
 					}
@@ -457,17 +515,7 @@ func (c *Client) sendLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 				}
 			}
 
-			// Log the event.
+			c.debugLogEvent(event, false)
-			if event.Sensitive {
-				c.debug.Printf("> %s ***redacted***", event.Command)
-			} else {
-				c.debug.Print("> ", StripRaw(event.String()))
-			}
-			if c.Config.Out != nil {
-				if pretty, ok := event.Pretty(); ok {
-					fmt.Fprintln(c.Config.Out, StripRaw(pretty))
-				}
-			}
 
 			c.conn.mu.Lock()
 			c.conn.lastWrite = time.Now()
@@ -488,6 +536,12 @@ func (c *Client) sendLoop(ctx context.Context, errs chan error, wg *sync.WaitGro
 				}
 			}
 
+			if event.Command == QUIT {
+				c.Close()
+				wg.Done()
+				return
+			}
+
 			if err != nil {
 				errs <- err
 				wg.Done()

vendor/github.com/lrstanley/girc/constants.go

@@ -21,13 +21,15 @@ const (
 // Emulated event commands used to allow easier hooks into the changing
 // state of the client.
 const (
-	UPDATE_STATE   = "CLIENT_STATE_UPDATED"   // when channel/user state is updated.
+	UPDATE_STATE     = "CLIENT_STATE_UPDATED"   // when channel/user state is updated.
-	UPDATE_GENERAL = "CLIENT_GENERAL_UPDATED" // when general state (client nick, server name, etc) is updated.
+	UPDATE_GENERAL   = "CLIENT_GENERAL_UPDATED" // when general state (client nick, server name, etc) is updated.
-	ALL_EVENTS     = "*"                      // trigger on all events
+	ALL_EVENTS       = "*"                      // trigger on all events
-	CONNECTED      = "CLIENT_CONNECTED"       // when it's safe to send arbitrary commands (joins, list, who, etc), trailing is host:port
+	CONNECTED        = "CLIENT_CONNECTED"       // when it's safe to send arbitrary commands (joins, list, who, etc), trailing is host:port
-	INITIALIZED    = "CLIENT_INIT"            // verifies successful socket connection, trailing is host:port
+	INITIALIZED      = "CLIENT_INIT"            // verifies successful socket connection, trailing is host:port
-	DISCONNECTED   = "CLIENT_DISCONNECTED"    // occurs when we're disconnected from the server (user-requested or not)
+	DISCONNECTED     = "CLIENT_DISCONNECTED"    // occurs when we're disconnected from the server (user-requested or not)
-	CLOSED         = "CLIENT_CLOSED"          // occurs when Client.Close() has been called
+	CLOSED           = "CLIENT_CLOSED"          // occurs when Client.Close() has been called
+	STS_UPGRADE_INIT = "STS_UPGRADE_INIT"       // when an STS upgrade initially happens.
+	STS_ERR_FALLBACK = "STS_ERR_FALLBACK"       // when an STS connection fails and fallbacks are supported.
 )
 
 // User/channel prefixes :: RFC1459.
@@ -225,6 +227,7 @@ const (
 	ERR_NOTOPLEVEL        = "413"
 	ERR_WILDTOPLEVEL      = "414"
 	ERR_BADMASK           = "415"
+	ERR_INPUTTOOLONG      = "417"
 	ERR_UNKNOWNCOMMAND    = "421"
 	ERR_NOMOTD            = "422"
 	ERR_NOADMININFO       = "423"
@@ -286,6 +289,7 @@ const (
 	CAP_CHGHOST = "CHGHOST"
 	CAP_AWAY    = "AWAY"
 	CAP_ACCOUNT = "ACCOUNT"
+	CAP_TAGMSG  = "TAGMSG"
 )
 
 // Numeric IRC reply mapping for ircv3 :: http://ircv3.net/irc/.

vendor/github.com/lrstanley/girc/event.go

@@ -49,6 +49,7 @@ func ParseEvent(raw string) (e *Event) {
 			}
 		}
 		raw = raw[i+1:]
+		i = 0
 	}
 
 	if raw[0] == messagePrefix {
@@ -91,7 +92,7 @@ func ParseEvent(raw string) (e *Event) {
 
 		if trailerIndex == -1 {
 			// No trailing argument found, assume the rest is just params.
-			e.Params = strings.Split(raw[j:], string(eventSpace))
+			e.Params = strings.Fields(raw[j:])
 			return e
 		}
 
@@ -114,7 +115,7 @@ func ParseEvent(raw string) (e *Event) {
 	// Check if we need to parse arguments. If so, take everything after the
 	// command, and right before the trailing prefix, and cut it up.
 	if i > j {
-		e.Params = strings.Split(raw[j:i-1], string(eventSpace))
+		e.Params = strings.Fields(raw[j : i-1])
 	}
 
 	e.Params = append(e.Params, raw[i+1:])

vendor/github.com/lrstanley/girc/go.mod

@@ -1 +1,3 @@
 module github.com/lrstanley/girc
+
+go 1.12

vendor/github.com/lrstanley/girc/handler.go

@@ -431,17 +431,27 @@ func recoverHandlerPanic(client *Client, event *Event, id string, skip int) {
 		return
 	}
 
-	var file string
+	var file, function string
 	var line int
 	var ok bool
 
-	_, file, line, ok = runtime.Caller(skip)
+	var pcs [10]uintptr
+	frames := runtime.CallersFrames(pcs[:runtime.Callers(skip, pcs[:])])
+	for {
+		frame, _ := frames.Next()
+		file = frame.File
+		line = frame.Line
+		function = frame.Function
+
+		break
+	}
 
 	err := &HandlerError{
 		Event:  *event,
 		ID:     id,
 		File:   file,
 		Line:   line,
+		Func:   function,
 		Panic:  perr,
 		Stack:  debug.Stack(),
 		callOk: ok,
@@ -460,6 +470,7 @@ type HandlerError struct {
 	ID     string      // ID is the CUID of the handler.
 	File   string      // File is the file from where the panic originated.
 	Line   int         // Line number where panic originated.
+	Func   string      // Function name where panic originated.
 	Panic  interface{} // Panic is the error that was passed to panic().
 	Stack  []byte      // Stack is the call stack. Note you may have to skip 1 or 2 due to debug functions.
 	callOk bool

vendor/github.com/lrstanley/girc/state.go

@@ -5,6 +5,7 @@
 package girc
 
 import (
+	"fmt"
 	"sort"
 	"sync"
 	"time"
@@ -22,27 +23,28 @@ type state struct {
 	// users represents all of users that we're tracking.
 	users map[string]*User
 	// enabledCap are the capabilities which are enabled for this connection.
-	enabledCap []string
+	enabledCap map[string]map[string]string
 	// tmpCap are the capabilties which we share with the server during the
 	// last capability check. These will get sent once we have received the
 	// last capability list command from the server.
-	tmpCap []string
+	tmpCap map[string]map[string]string
 	// serverOptions are the standard capabilities and configurations
 	// supported by the server at connection time. This also includes
 	// RPL_ISUPPORT entries.
 	serverOptions map[string]string
 	// motd is the servers message of the day.
 	motd string
-}
 
-// notify sends state change notifications so users can update their refs
+	// sts are strict transport security configurations, if specified by the
-// when state changes.
+	// server.
-func (s *state) notify(c *Client, ntype string) {
+	//
-	c.RunHandlers(&Event{Command: ntype})
+	// TODO: ideally, this would be a configurable policy store that the user could
+	// optionally override (to store STS information on disk, memory, etc).
+	sts strictTransport
 }
 
 // reset resets the state back to it's original form.
-func (s *state) reset() {
+func (s *state) reset(initial bool) {
 	s.Lock()
 	s.nick = ""
 	s.ident = ""
@@ -50,8 +52,13 @@ func (s *state) reset() {
 	s.channels = make(map[string]*Channel)
 	s.users = make(map[string]*User)
 	s.serverOptions = make(map[string]string)
-	s.enabledCap = []string{}
+	s.enabledCap = make(map[string]map[string]string)
+	s.tmpCap = make(map[string]map[string]string)
 	s.motd = ""
+
+	if initial {
+		s.sts.reset()
+	}
 	s.Unlock()
 }
 
@@ -500,3 +507,44 @@ func (s *state) renameUser(from, to string) {
 		}
 	}
 }
+
+type strictTransport struct {
+	beginUpgrade        bool
+	upgradePort         int
+	persistenceDuration int
+	persistenceReceived time.Time
+	preload             bool
+	lastFailed          time.Time
+}
+
+func (s *strictTransport) reset() {
+	s.upgradePort = -1
+	s.persistenceDuration = -1
+	s.preload = false
+}
+
+func (s *strictTransport) expired() bool {
+	return int(time.Since(s.persistenceReceived).Seconds()) > s.persistenceDuration
+}
+
+func (s *strictTransport) enabled() bool {
+	return s.upgradePort > 0
+}
+
+// ErrSTSUpgradeFailed is an error that occurs when a connection that was attempted
+// to be upgraded via a strict transport policy, failed. This does not necessarily
+// indicate that STS was to blame, but the underlying connection failed for some
+// reason.
+type ErrSTSUpgradeFailed struct {
+	Err error
+}
+
+func (e ErrSTSUpgradeFailed) Error() string {
+	return fmt.Sprintf("fail to upgrade to secure (sts) connection: %v", e.Err)
+}
+
+// notify sends state change notifications so users can update their refs
+// when state changes.
+func (s *state) notify(c *Client, ntype string) {
+	c.RunHandlers(&Event{Command: ntype})
+}

vendor/github.com/mattn/go-isatty/go.mod

@@ -1,3 +1,3 @@
 module github.com/mattn/go-isatty
 
-require golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223
+require golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a

vendor/github.com/mattn/go-isatty/go.sum

@@ -1,2 +1,2 @@
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vendor/github.com/nlopes/slack/.travis.yml

@@ -1,12 +1,9 @@
 language: go
 
-go:
+env:
-  - 1.7.x
+  - GO111MODULE=on
-  - 1.8.x
+
-  - 1.9.x
+install: true
-  - 1.10.x
-  - 1.11.x
-  - tip
 
 before_install:
   - export PATH=$HOME/gopath/bin:$PATH
@@ -20,6 +17,19 @@ script:
 matrix:
   allow_failures:
     - go: tip
+  include:
+  - go: "1.7.x"
+    script:  go test -v ./...
+  - go: "1.8.x"
+    script:  go test -v ./...
+  - go: "1.9.x"
+    script:  go test -v ./...
+  - go: "1.10.x"
+    script:  go test -v ./...
+  - go: "1.11.x"
+    script: go test -v -mod=vendor ./...
+  - go: "tip"
+    script: go test -v -mod=vendor ./...
 
 git:
   depth: 10

vendor/github.com/nlopes/slack/CHANGELOG.md

@@ -1,3 +1,20 @@
+### v0.6.0 - August 31, 2019
+full differences can be viewed using `git log --oneline --decorate --color v0.5.0..v0.6.0`
+thanks to everyone who has contributed since January!
+
+
+#### Breaking Changes:
+- Info struct has had fields removed related to deprecated functionality by slack.
+- minor adjustments to some structs.
+- some internal default values have changed, usually to be more inline with slack defaults or to correct inability to set a particular value. (Message Parse for example.)
+
+##### Highlights:
+- new slacktest package easy mocking for slack client. use, enjoy, please submit PRs for improvements and default behaviours! shamelessly taken from the [slack-test repo](https://github.com/lusis/slack-test) thank you lusis for letting us use it and bring it into the slack repo.
+- blocks, blocks, blocks.
+- RTM ManagedConnection has undergone a significant cleanup.
+in particular handles backoffs gracefully, removed many deadlocks,
+and Disconnect is now much more responsive.
+
 ### v0.5.0 - January 20, 2019
 full differences can be viewed using `git log --oneline --decorate --color v0.4.0..v0.5.0`
 - Breaking changes: various old struct fields have been removed or updated to match slack's api.

vendor/github.com/nlopes/slack/Gopkg.lock

@@ -1,39 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/gorilla/websocket"
-  packages = ["."]
-  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
-  version = "v1.2.0"
-
-[[projects]]
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/stretchr/testify"
-  packages = ["assert"]
-  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
-  version = "v1.2.2"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "596fa546322c2a1e9708a10c9f39aca2e04792b477fab86fb2899fbaab776070"
-  solver-name = "gps-cdcl"
-  solver-version = 1

vendor/github.com/nlopes/slack/Gopkg.toml

@@ -1,17 +0,0 @@
-ignored = ["github.com/lusis/slack-test"]
-
-[[constraint]]
-  name = "github.com/gorilla/websocket"
-  version = "1.2.0"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.1"
-
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "0.8.0"
-
-[prune]
-  go-tests = true
-  unused-packages = true