From c3d536c644f102cbdc07354aa2ecf8bc8194882e Mon Sep 17 00:00:00 2001
From: S4KH <kh.syerikjan@gmail.com>
Date: Fri, 19 Oct 2018 04:07:21 +0800
Subject: GH-9619 GetEmojiImage added to plugin API (#9628)

* GH-9619 conflict fix

* GH-9619 fixed conflicts, version comment
---
 plugin/api.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'plugin/api.go')

diff --git a/plugin/api.go b/plugin/api.go
index fc64c627a..dc60bb57a 100644
--- a/plugin/api.go
+++ b/plugin/api.go
@@ -276,6 +276,11 @@ type API interface {
 	// Minimum server version: 5.3
 	ReadFile(path string) ([]byte, *model.AppError)
 
+	// GetEmojiImage returns the emoji image.
+	//
+	// Minimum server version: 5.6
+	GetEmojiImage(emojiId string) ([]byte, string, *model.AppError)
+
 	// KVSet will store a key-value pair, unique per plugin.
 	KVSet(key string, value []byte) *model.AppError
 
-- 
cgit v1.2.3-1-g7c22