Release v1.16.5

* Add Docker Compose configuration

* Add docker wiki link

.gitignore

@@ -1,5 +1,6 @@
 # Exclude matterbridge binary
-matterbridge
+/matterbridge
+/matterbridge.exe
 
 # Exclude configuration file
 matterbridge.toml

.golangci.yaml

@@ -174,6 +174,7 @@ linters:
     - lll
     - maligned
     - prealloc
+    - wsl
 
 
 # rules to deal with reported isues

.travis.yml

@@ -20,22 +20,22 @@ jobs:
   - stage: lint
     # Run linting in one Go environment only.
     script: ./ci/lint.sh
-    go: 1.12.x
+    go: 1.13.x
     env:
     - GO111MODULE=on
-    - GOLANGCI_VERSION="v1.17.1"
+    - GOLANGCI_VERSION="v1.21.0"
   - stage: test
     # Run tests in a combination of Go environments.
     script: ./ci/test.sh
-    go: 1.11.x
+    go: 1.12.x
     env:
     - GO111MODULE=off
   - script: ./ci/test.sh
-    go: 1.11.x
+    go: 1.12.x
     env:
     - GO111MODULE=on
   - script: ./ci/test.sh
-    go: 1.12.x
+    go: 1.13.x
     env:
     - GO111MODULE=on
     - REPORT_COVERAGE=1

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:edge
 ENTRYPOINT ["/bin/matterbridge"]
 
 COPY . /go/src/github.com/42wim/matterbridge
-RUN apk update && apk add go git gcc musl-dev ca-certificates \
+RUN apk update && apk add go git gcc musl-dev ca-certificates mailcap \
         && cd /go/src/github.com/42wim/matterbridge \
         && export GOPATH=/go \
         && go get \

README.md

@@ -44,28 +44,34 @@ And more...
   </a>
 </p>
 
-### Table of Contents
+# Table of Contents
 
-- [Features](https://github.com/42wim/matterbridge/wiki/Features)
-  - [Natively supported](#natively-supported)
-  - [3rd party via matterbridge api](#3rd-party-via-matterbridge-api)
-  - [API](#API)
-- [Chat with us](#chat-with-us)
-- [Screenshots](https://github.com/42wim/matterbridge/wiki/)
-- [Installing/upgrading](#installing--upgrading)
-  - [Binaries](#binaries)
-- [Building](#building)
-- [Configuration](#configuration)
-  - [Howto](https://github.com/42wim/matterbridge/wiki/How-to-create-your-config)
-  - [Settings](#settings)
-  - [Examples](#examples)
-- [Running](#running)
-  - [Docker](#docker)
-- [Changelog](#changelog)
-- [FAQ](#faq)
-- [Related projects](#related-projects)
-- [Articles](#articles)
-- [Thanks](#thanks)
+- [matterbridge](#matterbridge)
+- [Table of Contents](#table-of-contents)
+  - [Features](#features)
+    - [Natively supported](#natively-supported)
+    - [3rd party via matterbridge api](#3rd-party-via-matterbridge-api)
+    - [API](#api)
+  - [Chat with us](#chat-with-us)
+  - [Screenshots](#screenshots)
+  - [Installing / upgrading](#installing--upgrading)
+    - [Binaries](#binaries)
+    - [Packages](#packages)
+  - [Building](#building)
+  - [Configuration](#configuration)
+    - [Basic configuration](#basic-configuration)
+    - [Settings](#settings)
+    - [Advanced configuration](#advanced-configuration)
+    - [Examples](#examples)
+      - [Bridge mattermost (off-topic) - irc (#testing)](#bridge-mattermost-off-topic---irc-testing)
+      - [Bridge slack (#general) - discord (general)](#bridge-slack-general---discord-general)
+  - [Running](#running)
+    - [Docker](#docker)
+  - [Changelog](#changelog)
+  - [FAQ](#faq)
+  - [Related projects](#related-projects)
+  - [Articles](#articles)
+  - [Thanks](#thanks)
 
 ## Features
 
@@ -102,6 +108,7 @@ And more...
 - [Reddit](https://github.com/bonehurtingjuice/mattereddit)
 - [Facebook messenger](https://github.com/VictorNine/fbridge)
 - [Discourse](https://github.com/DeclanHoare/matterbabble)
+- [Counter-Strike, half-life and more](https://forums.alliedmods.net/showthread.php?t=319430)
 
 ### API
 
@@ -115,6 +122,7 @@ Used by the projects below. Feel free to make a PR to add your project to this l
 - [Mattereddit](https://github.com/bonehurtingjuice/mattereddit) (Reddit chat support)
 - [fbridge](https://github.com/VictorNine/fbridge) (Facebook messenger support)
 - [matterbabble](https://github.com/DeclanHoare/matterbabble) (Discourse support)
+- [MatterAMXX](https://forums.alliedmods.net/showthread.php?t=319430) (Counter-Strike, half-life and more via AMXX mod)
 
 ## Chat with us
 
@@ -140,7 +148,7 @@ See https://github.com/42wim/matterbridge/wiki
 
 ### Binaries
 
-- Latest stable release [v1.16.1](https://github.com/42wim/matterbridge/releases/latest)
+- Latest stable release [v1.16.5](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.
@@ -154,19 +162,17 @@ To install or upgrade just download the latest [binary](https://github.com/42wim
 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).
+Go 1.12+ is required. Make sure you have [Go](https://golang.org/doc/install) properly installed.
 
-After Go is setup, download matterbridge to your \$GOPATH directory.
 
 ```
-cd $GOPATH
 go get github.com/42wim/matterbridge
 ```
 
-You should now have matterbridge binary in the bin directory:
+You should now have matterbridge binary in the ~/go/bin directory:
 
 ```
-$ ls bin/
+$ ls ~/go/bin/
 matterbridge
 ```
 
@@ -262,11 +268,7 @@ 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
-```
+Please take a look at the [Docker Wiki page](https://github.com/42wim/matterbridge/wiki/Deploy:-Docker) for more information.
 
 ## Changelog
 
@@ -278,7 +280,7 @@ 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)
+- [jwflory/ansible-role-matterbridge](https://galaxy.ansible.com/jwflory/matterbridge) (Ansible role to simplify deploying Matterbridge)
 - [matterbridge autoconfig](https://github.com/patcon/matterbridge-autoconfig)
 - [matterbridge config viewer](https://github.com/patcon/matterbridge-heroku-viewer)
 - [matterbridge-heroku](https://github.com/cadecairos/matterbridge-heroku)

bridge/bridge.go

@@ -1,6 +1,7 @@
 package bridge
 
 import (
+	"log"
 	"strings"
 	"sync"
 
@@ -41,6 +42,10 @@ type Factory func(*Config) Bridger
 
 func New(bridge *config.Bridge) *Bridge {
 	accInfo := strings.Split(bridge.Account, ".")
+	if len(accInfo) != 2 {
+		log.Fatalf("config failure, account incorrect: %s", bridge.Account)
+	}
+
 	protocol := accInfo[0]
 	name := accInfo[1]
 

bridge/config/config.go

@@ -79,6 +79,7 @@ type Protocol struct {
 	ColorNicks             bool   // only irc for now
 	Debug                  bool   // general
 	DebugLevel             int    // only for irc now
+	DisableWebPagePreview  bool   // telegram
 	EditSuffix             string // mattermost, slack, discord, telegram, gitter
 	EditDisable            bool   // mattermost, slack, discord, telegram, gitter
 	IconURL                string // mattermost, slack
@@ -116,6 +117,7 @@ type Protocol struct {
 	Protocol               string     // all protocols
 	QuoteDisable           bool       // telegram
 	QuoteFormat            string     // telegram
+	QuoteLengthLimit       int        // telegram
 	RejoinDelay            int        // IRC
 	ReplaceMessages        [][]string // all protocols
 	ReplaceNicks           [][]string // all protocols

bridge/discord/discord.go

@@ -21,7 +21,6 @@ type Bdiscord struct {
 	c *discordgo.Session
 
 	nick            string
-	useChannelID    bool
 	guildID         string
 	webhookID       string
 	webhookToken    string
@@ -174,10 +173,6 @@ func (b *Bdiscord) JoinChannel(channel config.ChannelInfo) error {
 	defer b.channelsMutex.Unlock()
 
 	b.channelInfoMap[channel.ID] = &channel
-	idcheck := strings.Split(channel.Name, "ID:")
-	if len(idcheck) > 1 {
-		b.useChannelID = true
-	}
 	return nil
 }
 
@@ -412,6 +407,10 @@ func (b *Bdiscord) webhookSend(msg *config.Message, webhookID, token string) (*d
 				ContentType: "",
 				Reader:      bytes.NewReader(*fi.Data),
 			}
+			content := ""
+			if msg.Text == "" {
+				content = fi.Comment
+			}
 			_, e2 := b.c.WebhookExecute(
 				webhookID,
 				token,
@@ -420,6 +419,7 @@ func (b *Bdiscord) webhookSend(msg *config.Message, webhookID, token string) (*d
 					Username:  msg.Username,
 					AvatarURL: msg.Avatar,
 					File:      &file,
+					Content:   content,
 				},
 			)
 			if e2 != nil {

bridge/discord/handlers.go

@@ -8,9 +8,7 @@ import (
 func (b *Bdiscord) messageDelete(s *discordgo.Session, m *discordgo.MessageDelete) { //nolint:unparam
 	rmsg := config.Message{Account: b.Account, ID: m.ID, Event: config.EventMsgDelete, Text: config.EventMsgDelete}
 	rmsg.Channel = b.getChannelName(m.ChannelID)
-	if b.useChannelID {
-		rmsg.Channel = "ID:" + m.ChannelID
-	}
+
 	b.Log.Debugf("<= Sending message from %s to gateway", b.Account)
 	b.Log.Debugf("<= Message is %#v", rmsg)
 	b.Remote <- rmsg
@@ -24,11 +22,7 @@ func (b *Bdiscord) messageDeleteBulk(s *discordgo.Session, m *discordgo.MessageD
 			ID:      msgID,
 			Event:   config.EventMsgDelete,
 			Text:    config.EventMsgDelete,
-			Channel: "ID:" + m.ChannelID,
-		}
-
-		if !b.useChannelID {
-			rmsg.Channel = b.getChannelName(m.ChannelID)
+			Channel: b.getChannelName(m.ChannelID),
 		}
 
 		b.Log.Debugf("<= Sending message from %s to gateway", b.Account)
@@ -44,9 +38,6 @@ func (b *Bdiscord) messageTyping(s *discordgo.Session, m *discordgo.TypingStart)
 
 	rmsg := config.Message{Account: b.Account, Event: config.EventUserTyping}
 	rmsg.Channel = b.getChannelName(m.ChannelID)
-	if b.useChannelID {
-		rmsg.Channel = "ID:" + m.ChannelID
-	}
 	b.Remote <- rmsg
 }
 
@@ -88,7 +79,6 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 
 	if m.Content != "" {
 		b.Log.Debugf("== Receiving event %#v", m.Message)
-		m.Message.Content = b.stripCustomoji(m.Message.Content)
 		m.Message.Content = b.replaceChannelMentions(m.Message.Content)
 		rmsg.Text, err = m.ContentWithMoreMentionsReplaced(b.c)
 		if err != nil {
@@ -99,9 +89,6 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 
 	// set channel name
 	rmsg.Channel = b.getChannelName(m.ChannelID)
-	if b.useChannelID {
-		rmsg.Channel = "ID:" + m.ChannelID
-	}
 
 	// set username
 	if !b.GetBool("UseUserName") {

bridge/discord/helpers.go

@@ -96,6 +96,13 @@ func (b *Bdiscord) getChannelName(id string) string {
 	b.channelsMutex.RLock()
 	defer b.channelsMutex.RUnlock()
 
+	for _, c := range b.channelInfoMap {
+		if c.Name == "ID:"+id {
+			// if we have ID: specified in our gateway configuration return this
+			return c.Name
+		}
+	}
+
 	for _, channel := range b.channels {
 		if channel.ID == id {
 			return b.getCategoryChannelName(channel.Name, channel.ParentID)
@@ -129,7 +136,6 @@ func (b *Bdiscord) getCategoryChannelName(name, parentID string) string {
 var (
 	// See https://discordapp.com/developers/docs/reference#message-formatting.
 	channelMentionRE = regexp.MustCompile("<#[0-9]+>")
-	emojiRE          = regexp.MustCompile("<(:.*?:)[0-9]+>")
 	userMentionRE    = regexp.MustCompile("@[^@\n]{1,32}")
 )
 
@@ -176,10 +182,6 @@ func (b *Bdiscord) replaceUserMentions(text string) string {
 	return userMentionRE.ReplaceAllStringFunc(text, replaceUserMentionFunc)
 }
 
-func (b *Bdiscord) stripCustomoji(text string) string {
-	return emojiRE.ReplaceAllString(text, `$1`)
-}
-
 func (b *Bdiscord) replaceAction(text string) (string, bool) {
 	if strings.HasPrefix(text, "_") && strings.HasSuffix(text, "_") {
 		return text[1 : len(text)-1], true

bridge/helper/helper.go

@@ -14,8 +14,10 @@ import (
 	"golang.org/x/image/webp"
 
 	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/gomarkdown/markdown/parser"
 	"github.com/sirupsen/logrus"
-	"gitlab.com/golang-commonmark/markdown"
 )
 
 // DownloadFile downloads the given non-authenticated URL.
@@ -176,9 +178,15 @@ func ClipMessage(text string, length int) string {
 	return text
 }
 
+// ParseMarkdown takes in an input string as markdown and parses it to html
 func ParseMarkdown(input string) string {
-	md := markdown.New(markdown.XHTMLOutput(true), markdown.Breaks(true))
-	res := md.RenderToString([]byte(input))
+	extensions := parser.HardLineBreak
+	markdownParser := parser.NewWithExtensions(extensions)
+	renderer := html.NewRenderer(html.RendererOptions{
+		Flags: 0,
+	})
+	parsedMarkdown := markdown.ToHTML([]byte(input), markdownParser, renderer)
+	res := string(parsedMarkdown)
 	res = strings.TrimPrefix(res, "<p>")
 	res = strings.TrimSuffix(res, "</p>\n")
 	return res

bridge/keybase/keybase.go

@@ -1,6 +1,9 @@
 package bkeybase
 
 import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strconv"
 
 	"github.com/42wim/matterbridge/bridge"
@@ -66,17 +69,37 @@ func (b *Bkeybase) Send(msg config.Message) (string, error) {
 	// 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
 
+	if len(msg.Extra["file"]) > 0 {
+		// Upload a file
+		dir, err := ioutil.TempDir("", "matterbridge")
+		if err != nil {
+			return "", err
+		}
+		defer os.RemoveAll(dir)
+
+		for _, f := range msg.Extra["file"] {
+			fname := f.(config.FileInfo).Name
+			fdata := *f.(config.FileInfo).Data
+			fcaption := f.(config.FileInfo).Comment
+			fpath := filepath.Join(dir, fname)
+
+			if err = ioutil.WriteFile(fpath, fdata, 0600); err != nil {
+				return "", err
+			}
+
+			_, _ = b.kbc.SendAttachmentByTeam(b.team, fpath, fcaption, &b.channel)
+		}
+
+		return "", nil
+	}
+
 	// 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/mattermost/handlers.go

@@ -67,9 +67,8 @@ func (b *Bmattermost) handleMatter() {
 			b.Log.Debugf("Choosing login/password based receiving")
 		}
 		// if for some reason we only want to sent stuff to mattermost but not receive, return
-		if b.GetString("WebhookBindAddress") == "" && b.GetString("WebhookURL") != "" {
+		if b.GetString("WebhookBindAddress") == "" && b.GetString("WebhookURL") != "" && b.GetString("Token") == "" && b.GetString("Login") == "" {
 			b.Log.Debugf("No WebhookBindAddress specified, only WebhookURL. You will not receive messages from mattermost, only sending is possible.")
-			return
 		}
 		go b.handleMatterClient(messages)
 	}

bridge/sshchat/sshchat.go

@@ -130,6 +130,10 @@ func (b *Bsshchat) handleSSHChat() error {
 			if strings.Contains(b.r.Text(), "Rate limiting is in effect") {
 				continue
 			}
+			// skip our own messages
+			if !strings.HasPrefix(b.r.Text(), "["+b.GetString("Nick")+"] \x1b") {
+				continue
+			}
 			res := strings.Split(stripPrompt(b.r.Text()), ":")
 			if res[0] == "-> Set theme" {
 				wait = false

bridge/telegram/handlers.go

@@ -357,6 +357,14 @@ func (b *Btelegram) handleQuote(message, quoteNick, quoteMessage string) string
 	if format == "" {
 		format = "{MESSAGE} (re @{QUOTENICK}: {QUOTEMESSAGE})"
 	}
+	quoteMessagelength := len(quoteMessage)
+	if b.GetInt("QuoteLengthLimit") != 0 && quoteMessagelength >= b.GetInt("QuoteLengthLimit") {
+		runes := []rune(quoteMessage)
+		quoteMessage = string(runes[0:b.GetInt("QuoteLengthLimit")])
+		if quoteMessagelength > b.GetInt("QuoteLengthLimit") {
+			quoteMessage += "..."
+		}
+	}
 	format = strings.Replace(format, "{MESSAGE}", message, -1)
 	format = strings.Replace(format, "{QUOTENICK}", quoteNick, -1)
 	format = strings.Replace(format, "{QUOTEMESSAGE}", quoteMessage, -1)

bridge/telegram/telegram.go

@@ -8,7 +8,7 @@ import (
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
-	"github.com/go-telegram-bot-api/telegram-bot-api"
+	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
 )
 
 const (
@@ -81,8 +81,8 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 	// Upload a file if it exists
 	if msg.Extra != nil {
 		for _, rmsg := range helper.HandleExtra(&msg, b.General) {
-			if _, err := b.sendMessage(chatid, rmsg.Username, rmsg.Text); err != nil {
-				b.Log.Errorf("sendMessage failed: %s", err)
+			if _, msgErr := b.sendMessage(chatid, rmsg.Username, rmsg.Text); msgErr != nil {
+				b.Log.Errorf("sendMessage failed: %s", msgErr)
 			}
 		}
 		// check if we have files to upload (from slack, telegram or mattermost)
@@ -97,7 +97,14 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 	}
 
 	// Post normal message
-	return b.sendMessage(chatid, msg.Username, msg.Text)
+	// TODO: recheck it.
+	// Ignore empty text field needs for prevent double messages from whatsapp to telegram
+	// when sending media with text caption
+	if msg.Text != "" {
+		return b.sendMessage(chatid, msg.Username, msg.Text)
+	}
+
+	return "", nil
 }
 
 func (b *Btelegram) getFileDirectURL(id string) string {
@@ -124,6 +131,9 @@ func (b *Btelegram) sendMessage(chatid int64, username, text string) (string, er
 		m.Text = username + html.EscapeString(text)
 		m.ParseMode = tgbotapi.ModeHTML
 	}
+
+	m.DisableWebPagePreview = b.GetBool("DisableWebPagePreview")
+
 	res, err := b.c.Send(m)
 	if err != nil {
 		return "", err

bridge/whatsapp/handlers.go

@@ -1,10 +1,13 @@
 package bwhatsapp
 
 import (
+	"fmt"
+	"mime"
 	"strings"
 	"time"
 
 	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/42wim/matterbridge/bridge/helper"
 	"github.com/Rhymen/go-whatsapp"
 )
 
@@ -36,16 +39,16 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
 	}
 
 	messageTime := time.Unix(int64(message.Info.Timestamp), 0) // TODO check how behaves between timezones
-	groupJid := message.Info.RemoteJid
+	groupJID := message.Info.RemoteJid
 
-	senderJid := message.Info.SenderJid
-	if len(senderJid) == 0 {
+	senderJID := message.Info.SenderJid
+	if len(senderJID) == 0 {
 		// TODO workaround till https://github.com/Rhymen/go-whatsapp/issues/86 resolved
-		senderJid = *message.Info.Source.Participant
+		senderJID = *message.Info.Source.Participant
 	}
 
-	// translate sender's Jid to the nicest username we can get
-	senderName := b.getSenderName(senderJid)
+	// translate sender's JID to the nicest username we can get
+	senderName := b.getSenderName(senderJID)
 	if senderName == "" {
 		senderName = "Someone" // don't expose telephone number
 	}
@@ -53,8 +56,8 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
 	extText := message.Info.Source.Message.ExtendedTextMessage
 	if extText != nil && extText.ContextInfo != nil && extText.ContextInfo.MentionedJid != nil {
 		// handle user mentions
-		for _, mentionedJid := range extText.ContextInfo.MentionedJid {
-			numberAndSuffix := strings.SplitN(mentionedJid, "@", 2)
+		for _, mentionedJID := range extText.ContextInfo.MentionedJid {
+			numberAndSuffix := strings.SplitN(mentionedJID, "@", 2)
 
 			// mentions comes as telephone numbers and we don't want to expose it to other bridges
 			// replace it with something more meaninful to others
@@ -66,22 +69,22 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
 		}
 	}
 
-	b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJid, b.Account)
+	b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJID, b.Account)
 	rmsg := config.Message{
-		UserID:    senderJid,
+		UserID:    senderJID,
 		Username:  senderName,
 		Text:      message.Text,
 		Timestamp: messageTime,
-		Channel:   groupJid,
+		Channel:   groupJID,
 		Account:   b.Account,
 		Protocol:  b.Protocol,
 		Extra:     make(map[string][]interface{}),
-		//		ParentID: TODO, // TODO handle thread replies  // map from Info.QuotedMessageID string
+		//	ParentID: TODO, // TODO handle thread replies  // map from Info.QuotedMessageID string
 		//	Event     string    `json:"event"`
 		//	Gateway   string  // will be added during message processing
 		ID: message.Info.Id}
 
-	if avatarURL, exists := b.userAvatars[senderJid]; exists {
+	if avatarURL, exists := b.userAvatars[senderJID]; exists {
 		rmsg.Avatar = avatarURL
 	}
 
@@ -89,11 +92,75 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) {
 	b.Remote <- rmsg
 }
 
-//
-//func (b *Bwhatsapp) HandleImageMessage(message whatsapp.ImageMessage) {
-//	fmt.Println(message) // TODO implement
-//}
-//
+// HandleImageMessage sent from WhatsApp, relay it to the brige
+func (b *Bwhatsapp) HandleImageMessage(message whatsapp.ImageMessage) {
+	if message.Info.FromMe { // || !strings.Contains(strings.ToLower(message.Text), "@echo") {
+		return
+	}
+
+	// whatsapp sends last messages to show context , cut them
+	if message.Info.Timestamp < b.startedAt {
+		return
+	}
+
+	messageTime := time.Unix(int64(message.Info.Timestamp), 0) // TODO check how behaves between timezones
+	groupJID := message.Info.RemoteJid
+
+	senderJID := message.Info.SenderJid
+	// if len(senderJid) == 0 {
+	//   // TODO workaround till https://github.com/Rhymen/go-whatsapp/issues/86 resolved
+	//   senderJid = *message.Info.Source.Participant
+	// }
+
+	// translate sender's Jid to the nicest username we can get
+	senderName := b.getSenderName(senderJID)
+	if senderName == "" {
+		senderName = "Someone" // don't expose telephone number
+	}
+
+	b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJID, b.Account)
+	rmsg := config.Message{
+		UserID:    senderJID,
+		Username:  senderName,
+		Timestamp: messageTime,
+		Channel:   groupJID,
+		Account:   b.Account,
+		Protocol:  b.Protocol,
+		Extra:     make(map[string][]interface{}),
+		//  ParentID: TODO,      // TODO handle thread replies  // map from Info.QuotedMessageID string
+		//  Event     string    `json:"event"`
+		//  Gateway   string     // will be added during message processing
+		ID: message.Info.Id}
+
+	if avatarURL, exists := b.userAvatars[senderJID]; exists {
+		rmsg.Avatar = avatarURL
+	}
+
+	// Download and unencrypt content
+	data, err := message.Download()
+	if err != nil {
+		b.Log.Errorf("%v", err)
+		return
+	}
+
+	// Get file extension by mimetype
+	fileExt, err := mime.ExtensionsByType(message.Type)
+	if err != nil {
+		b.Log.Errorf("%v", err)
+		return
+	}
+
+	filename := fmt.Sprintf("%v%v", message.Info.Id, fileExt[0])
+
+	b.Log.Debugf("<= Image downloaded and unencrypted")
+
+	// Move file to bridge storage
+	helper.HandleDownloadData(b.Log, &rmsg, filename, message.Caption, "", &data, b.General)
+
+	b.Log.Debugf("<= Image Message is %#v", rmsg)
+	b.Remote <- rmsg
+}
+
 //func (b *Bwhatsapp) HandleVideoMessage(message whatsapp.VideoMessage) {
 //	fmt.Println(message) // TODO implement
 //}

bridge/whatsapp/whatsapp.go

@@ -1,11 +1,14 @@
 package bwhatsapp
 
 import (
+	"bytes"
 	"crypto/rand"
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"mime"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -230,6 +233,66 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
 	return nil
 }
 
+// Post a document message from the bridge to WhatsApp
+func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (string, error) {
+	fi := msg.Extra["file"][0].(config.FileInfo)
+
+	// Post document message
+	message := whatsapp.DocumentMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: msg.Channel,
+		},
+		Title:    fi.Name,
+		FileName: fi.Name,
+		Type:     filetype,
+		Content:  bytes.NewReader(*fi.Data),
+	}
+
+	b.Log.Debugf("=> Sending %#v", msg)
+
+	// create message ID
+	// TODO follow and act if https://github.com/Rhymen/go-whatsapp/issues/101 implemented
+	idBytes := make([]byte, 10)
+	if _, err := rand.Read(idBytes); err != nil {
+		b.Log.Warn(err.Error())
+	}
+
+	message.Info.Id = strings.ToUpper(hex.EncodeToString(idBytes))
+	_, err := b.conn.Send(message)
+
+	return message.Info.Id, err
+}
+
+// Post an image message from the bridge to WhatsApp
+// Handle, for sure image/jpeg, image/png and image/gif MIME types
+func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (string, error) {
+	fi := msg.Extra["file"][0].(config.FileInfo)
+
+	// Post image message
+	message := whatsapp.ImageMessage{
+		Info: whatsapp.MessageInfo{
+			RemoteJid: msg.Channel,
+		},
+		Type:    filetype,
+		Caption: msg.Username + fi.Comment,
+		Content: bytes.NewReader(*fi.Data),
+	}
+
+	b.Log.Debugf("=> Sending %#v", msg)
+
+	// create message ID
+	// TODO follow and act if https://github.com/Rhymen/go-whatsapp/issues/101 implemented
+	idBytes := make([]byte, 10)
+	if _, err := rand.Read(idBytes); err != nil {
+		b.Log.Warn(err.Error())
+	}
+
+	message.Info.Id = strings.ToUpper(hex.EncodeToString(idBytes))
+	_, err := b.conn.Send(message)
+
+	return message.Info.Id, err
+}
+
 // Send a message from the bridge to WhatsApp
 // Required implementation of the Bridger interface
 // https://github.com/42wim/matterbridge/blob/2cfd880cdb0df29771bf8f31df8d990ab897889d/bridge/bridge.go#L11-L16
@@ -259,18 +322,25 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
 		// TODO handle edit as a message reply with updated text
 	}
 
-	//// TODO Handle Upload a file
-	//if msg.Extra != nil {
-	//	for _, rmsg := range helper.HandleExtra(&msg, b.General) {
-	//		b.c.SendMessage(roomID, rmsg.Username+rmsg.Text)
-	//	}
-	//	if len(msg.Extra["file"]) > 0 {
-	//		return b.handleUploadFile(&msg, roomID)
-	//	}
-	//}
+	// Handle Upload a file
+	if msg.Extra["file"] != nil {
+		fi := msg.Extra["file"][0].(config.FileInfo)
+		filetype := mime.TypeByExtension(filepath.Ext(fi.Name))
+
+		b.Log.Debugf("Extra file is %#v", filetype)
+
+		// TODO: add different types
+		// TODO: add webp conversion
+		switch filetype {
+		case "image/jpeg", "image/png", "image/gif":
+			return b.PostImageMessage(msg, filetype)
+		default:
+			return b.PostDocumentMessage(msg, filetype)
+		}
+	}
 
 	// Post text message
-	text := whatsapp.TextMessage{
+	message := whatsapp.TextMessage{
 		Info: whatsapp.MessageInfo{
 			RemoteJid: msg.Channel, // which equals to group id
 		},
@@ -281,15 +351,14 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
 
 	// create message ID
 	// TODO follow and act if https://github.com/Rhymen/go-whatsapp/issues/101 implemented
-	bytes := make([]byte, 10)
-	if _, err := rand.Read(bytes); err != nil {
+	idBytes := make([]byte, 10)
+	if _, err := rand.Read(idBytes); err != nil {
 		b.Log.Warn(err.Error())
 	}
-	text.Info.Id = strings.ToUpper(hex.EncodeToString(bytes))
+	message.Info.Id = strings.ToUpper(hex.EncodeToString(idBytes))
+	_, err := b.conn.Send(message)
 
-	_, err := b.conn.Send(text)
-
-	return text.Info.Id, err
+	return message.Info.Id, err
 }
 
 // TODO do we want that? to allow login with QR code from a bridged channel? https://github.com/tulir/mautrix-whatsapp/blob/513eb18e2d59bada0dd515ee1abaaf38a3bfe3d5/commands.go#L76

changelog.md

@@ -1,4 +1,58 @@
-# dev
+# v1.16.5
+
+- Fix version bump
+
+# v1.16.4
+
+## New features
+
+- whatsapp: Add support for WhatsApp media (jpeg/png/gif) bridging (#974)
+- telegram: Add QuoteLengthLimit option (telegram) fixes #963 (#985)
+- telegram: Add DisableWebPagePreview option (telegram). Closes #980 (#994)
+
+## Enhancements
+
+- general: update dependencies
+- tengo: update to tengo v2
+- general: Add Docker Compose configuration (#990)
+
+## Bugfix
+
+- general: Fail with message instead of panic. #988 (#991)
+- telegram: Add extra mimetypes to docker image. Fixes #969
+- discord: Fix channel ID problem with multiple gateways (discord). Fixes #953 (#977)
+- discord: Show file comment in webhook if normal message is empty (discord). Fixes #962 (#995)
+- matrix: Fix parsing issues - Disable smartypants in markdown parser. Fixes #989, #983 (#993)
+- sshchat: Fix duplicated messages (sshchat). Fixes #950 (#996)
+
+This release couldn't exist without the following contributors:
+@jwflory, @42wim, @pbek, @Humorhenker, @c0ncord2, @glazzara
+
+# v1.16.3
+
+## Bugfix
+
+- slack: Fix issues with ratelimiting #959
+- mattermost: Fix bug when using webhookURL and login/token together #960
+
+# v1.16.2
+
+## New features
+
+- keybase: Add support for receiving attachments (keybase) (#923)
+
+## Enhancements
+
+- general: Switch to new emoji library kyokomi/emoji (#948)
+- general: Update markdown parsing library to github.com/gomarkdown/markdown (#944)
+- ssh-chat: Update shazow/ssh-chat dependency (#947)
+
+## Bugfix
+
+- slack: Fix issues with the slack block kit API #937 (#943).
+
+This release couldn't exist without the following contributors:
+@42wim, @bmpickford, @goncalor
 
 # v1.16.1
 

ci/bintray.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -u -e -x -o pipefail
 
-go version | grep go1.12 || exit
+go version | grep go1.13 || exit
 
 VERSION=$(git describe --tags)
 mkdir ci/binaries

contrib/outmessage-discordemoji.tengo

@@ -0,0 +1,10 @@
+text := import("text")
+
+// if we're not sending to a discord bridge,
+// then convert custom emoji tags into url's
+if (inProtocol == "discord" && outProtocol != "discord") {
+    rePNG := text.re_compile(`<:.*?:([0-9]+)>`)
+    msgText=rePNG.replace(msgText,"https://cdn.discordapp.com/emojis/$1.png")
+    reGIF := text.re_compile(`<a:.*?:([0-9]+)>`)
+    msgText=reGIF.replace(msgText,"https://cdn.discordapp.com/emojis/$1.gif")
+}

gateway/gateway.go

@@ -10,10 +10,10 @@ import (
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/internal"
-	"github.com/d5/tengo/script"
-	"github.com/d5/tengo/stdlib"
+	"github.com/d5/tengo/v2"
+	"github.com/d5/tengo/v2/stdlib"
 	lru "github.com/hashicorp/golang-lru"
-	"github.com/peterhellberg/emojilib"
+	"github.com/matterbridge/emoji"
 	"github.com/sirupsen/logrus"
 )
 
@@ -372,7 +372,7 @@ func (gw *Gateway) modifyMessage(msg *config.Message) {
 	}
 
 	// replace :emoji: to unicode
-	msg.Text = emojilib.Replace(msg.Text)
+	msg.Text = emoji.Sprint(msg.Text)
 
 	br := gw.Bridges[msg.Account]
 	// loop to replace messages
@@ -514,7 +514,7 @@ func modifyMessageTengo(filename string, msg *config.Message) error {
 	if err != nil {
 		return err
 	}
-	s := script.New(res)
+	s := tengo.NewScript(res)
 	s.SetImports(stdlib.GetModuleMap(stdlib.AllModuleNames()...))
 	_ = s.Add("msgText", msg.Text)
 	_ = s.Add("msgUsername", msg.Username)
@@ -541,7 +541,7 @@ func (gw *Gateway) modifyUsernameTengo(msg *config.Message, br *bridge.Bridge) (
 	if err != nil {
 		return "", err
 	}
-	s := script.New(res)
+	s := tengo.NewScript(res)
 	s.SetImports(stdlib.GetModuleMap(stdlib.AllModuleNames()...))
 	_ = s.Add("result", "")
 	_ = s.Add("msgText", msg.Text)
@@ -580,7 +580,7 @@ func (gw *Gateway) modifySendMessageTengo(origmsg *config.Message, msg *config.M
 			return err
 		}
 	}
-	s := script.New(res)
+	s := tengo.NewScript(res)
 	s.SetImports(stdlib.GetModuleMap(stdlib.AllModuleNames()...))
 	_ = s.Add("inAccount", origmsg.Account)
 	_ = s.Add("inProtocol", origmsg.Protocol)

go.mod

@@ -5,26 +5,25 @@ require (
 	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.20190816133340-b04c5a83c1c0
-	github.com/Rhymen/go-whatsapp v0.0.3-0.20191003184814-fc3f792c814c
-	github.com/bwmarrin/discordgo v0.19.0
-	// github.com/bwmarrin/discordgo v0.19.0
-	github.com/d5/tengo v1.24.8
+	github.com/Rhymen/go-whatsapp v0.1.0
+	github.com/bwmarrin/discordgo v0.20.2
+	github.com/d5/tengo/v2 v2.0.2
 	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
+	github.com/gomarkdown/markdown v0.0.0-20200127000047-1813ea067497
 	github.com/google/gops v0.3.6
 	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.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/jpillora/backoff v1.0.0
 	github.com/keybase/go-keybase-chat-bot v0.0.0-20190816161829-561f10822eb2
-	github.com/labstack/echo/v4 v4.1.10
+	github.com/labstack/echo/v4 v4.1.13
 	github.com/lrstanley/girc v0.0.0-20190801035559-4fc93959e1a7
 	github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20190210153444-cc9d05784d5d
+	github.com/matterbridge/emoji v2.1.1-0.20191117213217-af507f6b02db+incompatible
 	github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91
 	github.com/matterbridge/gomatrix v0.0.0-20191026211822-6fc7accd00ca
 	github.com/matterbridge/gozulipbot v0.0.0-20190212232658-7aa251978a18
@@ -40,36 +39,24 @@ require (
 	github.com/onsi/gomega v1.4.1 // indirect
 	github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
 	github.com/pborman/uuid v0.0.0-20160216163710-c55201b03606 // indirect
-	github.com/peterhellberg/emojilib v0.0.0-20190124112554-c18758d55320
 	github.com/rs/xid v1.2.1
 	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/shazow/ssh-chat v1.8.2
 	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/spf13/viper v1.6.1
 	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
-	gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a // indirect
-	gitlab.com/golang-commonmark/linkify v0.0.0-20191026162114-a0c2df6c8f82 // indirect
-	gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f
-	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/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
+	github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447
+	golang.org/x/image v0.0.0-20191214001246-9130b4cfad52
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	gopkg.in/russross/blackfriday.v2 v2.0.0 // 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-20191026232317-01823f4ebba4
+replace github.com/nlopes/slack v0.6.0 => github.com/matterbridge/slack v0.1.1-0.20191208194820-95190f11bfb6
+
+replace github.com/bwmarrin/discordgo v0.20.2 => github.com/matterbridge/discordgo v0.18.1-0.20200109173909-ed873362fa43
 
 go 1.13

go.sum

@@ -11,8 +11,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
 github.com/Philipp15b/go-steam v1.0.1-0.20190816133340-b04c5a83c1c0 h1:TO7d4rocnNFng6ZQrPe7U6WqHtK5eHEMrgrnnM/72IQ=
 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.3-0.20191003184814-fc3f792c814c h1:+yAllLxP+WjpuVVE1WNm0/Oigbeob9+liYEyk/v4nj8=
-github.com/Rhymen/go-whatsapp v0.0.3-0.20191003184814-fc3f792c814c/go.mod h1:qf/2PQi82Okxw/igghu/oMGzTeUYuKBq1JNo3tdQyNg=
+github.com/Rhymen/go-whatsapp v0.1.0 h1:XTXhFIQ/fx9jKObUnUX2Q+nh58EyeHNhX7DniE8xeuA=
+github.com/Rhymen/go-whatsapp v0.1.0/go.mod h1:xJSy+okeRjKkQEH/lEYrnekXB3PG33fqL0I6ncAkV50=
 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=
@@ -21,6 +21,7 @@ github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e h1:IHXQQIpxASe3m
 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=
+github.com/alexcesaro/log v0.0.0-20150915221235-61e686294e58 h1:MkpmYfld/S8kXqTYI68DfL8/hHXjHogL120Dy00TIxc=
 github.com/alexcesaro/log v0.0.0-20150915221235-61e686294e58/go.mod h1:YNfsMyWSs+h+PaYkxGeMVmVCX75Zj/pqdjbu12ciCYE=
 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=
@@ -32,8 +33,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.8 h1:PRJ+NWt7ae/9sSbIfThOBTkPSvNV+dwYoBAvwfNgNJY=
-github.com/d5/tengo v1.24.8/go.mod h1:VhLq8Q2QFhCIJO3NhvM934qOThykMqJi9y9Siqd1ocQ=
+github.com/d5/tengo/v2 v2.0.2 h1:3APkPZPc1FExaJoWrN5YzvDqc6GNkQH6ehmCRDmN83I=
+github.com/d5/tengo/v2 v2.0.2/go.mod h1:XRGjEs5I9jYIKTxly6HCF8oiiilk5E/RYXOZ5b0DZC8=
 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=
@@ -63,14 +64,16 @@ github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk
 github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/gomarkdown/markdown v0.0.0-20200127000047-1813ea067497 h1:wJkj+x9gPYlDyM34C6r3SXPs270coWeh85wu1CsusDo=
+github.com/gomarkdown/markdown v0.0.0-20200127000047-1813ea067497/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/gops v0.3.6 h1:6akvbMlpZrEYOuoebn2kR+ZJekbZqJ28fJXTs84+8to=
 github.com/google/gops v0.3.6/go.mod h1:RZ1rH95wsAGX4vMWKmqBOIWynmWisBf4QFdgT/k/xOI=
 github.com/gopackage/ddp v0.0.0-20170117053602-652027933df4 h1:4EZlYQIiyecYJlUbVkFXCXHz1QPhVXcHnQKAzBTPfQo=
 github.com/gopackage/ddp v0.0.0-20170117053602-652027933df4/go.mod h1:lEO7XoHJ/xNRBCxrn4h/CEB67h0kW1B0t4ooP2yrjUA=
-github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f h1:FDM3EtwZLyhW48YRiyqjivNlNZjAObv4xt4NnJaU+NQ=
-github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/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=
@@ -88,12 +91,12 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jessevdk/go-flags v1.3.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7 h1:K//n/AqR5HjG3qxbrBCL4vJPW0MVFSs9CPK1OOJdRME=
-github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
-github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 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=
@@ -111,18 +114,22 @@ 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.10 h1:/yhIpO50CBInUbE/nHJtGIyhBv0dJe2cDAYxc3V3uMo=
-github.com/labstack/echo/v4 v4.1.10/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
+github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/echo/v4 v4.1.13 h1:JYgKq6NQQSaKbQcsOadAKX1kUVLCUzLGwu8sxN5tC34=
+github.com/labstack/echo/v4 v4.1.13/go.mod h1:3WZNypykZ3tnqpF2Qb4fPg27XDunFqgP3HGDmCMgv7U=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lrstanley/girc v0.0.0-20190801035559-4fc93959e1a7 h1:BS9tqL0OCiOGuy/CYYk2gc33fxqaqh5/rhqMKu4tcYA=
 github.com/lrstanley/girc v0.0.0-20190801035559-4fc93959e1a7/go.mod h1:liX5MxHPrwgHaKowoLkYGwbXfYABh1jbZ6FpElbGF1I=
-github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
-github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
+github.com/magiconair/properties v1.8.1/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-20191026232317-01823f4ebba4 h1:RvH3lC4bEp+bieca+Yh5xPU8tLJgnk7ridiSwMFHrrw=
-github.com/matterbridge/discordgo v0.0.0-20191026232317-01823f4ebba4/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
+github.com/matterbridge/discordgo v0.18.1-0.20200109173909-ed873362fa43 h1:xTcLiEPMp9jVh/lHEPpLc87RZ4sRWRZe0rM578/waOk=
+github.com/matterbridge/discordgo v0.18.1-0.20200109173909-ed873362fa43/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
+github.com/matterbridge/emoji v2.1.1-0.20191117213217-af507f6b02db+incompatible h1:oaOqwbg5HxHRxvAbd84ks0Okwoc1ISyUZ87EiVJFhGI=
+github.com/matterbridge/emoji v2.1.1-0.20191117213217-af507f6b02db+incompatible/go.mod h1:igE6rUAn3jai2wCdsjFHfhUoekjrFthoEjFObKKwSb4=
 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-20191026211822-6fc7accd00ca h1:3ypqEpFpt6vg5Sv2xxA8/v4WiSOnWMXW7DqxTxpM4XI=
@@ -131,18 +138,24 @@ github.com/matterbridge/gozulipbot v0.0.0-20190212232658-7aa251978a18 h1:fLhwXtW
 github.com/matterbridge/gozulipbot v0.0.0-20190212232658-7aa251978a18/go.mod h1:yAjnZ34DuDyPHMPHHjOsTk/FefW4JJjoMMCGt/8uuQA=
 github.com/matterbridge/logrus-prefixed-formatter v0.0.0-20180806162718-01618749af61 h1:R/MgM/eUyRBQx2FiH6JVmXck8PaAuKfe2M1tWIzW7nE=
 github.com/matterbridge/logrus-prefixed-formatter v0.0.0-20180806162718-01618749af61/go.mod h1:iXGEotOvwI1R1SjLxRc+BF5rUORTMtE0iMZBT2lxqAU=
+github.com/matterbridge/slack v0.1.1-0.20191208194820-95190f11bfb6 h1:UvXXR9tHYqJUXZVEtiK2qkEWBXfFneicate5kOshVFk=
+github.com/matterbridge/slack v0.1.1-0.20191208194820-95190f11bfb6/go.mod h1:2uCJim0Ct2z1Uj+XQq47KCLLC1b/9UTYaZOvDtbZfK4=
 github.com/mattermost/mattermost-server v5.5.0+incompatible h1:0wcLGgYtd+YImtLDPf2AOfpBHxbU4suATx+6XKw1XbU=
 github.com/mattermost/mattermost-server v5.5.0+incompatible/go.mod h1:5L6MjAec+XXQwMIt791Ganu45GKsSiM+I0tLR9wUj8Y=
 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-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 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/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 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=
@@ -157,8 +170,6 @@ 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.6.0 h1:jt0jxVQGhssx1Ib7naAOZEZcGdtIhTzkP0nopK0AsRA=
-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=
@@ -170,8 +181,6 @@ github.com/pborman/uuid v0.0.0-20160216163710-c55201b03606 h1:/CPgDYrfeK2LMK6xcU
 github.com/pborman/uuid v0.0.0-20160216163710-c55201b03606/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/peterhellberg/emojilib v0.0.0-20190124112554-c18758d55320 h1:YxcQy/DV+48NGv1lxx1vsWBzs6W1f1ogubkuCozxpX0=
-github.com/peterhellberg/emojilib v0.0.0-20190124112554-c18758d55320/go.mod h1:G7LufuPajuIvdt9OitkNt2qh0mmvD4bfRgRM7bhDIOA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -195,23 +204,21 @@ github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxT
 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=
 github.com/shazow/rateio v0.0.0-20150116013248-e8e00881e5c1/go.mod h1:vt2jWY/3Qw1bIzle5thrJWucsLuuX9iUNnp20CqCciI=
-github.com/shazow/ssh-chat v0.0.0-20190125184227-81d7e1686296 h1:8RLq547MSVc6vhOuCl4Ca0TsAQknj6NX6ZLSZ3+xmio=
-github.com/shazow/ssh-chat v0.0.0-20190125184227-81d7e1686296/go.mod h1:1GLXsL4esywkpNId3v4QWuMf3THtWGitWvtQ/L3aSA4=
+github.com/shazow/ssh-chat v1.8.2 h1:MMso9eWfCnPBelRsusYxKcRBUwHIPEQkR9WrO89II38=
+github.com/shazow/ssh-chat v1.8.2/go.mod h1:cXTZK/D1zujEwB0y8DIT1GX8rIKjyLDYeWd+jitPX84=
 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=
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo=
-github.com/smartystreets/assertions v0.0.0-20180803164922-886ec427f6b9 h1:lXQ+j+KwZcbwrbgU0Rp4Eglg3EJLHbuZU3BbOqAGBmg=
-github.com/smartystreets/assertions v0.0.0-20180803164922-886ec427f6b9/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a h1:JSvGDIbmil4Ui/dDdFBExb7/cmkNjyX5F97oglmvCDo=
-github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
@@ -222,13 +229,16 @@ github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-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/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
+github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 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=
@@ -237,26 +247,16 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 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=
+github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
+github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 h1:YdYsPAZ2pC6Tow/nPZOPQ96O3hm/ToAkGsPLzedXERk=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/zfjagann/golang-ring v0.0.0-20190304061218-d34796e0a6c2 h1:UQwvu7FjUEdVYofx0U6bsc5odNE7wa5TSA0fl559GcA=
-github.com/zfjagann/golang-ring v0.0.0-20190304061218-d34796e0a6c2/go.mod h1:0MsIttMJIF/8Y7x0XjonJP7K99t3sR6bjj4m5S4JmqU=
-gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a h1:Ax7kdHNICZiIeFpmevmaEWb0Ae3BUj3zCTKhZHZ+zd0=
-gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a/go.mod h1:JT4uoTz0tfPoyVH88GZoWDNm5NHJI2VbUW+eyPClueI=
-gitlab.com/golang-commonmark/linkify v0.0.0-20191026162114-a0c2df6c8f82 h1:oYrL81N608MLZhma3ruL8qTM4xcpYECGut8KSxRY59g=
-gitlab.com/golang-commonmark/linkify v0.0.0-20191026162114-a0c2df6c8f82/go.mod h1:Gn+LZmCrhPECMD3SOKlE+BOHwhOYD9j7WT9NUtkCrC8=
-gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f h1:jwXy/CsM4xS2aoiF2fHAlukmInWhd2TlWB+HDCyvzKc=
-gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f/go.mod h1:SIHlEr9462fpIfTrVWf3GqQDxnA65Vm3BMMsUtuA6W0=
-gitlab.com/golang-commonmark/mdurl v0.0.0-20180912090424-e5bce34c34f2 h1:wD/sPUgx2QJFPTyXZpJnLaROolfeKuruh06U4pRV0WY=
-gitlab.com/golang-commonmark/mdurl v0.0.0-20180912090424-e5bce34c34f2/go.mod h1:wQk4rLkWrdOPjUAtqJRJ10hIlseLSVYWP95PLrjDF9s=
-gitlab.com/golang-commonmark/puny v0.0.0-20180912090636-2cd490539afe h1:5kUPFAF52umOUPH12MuNUmyVTseJRNBftDl/KfsvX3I=
-gitlab.com/golang-commonmark/puny v0.0.0-20180912090636-2cd490539afe/go.mod h1:P9LSM1KVzrIstFgUaveuwiAm8PK5VTB3yJEU8kqlbrU=
-gitlab.com/opennota/wd v0.0.0-20180912061657-c5d65f63c638 h1:uPZaMiz6Sz0PZs3IZJWpU5qHKGNy///1pacZC9txiUI=
-gitlab.com/opennota/wd v0.0.0-20180912061657-c5d65f63c638/go.mod h1:EGRJaqe2eO9XGmFtQCvV3Lm9NLico3UhFwUpCG/+mVU=
+github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447 h1:CHgPZh8bFkZmislPrr/0gd7MciDAX+JJB70A2/5Lvmo=
+github.com/zfjagann/golang-ring v0.0.0-20190106091943-a88bb6aef447/go.mod h1:0MsIttMJIF/8Y7x0XjonJP7K99t3sR6bjj4m5S4JmqU=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -264,16 +264,17 @@ go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 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-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-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/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 h1:sKJQZMuxjOAR/Uo2LBfU90onWEf1dF4C+0hPJCc9Mpc=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 h1:2fktqPPvDiVEEVT/vSTeoUPXfmRxRaGy6GU8jypvEn0=
+golang.org/x/image v0.0.0-20191214001246-9130b4cfad52/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=
@@ -282,9 +283,10 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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=
@@ -297,10 +299,14 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 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-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 h1:JA8d3MPx/IToSyXZG/RhwYEtfrKO1Fxrqe8KrkiLXKM=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/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=
@@ -310,6 +316,7 @@ 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-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 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=
@@ -321,17 +328,19 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/russross/blackfriday.v2 v2.0.0 h1:+FlnIV8DSQnT7NZ43hcVKcdJdzZoeCmJj4Ql8gq5keA=
-gopkg.in/russross/blackfriday.v2 v2.0.0/go.mod h1:6sSBNz/GtOm/pJTuh5UmBK2ZHfmnxGbl2NZg1UliSOI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 rsc.io/goversion v1.0.0 h1:/IhXBiai89TyuerPquiZZ39IQkTfAUbZB2awsyYZ/2c=
 rsc.io/goversion v1.0.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=

internal/tengo/outmessage.tengo

@@ -12,8 +12,14 @@ text := import("text")
 
 // start - strip irc colors 
 // if we're not sending to an irc bridge we strip the IRC colors
-if inProtocol == "irc" {
+if inProtocol == "irc" && outProtocol != "irc" {
     re := text.re_compile(`\x03(?:\d{1,2}(?:,\d{1,2})?)?|[[:cntrl:]]`)
     msgText=re.replace(msgText,"")
 }
 // end - strip irc colors
+
+// strip custom emoji
+if inProtocol == "discord" {
+    re := text.re_compile(`<a?(:.*?:)[0-9]+>`)
+    msgText=re.replace(msgText,"$1")
+}

matterbridge.go

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

matterbridge.toml.sample

@@ -837,6 +837,10 @@ Token="Yourtokenhere"
 #HTMLNick only allows HTML for the nick, the message itself will be html-escaped
 MessageFormat=""
 
+#OPTIONAL (default false)
+#Disables link previews for links in messages
+DisableWebPagePreview=false
+
 #If enabled use the "First Name" as username. If this is empty use the Username
 #If disabled use the "Username" as username. If this is empty use the First Name 
 #If all names are empty, username will be "unknown"
@@ -853,6 +857,10 @@ UseInsecureURL=false
 #OPTIONAL (default false)
 QuoteDisable=false
 
+#Set the max. quoted length if 0 the whole message will be quoted
+#OPTIONAL (default 0)
+QuoteLengthLimit=0
+
 #Format quoted/reply messages
 #OPTIONAL (default "{MESSAGE} (re @{QUOTENICK}: {QUOTEMESSAGE})")
 QuoteFormat="{MESSAGE} (re @{QUOTENICK}: {QUOTEMESSAGE})"

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

@@ -23,7 +23,7 @@ qrChan := make(chan string)
 go func() {
     fmt.Printf("qr code: %v\n", <-qrChan)
     //show qr code or save it somewhere to scan
-}
+}()
 sess, err := wac.Login(qrChan)
 ```
 The authentication process requires you to scan the qr code, that is send through the channel, with the device you are using whatsapp on. The session struct that is returned can be saved and used to restore the login without scanning the qr code again. The qr code has a ttl of 20 seconds and the login function throws a timeout err if the time has passed or any other request fails.
@@ -66,6 +66,10 @@ func (myHandler) HandleJsonMessage(message string) {
 	fmt.Println(message)
 }
 
+func (myHandler) HandleContactMessage(message whatsapp.ContactMessage) {
+	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, VideoMessage, AudioMessage and DocumentMessage provide a Download function to get the media data.
@@ -81,6 +85,21 @@ text := whatsapp.TextMessage{
 
 err := wac.Send(text)
 ```
+
+### Sending Contact Messages
+```go
+contactMessage := whatsapp.ContactMessage{
+			Info: whatsapp.MessageInfo{ 
+                RemoteJid: "0123456789@s.whatsapp.net", 
+                },
+			DisplayName: "Luke Skylwallker",
+			Vcard: "BEGIN:VCARD\nVERSION:3.0\nN:Skyllwalker;Luke;;\nFN:Luke Skywallker\nitem1.TEL;waid=0123456789:+1 23 456789789\nitem1.X-ABLabel:Mobile\nEND:VCARD",
+		}
+
+id, error := client.WaConn.Send(contactMessage)
+```
+
+
 The message will be send over the websocket. The attributes seen above are the required ones. All other relevant attributes (id, timestamp, fromMe, status) are set if they are missing in the struct. For the time being we only support text messages, but other types are planned for the near future.
 
 ## Legal

vendor/github.com/Rhymen/go-whatsapp/binary/node.go

@@ -66,9 +66,12 @@ func Unmarshal(data []byte) (*Node, error) {
 	}
 
 	if n != nil && n.Attributes != nil && n.Content != nil {
-		n.Content, err = unmarshalMessageArray(n.Content.([]Node))
-		if err != nil {
-			return nil, err
+		nContent, ok := n.Content.([]Node)
+		if ok {
+			n.Content, err = unmarshalMessageArray(nContent)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
 

vendor/github.com/Rhymen/go-whatsapp/binary/proto/def.proto

@@ -3,7 +3,7 @@ package proto;
 
 message HydratedQuickReplyButton {
     optional string displayText = 1;
-    optional string buttonId = 2;
+    optional string id = 2;
 }
 
 message HydratedURLButton {
@@ -17,6 +17,7 @@ message HydratedCallButton {
 }
 
 message HydratedTemplateButton {
+    optional uint32 index = 4;
     oneof hydratedButton {
         HydratedQuickReplyButton quickReplyButton = 1;
         HydratedURLButton urlButton = 2;
@@ -26,7 +27,7 @@ message HydratedTemplateButton {
 
 message QuickReplyButton {
     optional HighlyStructuredMessage displayText = 1;
-    optional string buttonId = 2;
+    optional string id = 2;
 }
 
 message URLButton {
@@ -40,6 +41,7 @@ message CallButton {
 }
 
 message TemplateButton {
+    optional uint32 index = 4;
     oneof button {
         QuickReplyButton quickReplyButton = 1;
         URLButton urlButton = 2;
@@ -89,6 +91,8 @@ message ContextInfo {
     optional uint32 forwardingScore = 21;
     optional bool isForwarded = 22;
     optional AdReplyInfo quotedAd = 23;
+    optional MessageKey placeholderKey = 24;
+    optional uint32 expiration = 25;
 }
 
 message SenderKeyDistributionMessage {
@@ -114,6 +118,10 @@ message ImageMessage {
     optional bytes firstScanSidecar = 18;
     optional uint32 firstScanLength = 19;
     optional uint32 experimentGroupId = 20;
+    optional bytes scansSidecar = 21;
+    repeated uint32 scanLengths = 22;
+    optional bytes midQualityFileSha256 = 23;
+    optional bytes midQualityFileEncSha256 = 24;
 }
 
 message ContactMessage {
@@ -156,6 +164,7 @@ message ExtendedTextMessage {
     optional EXTENDED_TEXT_MESSAGE_PREVIEWTYPE previewType = 10;
     optional bytes jpegThumbnail = 16;
     optional ContextInfo contextInfo = 17;
+    optional bool doNotPlayInline = 18;
 }
 
 message DocumentMessage {
@@ -228,8 +237,10 @@ message ProtocolMessage {
     optional MessageKey key = 1;
     enum PROTOCOL_MESSAGE_TYPE {
         REVOKE = 0;
+        EPHEMERAL_SETTING = 3;
     }
     optional PROTOCOL_MESSAGE_TYPE type = 2;
+    optional uint32 ephemeralExpiration = 4;
 }
 
 message ContactsArrayMessage {
@@ -294,6 +305,7 @@ message HighlyStructuredMessage {
     repeated HSMLocalizableParameter localizableParams = 6;
     optional string deterministicLg = 7;
     optional string deterministicLc = 8;
+    optional TemplateMessage hydratedHsm = 9;
 }
 
 message SendPaymentMessage {
@@ -341,7 +353,8 @@ message StickerMessage {
     optional string directPath = 8;
     optional uint64 fileLength = 9;
     optional int64 mediaKeyTimestamp = 10;
-    optional bytes pngThumbnail = 16;
+    optional uint32 firstFrameLength = 11;
+    optional bytes firstFrameSidecar = 12;
     optional ContextInfo contextInfo = 17;
 }
 
@@ -361,7 +374,8 @@ message FourRowTemplate {
 message HydratedFourRowTemplate {
     optional string hydratedContentText = 6;
     optional string hydratedFooterText = 7;
-    repeated HydratedTemplateButton hydratedButtons = 9;
+    repeated HydratedTemplateButton hydratedButtons = 8;
+    optional string templateId = 9;
     oneof title {
         DocumentMessage documentMessage = 1;
         string hydratedTitleText = 2;
@@ -372,6 +386,8 @@ message HydratedFourRowTemplate {
 }
 
 message TemplateMessage {
+    optional ContextInfo contextInfo = 3;
+    optional HydratedFourRowTemplate hydratedTemplate = 4;
     oneof format {
         FourRowTemplate fourRowTemplate = 1;
         HydratedFourRowTemplate hydratedFourRowTemplate = 2;
@@ -379,9 +395,10 @@ message TemplateMessage {
 }
 
 message TemplateButtonReplyMessage {
-    optional string selectedButtonId = 1;
-    repeated string selectedButtonDisplayText = 2;
+    optional string selectedId = 1;
+    optional string selectedDisplayText = 2;
     optional ContextInfo contextInfo = 3;
+    optional uint32 selectedIndex = 4;
 }
 
 message ProductSnapshot {
@@ -394,6 +411,7 @@ message ProductSnapshot {
     optional string retailerId = 7;
     optional string url = 8;
     optional uint32 productImageCount = 9;
+    optional string firstImageId = 11;
 }
 
 message ProductMessage {
@@ -409,6 +427,16 @@ message GroupInviteMessage {
     optional string groupName = 4;
     optional bytes jpegThumbnail = 5;
     optional string caption = 6;
+    optional ContextInfo contextInfo = 7;
+}
+
+message DeviceSentMessage {
+    optional string destinationJid = 1;
+    optional Message message = 2;
+}
+
+message DeviceSyncMessage {
+    optional bytes serializedXmlBytes = 1;
 }
 
 message Message {
@@ -434,8 +462,11 @@ message Message {
     optional CancelPaymentRequestMessage cancelPaymentRequestMessage = 24;
     optional TemplateMessage templateMessage = 25;
     optional StickerMessage stickerMessage = 26;
-    optional ProductMessage productMessage = 27;
     optional GroupInviteMessage groupInviteMessage = 28;
+    optional TemplateButtonReplyMessage templateButtonReplyMessage = 29;
+    optional ProductMessage productMessage = 30;
+    optional DeviceSentMessage deviceSentMessage = 31;
+    optional DeviceSyncMessage deviceSyncMessage = 32;
 }
 
 message MessageKey {
@@ -447,9 +478,10 @@ message MessageKey {
 
 message WebFeatures {
     enum WEB_FEATURES_FLAG {
-        NOT_IMPLEMENTED = 0;
-        IMPLEMENTED = 1;
-        OPTIONAL = 2;
+        NOT_STARTED = 0;
+        FORCE_UPGRADE = 1;
+        DEVELOPMENT = 2;
+        PRODUCTION = 3;
     }
     optional WEB_FEATURES_FLAG labelsDisplay = 1;
     optional WEB_FEATURES_FLAG voipIndividualOutgoing = 2;
@@ -473,6 +505,14 @@ message WebFeatures {
     optional WEB_FEATURES_FLAG voipIndividualVideo = 22;
     optional WEB_FEATURES_FLAG thirdPartyStickers = 23;
     optional WEB_FEATURES_FLAG frequentlyForwardedSetting = 24;
+    optional WEB_FEATURES_FLAG groupsV4JoinPermission = 25;
+    optional WEB_FEATURES_FLAG recentStickers = 26;
+    optional WEB_FEATURES_FLAG catalog = 27;
+    optional WEB_FEATURES_FLAG starredStickers = 28;
+    optional WEB_FEATURES_FLAG voipGroupCall = 29;
+    optional WEB_FEATURES_FLAG templateMessage = 30;
+    optional WEB_FEATURES_FLAG templateMessageInteractivity = 31;
+    optional WEB_FEATURES_FLAG ephemeralMessages = 32;
 }
 
 message TabletNotificationsInfo {
@@ -614,6 +654,9 @@ message WebMessageInfo {
         BIZ_TWO_TIER_MIGRATION_BOTTOM = 67;
         OVERSIZED = 68;
         GROUP_CHANGE_NO_FREQUENTLY_FORWARDED = 69;
+        GROUP_V4_ADD_INVITE_SENT = 70;
+        GROUP_PARTICIPANT_ADD_REQUEST_JOIN = 71;
+        CHANGE_EPHEMERAL_SETTING = 72;
     }
     optional WEB_MESSAGE_INFO_STUBTYPE messageStubType = 24;
     optional bool clearMedia = 25;
@@ -623,4 +666,6 @@ message WebMessageInfo {
     optional PaymentInfo paymentInfo = 29;
     optional LiveLocationMessage finalLiveLocation = 30;
     optional PaymentInfo quotedPaymentInfo = 31;
-}
+    optional uint64 ephemeralStartTimestamp = 32;
+    optional uint32 ephemeralDuration = 33;
+}

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

@@ -93,6 +93,8 @@ type Conn struct {
 
 	loginSessionLock sync.RWMutex
 	Proxy            func(*http.Request) (*url.URL, error)
+
+	writerLock sync.RWMutex
 }
 
 type websocketWrapper struct {

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

@@ -10,11 +10,11 @@ import (
 type Presence string
 
 const (
-	PresenceAvailable   = "available"
-	PresenceUnavailable = "unavailable"
-	PresenceComposing   = "composing"
-	PresenceRecording   = "recording"
-	PresencePaused      = "paused"
+	PresenceAvailable   Presence = "available"
+	PresenceUnavailable Presence = "unavailable"
+	PresenceComposing   Presence = "composing"
+	PresenceRecording   Presence = "recording"
+	PresencePaused      Presence = "paused"
 )
 
 //TODO: filename? WhatsApp uses Store.Contacts for these functions

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

@@ -10,3 +10,5 @@ require (
 	github.com/pkg/errors v0.8.1
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 )
+
+go 1.13

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

@@ -82,13 +82,21 @@ type LocationMessageHandler interface {
 }
 
 /*
-The StickerMessageHandler interface needs to be implemented to receive location messages dispatched by the dispatcher.
+The StickerMessageHandler interface needs to be implemented to receive sticker messages dispatched by the dispatcher.
 */
 type StickerMessageHandler interface {
 	Handler
 	HandleStickerMessage(message StickerMessage)
 }
 
+/*
+The ContactMessageHandler interface needs to be implemented to receive contact messages dispatched by the dispatcher.
+*/
+type ContactMessageHandler interface {
+	Handler
+	HandleContactMessage(message ContactMessage)
+}
+
 /*
 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
@@ -267,6 +275,17 @@ func (wac *Conn) handleWithCustomHandlers(message interface{}, handlers []Handle
 			}
 		}
 
+	case ContactMessage:
+		for _, h := range handlers {
+			if x, ok := h.(ContactMessageHandler); ok {
+				if wac.shouldCallSynchronously(h) {
+					x.HandleContactMessage(m)
+				} else {
+					go x.HandleContactMessage(m)
+				}
+			}
+		}
+
 	case *proto.WebMessageInfo:
 		for _, h := range handlers {
 			if x, ok := h.(RawMessageHandler); ok {

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

@@ -23,64 +23,53 @@ const (
 	MediaDocument MediaType = "WhatsApp Document Keys"
 )
 
-var msgInfo MessageInfo
-
 func (wac *Conn) Send(msg interface{}) (string, error) {
-	var err error
-	var ch <-chan string
 	var msgProto *proto.WebMessageInfo
 
 	switch m := msg.(type) {
 	case *proto.WebMessageInfo:
-		ch, err = wac.sendProto(m)
+		msgProto = m
 	case TextMessage:
 		msgProto = getTextProto(m)
-		msgInfo = getMessageInfo(msgProto)
-		ch, err = wac.sendProto(msgProto)
 	case ImageMessage:
+		var err error
 		m.url, m.mediaKey, m.fileEncSha256, m.fileSha256, m.fileLength, err = wac.Upload(m.Content, MediaImage)
 		if err != nil {
 			return "ERROR", fmt.Errorf("image upload failed: %v", err)
 		}
 		msgProto = getImageProto(m)
-		msgInfo = getMessageInfo(msgProto)
-		ch, err = wac.sendProto(msgProto)
 	case VideoMessage:
+		var err error
 		m.url, m.mediaKey, m.fileEncSha256, m.fileSha256, m.fileLength, err = wac.Upload(m.Content, MediaVideo)
 		if err != nil {
 			return "ERROR", fmt.Errorf("video upload failed: %v", err)
 		}
 		msgProto = getVideoProto(m)
-		msgInfo = getMessageInfo(msgProto)
-		ch, err = wac.sendProto(msgProto)
 	case DocumentMessage:
+		var err error
 		m.url, m.mediaKey, m.fileEncSha256, m.fileSha256, m.fileLength, err = wac.Upload(m.Content, MediaDocument)
 		if err != nil {
 			return "ERROR", fmt.Errorf("document upload failed: %v", err)
 		}
 		msgProto = getDocumentProto(m)
-		msgInfo = getMessageInfo(msgProto)
-		ch, err = wac.sendProto(msgProto)
 	case AudioMessage:
+		var err error
 		m.url, m.mediaKey, m.fileEncSha256, m.fileSha256, m.fileLength, err = wac.Upload(m.Content, MediaAudio)
 		if err != nil {
 			return "ERROR", fmt.Errorf("audio upload failed: %v", err)
 		}
 		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)
+	case ContactMessage:
+		msgProto = getContactMessageProto(m)
 	default:
 		return "ERROR", fmt.Errorf("cannot match type %T, use message types declared in the package", msg)
 	}
 
+	ch, err := wac.sendProto(msgProto)
 	if err != nil {
 		return "ERROR", fmt.Errorf("could not send proto: %v", err)
 	}
@@ -95,7 +84,7 @@ func (wac *Conn) Send(msg interface{}) (string, error) {
 			return "ERROR", fmt.Errorf("message sending responded with %d", resp["status"])
 		}
 		if int(resp["status"].(float64)) == 200 {
-			return msgInfo.Id, nil
+			return getMessageInfo(msgProto).Id, nil
 		}
 	case <-time.After(wac.msgTimeout):
 		return "ERROR", fmt.Errorf("sending message timed out")
@@ -124,15 +113,13 @@ func init() {
 MessageInfo contains general message information. It is part of every of every message type.
 */
 type MessageInfo struct {
-	Id              string
-	RemoteJid       string
-	SenderJid       string
-	FromMe          bool
-	Timestamp       uint64
-	PushName        string
-	Status          MessageStatus
-	QuotedMessageID string
-	QuotedMessage   proto.Message
+	Id        string
+	RemoteJid string
+	SenderJid string
+	FromMe    bool
+	Timestamp uint64
+	PushName  string
+	Status    MessageStatus
 
 	Source *proto.WebMessageInfo
 }
@@ -185,14 +172,35 @@ func getInfoProto(info *MessageInfo) *proto.WebMessageInfo {
 	}
 }
 
-func getContextInfoProto(info *MessageInfo) *proto.ContextInfo {
-	if len(info.QuotedMessageID) > 0 {
+/*
+ContextInfo represents contextinfo of every message
+*/
+type ContextInfo struct {
+	QuotedMessageID string //StanzaId
+	QuotedMessage   *proto.Message
+	Participant     string
+	IsForwarded     bool
+}
+
+func getMessageContext(msg *proto.ContextInfo) ContextInfo {
+
+	return ContextInfo{
+		QuotedMessageID: msg.GetStanzaId(), //StanzaId
+		QuotedMessage:   msg.GetQuotedMessage(),
+		Participant:     msg.GetParticipant(),
+		IsForwarded:     msg.GetIsForwarded(),
+	}
+}
+
+func getContextInfoProto(context *ContextInfo) *proto.ContextInfo {
+	if len(context.QuotedMessageID) > 0 {
 		contextInfo := &proto.ContextInfo{
-			StanzaId: &info.QuotedMessageID,
+			StanzaId: &context.QuotedMessageID,
 		}
 
-		if &info.QuotedMessage != nil {
-			contextInfo.QuotedMessage = &info.QuotedMessage
+		if &context.QuotedMessage != nil {
+			contextInfo.QuotedMessage = context.QuotedMessage
+			contextInfo.Participant = &context.Participant
 		}
 
 		return contextInfo
@@ -205,24 +213,28 @@ func getContextInfoProto(info *MessageInfo) *proto.ContextInfo {
 TextMessage represents a text message.
 */
 type TextMessage struct {
-	Info MessageInfo
-	Text string
+	Info        MessageInfo
+	Text        string
+	ContextInfo ContextInfo
 }
 
 func getTextMessage(msg *proto.WebMessageInfo) TextMessage {
 	text := TextMessage{Info: getMessageInfo(msg)}
 	if m := msg.GetMessage().GetExtendedTextMessage(); m != nil {
 		text.Text = m.GetText()
-		text.Info.QuotedMessageID = m.GetContextInfo().GetStanzaId()
+
+		text.ContextInfo = getMessageContext(m.GetContextInfo())
 	} else {
 		text.Text = msg.GetMessage().GetConversation()
+
 	}
+
 	return text
 }
 
 func getTextProto(msg TextMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 
 	if contextInfo == nil {
 		p.Message = &proto.Message{
@@ -255,6 +267,7 @@ type ImageMessage struct {
 	fileEncSha256 []byte
 	fileSha256    []byte
 	fileLength    uint64
+	ContextInfo   ContextInfo
 }
 
 func getImageMessage(msg *proto.WebMessageInfo) ImageMessage {
@@ -270,10 +283,7 @@ func getImageMessage(msg *proto.WebMessageInfo) ImageMessage {
 		fileEncSha256: image.GetFileEncSha256(),
 		fileSha256:    image.GetFileSha256(),
 		fileLength:    image.GetFileLength(),
-	}
-
-	if contextInfo := image.GetContextInfo(); contextInfo != nil {
-		imageMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+		ContextInfo:   getMessageContext(image.GetContextInfo()),
 	}
 
 	return imageMessage
@@ -281,7 +291,7 @@ func getImageMessage(msg *proto.WebMessageInfo) ImageMessage {
 
 func getImageProto(msg ImageMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 
 	p.Message = &proto.Message{
 		ImageMessage: &proto.ImageMessage{
@@ -323,6 +333,7 @@ type VideoMessage struct {
 	fileEncSha256 []byte
 	fileSha256    []byte
 	fileLength    uint64
+	ContextInfo   ContextInfo
 }
 
 func getVideoMessage(msg *proto.WebMessageInfo) VideoMessage {
@@ -340,10 +351,7 @@ func getVideoMessage(msg *proto.WebMessageInfo) VideoMessage {
 		fileEncSha256: vid.GetFileEncSha256(),
 		fileSha256:    vid.GetFileSha256(),
 		fileLength:    vid.GetFileLength(),
-	}
-
-	if contextInfo := vid.GetContextInfo(); contextInfo != nil {
-		videoMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+		ContextInfo:   getMessageContext(vid.GetContextInfo()),
 	}
 
 	return videoMessage
@@ -351,7 +359,7 @@ func getVideoMessage(msg *proto.WebMessageInfo) VideoMessage {
 
 func getVideoProto(msg VideoMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 
 	p.Message = &proto.Message{
 		VideoMessage: &proto.VideoMessage{
@@ -393,6 +401,7 @@ type AudioMessage struct {
 	fileEncSha256 []byte
 	fileSha256    []byte
 	fileLength    uint64
+	ContextInfo   ContextInfo
 }
 
 func getAudioMessage(msg *proto.WebMessageInfo) AudioMessage {
@@ -407,10 +416,7 @@ func getAudioMessage(msg *proto.WebMessageInfo) AudioMessage {
 		fileEncSha256: aud.GetFileEncSha256(),
 		fileSha256:    aud.GetFileSha256(),
 		fileLength:    aud.GetFileLength(),
-	}
-
-	if contextInfo := aud.GetContextInfo(); contextInfo != nil {
-		audioMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+		ContextInfo:   getMessageContext(aud.GetContextInfo()),
 	}
 
 	return audioMessage
@@ -418,7 +424,7 @@ func getAudioMessage(msg *proto.WebMessageInfo) AudioMessage {
 
 func getAudioProto(msg AudioMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 	p.Message = &proto.Message{
 		AudioMessage: &proto.AudioMessage{
 			Url:           &msg.url,
@@ -459,6 +465,7 @@ type DocumentMessage struct {
 	fileEncSha256 []byte
 	fileSha256    []byte
 	fileLength    uint64
+	ContextInfo   ContextInfo
 }
 
 func getDocumentMessage(msg *proto.WebMessageInfo) DocumentMessage {
@@ -476,10 +483,7 @@ func getDocumentMessage(msg *proto.WebMessageInfo) DocumentMessage {
 		fileEncSha256: doc.GetFileEncSha256(),
 		fileSha256:    doc.GetFileSha256(),
 		fileLength:    doc.GetFileLength(),
-	}
-
-	if contextInfo := doc.GetContextInfo(); contextInfo != nil {
-		documentMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+		ContextInfo:   getMessageContext(doc.GetContextInfo()),
 	}
 
 	return documentMessage
@@ -487,7 +491,7 @@ func getDocumentMessage(msg *proto.WebMessageInfo) DocumentMessage {
 
 func getDocumentProto(msg DocumentMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 	p.Message = &proto.Message{
 		DocumentMessage: &proto.DocumentMessage{
 			JpegThumbnail: msg.Thumbnail,
@@ -523,6 +527,7 @@ type LocationMessage struct {
 	Address          string
 	Url              string
 	JpegThumbnail    []byte
+	ContextInfo      ContextInfo
 }
 
 func GetLocationMessage(msg *proto.WebMessageInfo) LocationMessage {
@@ -536,10 +541,7 @@ func GetLocationMessage(msg *proto.WebMessageInfo) LocationMessage {
 		Address:          loc.GetAddress(),
 		Url:              loc.GetUrl(),
 		JpegThumbnail:    loc.GetJpegThumbnail(),
-	}
-
-	if contextInfo := loc.GetContextInfo(); contextInfo != nil {
-		locationMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+		ContextInfo:      getMessageContext(loc.GetContextInfo()),
 	}
 
 	return locationMessage
@@ -547,7 +549,7 @@ func GetLocationMessage(msg *proto.WebMessageInfo) LocationMessage {
 
 func GetLocationProto(msg LocationMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 
 	p.Message = &proto.Message{
 		LocationMessage: &proto.LocationMessage{
@@ -576,6 +578,7 @@ type LiveLocationMessage struct {
 	Caption                           string
 	SequenceNumber                    int64
 	JpegThumbnail                     []byte
+	ContextInfo                       ContextInfo
 }
 
 func GetLiveLocationMessage(msg *proto.WebMessageInfo) LiveLocationMessage {
@@ -591,10 +594,7 @@ func GetLiveLocationMessage(msg *proto.WebMessageInfo) LiveLocationMessage {
 		Caption:                           loc.GetCaption(),
 		SequenceNumber:                    loc.GetSequenceNumber(),
 		JpegThumbnail:                     loc.GetJpegThumbnail(),
-	}
-
-	if contextInfo := loc.GetContextInfo(); contextInfo != nil {
-		liveLocationMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+		ContextInfo:                       getMessageContext(loc.GetContextInfo()),
 	}
 
 	return liveLocationMessage
@@ -602,7 +602,7 @@ func GetLiveLocationMessage(msg *proto.WebMessageInfo) LiveLocationMessage {
 
 func GetLiveLocationProto(msg LiveLocationMessage) *proto.WebMessageInfo {
 	p := getInfoProto(&msg.Info)
-	contextInfo := getContextInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
 	p.Message = &proto.Message{
 		LiveLocationMessage: &proto.LiveLocationMessage{
 			DegreesLatitude:                   &msg.DegreesLatitude,
@@ -625,7 +625,6 @@ StickerMessage represents a sticker message.
 type StickerMessage struct {
 	Info MessageInfo
 
-	Thumbnail     []byte
 	Type          string
 	Content       io.Reader
 	url           string
@@ -633,30 +632,79 @@ type StickerMessage struct {
 	fileEncSha256 []byte
 	fileSha256    []byte
 	fileLength    uint64
+
+	ContextInfo ContextInfo
 }
 
 func getStickerMessage(msg *proto.WebMessageInfo) StickerMessage {
 	sticker := msg.GetMessage().GetStickerMessage()
 
-	StickerMessage := StickerMessage{
+	stickerMessage := StickerMessage{
 		Info:          getMessageInfo(msg),
-		Thumbnail:     sticker.GetPngThumbnail(),
 		url:           sticker.GetUrl(),
 		mediaKey:      sticker.GetMediaKey(),
 		Type:          sticker.GetMimetype(),
 		fileEncSha256: sticker.GetFileEncSha256(),
 		fileSha256:    sticker.GetFileSha256(),
 		fileLength:    sticker.GetFileLength(),
+		ContextInfo:   getMessageContext(sticker.GetContextInfo()),
 	}
 
-	if contextInfo := sticker.GetContextInfo(); contextInfo != nil {
-		StickerMessage.Info.QuotedMessageID = contextInfo.GetStanzaId()
+	return stickerMessage
+}
+
+/*
+Download is the function to retrieve Sticker media data. The media gets downloaded, validated and returned.
+*/
+
+func (m *StickerMessage) Download() ([]byte, error) {
+	return Download(m.url, m.mediaKey, MediaImage, int(m.fileLength))
+}
+
+/*
+ContactMessage represents a contact message.
+*/
+type ContactMessage struct {
+	Info MessageInfo
+
+	DisplayName string
+	Vcard       string
+
+	ContextInfo ContextInfo
+}
+
+func getContactMessage(msg *proto.WebMessageInfo) ContactMessage {
+	contact := msg.GetMessage().GetContactMessage()
+
+	contactMessage := ContactMessage{
+		Info: getMessageInfo(msg),
+
+		DisplayName: contact.GetDisplayName(),
+		Vcard:       contact.GetVcard(),
+
+		ContextInfo: getMessageContext(contact.GetContextInfo()),
 	}
 
-	return StickerMessage
+	return contactMessage
+}
+
+func getContactMessageProto(msg ContactMessage) *proto.WebMessageInfo {
+	p := getInfoProto(&msg.Info)
+	contextInfo := getContextInfoProto(&msg.ContextInfo)
+
+	p.Message = &proto.Message{
+		ContactMessage: &proto.ContactMessage{
+			DisplayName: &msg.DisplayName,
+			Vcard:       &msg.Vcard,
+			ContextInfo: contextInfo,
+		},
+	}
+
+	return p
 }
 
 func ParseProtoMessage(msg *proto.WebMessageInfo) interface{} {
+
 	switch {
 
 	case msg.GetMessage().GetAudioMessage() != nil:
@@ -686,8 +734,12 @@ func ParseProtoMessage(msg *proto.WebMessageInfo) interface{} {
 	case msg.GetMessage().GetStickerMessage() != nil:
 		return getStickerMessage(msg)
 
+	case msg.GetMessage().GetContactMessage() != nil:
+		return getContactMessage(msg)
+
 	default:
 		//cannot match message
+
 	}
 
 	return nil

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

@@ -0,0 +1,43 @@
+package whatsapp
+
+import (
+	"fmt"
+	"github.com/Rhymen/go-whatsapp/binary"
+	"strconv"
+	"time"
+)
+
+// Pictures must be JPG 640x640 and 96x96, respectively
+func (wac *Conn) UploadProfilePic(image, preview []byte) (<-chan string, error) {
+	tag := fmt.Sprintf("%d.--%d", time.Now().Unix(), wac.msgCount*19)
+	n := binary.Node{
+		Description: "action",
+		Attributes: map[string]string{
+			"type":  "set",
+			"epoch": strconv.Itoa(wac.msgCount),
+		},
+		Content: []interface{}{
+			binary.Node{
+				Description: "picture",
+				Attributes: map[string]string{
+					"id":   tag,
+					"jid":  wac.Info.Wid,
+					"type": "set",
+				},
+				Content: []binary.Node{
+					{
+						Description: "image",
+						Attributes:  nil,
+						Content:     image,
+					},
+					{
+						Description: "preview",
+						Attributes:  nil,
+						Content:     preview,
+					},
+				},
+			},
+		},
+	}
+	return wac.writeBinary(n, profile, 136, tag)
+}

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

@@ -5,16 +5,22 @@ import (
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
+	"strconv"
+
+	"time"
+
 	"github.com/Rhymen/go-whatsapp/binary"
 	"github.com/Rhymen/go-whatsapp/crypto/cbc"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
-	"strconv"
-	"time"
 )
 
 //writeJson enqueues a json message into the writeChan
 func (wac *Conn) writeJson(data []interface{}) (<-chan string, error) {
+
+	wac.writerLock.Lock()
+	defer wac.writerLock.Unlock()
+
 	d, err := json.Marshal(data)
 	if err != nil {
 		return nil, err
@@ -38,6 +44,9 @@ func (wac *Conn) writeBinary(node binary.Node, metric metric, flag flag, message
 		return nil, ErrMissingMessageTag
 	}
 
+	wac.writerLock.Lock()
+	defer wac.writerLock.Unlock()
+
 	data, err := wac.encryptBinaryMessage(node)
 	if err != nil {
 		return nil, errors.Wrap(err, "encryptBinaryMessage(node) failed")

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

@@ -21,7 +21,7 @@ import (
 )
 
 // VERSION of DiscordGo, follows Semantic Versioning. (http://semver.org/)
-const VERSION = "0.20.1"
+const VERSION = "0.20.2"
 
 // ErrMFA will be risen by New when the user has 2FA.
 var ErrMFA = errors.New("account has 2FA enabled")

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

@@ -88,7 +88,12 @@ func (s *Session) RequestWithLockedBucket(method, urlStr, contentType string, b
 		req.Header.Set("authorization", s.Token)
 	}
 
-	req.Header.Set("Content-Type", contentType)
+	// Discord's API returns a 400 Bad Request is Content-Type is set, but the
+	// request body is empty.
+	if b != nil {
+		req.Header.Set("Content-Type", contentType)
+	}
+
 	// TODO: Make a configurable static variable.
 	req.Header.Set("User-Agent", s.UserAgent)
 

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

@@ -1,17 +0,0 @@
-language: go
-
-go:
-  - "1.12"
-
-install:
-  - env GO111MODULE=on go get -u golang.org/x/lint/golint
-
-script:
-  - env GO111MODULE=on make test
-
-deploy:
-  - provider: script
-    skip_cleanup: true
-    script: curl -sL https://git.io/goreleaser | bash
-    on:
-      tags: true

vendor/github.com/d5/tengo/compiler/ast/array_lit.go

@@ -1,35 +0,0 @@
-package ast
-
-import (
-	"strings"
-
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ArrayLit represents an array literal.
-type ArrayLit struct {
-	Elements []Expr
-	LBrack   source.Pos
-	RBrack   source.Pos
-}
-
-func (e *ArrayLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *ArrayLit) Pos() source.Pos {
-	return e.LBrack
-}
-
-// End returns the position of first character immediately after the node.
-func (e *ArrayLit) End() source.Pos {
-	return e.RBrack + 1
-}
-
-func (e *ArrayLit) String() string {
-	var elements []string
-	for _, m := range e.Elements {
-		elements = append(elements, m.String())
-	}
-
-	return "[" + strings.Join(elements, ", ") + "]"
-}

vendor/github.com/d5/tengo/compiler/ast/assign_stmt.go

@@ -1,40 +0,0 @@
-package ast
-
-import (
-	"strings"
-
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-)
-
-// AssignStmt represents an assignment statement.
-type AssignStmt struct {
-	LHS      []Expr
-	RHS      []Expr
-	Token    token.Token
-	TokenPos source.Pos
-}
-
-func (s *AssignStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *AssignStmt) Pos() source.Pos {
-	return s.LHS[0].Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (s *AssignStmt) End() source.Pos {
-	return s.RHS[len(s.RHS)-1].End()
-}
-
-func (s *AssignStmt) String() string {
-	var lhs, rhs []string
-	for _, e := range s.LHS {
-		lhs = append(lhs, e.String())
-	}
-	for _, e := range s.RHS {
-		rhs = append(rhs, e.String())
-	}
-
-	return strings.Join(lhs, ", ") + " " + s.Token.String() + " " + strings.Join(rhs, ", ")
-}

vendor/github.com/d5/tengo/compiler/ast/ast.go

@@ -1,5 +0,0 @@
-package ast
-
-const (
-	nullRep = "<null>"
-)

vendor/github.com/d5/tengo/compiler/ast/bad_expr.go

@@ -1,25 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// BadExpr represents a bad expression.
-type BadExpr struct {
-	From source.Pos
-	To   source.Pos
-}
-
-func (e *BadExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *BadExpr) Pos() source.Pos {
-	return e.From
-}
-
-// End returns the position of first character immediately after the node.
-func (e *BadExpr) End() source.Pos {
-	return e.To
-}
-
-func (e *BadExpr) String() string {
-	return "<bad expression>"
-}

vendor/github.com/d5/tengo/compiler/ast/bad_stmt.go

@@ -1,25 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// BadStmt represents a bad statement.
-type BadStmt struct {
-	From source.Pos
-	To   source.Pos
-}
-
-func (s *BadStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *BadStmt) Pos() source.Pos {
-	return s.From
-}
-
-// End returns the position of first character immediately after the node.
-func (s *BadStmt) End() source.Pos {
-	return s.To
-}
-
-func (s *BadStmt) String() string {
-	return "<bad statement>"
-}

vendor/github.com/d5/tengo/compiler/ast/binary_expr.go

@@ -1,30 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-)
-
-// BinaryExpr represents a binary operator expression.
-type BinaryExpr struct {
-	LHS      Expr
-	RHS      Expr
-	Token    token.Token
-	TokenPos source.Pos
-}
-
-func (e *BinaryExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *BinaryExpr) Pos() source.Pos {
-	return e.LHS.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *BinaryExpr) End() source.Pos {
-	return e.RHS.End()
-}
-
-func (e *BinaryExpr) String() string {
-	return "(" + e.LHS.String() + " " + e.Token.String() + " " + e.RHS.String() + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/block_stmt.go

@@ -1,35 +0,0 @@
-package ast
-
-import (
-	"strings"
-
-	"github.com/d5/tengo/compiler/source"
-)
-
-// BlockStmt represents a block statement.
-type BlockStmt struct {
-	Stmts  []Stmt
-	LBrace source.Pos
-	RBrace source.Pos
-}
-
-func (s *BlockStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *BlockStmt) Pos() source.Pos {
-	return s.LBrace
-}
-
-// End returns the position of first character immediately after the node.
-func (s *BlockStmt) End() source.Pos {
-	return s.RBrace + 1
-}
-
-func (s *BlockStmt) String() string {
-	var list []string
-	for _, e := range s.Stmts {
-		list = append(list, e.String())
-	}
-
-	return "{" + strings.Join(list, "; ") + "}"
-}

vendor/github.com/d5/tengo/compiler/ast/bool_lit.go

@@ -1,26 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// BoolLit represents a boolean literal.
-type BoolLit struct {
-	Value    bool
-	ValuePos source.Pos
-	Literal  string
-}
-
-func (e *BoolLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *BoolLit) Pos() source.Pos {
-	return e.ValuePos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *BoolLit) End() source.Pos {
-	return source.Pos(int(e.ValuePos) + len(e.Literal))
-}
-
-func (e *BoolLit) String() string {
-	return e.Literal
-}

vendor/github.com/d5/tengo/compiler/ast/branch_stmt.go

@@ -1,38 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-)
-
-// BranchStmt represents a branch statement.
-type BranchStmt struct {
-	Token    token.Token
-	TokenPos source.Pos
-	Label    *Ident
-}
-
-func (s *BranchStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *BranchStmt) Pos() source.Pos {
-	return s.TokenPos
-}
-
-// End returns the position of first character immediately after the node.
-func (s *BranchStmt) End() source.Pos {
-	if s.Label != nil {
-		return s.Label.End()
-	}
-
-	return source.Pos(int(s.TokenPos) + len(s.Token.String()))
-}
-
-func (s *BranchStmt) String() string {
-	var label string
-	if s.Label != nil {
-		label = " " + s.Label.Name
-	}
-
-	return s.Token.String() + label
-}

vendor/github.com/d5/tengo/compiler/ast/call_expr.go

@@ -1,36 +0,0 @@
-package ast
-
-import (
-	"strings"
-
-	"github.com/d5/tengo/compiler/source"
-)
-
-// CallExpr represents a function call expression.
-type CallExpr struct {
-	Func   Expr
-	LParen source.Pos
-	Args   []Expr
-	RParen source.Pos
-}
-
-func (e *CallExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *CallExpr) Pos() source.Pos {
-	return e.Func.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *CallExpr) End() source.Pos {
-	return e.RParen + 1
-}
-
-func (e *CallExpr) String() string {
-	var args []string
-	for _, e := range e.Args {
-		args = append(args, e.String())
-	}
-
-	return e.Func.String() + "(" + strings.Join(args, ", ") + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/char_lit.go

@@ -1,26 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// CharLit represents a character literal.
-type CharLit struct {
-	Value    rune
-	ValuePos source.Pos
-	Literal  string
-}
-
-func (e *CharLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *CharLit) Pos() source.Pos {
-	return e.ValuePos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *CharLit) End() source.Pos {
-	return source.Pos(int(e.ValuePos) + len(e.Literal))
-}
-
-func (e *CharLit) String() string {
-	return e.Literal
-}

vendor/github.com/d5/tengo/compiler/ast/cond_expr.go

@@ -1,30 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-)
-
-// CondExpr represents a ternary conditional expression.
-type CondExpr struct {
-	Cond        Expr
-	True        Expr
-	False       Expr
-	QuestionPos source.Pos
-	ColonPos    source.Pos
-}
-
-func (e *CondExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *CondExpr) Pos() source.Pos {
-	return e.Cond.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *CondExpr) End() source.Pos {
-	return e.False.End()
-}
-
-func (e *CondExpr) String() string {
-	return "(" + e.Cond.String() + " ? " + e.True.String() + " : " + e.False.String() + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/empty_stmt.go

@@ -1,29 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// EmptyStmt represents an empty statement.
-type EmptyStmt struct {
-	Semicolon source.Pos
-	Implicit  bool
-}
-
-func (s *EmptyStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *EmptyStmt) Pos() source.Pos {
-	return s.Semicolon
-}
-
-// End returns the position of first character immediately after the node.
-func (s *EmptyStmt) End() source.Pos {
-	if s.Implicit {
-		return s.Semicolon
-	}
-
-	return s.Semicolon + 1
-}
-
-func (s *EmptyStmt) String() string {
-	return ";"
-}

vendor/github.com/d5/tengo/compiler/ast/error_expr.go

@@ -1,29 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ErrorExpr represents an error expression
-type ErrorExpr struct {
-	Expr     Expr
-	ErrorPos source.Pos
-	LParen   source.Pos
-	RParen   source.Pos
-}
-
-func (e *ErrorExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *ErrorExpr) Pos() source.Pos {
-	return e.ErrorPos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *ErrorExpr) End() source.Pos {
-	return e.RParen
-}
-
-func (e *ErrorExpr) String() string {
-	return "error(" + e.Expr.String() + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/export_stmt.go

@@ -1,27 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ExportStmt represents an export statement.
-type ExportStmt struct {
-	ExportPos source.Pos
-	Result    Expr
-}
-
-func (s *ExportStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *ExportStmt) Pos() source.Pos {
-	return s.ExportPos
-}
-
-// End returns the position of first character immediately after the node.
-func (s *ExportStmt) End() source.Pos {
-	return s.Result.End()
-}
-
-func (s *ExportStmt) String() string {
-	return "export " + s.Result.String()
-}

vendor/github.com/d5/tengo/compiler/ast/expr.go

@@ -1,7 +0,0 @@
-package ast
-
-// Expr represents an expression node in the AST.
-type Expr interface {
-	Node
-	exprNode()
-}

vendor/github.com/d5/tengo/compiler/ast/expr_stmt.go

@@ -1,24 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// ExprStmt represents an expression statement.
-type ExprStmt struct {
-	Expr Expr
-}
-
-func (s *ExprStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *ExprStmt) Pos() source.Pos {
-	return s.Expr.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (s *ExprStmt) End() source.Pos {
-	return s.Expr.End()
-}
-
-func (s *ExprStmt) String() string {
-	return s.Expr.String()
-}

vendor/github.com/d5/tengo/compiler/ast/float_lit.go

@@ -1,26 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// FloatLit represents a floating point literal.
-type FloatLit struct {
-	Value    float64
-	ValuePos source.Pos
-	Literal  string
-}
-
-func (e *FloatLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *FloatLit) Pos() source.Pos {
-	return e.ValuePos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *FloatLit) End() source.Pos {
-	return source.Pos(int(e.ValuePos) + len(e.Literal))
-}
-
-func (e *FloatLit) String() string {
-	return e.Literal
-}

vendor/github.com/d5/tengo/compiler/ast/for_in_stmt.go

@@ -1,32 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// ForInStmt represents a for-in statement.
-type ForInStmt struct {
-	ForPos   source.Pos
-	Key      *Ident
-	Value    *Ident
-	Iterable Expr
-	Body     *BlockStmt
-}
-
-func (s *ForInStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *ForInStmt) Pos() source.Pos {
-	return s.ForPos
-}
-
-// End returns the position of first character immediately after the node.
-func (s *ForInStmt) End() source.Pos {
-	return s.Body.End()
-}
-
-func (s *ForInStmt) String() string {
-	if s.Value != nil {
-		return "for " + s.Key.String() + ", " + s.Value.String() + " in " + s.Iterable.String() + " " + s.Body.String()
-	}
-
-	return "for " + s.Key.String() + " in " + s.Iterable.String() + " " + s.Body.String()
-}

vendor/github.com/d5/tengo/compiler/ast/for_stmt.go

@@ -1,43 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// ForStmt represents a for statement.
-type ForStmt struct {
-	ForPos source.Pos
-	Init   Stmt
-	Cond   Expr
-	Post   Stmt
-	Body   *BlockStmt
-}
-
-func (s *ForStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *ForStmt) Pos() source.Pos {
-	return s.ForPos
-}
-
-// End returns the position of first character immediately after the node.
-func (s *ForStmt) End() source.Pos {
-	return s.Body.End()
-}
-
-func (s *ForStmt) String() string {
-	var init, cond, post string
-	if s.Init != nil {
-		init = s.Init.String()
-	}
-	if s.Cond != nil {
-		cond = s.Cond.String() + " "
-	}
-	if s.Post != nil {
-		post = s.Post.String()
-	}
-
-	if init != "" || post != "" {
-		return "for " + init + " ; " + cond + " ; " + post + s.Body.String()
-	}
-
-	return "for " + cond + s.Body.String()
-}

vendor/github.com/d5/tengo/compiler/ast/func_lit.go

@@ -1,25 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// FuncLit represents a function literal.
-type FuncLit struct {
-	Type *FuncType
-	Body *BlockStmt
-}
-
-func (e *FuncLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *FuncLit) Pos() source.Pos {
-	return e.Type.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *FuncLit) End() source.Pos {
-	return e.Body.End()
-}
-
-func (e *FuncLit) String() string {
-	return "func" + e.Type.Params.String() + " " + e.Body.String()
-}

vendor/github.com/d5/tengo/compiler/ast/func_type.go

@@ -1,25 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// FuncType represents a function type definition.
-type FuncType struct {
-	FuncPos source.Pos
-	Params  *IdentList
-}
-
-func (e *FuncType) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *FuncType) Pos() source.Pos {
-	return e.FuncPos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *FuncType) End() source.Pos {
-	return e.Params.End()
-}
-
-func (e *FuncType) String() string {
-	return "func" + e.Params.String()
-}

vendor/github.com/d5/tengo/compiler/ast/ident.go

@@ -1,29 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// Ident represents an identifier.
-type Ident struct {
-	Name    string
-	NamePos source.Pos
-}
-
-func (e *Ident) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *Ident) Pos() source.Pos {
-	return e.NamePos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *Ident) End() source.Pos {
-	return source.Pos(int(e.NamePos) + len(e.Name))
-}
-
-func (e *Ident) String() string {
-	if e != nil {
-		return e.Name
-	}
-
-	return nullRep
-}

vendor/github.com/d5/tengo/compiler/ast/if_stmt.go

@@ -1,40 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// IfStmt represents an if statement.
-type IfStmt struct {
-	IfPos source.Pos
-	Init  Stmt
-	Cond  Expr
-	Body  *BlockStmt
-	Else  Stmt // else branch; or nil
-}
-
-func (s *IfStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *IfStmt) Pos() source.Pos {
-	return s.IfPos
-}
-
-// End returns the position of first character immediately after the node.
-func (s *IfStmt) End() source.Pos {
-	if s.Else != nil {
-		return s.Else.End()
-	}
-
-	return s.Body.End()
-}
-
-func (s *IfStmt) String() string {
-	var initStmt, elseStmt string
-	if s.Init != nil {
-		initStmt = s.Init.String() + "; "
-	}
-	if s.Else != nil {
-		elseStmt = " else " + s.Else.String()
-	}
-
-	return "if " + initStmt + s.Cond.String() + " " + s.Body.String() + elseStmt
-}

vendor/github.com/d5/tengo/compiler/ast/immutable_expr.go

@@ -1,29 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ImmutableExpr represents an immutable expression
-type ImmutableExpr struct {
-	Expr     Expr
-	ErrorPos source.Pos
-	LParen   source.Pos
-	RParen   source.Pos
-}
-
-func (e *ImmutableExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *ImmutableExpr) Pos() source.Pos {
-	return e.ErrorPos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *ImmutableExpr) End() source.Pos {
-	return e.RParen
-}
-
-func (e *ImmutableExpr) String() string {
-	return "immutable(" + e.Expr.String() + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/import_expr.go

@@ -1,29 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-)
-
-// ImportExpr represents an import expression
-type ImportExpr struct {
-	ModuleName string
-	Token      token.Token
-	TokenPos   source.Pos
-}
-
-func (e *ImportExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *ImportExpr) Pos() source.Pos {
-	return e.TokenPos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *ImportExpr) End() source.Pos {
-	return source.Pos(int(e.TokenPos) + 10 + len(e.ModuleName)) // import("moduleName")
-}
-
-func (e *ImportExpr) String() string {
-	return `import("` + e.ModuleName + `")"`
-}

vendor/github.com/d5/tengo/compiler/ast/inc_dec_stmt.go

@@ -1,29 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-)
-
-// IncDecStmt represents increment or decrement statement.
-type IncDecStmt struct {
-	Expr     Expr
-	Token    token.Token
-	TokenPos source.Pos
-}
-
-func (s *IncDecStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *IncDecStmt) Pos() source.Pos {
-	return s.Expr.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (s *IncDecStmt) End() source.Pos {
-	return source.Pos(int(s.TokenPos) + 2)
-}
-
-func (s *IncDecStmt) String() string {
-	return s.Expr.String() + s.Token.String()
-}

vendor/github.com/d5/tengo/compiler/ast/index_expr.go

@@ -1,32 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// IndexExpr represents an index expression.
-type IndexExpr struct {
-	Expr   Expr
-	LBrack source.Pos
-	Index  Expr
-	RBrack source.Pos
-}
-
-func (e *IndexExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *IndexExpr) Pos() source.Pos {
-	return e.Expr.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *IndexExpr) End() source.Pos {
-	return e.RBrack + 1
-}
-
-func (e *IndexExpr) String() string {
-	var index string
-	if e.Index != nil {
-		index = e.Index.String()
-	}
-
-	return e.Expr.String() + "[" + index + "]"
-}

vendor/github.com/d5/tengo/compiler/ast/int_lit.go

@@ -1,26 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// IntLit represents an integer literal.
-type IntLit struct {
-	Value    int64
-	ValuePos source.Pos
-	Literal  string
-}
-
-func (e *IntLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *IntLit) Pos() source.Pos {
-	return e.ValuePos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *IntLit) End() source.Pos {
-	return source.Pos(int(e.ValuePos) + len(e.Literal))
-}
-
-func (e *IntLit) String() string {
-	return e.Literal
-}

vendor/github.com/d5/tengo/compiler/ast/map_element_lit.go

@@ -1,27 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// MapElementLit represents a map element.
-type MapElementLit struct {
-	Key      string
-	KeyPos   source.Pos
-	ColonPos source.Pos
-	Value    Expr
-}
-
-func (e *MapElementLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *MapElementLit) Pos() source.Pos {
-	return e.KeyPos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *MapElementLit) End() source.Pos {
-	return e.Value.End()
-}
-
-func (e *MapElementLit) String() string {
-	return e.Key + ": " + e.Value.String()
-}

vendor/github.com/d5/tengo/compiler/ast/map_lit.go

@@ -1,35 +0,0 @@
-package ast
-
-import (
-	"strings"
-
-	"github.com/d5/tengo/compiler/source"
-)
-
-// MapLit represents a map literal.
-type MapLit struct {
-	LBrace   source.Pos
-	Elements []*MapElementLit
-	RBrace   source.Pos
-}
-
-func (e *MapLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *MapLit) Pos() source.Pos {
-	return e.LBrace
-}
-
-// End returns the position of first character immediately after the node.
-func (e *MapLit) End() source.Pos {
-	return e.RBrace + 1
-}
-
-func (e *MapLit) String() string {
-	var elements []string
-	for _, m := range e.Elements {
-		elements = append(elements, m.String())
-	}
-
-	return "{" + strings.Join(elements, ", ") + "}"
-}

vendor/github.com/d5/tengo/compiler/ast/node.go

@@ -1,13 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// Node represents a node in the AST.
-type Node interface {
-	// Pos returns the position of first character belonging to the node.
-	Pos() source.Pos
-	// End returns the position of first character immediately after the node.
-	End() source.Pos
-	// String returns a string representation of the node.
-	String() string
-}

vendor/github.com/d5/tengo/compiler/ast/paren_expr.go

@@ -1,26 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// ParenExpr represents a parenthesis wrapped expression.
-type ParenExpr struct {
-	Expr   Expr
-	LParen source.Pos
-	RParen source.Pos
-}
-
-func (e *ParenExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *ParenExpr) Pos() source.Pos {
-	return e.LParen
-}
-
-// End returns the position of first character immediately after the node.
-func (e *ParenExpr) End() source.Pos {
-	return e.RParen + 1
-}
-
-func (e *ParenExpr) String() string {
-	return "(" + e.Expr.String() + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/return_stmt.go

@@ -1,35 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ReturnStmt represents a return statement.
-type ReturnStmt struct {
-	ReturnPos source.Pos
-	Result    Expr
-}
-
-func (s *ReturnStmt) stmtNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (s *ReturnStmt) Pos() source.Pos {
-	return s.ReturnPos
-}
-
-// End returns the position of first character immediately after the node.
-func (s *ReturnStmt) End() source.Pos {
-	if s.Result != nil {
-		return s.Result.End()
-	}
-
-	return s.ReturnPos + 6
-}
-
-func (s *ReturnStmt) String() string {
-	if s.Result != nil {
-		return "return " + s.Result.String()
-	}
-
-	return "return"
-}

vendor/github.com/d5/tengo/compiler/ast/selector_expr.go

@@ -1,25 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// SelectorExpr represents a selector expression.
-type SelectorExpr struct {
-	Expr Expr
-	Sel  Expr
-}
-
-func (e *SelectorExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *SelectorExpr) Pos() source.Pos {
-	return e.Expr.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *SelectorExpr) End() source.Pos {
-	return e.Sel.End()
-}
-
-func (e *SelectorExpr) String() string {
-	return e.Expr.String() + "." + e.Sel.String()
-}

vendor/github.com/d5/tengo/compiler/ast/slice_expr.go

@@ -1,36 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// SliceExpr represents a slice expression.
-type SliceExpr struct {
-	Expr   Expr
-	LBrack source.Pos
-	Low    Expr
-	High   Expr
-	RBrack source.Pos
-}
-
-func (e *SliceExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *SliceExpr) Pos() source.Pos {
-	return e.Expr.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *SliceExpr) End() source.Pos {
-	return e.RBrack + 1
-}
-
-func (e *SliceExpr) String() string {
-	var low, high string
-	if e.Low != nil {
-		low = e.Low.String()
-	}
-	if e.High != nil {
-		high = e.High.String()
-	}
-
-	return e.Expr.String() + "[" + low + ":" + high + "]"
-}

vendor/github.com/d5/tengo/compiler/ast/stmt.go

@@ -1,7 +0,0 @@
-package ast
-
-// Stmt represents a statement in the AST.
-type Stmt interface {
-	Node
-	stmtNode()
-}

vendor/github.com/d5/tengo/compiler/ast/string_lit.go

@@ -1,26 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// StringLit represents a string literal.
-type StringLit struct {
-	Value    string
-	ValuePos source.Pos
-	Literal  string
-}
-
-func (e *StringLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *StringLit) Pos() source.Pos {
-	return e.ValuePos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *StringLit) End() source.Pos {
-	return source.Pos(int(e.ValuePos) + len(e.Literal))
-}
-
-func (e *StringLit) String() string {
-	return e.Literal
-}

vendor/github.com/d5/tengo/compiler/ast/unary_expr.go

@@ -1,29 +0,0 @@
-package ast
-
-import (
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-)
-
-// UnaryExpr represents an unary operator expression.
-type UnaryExpr struct {
-	Expr     Expr
-	Token    token.Token
-	TokenPos source.Pos
-}
-
-func (e *UnaryExpr) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *UnaryExpr) Pos() source.Pos {
-	return e.Expr.Pos()
-}
-
-// End returns the position of first character immediately after the node.
-func (e *UnaryExpr) End() source.Pos {
-	return e.Expr.End()
-}
-
-func (e *UnaryExpr) String() string {
-	return "(" + e.Token.String() + e.Expr.String() + ")"
-}

vendor/github.com/d5/tengo/compiler/ast/undefined_lit.go

@@ -1,24 +0,0 @@
-package ast
-
-import "github.com/d5/tengo/compiler/source"
-
-// UndefinedLit represents an undefined literal.
-type UndefinedLit struct {
-	TokenPos source.Pos
-}
-
-func (e *UndefinedLit) exprNode() {}
-
-// Pos returns the position of first character belonging to the node.
-func (e *UndefinedLit) Pos() source.Pos {
-	return e.TokenPos
-}
-
-// End returns the position of first character immediately after the node.
-func (e *UndefinedLit) End() source.Pos {
-	return e.TokenPos + 9 // len(undefined) == 9
-}
-
-func (e *UndefinedLit) String() string {
-	return "undefined"
-}

vendor/github.com/d5/tengo/compiler/bytecode.go

@@ -1,90 +0,0 @@
-package compiler
-
-import (
-	"encoding/gob"
-	"fmt"
-	"io"
-	"reflect"
-
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/objects"
-)
-
-// Bytecode is a compiled instructions and constants.
-type Bytecode struct {
-	FileSet      *source.FileSet
-	MainFunction *objects.CompiledFunction
-	Constants    []objects.Object
-}
-
-// Encode writes Bytecode data to the writer.
-func (b *Bytecode) Encode(w io.Writer) error {
-	enc := gob.NewEncoder(w)
-
-	if err := enc.Encode(b.FileSet); err != nil {
-		return err
-	}
-
-	if err := enc.Encode(b.MainFunction); err != nil {
-		return err
-	}
-
-	// constants
-	return enc.Encode(b.Constants)
-}
-
-// CountObjects returns the number of objects found in Constants.
-func (b *Bytecode) CountObjects() int {
-	n := 0
-
-	for _, c := range b.Constants {
-		n += objects.CountObjects(c)
-	}
-
-	return n
-}
-
-// FormatInstructions returns human readable string representations of
-// compiled instructions.
-func (b *Bytecode) FormatInstructions() []string {
-	return FormatInstructions(b.MainFunction.Instructions, 0)
-}
-
-// FormatConstants returns human readable string representations of
-// compiled constants.
-func (b *Bytecode) FormatConstants() (output []string) {
-	for cidx, cn := range b.Constants {
-		switch cn := cn.(type) {
-		case *objects.CompiledFunction:
-			output = append(output, fmt.Sprintf("[% 3d] (Compiled Function|%p)", cidx, &cn))
-			for _, l := range FormatInstructions(cn.Instructions, 0) {
-				output = append(output, fmt.Sprintf("     %s", l))
-			}
-		default:
-			output = append(output, fmt.Sprintf("[% 3d] %s (%s|%p)", cidx, cn, reflect.TypeOf(cn).Elem().Name(), &cn))
-		}
-	}
-
-	return
-}
-
-func init() {
-	gob.Register(&source.FileSet{})
-	gob.Register(&source.File{})
-	gob.Register(&objects.Array{})
-	gob.Register(&objects.Bool{})
-	gob.Register(&objects.Bytes{})
-	gob.Register(&objects.Char{})
-	gob.Register(&objects.Closure{})
-	gob.Register(&objects.CompiledFunction{})
-	gob.Register(&objects.Error{})
-	gob.Register(&objects.Float{})
-	gob.Register(&objects.ImmutableArray{})
-	gob.Register(&objects.ImmutableMap{})
-	gob.Register(&objects.Int{})
-	gob.Register(&objects.Map{})
-	gob.Register(&objects.String{})
-	gob.Register(&objects.Time{})
-	gob.Register(&objects.Undefined{})
-	gob.Register(&objects.UserFunction{})
-}

vendor/github.com/d5/tengo/compiler/bytecode_decode.go

@@ -1,97 +0,0 @@
-package compiler
-
-import (
-	"encoding/gob"
-	"fmt"
-	"io"
-
-	"github.com/d5/tengo/objects"
-)
-
-// Decode reads Bytecode data from the reader.
-func (b *Bytecode) Decode(r io.Reader, modules *objects.ModuleMap) error {
-	if modules == nil {
-		modules = objects.NewModuleMap()
-	}
-
-	dec := gob.NewDecoder(r)
-
-	if err := dec.Decode(&b.FileSet); err != nil {
-		return err
-	}
-	// TODO: files in b.FileSet.File does not have their 'set' field properly set to b.FileSet
-	// as it's private field and not serialized by gob encoder/decoder.
-
-	if err := dec.Decode(&b.MainFunction); err != nil {
-		return err
-	}
-
-	if err := dec.Decode(&b.Constants); err != nil {
-		return err
-	}
-	for i, v := range b.Constants {
-		fv, err := fixDecoded(v, modules)
-		if err != nil {
-			return err
-		}
-		b.Constants[i] = fv
-	}
-
-	return nil
-}
-
-func fixDecoded(o objects.Object, modules *objects.ModuleMap) (objects.Object, error) {
-	switch o := o.(type) {
-	case *objects.Bool:
-		if o.IsFalsy() {
-			return objects.FalseValue, nil
-		}
-		return objects.TrueValue, nil
-	case *objects.Undefined:
-		return objects.UndefinedValue, nil
-	case *objects.Array:
-		for i, v := range o.Value {
-			fv, err := fixDecoded(v, modules)
-			if err != nil {
-				return nil, err
-			}
-			o.Value[i] = fv
-		}
-	case *objects.ImmutableArray:
-		for i, v := range o.Value {
-			fv, err := fixDecoded(v, modules)
-			if err != nil {
-				return nil, err
-			}
-			o.Value[i] = fv
-		}
-	case *objects.Map:
-		for k, v := range o.Value {
-			fv, err := fixDecoded(v, modules)
-			if err != nil {
-				return nil, err
-			}
-			o.Value[k] = fv
-		}
-	case *objects.ImmutableMap:
-		modName := moduleName(o)
-		if mod := modules.GetBuiltinModule(modName); mod != nil {
-			return mod.AsImmutableMap(modName), nil
-		}
-
-		for k, v := range o.Value {
-			// encoding of user function not supported
-			if _, isUserFunction := v.(*objects.UserFunction); isUserFunction {
-				return nil, fmt.Errorf("user function not decodable")
-			}
-
-			fv, err := fixDecoded(v, modules)
-			if err != nil {
-				return nil, err
-			}
-			o.Value[k] = fv
-		}
-	}
-
-	return o, nil
-}

vendor/github.com/d5/tengo/compiler/bytecode_optimize.go

@@ -1,129 +0,0 @@
-package compiler
-
-import (
-	"fmt"
-
-	"github.com/d5/tengo/objects"
-)
-
-// RemoveDuplicates finds and remove the duplicate values in Constants.
-// Note this function mutates Bytecode.
-func (b *Bytecode) RemoveDuplicates() {
-	var deduped []objects.Object
-
-	indexMap := make(map[int]int) // mapping from old constant index to new index
-	ints := make(map[int64]int)
-	strings := make(map[string]int)
-	floats := make(map[float64]int)
-	chars := make(map[rune]int)
-	immutableMaps := make(map[string]int) // for modules
-
-	for curIdx, c := range b.Constants {
-		switch c := c.(type) {
-		case *objects.CompiledFunction:
-			// add to deduped list
-			indexMap[curIdx] = len(deduped)
-			deduped = append(deduped, c)
-		case *objects.ImmutableMap:
-			modName := moduleName(c)
-			newIdx, ok := immutableMaps[modName]
-			if modName != "" && ok {
-				indexMap[curIdx] = newIdx
-			} else {
-				newIdx = len(deduped)
-				immutableMaps[modName] = newIdx
-				indexMap[curIdx] = newIdx
-				deduped = append(deduped, c)
-			}
-		case *objects.Int:
-			if newIdx, ok := ints[c.Value]; ok {
-				indexMap[curIdx] = newIdx
-			} else {
-				newIdx = len(deduped)
-				ints[c.Value] = newIdx
-				indexMap[curIdx] = newIdx
-				deduped = append(deduped, c)
-			}
-		case *objects.String:
-			if newIdx, ok := strings[c.Value]; ok {
-				indexMap[curIdx] = newIdx
-			} else {
-				newIdx = len(deduped)
-				strings[c.Value] = newIdx
-				indexMap[curIdx] = newIdx
-				deduped = append(deduped, c)
-			}
-		case *objects.Float:
-			if newIdx, ok := floats[c.Value]; ok {
-				indexMap[curIdx] = newIdx
-			} else {
-				newIdx = len(deduped)
-				floats[c.Value] = newIdx
-				indexMap[curIdx] = newIdx
-				deduped = append(deduped, c)
-			}
-		case *objects.Char:
-			if newIdx, ok := chars[c.Value]; ok {
-				indexMap[curIdx] = newIdx
-			} else {
-				newIdx = len(deduped)
-				chars[c.Value] = newIdx
-				indexMap[curIdx] = newIdx
-				deduped = append(deduped, c)
-			}
-		default:
-			panic(fmt.Errorf("unsupported top-level constant type: %s", c.TypeName()))
-		}
-	}
-
-	// replace with de-duplicated constants
-	b.Constants = deduped
-
-	// update CONST instructions with new indexes
-	// main function
-	updateConstIndexes(b.MainFunction.Instructions, indexMap)
-	// other compiled functions in constants
-	for _, c := range b.Constants {
-		switch c := c.(type) {
-		case *objects.CompiledFunction:
-			updateConstIndexes(c.Instructions, indexMap)
-		}
-	}
-}
-
-func updateConstIndexes(insts []byte, indexMap map[int]int) {
-	i := 0
-	for i < len(insts) {
-		op := insts[i]
-		numOperands := OpcodeOperands[op]
-		_, read := ReadOperands(numOperands, insts[i+1:])
-
-		switch op {
-		case OpConstant:
-			curIdx := int(insts[i+2]) | int(insts[i+1])<<8
-			newIdx, ok := indexMap[curIdx]
-			if !ok {
-				panic(fmt.Errorf("constant index not found: %d", curIdx))
-			}
-			copy(insts[i:], MakeInstruction(op, newIdx))
-		case OpClosure:
-			curIdx := int(insts[i+2]) | int(insts[i+1])<<8
-			numFree := int(insts[i+3])
-			newIdx, ok := indexMap[curIdx]
-			if !ok {
-				panic(fmt.Errorf("constant index not found: %d", curIdx))
-			}
-			copy(insts[i:], MakeInstruction(op, newIdx, numFree))
-		}
-
-		i += 1 + read
-	}
-}
-
-func moduleName(mod *objects.ImmutableMap) string {
-	if modName, ok := mod.Value["__module_name__"].(*objects.String); ok {
-		return modName.Value
-	}
-
-	return ""
-}

vendor/github.com/d5/tengo/compiler/compilation_scope.go

@@ -1,11 +0,0 @@
-package compiler
-
-import "github.com/d5/tengo/compiler/source"
-
-// CompilationScope represents a compiled instructions
-// and the last two instructions that were emitted.
-type CompilationScope struct {
-	instructions []byte
-	symbolInit   map[string]bool
-	sourceMap    map[int]source.Pos
-}

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

@@ -1,846 +0,0 @@
-package compiler
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"path/filepath"
-	"reflect"
-	"strings"
-
-	"github.com/d5/tengo"
-	"github.com/d5/tengo/compiler/ast"
-	"github.com/d5/tengo/compiler/source"
-	"github.com/d5/tengo/compiler/token"
-	"github.com/d5/tengo/objects"
-)
-
-// Compiler compiles the AST into a bytecode.
-type Compiler struct {
-	file            *source.File
-	parent          *Compiler
-	modulePath      string
-	constants       []objects.Object
-	symbolTable     *SymbolTable
-	scopes          []CompilationScope
-	scopeIndex      int
-	modules         *objects.ModuleMap
-	compiledModules map[string]*objects.CompiledFunction
-	allowFileImport bool
-	loops           []*Loop
-	loopIndex       int
-	trace           io.Writer
-	indent          int
-}
-
-// NewCompiler creates a Compiler.
-func NewCompiler(file *source.File, symbolTable *SymbolTable, constants []objects.Object, modules *objects.ModuleMap, trace io.Writer) *Compiler {
-	mainScope := CompilationScope{
-		symbolInit: make(map[string]bool),
-		sourceMap:  make(map[int]source.Pos),
-	}
-
-	// symbol table
-	if symbolTable == nil {
-		symbolTable = NewSymbolTable()
-	}
-
-	// add builtin functions to the symbol table
-	for idx, fn := range objects.Builtins {
-		symbolTable.DefineBuiltin(idx, fn.Name)
-	}
-
-	// builtin modules
-	if modules == nil {
-		modules = objects.NewModuleMap()
-	}
-
-	return &Compiler{
-		file:            file,
-		symbolTable:     symbolTable,
-		constants:       constants,
-		scopes:          []CompilationScope{mainScope},
-		scopeIndex:      0,
-		loopIndex:       -1,
-		trace:           trace,
-		modules:         modules,
-		compiledModules: make(map[string]*objects.CompiledFunction),
-	}
-}
-
-// Compile compiles the AST node.
-func (c *Compiler) Compile(node ast.Node) error {
-	if c.trace != nil {
-		if node != nil {
-			defer un(trace(c, fmt.Sprintf("%s (%s)", node.String(), reflect.TypeOf(node).Elem().Name())))
-		} else {
-			defer un(trace(c, "<nil>"))
-		}
-	}
-
-	switch node := node.(type) {
-	case *ast.File:
-		for _, stmt := range node.Stmts {
-			if err := c.Compile(stmt); err != nil {
-				return err
-			}
-		}
-
-	case *ast.ExprStmt:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-		c.emit(node, OpPop)
-
-	case *ast.IncDecStmt:
-		op := token.AddAssign
-		if node.Token == token.Dec {
-			op = token.SubAssign
-		}
-
-		return c.compileAssign(node, []ast.Expr{node.Expr}, []ast.Expr{&ast.IntLit{Value: 1}}, op)
-
-	case *ast.ParenExpr:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-	case *ast.BinaryExpr:
-		if node.Token == token.LAnd || node.Token == token.LOr {
-			return c.compileLogical(node)
-		}
-
-		if node.Token == token.Less {
-			if err := c.Compile(node.RHS); err != nil {
-				return err
-			}
-
-			if err := c.Compile(node.LHS); err != nil {
-				return err
-			}
-
-			c.emit(node, OpBinaryOp, int(token.Greater))
-
-			return nil
-		} else if node.Token == token.LessEq {
-			if err := c.Compile(node.RHS); err != nil {
-				return err
-			}
-			if err := c.Compile(node.LHS); err != nil {
-				return err
-			}
-
-			c.emit(node, OpBinaryOp, int(token.GreaterEq))
-
-			return nil
-		}
-
-		if err := c.Compile(node.LHS); err != nil {
-			return err
-		}
-		if err := c.Compile(node.RHS); err != nil {
-			return err
-		}
-
-		switch node.Token {
-		case token.Add:
-			c.emit(node, OpBinaryOp, int(token.Add))
-		case token.Sub:
-			c.emit(node, OpBinaryOp, int(token.Sub))
-		case token.Mul:
-			c.emit(node, OpBinaryOp, int(token.Mul))
-		case token.Quo:
-			c.emit(node, OpBinaryOp, int(token.Quo))
-		case token.Rem:
-			c.emit(node, OpBinaryOp, int(token.Rem))
-		case token.Greater:
-			c.emit(node, OpBinaryOp, int(token.Greater))
-		case token.GreaterEq:
-			c.emit(node, OpBinaryOp, int(token.GreaterEq))
-		case token.Equal:
-			c.emit(node, OpEqual)
-		case token.NotEqual:
-			c.emit(node, OpNotEqual)
-		case token.And:
-			c.emit(node, OpBinaryOp, int(token.And))
-		case token.Or:
-			c.emit(node, OpBinaryOp, int(token.Or))
-		case token.Xor:
-			c.emit(node, OpBinaryOp, int(token.Xor))
-		case token.AndNot:
-			c.emit(node, OpBinaryOp, int(token.AndNot))
-		case token.Shl:
-			c.emit(node, OpBinaryOp, int(token.Shl))
-		case token.Shr:
-			c.emit(node, OpBinaryOp, int(token.Shr))
-		default:
-			return c.errorf(node, "invalid binary operator: %s", node.Token.String())
-		}
-
-	case *ast.IntLit:
-		c.emit(node, OpConstant, c.addConstant(&objects.Int{Value: node.Value}))
-
-	case *ast.FloatLit:
-		c.emit(node, OpConstant, c.addConstant(&objects.Float{Value: node.Value}))
-
-	case *ast.BoolLit:
-		if node.Value {
-			c.emit(node, OpTrue)
-		} else {
-			c.emit(node, OpFalse)
-		}
-
-	case *ast.StringLit:
-		if len(node.Value) > tengo.MaxStringLen {
-			return c.error(node, objects.ErrStringLimit)
-		}
-
-		c.emit(node, OpConstant, c.addConstant(&objects.String{Value: node.Value}))
-
-	case *ast.CharLit:
-		c.emit(node, OpConstant, c.addConstant(&objects.Char{Value: node.Value}))
-
-	case *ast.UndefinedLit:
-		c.emit(node, OpNull)
-
-	case *ast.UnaryExpr:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-		switch node.Token {
-		case token.Not:
-			c.emit(node, OpLNot)
-		case token.Sub:
-			c.emit(node, OpMinus)
-		case token.Xor:
-			c.emit(node, OpBComplement)
-		case token.Add:
-			// do nothing?
-		default:
-			return c.errorf(node, "invalid unary operator: %s", node.Token.String())
-		}
-
-	case *ast.IfStmt:
-		// open new symbol table for the statement
-		c.symbolTable = c.symbolTable.Fork(true)
-		defer func() {
-			c.symbolTable = c.symbolTable.Parent(false)
-		}()
-
-		if node.Init != nil {
-			if err := c.Compile(node.Init); err != nil {
-				return err
-			}
-		}
-
-		if err := c.Compile(node.Cond); err != nil {
-			return err
-		}
-
-		// first jump placeholder
-		jumpPos1 := c.emit(node, OpJumpFalsy, 0)
-
-		if err := c.Compile(node.Body); err != nil {
-			return err
-		}
-
-		if node.Else != nil {
-			// second jump placeholder
-			jumpPos2 := c.emit(node, OpJump, 0)
-
-			// update first jump offset
-			curPos := len(c.currentInstructions())
-			c.changeOperand(jumpPos1, curPos)
-
-			if err := c.Compile(node.Else); err != nil {
-				return err
-			}
-
-			// update second jump offset
-			curPos = len(c.currentInstructions())
-			c.changeOperand(jumpPos2, curPos)
-		} else {
-			// update first jump offset
-			curPos := len(c.currentInstructions())
-			c.changeOperand(jumpPos1, curPos)
-		}
-
-	case *ast.ForStmt:
-		return c.compileForStmt(node)
-
-	case *ast.ForInStmt:
-		return c.compileForInStmt(node)
-
-	case *ast.BranchStmt:
-		if node.Token == token.Break {
-			curLoop := c.currentLoop()
-			if curLoop == nil {
-				return c.errorf(node, "break not allowed outside loop")
-			}
-			pos := c.emit(node, OpJump, 0)
-			curLoop.Breaks = append(curLoop.Breaks, pos)
-		} else if node.Token == token.Continue {
-			curLoop := c.currentLoop()
-			if curLoop == nil {
-				return c.errorf(node, "continue not allowed outside loop")
-			}
-			pos := c.emit(node, OpJump, 0)
-			curLoop.Continues = append(curLoop.Continues, pos)
-		} else {
-			panic(fmt.Errorf("invalid branch statement: %s", node.Token.String()))
-		}
-
-	case *ast.BlockStmt:
-		if len(node.Stmts) == 0 {
-			return nil
-		}
-
-		c.symbolTable = c.symbolTable.Fork(true)
-		defer func() {
-			c.symbolTable = c.symbolTable.Parent(false)
-		}()
-
-		for _, stmt := range node.Stmts {
-			if err := c.Compile(stmt); err != nil {
-				return err
-			}
-		}
-
-	case *ast.AssignStmt:
-		if err := c.compileAssign(node, node.LHS, node.RHS, node.Token); err != nil {
-			return err
-		}
-
-	case *ast.Ident:
-		symbol, _, ok := c.symbolTable.Resolve(node.Name)
-		if !ok {
-			return c.errorf(node, "unresolved reference '%s'", node.Name)
-		}
-
-		switch symbol.Scope {
-		case ScopeGlobal:
-			c.emit(node, OpGetGlobal, symbol.Index)
-		case ScopeLocal:
-			c.emit(node, OpGetLocal, symbol.Index)
-		case ScopeBuiltin:
-			c.emit(node, OpGetBuiltin, symbol.Index)
-		case ScopeFree:
-			c.emit(node, OpGetFree, symbol.Index)
-		}
-
-	case *ast.ArrayLit:
-		for _, elem := range node.Elements {
-			if err := c.Compile(elem); err != nil {
-				return err
-			}
-		}
-
-		c.emit(node, OpArray, len(node.Elements))
-
-	case *ast.MapLit:
-		for _, elt := range node.Elements {
-			// key
-			if len(elt.Key) > tengo.MaxStringLen {
-				return c.error(node, objects.ErrStringLimit)
-			}
-			c.emit(node, OpConstant, c.addConstant(&objects.String{Value: elt.Key}))
-
-			// value
-			if err := c.Compile(elt.Value); err != nil {
-				return err
-			}
-		}
-
-		c.emit(node, OpMap, len(node.Elements)*2)
-
-	case *ast.SelectorExpr: // selector on RHS side
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-		if err := c.Compile(node.Sel); err != nil {
-			return err
-		}
-
-		c.emit(node, OpIndex)
-
-	case *ast.IndexExpr:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-		if err := c.Compile(node.Index); err != nil {
-			return err
-		}
-
-		c.emit(node, OpIndex)
-
-	case *ast.SliceExpr:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-		if node.Low != nil {
-			if err := c.Compile(node.Low); err != nil {
-				return err
-			}
-		} else {
-			c.emit(node, OpNull)
-		}
-
-		if node.High != nil {
-			if err := c.Compile(node.High); err != nil {
-				return err
-			}
-		} else {
-			c.emit(node, OpNull)
-		}
-
-		c.emit(node, OpSliceIndex)
-
-	case *ast.FuncLit:
-		c.enterScope()
-
-		for _, p := range node.Type.Params.List {
-			s := c.symbolTable.Define(p.Name)
-
-			// function arguments is not assigned directly.
-			s.LocalAssigned = true
-		}
-
-		if err := c.Compile(node.Body); err != nil {
-			return err
-		}
-
-		// code optimization
-		c.optimizeFunc(node)
-
-		freeSymbols := c.symbolTable.FreeSymbols()
-		numLocals := c.symbolTable.MaxSymbols()
-		instructions, sourceMap := c.leaveScope()
-
-		for _, s := range freeSymbols {
-			switch s.Scope {
-			case ScopeLocal:
-				if !s.LocalAssigned {
-					// Here, the closure is capturing a local variable that's not yet assigned its value.
-					// One example is a local recursive function:
-					//
-					//   func() {
-					//     foo := func(x) {
-					//       // ..
-					//       return foo(x-1)
-					//     }
-					//   }
-					//
-					// which translate into
-					//
-					//   0000 GETL    0
-					//   0002 CLOSURE ?     1
-					//   0006 DEFL    0
-					//
-					// . So the local variable (0) is being captured before it's assigned the value.
-					//
-					// Solution is to transform the code into something like this:
-					//
-					//   func() {
-					//     foo := undefined
-					//     foo = func(x) {
-					//       // ..
-					//       return foo(x-1)
-					//     }
-					//   }
-					//
-					// that is equivalent to
-					//
-					//   0000 NULL
-					//   0001 DEFL    0
-					//   0003 GETL    0
-					//   0005 CLOSURE ?     1
-					//   0009 SETL    0
-					//
-
-					c.emit(node, OpNull)
-					c.emit(node, OpDefineLocal, s.Index)
-
-					s.LocalAssigned = true
-				}
-
-				c.emit(node, OpGetLocalPtr, s.Index)
-			case ScopeFree:
-				c.emit(node, OpGetFreePtr, s.Index)
-			}
-		}
-
-		compiledFunction := &objects.CompiledFunction{
-			Instructions:  instructions,
-			NumLocals:     numLocals,
-			NumParameters: len(node.Type.Params.List),
-			VarArgs:       node.Type.Params.VarArgs,
-			SourceMap:     sourceMap,
-		}
-
-		if len(freeSymbols) > 0 {
-			c.emit(node, OpClosure, c.addConstant(compiledFunction), len(freeSymbols))
-		} else {
-			c.emit(node, OpConstant, c.addConstant(compiledFunction))
-		}
-
-	case *ast.ReturnStmt:
-		if c.symbolTable.Parent(true) == nil {
-			// outside the function
-			return c.errorf(node, "return not allowed outside function")
-		}
-
-		if node.Result == nil {
-			c.emit(node, OpReturn, 0)
-		} else {
-			if err := c.Compile(node.Result); err != nil {
-				return err
-			}
-
-			c.emit(node, OpReturn, 1)
-		}
-
-	case *ast.CallExpr:
-		if err := c.Compile(node.Func); err != nil {
-			return err
-		}
-
-		for _, arg := range node.Args {
-			if err := c.Compile(arg); err != nil {
-				return err
-			}
-		}
-
-		c.emit(node, OpCall, len(node.Args))
-
-	case *ast.ImportExpr:
-		if node.ModuleName == "" {
-			return c.errorf(node, "empty module name")
-		}
-
-		if mod := c.modules.Get(node.ModuleName); mod != nil {
-			v, err := mod.Import(node.ModuleName)
-			if err != nil {
-				return err
-			}
-
-			switch v := v.(type) {
-			case []byte: // module written in Tengo
-				compiled, err := c.compileModule(node, node.ModuleName, node.ModuleName, v)
-				if err != nil {
-					return err
-				}
-				c.emit(node, OpConstant, c.addConstant(compiled))
-				c.emit(node, OpCall, 0)
-			case objects.Object: // builtin module
-				c.emit(node, OpConstant, c.addConstant(v))
-			default:
-				panic(fmt.Errorf("invalid import value type: %T", v))
-			}
-		} else if c.allowFileImport {
-			moduleName := node.ModuleName
-			if !strings.HasSuffix(moduleName, ".tengo") {
-				moduleName += ".tengo"
-			}
-
-			modulePath, err := filepath.Abs(moduleName)
-			if err != nil {
-				return c.errorf(node, "module file path error: %s", err.Error())
-			}
-
-			if err := c.checkCyclicImports(node, modulePath); err != nil {
-				return err
-			}
-
-			moduleSrc, err := ioutil.ReadFile(moduleName)
-			if err != nil {
-				return c.errorf(node, "module file read error: %s", err.Error())
-			}
-
-			compiled, err := c.compileModule(node, moduleName, modulePath, moduleSrc)
-			if err != nil {
-				return err
-			}
-			c.emit(node, OpConstant, c.addConstant(compiled))
-			c.emit(node, OpCall, 0)
-		} else {
-			return c.errorf(node, "module '%s' not found", node.ModuleName)
-		}
-
-	case *ast.ExportStmt:
-		// export statement must be in top-level scope
-		if c.scopeIndex != 0 {
-			return c.errorf(node, "export not allowed inside function")
-		}
-
-		// export statement is simply ignore when compiling non-module code
-		if c.parent == nil {
-			break
-		}
-
-		if err := c.Compile(node.Result); err != nil {
-			return err
-		}
-
-		c.emit(node, OpImmutable)
-		c.emit(node, OpReturn, 1)
-
-	case *ast.ErrorExpr:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-		c.emit(node, OpError)
-
-	case *ast.ImmutableExpr:
-		if err := c.Compile(node.Expr); err != nil {
-			return err
-		}
-
-		c.emit(node, OpImmutable)
-
-	case *ast.CondExpr:
-		if err := c.Compile(node.Cond); err != nil {
-			return err
-		}
-
-		// first jump placeholder
-		jumpPos1 := c.emit(node, OpJumpFalsy, 0)
-
-		if err := c.Compile(node.True); err != nil {
-			return err
-		}
-
-		// second jump placeholder
-		jumpPos2 := c.emit(node, OpJump, 0)
-
-		// update first jump offset
-		curPos := len(c.currentInstructions())
-		c.changeOperand(jumpPos1, curPos)
-
-		if err := c.Compile(node.False); err != nil {
-			return err
-		}
-
-		// update second jump offset
-		curPos = len(c.currentInstructions())
-		c.changeOperand(jumpPos2, curPos)
-	}
-
-	return nil
-}
-
-// Bytecode returns a compiled bytecode.
-func (c *Compiler) Bytecode() *Bytecode {
-	return &Bytecode{
-		FileSet: c.file.Set(),
-		MainFunction: &objects.CompiledFunction{
-			Instructions: c.currentInstructions(),
-			SourceMap:    c.currentSourceMap(),
-		},
-		Constants: c.constants,
-	}
-}
-
-// EnableFileImport enables or disables module loading from local files.
-// Local file modules are disabled by default.
-func (c *Compiler) EnableFileImport(enable bool) {
-	c.allowFileImport = enable
-}
-
-func (c *Compiler) fork(file *source.File, modulePath string, symbolTable *SymbolTable) *Compiler {
-	child := NewCompiler(file, symbolTable, nil, c.modules, c.trace)
-	child.modulePath = modulePath // module file path
-	child.parent = c              // parent to set to current compiler
-
-	return child
-}
-
-func (c *Compiler) error(node ast.Node, err error) error {
-	return &Error{
-		fileSet: c.file.Set(),
-		node:    node,
-		error:   err,
-	}
-}
-
-func (c *Compiler) errorf(node ast.Node, format string, args ...interface{}) error {
-	return &Error{
-		fileSet: c.file.Set(),
-		node:    node,
-		error:   fmt.Errorf(format, args...),
-	}
-}
-
-func (c *Compiler) addConstant(o objects.Object) int {
-	if c.parent != nil {
-		// module compilers will use their parent's constants array
-		return c.parent.addConstant(o)
-	}
-
-	c.constants = append(c.constants, o)
-
-	if c.trace != nil {
-		c.printTrace(fmt.Sprintf("CONST %04d %s", len(c.constants)-1, o))
-	}
-
-	return len(c.constants) - 1
-}
-
-func (c *Compiler) addInstruction(b []byte) int {
-	posNewIns := len(c.currentInstructions())
-
-	c.scopes[c.scopeIndex].instructions = append(c.currentInstructions(), b...)
-
-	return posNewIns
-}
-
-func (c *Compiler) replaceInstruction(pos int, inst []byte) {
-	copy(c.currentInstructions()[pos:], inst)
-
-	if c.trace != nil {
-		c.printTrace(fmt.Sprintf("REPLC %s",
-			FormatInstructions(c.scopes[c.scopeIndex].instructions[pos:], pos)[0]))
-	}
-}
-
-func (c *Compiler) changeOperand(opPos int, operand ...int) {
-	op := Opcode(c.currentInstructions()[opPos])
-	inst := MakeInstruction(op, operand...)
-
-	c.replaceInstruction(opPos, inst)
-}
-
-// optimizeFunc performs some code-level optimization for the current function instructions
-// it removes unreachable (dead code) instructions and adds "returns" instruction if needed.
-func (c *Compiler) optimizeFunc(node ast.Node) {
-	// any instructions between RETURN and the function end
-	// or instructions between RETURN and jump target position
-	// are considered as unreachable.
-
-	// pass 1. identify all jump destinations
-	dsts := make(map[int]bool)
-	iterateInstructions(c.scopes[c.scopeIndex].instructions, func(pos int, opcode Opcode, operands []int) bool {
-		switch opcode {
-		case OpJump, OpJumpFalsy, OpAndJump, OpOrJump:
-			dsts[operands[0]] = true
-		}
-
-		return true
-	})
-
-	var newInsts []byte
-
-	// pass 2. eliminate dead code
-	posMap := make(map[int]int) // old position to new position
-	var dstIdx int
-	var deadCode bool
-	iterateInstructions(c.scopes[c.scopeIndex].instructions, func(pos int, opcode Opcode, operands []int) bool {
-		switch {
-		case opcode == OpReturn:
-			if deadCode {
-				return true
-			}
-			deadCode = true
-		case dsts[pos]:
-			dstIdx++
-			deadCode = false
-		case deadCode:
-			return true
-		}
-
-		posMap[pos] = len(newInsts)
-		newInsts = append(newInsts, MakeInstruction(opcode, operands...)...)
-		return true
-	})
-
-	// pass 3. update jump positions
-	var lastOp Opcode
-	var appendReturn bool
-	endPos := len(c.scopes[c.scopeIndex].instructions)
-	iterateInstructions(newInsts, func(pos int, opcode Opcode, operands []int) bool {
-		switch opcode {
-		case OpJump, OpJumpFalsy, OpAndJump, OpOrJump:
-			newDst, ok := posMap[operands[0]]
-			if ok {
-				copy(newInsts[pos:], MakeInstruction(opcode, newDst))
-			} else if endPos == operands[0] {
-				// there's a jump instruction that jumps to the end of function
-				// compiler should append "return".
-				appendReturn = true
-			} else {
-				panic(fmt.Errorf("invalid jump position: %d", newDst))
-			}
-		}
-		lastOp = opcode
-		return true
-	})
-	if lastOp != OpReturn {
-		appendReturn = true
-	}
-
-	// pass 4. update source map
-	newSourceMap := make(map[int]source.Pos)
-	for pos, srcPos := range c.scopes[c.scopeIndex].sourceMap {
-		newPos, ok := posMap[pos]
-		if ok {
-			newSourceMap[newPos] = srcPos
-		}
-	}
-
-	c.scopes[c.scopeIndex].instructions = newInsts
-	c.scopes[c.scopeIndex].sourceMap = newSourceMap
-
-	// append "return"
-	if appendReturn {
-		c.emit(node, OpReturn, 0)
-	}
-}
-
-func (c *Compiler) emit(node ast.Node, opcode Opcode, operands ...int) int {
-	filePos := source.NoPos
-	if node != nil {
-		filePos = node.Pos()
-	}
-
-	inst := MakeInstruction(opcode, operands...)
-	pos := c.addInstruction(inst)
-	c.scopes[c.scopeIndex].sourceMap[pos] = filePos
-
-	if c.trace != nil {
-		c.printTrace(fmt.Sprintf("EMIT  %s",
-			FormatInstructions(c.scopes[c.scopeIndex].instructions[pos:], pos)[0]))
-	}
-
-	return pos
-}
-
-func (c *Compiler) printTrace(a ...interface{}) {
-	const (
-		dots = ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "
-		n    = len(dots)
-	)
-
-	i := 2 * c.indent
-	for i > n {
-		_, _ = fmt.Fprint(c.trace, dots)
-		i -= n
-	}
-	_, _ = fmt.Fprint(c.trace, dots[0:i])
-	_, _ = fmt.Fprintln(c.trace, a...)
-}
-
-func trace(c *Compiler, msg string) *Compiler {
-	c.printTrace(msg, "{")
-	c.indent++
-
-	return c
-}
-
-func un(c *Compiler) {
-	c.indent--
-	c.printTrace("}")
-}

vendor/github.com/d5/tengo/compiler/compiler_assign.go

@@ -1,133 +0,0 @@
-package compiler
-
-import (
-	"fmt"
-
-	"github.com/d5/tengo/compiler/ast"
-	"github.com/d5/tengo/compiler/token"
-)
-
-func (c *Compiler) compileAssign(node ast.Node, lhs, rhs []ast.Expr, op token.Token) error {
-	numLHS, numRHS := len(lhs), len(rhs)
-	if numLHS > 1 || numRHS > 1 {
-		return c.errorf(node, "tuple assignment not allowed")
-	}
-
-	// resolve and compile left-hand side
-	ident, selectors := resolveAssignLHS(lhs[0])
-	numSel := len(selectors)
-
-	if op == token.Define && numSel > 0 {
-		// using selector on new variable does not make sense
-		return c.errorf(node, "operator ':=' not allowed with selector")
-	}
-
-	symbol, depth, exists := c.symbolTable.Resolve(ident)
-	if op == token.Define {
-		if depth == 0 && exists {
-			return c.errorf(node, "'%s' redeclared in this block", ident)
-		}
-
-		symbol = c.symbolTable.Define(ident)
-	} else {
-		if !exists {
-			return c.errorf(node, "unresolved reference '%s'", ident)
-		}
-	}
-
-	// +=, -=, *=, /=
-	if op != token.Assign && op != token.Define {
-		if err := c.Compile(lhs[0]); err != nil {
-			return err
-		}
-	}
-
-	// compile RHSs
-	for _, expr := range rhs {
-		if err := c.Compile(expr); err != nil {
-			return err
-		}
-	}
-
-	switch op {
-	case token.AddAssign:
-		c.emit(node, OpBinaryOp, int(token.Add))
-	case token.SubAssign:
-		c.emit(node, OpBinaryOp, int(token.Sub))
-	case token.MulAssign:
-		c.emit(node, OpBinaryOp, int(token.Mul))
-	case token.QuoAssign:
-		c.emit(node, OpBinaryOp, int(token.Quo))
-	case token.RemAssign:
-		c.emit(node, OpBinaryOp, int(token.Rem))
-	case token.AndAssign:
-		c.emit(node, OpBinaryOp, int(token.And))
-	case token.OrAssign:
-		c.emit(node, OpBinaryOp, int(token.Or))
-	case token.AndNotAssign:
-		c.emit(node, OpBinaryOp, int(token.AndNot))
-	case token.XorAssign:
-		c.emit(node, OpBinaryOp, int(token.Xor))
-	case token.ShlAssign:
-		c.emit(node, OpBinaryOp, int(token.Shl))
-	case token.ShrAssign:
-		c.emit(node, OpBinaryOp, int(token.Shr))
-	}
-
-	// compile selector expressions (right to left)
-	for i := numSel - 1; i >= 0; i-- {
-		if err := c.Compile(selectors[i]); err != nil {
-			return err
-		}
-	}
-
-	switch symbol.Scope {
-	case ScopeGlobal:
-		if numSel > 0 {
-			c.emit(node, OpSetSelGlobal, symbol.Index, numSel)
-		} else {
-			c.emit(node, OpSetGlobal, symbol.Index)
-		}
-	case ScopeLocal:
-		if numSel > 0 {
-			c.emit(node, OpSetSelLocal, symbol.Index, numSel)
-		} else {
-			if op == token.Define && !symbol.LocalAssigned {
-				c.emit(node, OpDefineLocal, symbol.Index)
-			} else {
-				c.emit(node, OpSetLocal, symbol.Index)
-			}
-		}
-
-		// mark the symbol as local-assigned
-		symbol.LocalAssigned = true
-	case ScopeFree:
-		if numSel > 0 {
-			c.emit(node, OpSetSelFree, symbol.Index, numSel)
-		} else {
-			c.emit(node, OpSetFree, symbol.Index)
-		}
-	default:
-		panic(fmt.Errorf("invalid assignment variable scope: %s", symbol.Scope))
-	}
-
-	return nil
-}
-
-func resolveAssignLHS(expr ast.Expr) (name string, selectors []ast.Expr) {
-	switch term := expr.(type) {
-	case *ast.SelectorExpr:
-		name, selectors = resolveAssignLHS(term.Expr)
-		selectors = append(selectors, term.Sel)
-		return
-
-	case *ast.IndexExpr:
-		name, selectors = resolveAssignLHS(term.Expr)
-		selectors = append(selectors, term.Index)
-
-	case *ast.Ident:
-		name = term.Name
-	}
-
-	return
-}

vendor/github.com/d5/tengo/compiler/compiler_for.go

@@ -1,181 +0,0 @@
-package compiler
-
-import (
-	"github.com/d5/tengo/compiler/ast"
-)
-
-func (c *Compiler) compileForStmt(stmt *ast.ForStmt) error {
-	c.symbolTable = c.symbolTable.Fork(true)
-	defer func() {
-		c.symbolTable = c.symbolTable.Parent(false)
-	}()
-
-	// init statement
-	if stmt.Init != nil {
-		if err := c.Compile(stmt.Init); err != nil {
-			return err
-		}
-	}
-
-	// pre-condition position
-	preCondPos := len(c.currentInstructions())
-
-	// condition expression
-	postCondPos := -1
-	if stmt.Cond != nil {
-		if err := c.Compile(stmt.Cond); err != nil {
-			return err
-		}
-		// condition jump position
-		postCondPos = c.emit(stmt, OpJumpFalsy, 0)
-	}
-
-	// enter loop
-	loop := c.enterLoop()
-
-	// body statement
-	if err := c.Compile(stmt.Body); err != nil {
-		c.leaveLoop()
-		return err
-	}
-
-	c.leaveLoop()
-
-	// post-body position
-	postBodyPos := len(c.currentInstructions())
-
-	// post statement
-	if stmt.Post != nil {
-		if err := c.Compile(stmt.Post); err != nil {
-			return err
-		}
-	}
-
-	// back to condition
-	c.emit(stmt, OpJump, preCondPos)
-
-	// post-statement position
-	postStmtPos := len(c.currentInstructions())
-	if postCondPos >= 0 {
-		c.changeOperand(postCondPos, postStmtPos)
-	}
-
-	// update all break/continue jump positions
-	for _, pos := range loop.Breaks {
-		c.changeOperand(pos, postStmtPos)
-	}
-	for _, pos := range loop.Continues {
-		c.changeOperand(pos, postBodyPos)
-	}
-
-	return nil
-}
-
-func (c *Compiler) compileForInStmt(stmt *ast.ForInStmt) error {
-	c.symbolTable = c.symbolTable.Fork(true)
-	defer func() {
-		c.symbolTable = c.symbolTable.Parent(false)
-	}()
-
-	// for-in statement is compiled like following:
-	//
-	//   for :it := iterator(iterable); :it.next();  {
-	//     k, v := :it.get()  // DEFINE operator
-	//
-	//     ... body ...
-	//   }
-	//
-	// ":it" is a local variable but will be conflict with other user variables
-	// because character ":" is not allowed.
-
-	// init
-	//   :it = iterator(iterable)
-	itSymbol := c.symbolTable.Define(":it")
-	if err := c.Compile(stmt.Iterable); err != nil {
-		return err
-	}
-	c.emit(stmt, OpIteratorInit)
-	if itSymbol.Scope == ScopeGlobal {
-		c.emit(stmt, OpSetGlobal, itSymbol.Index)
-	} else {
-		c.emit(stmt, OpDefineLocal, itSymbol.Index)
-	}
-
-	// pre-condition position
-	preCondPos := len(c.currentInstructions())
-
-	// condition
-	//  :it.HasMore()
-	if itSymbol.Scope == ScopeGlobal {
-		c.emit(stmt, OpGetGlobal, itSymbol.Index)
-	} else {
-		c.emit(stmt, OpGetLocal, itSymbol.Index)
-	}
-	c.emit(stmt, OpIteratorNext)
-
-	// condition jump position
-	postCondPos := c.emit(stmt, OpJumpFalsy, 0)
-
-	// enter loop
-	loop := c.enterLoop()
-
-	// assign key variable
-	if stmt.Key.Name != "_" {
-		keySymbol := c.symbolTable.Define(stmt.Key.Name)
-		if itSymbol.Scope == ScopeGlobal {
-			c.emit(stmt, OpGetGlobal, itSymbol.Index)
-		} else {
-			c.emit(stmt, OpGetLocal, itSymbol.Index)
-		}
-		c.emit(stmt, OpIteratorKey)
-		if keySymbol.Scope == ScopeGlobal {
-			c.emit(stmt, OpSetGlobal, keySymbol.Index)
-		} else {
-			c.emit(stmt, OpDefineLocal, keySymbol.Index)
-		}
-	}
-
-	// assign value variable
-	if stmt.Value.Name != "_" {
-		valueSymbol := c.symbolTable.Define(stmt.Value.Name)
-		if itSymbol.Scope == ScopeGlobal {
-			c.emit(stmt, OpGetGlobal, itSymbol.Index)
-		} else {
-			c.emit(stmt, OpGetLocal, itSymbol.Index)
-		}
-		c.emit(stmt, OpIteratorValue)
-		if valueSymbol.Scope == ScopeGlobal {
-			c.emit(stmt, OpSetGlobal, valueSymbol.Index)
-		} else {
-			c.emit(stmt, OpDefineLocal, valueSymbol.Index)
-		}
-	}
-
-	// body statement
-	if err := c.Compile(stmt.Body); err != nil {
-		c.leaveLoop()
-		return err
-	}
-
-	c.leaveLoop()
-
-	// post-body position
-	postBodyPos := len(c.currentInstructions())
-
-	// back to condition
-	c.emit(stmt, OpJump, preCondPos)
-
-	// post-statement position
-	postStmtPos := len(c.currentInstructions())
-	c.changeOperand(postCondPos, postStmtPos)
-
-	// update all break/continue jump positions
-	for _, pos := range loop.Breaks {
-		c.changeOperand(pos, postStmtPos)
-	}
-	for _, pos := range loop.Continues {
-		c.changeOperand(pos, postBodyPos)
-	}
-
-	return nil
-}

vendor/github.com/d5/tengo/compiler/compiler_logical.go

@@ -1,30 +0,0 @@
-package compiler
-
-import (
-	"github.com/d5/tengo/compiler/ast"
-	"github.com/d5/tengo/compiler/token"
-)
-
-func (c *Compiler) compileLogical(node *ast.BinaryExpr) error {
-	// left side term
-	if err := c.Compile(node.LHS); err != nil {
-		return err
-	}
-
-	// jump position
-	var jumpPos int
-	if node.Token == token.LAnd {
-		jumpPos = c.emit(node, OpAndJump, 0)
-	} else {
-		jumpPos = c.emit(node, OpOrJump, 0)
-	}
-
-	// right side term
-	if err := c.Compile(node.RHS); err != nil {
-		return err
-	}
-
-	c.changeOperand(jumpPos, len(c.currentInstructions()))
-
-	return nil
-}

vendor/github.com/d5/tengo/compiler/compiler_loops.go

@@ -1,31 +0,0 @@
-package compiler
-
-func (c *Compiler) enterLoop() *Loop {
-	loop := &Loop{}
-
-	c.loops = append(c.loops, loop)
-	c.loopIndex++
-
-	if c.trace != nil {
-		c.printTrace("LOOPE", c.loopIndex)
-	}
-
-	return loop
-}
-
-func (c *Compiler) leaveLoop() {
-	if c.trace != nil {
-		c.printTrace("LOOPL", c.loopIndex)
-	}
-
-	c.loops = c.loops[:len(c.loops)-1]
-	c.loopIndex--
-}
-
-func (c *Compiler) currentLoop() *Loop {
-	if c.loopIndex >= 0 {
-		return c.loops[c.loopIndex]
-	}
-
-	return nil
-}

vendor/github.com/d5/tengo/compiler/compiler_module.go

@@ -1,79 +0,0 @@
-package compiler
-
-import (
-	"github.com/d5/tengo/compiler/ast"
-	"github.com/d5/tengo/compiler/parser"
-	"github.com/d5/tengo/objects"
-)
-
-func (c *Compiler) checkCyclicImports(node ast.Node, modulePath string) error {
-	if c.modulePath == modulePath {
-		return c.errorf(node, "cyclic module import: %s", modulePath)
-	} else if c.parent != nil {
-		return c.parent.checkCyclicImports(node, modulePath)
-	}
-
-	return nil
-}
-
-func (c *Compiler) compileModule(node ast.Node, moduleName, modulePath string, src []byte) (*objects.CompiledFunction, error) {
-	if err := c.checkCyclicImports(node, modulePath); err != nil {
-		return nil, err
-	}
-
-	compiledModule, exists := c.loadCompiledModule(modulePath)
-	if exists {
-		return compiledModule, nil
-	}
-
-	modFile := c.file.Set().AddFile(moduleName, -1, len(src))
-	p := parser.NewParser(modFile, src, nil)
-	file, err := p.ParseFile()
-	if err != nil {
-		return nil, err
-	}
-
-	symbolTable := NewSymbolTable()
-
-	// inherit builtin functions
-	for _, sym := range c.symbolTable.BuiltinSymbols() {
-		symbolTable.DefineBuiltin(sym.Index, sym.Name)
-	}
-
-	// no global scope for the module
-	symbolTable = symbolTable.Fork(false)
-
-	// compile module
-	moduleCompiler := c.fork(modFile, modulePath, symbolTable)
-	if err := moduleCompiler.Compile(file); err != nil {
-		return nil, err
-	}
-
-	// code optimization
-	moduleCompiler.optimizeFunc(node)
-
-	compiledFunc := moduleCompiler.Bytecode().MainFunction
-	compiledFunc.NumLocals = symbolTable.MaxSymbols()
-
-	c.storeCompiledModule(modulePath, compiledFunc)
-
-	return compiledFunc, nil
-}
-
-func (c *Compiler) loadCompiledModule(modulePath string) (mod *objects.CompiledFunction, ok bool) {
-	if c.parent != nil {
-		return c.parent.loadCompiledModule(modulePath)
-	}
-
-	mod, ok = c.compiledModules[modulePath]
-
-	return
-}
-
-func (c *Compiler) storeCompiledModule(modulePath string, module *objects.CompiledFunction) {
-	if c.parent != nil {
-		c.parent.storeCompiledModule(modulePath, module)
-	}
-
-	c.compiledModules[modulePath] = module
-}

vendor/github.com/d5/tengo/compiler/compiler_scopes.go

@@ -1,43 +0,0 @@
-package compiler
-
-import "github.com/d5/tengo/compiler/source"
-
-func (c *Compiler) currentInstructions() []byte {
-	return c.scopes[c.scopeIndex].instructions
-}
-
-func (c *Compiler) currentSourceMap() map[int]source.Pos {
-	return c.scopes[c.scopeIndex].sourceMap
-}
-
-func (c *Compiler) enterScope() {
-	scope := CompilationScope{
-		symbolInit: make(map[string]bool),
-		sourceMap:  make(map[int]source.Pos),
-	}
-
-	c.scopes = append(c.scopes, scope)
-	c.scopeIndex++
-
-	c.symbolTable = c.symbolTable.Fork(false)
-
-	if c.trace != nil {
-		c.printTrace("SCOPE", c.scopeIndex)
-	}
-}
-
-func (c *Compiler) leaveScope() (instructions []byte, sourceMap map[int]source.Pos) {
-	instructions = c.currentInstructions()
-	sourceMap = c.currentSourceMap()
-
-	c.scopes = c.scopes[:len(c.scopes)-1]
-	c.scopeIndex--
-
-	c.symbolTable = c.symbolTable.Parent(true)
-
-	if c.trace != nil {
-		c.printTrace("SCOPL", c.scopeIndex)
-	}
-
-	return
-}

vendor/github.com/d5/tengo/compiler/emitted_instruction.go

@@ -1,8 +0,0 @@
-package compiler
-
-// EmittedInstruction represents an opcode
-// with its emitted position.
-type EmittedInstruction struct {
-	Opcode   Opcode
-	Position int
-}

vendor/github.com/d5/tengo/compiler/error.go

@@ -1,20 +0,0 @@
-package compiler
-
-import (
-	"fmt"
-
-	"github.com/d5/tengo/compiler/ast"
-	"github.com/d5/tengo/compiler/source"
-)
-
-// Error represents a compiler error.
-type Error struct {
-	fileSet *source.FileSet
-	node    ast.Node
-	error   error
-}
-
-func (e *Error) Error() string {
-	filePos := e.fileSet.Position(e.node.Pos())
-	return fmt.Sprintf("Compile Error: %s\n\tat %s", e.error.Error(), filePos)
-}

vendor/github.com/d5/tengo/compiler/instructions.go

@@ -1,72 +0,0 @@
-package compiler
-
-import (
-	"fmt"
-)
-
-// MakeInstruction returns a bytecode for an opcode and the operands.
-func MakeInstruction(opcode Opcode, operands ...int) []byte {
-	numOperands := OpcodeOperands[opcode]
-
-	totalLen := 1
-	for _, w := range numOperands {
-		totalLen += w
-	}
-
-	instruction := make([]byte, totalLen)
-	instruction[0] = byte(opcode)
-
-	offset := 1
-	for i, o := range operands {
-		width := numOperands[i]
-		switch width {
-		case 1:
-			instruction[offset] = byte(o)
-		case 2:
-			n := uint16(o)
-			instruction[offset] = byte(n >> 8)
-			instruction[offset+1] = byte(n)
-		}
-		offset += width
-	}
-
-	return instruction
-}
-
-// FormatInstructions returns string representation of
-// bytecode instructions.
-func FormatInstructions(b []byte, posOffset int) []string {
-	var out []string
-
-	i := 0
-	for i < len(b) {
-		numOperands := OpcodeOperands[Opcode(b[i])]
-		operands, read := ReadOperands(numOperands, b[i+1:])
-
-		switch len(numOperands) {
-		case 0:
-			out = append(out, fmt.Sprintf("%04d %-7s", posOffset+i, OpcodeNames[Opcode(b[i])]))
-		case 1:
-			out = append(out, fmt.Sprintf("%04d %-7s %-5d", posOffset+i, OpcodeNames[Opcode(b[i])], operands[0]))
-		case 2:
-			out = append(out, fmt.Sprintf("%04d %-7s %-5d %-5d", posOffset+i, OpcodeNames[Opcode(b[i])], operands[0], operands[1]))
-		}
-
-		i += 1 + read
-	}
-
-	return out
-}
-
-func iterateInstructions(b []byte, fn func(pos int, opcode Opcode, operands []int) bool) {
-	for i := 0; i < len(b); i++ {
-		numOperands := OpcodeOperands[Opcode(b[i])]
-		operands, read := ReadOperands(numOperands, b[i+1:])
-
-		if !fn(i, b[i], operands) {
-			break
-		}
-
-		i += read
-	}
-}

vendor/github.com/d5/tengo/compiler/loop.go

@@ -1,8 +0,0 @@
-package compiler
-
-// Loop represents a loop construct that
-// the compiler uses to track the current loop.
-type Loop struct {
-	Continues []int
-	Breaks    []int
-}

vendor/github.com/d5/tengo/compiler/module_loader.go

@@ -1,4 +0,0 @@
-package compiler
-
-// ModuleLoader should take a module name and return the module data.
-type ModuleLoader func(moduleName string) ([]byte, error)

vendor/github.com/d5/tengo/compiler/parser/error.go

@@ -1,21 +0,0 @@
-package parser
-
-import (
-	"fmt"
-
-	"github.com/d5/tengo/compiler/source"
-)
-
-// Error represents a parser error.
-type Error struct {
-	Pos source.FilePos
-	Msg string
-}
-
-func (e Error) Error() string {
-	if e.Pos.Filename != "" || e.Pos.IsValid() {
-		return fmt.Sprintf("Parse Error: %s\n\tat %s", e.Msg, e.Pos)
-	}
-
-	return fmt.Sprintf("Parse Error: %s", e.Msg)
-}

vendor/github.com/d5/tengo/compiler/parser/error_list.go

@@ -1,68 +0,0 @@
-package parser
-
-import (
-	"fmt"
-	"sort"
-
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ErrorList is a collection of parser errors.
-type ErrorList []*Error
-
-// Add adds a new parser error to the collection.
-func (p *ErrorList) Add(pos source.FilePos, msg string) {
-	*p = append(*p, &Error{pos, msg})
-}
-
-// Len returns the number of elements in the collection.
-func (p ErrorList) Len() int {
-	return len(p)
-}
-
-func (p ErrorList) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i]
-}
-
-func (p ErrorList) Less(i, j int) bool {
-	e := &p[i].Pos
-	f := &p[j].Pos
-
-	if e.Filename != f.Filename {
-		return e.Filename < f.Filename
-	}
-
-	if e.Line != f.Line {
-		return e.Line < f.Line
-	}
-
-	if e.Column != f.Column {
-		return e.Column < f.Column
-	}
-
-	return p[i].Msg < p[j].Msg
-}
-
-// Sort sorts the collection.
-func (p ErrorList) Sort() {
-	sort.Sort(p)
-}
-
-func (p ErrorList) Error() string {
-	switch len(p) {
-	case 0:
-		return "no errors"
-	case 1:
-		return p[0].Error()
-	}
-	return fmt.Sprintf("%s (and %d more errors)", p[0], len(p)-1)
-}
-
-// Err returns an error.
-func (p ErrorList) Err() error {
-	if len(p) == 0 {
-		return nil
-	}
-
-	return p
-}

vendor/github.com/d5/tengo/compiler/parser/parse_source.go

@@ -1,17 +0,0 @@
-package parser
-
-import (
-	"io"
-
-	"github.com/d5/tengo/compiler/ast"
-	"github.com/d5/tengo/compiler/source"
-)
-
-// ParseSource parses source code 'src' and builds an AST.
-func ParseSource(filename string, src []byte, trace io.Writer) (res *ast.File, err error) {
-	fileSet := source.NewFileSet()
-	file := fileSet.AddFile(filename, -1, len(src))
-
-	p := NewParser(file, src, trace)
-	return p.ParseFile()
-}