New Slack Library

This commit is contained in:
2023-11-29 17:54:12 -06:00
parent 09a662a8cd
commit 29ff2c7daf
12 changed files with 80 additions and 103 deletions

View File

@@ -6,7 +6,7 @@ import (
"os"
"strings"
"github.com/nlopes/slack"
"github.com/slack-go/slack"
)
type App struct {
@@ -86,7 +86,7 @@ func (a *App) watchMessageChannel() {
} else if msg.GetDestination() == "error" {
fmt.Printf("ERROR: %s: %s\n", msg.GetSource(), msg.GetMessage().Text)
} else if msg.GetDestination() == "slack" {
a.m.SendSlackChannelMessage(&slackMsg)
a.m.SendSlackChannelMessage(slackMsg.Text, msg.GetDestination())
}
for _, v := range a.plugins {

View File

@@ -3,7 +3,7 @@ package main
import (
"encoding/json"
"github.com/nlopes/slack"
"github.com/slack-go/slack"
)
func GetMessageJson(msg *slack.Message) string {

View File

@@ -7,7 +7,7 @@ import (
"syscall"
"time"
"github.com/nlopes/slack"
"github.com/slack-go/slack"
)
var DebugMode = false

View File

@@ -1,6 +1,6 @@
package main
import "github.com/nlopes/slack"
import "github.com/slack-go/slack"
// This message type is for communications over the messages channel
type BotMessage struct {

View File

@@ -10,7 +10,7 @@ import (
"git.bullercodeworks.com/brian/boltease"
"git.bullercodeworks.com/brian/helperbot"
"github.com/nlopes/slack"
"github.com/slack-go/slack"
)
type BotModel struct {
@@ -44,7 +44,13 @@ func NewBotModel() (*BotModel, error) {
return m, nil
}
func (m *BotModel) GetChannelInfo(id string) (*slack.Channel, error) {
return m.slackApi.GetConversationInfo(&slack.GetConversationInfoInput{id, false, false})
}
func (m *BotModel) SendMessage(src, dst string, msg slack.Message) {
fmt.Println("Sending Message:", src, "->", dst)
fmt.Println(msg.Text)
m.messages <- NewBotMessage(src, dst, msg)
}

View File

@@ -2,13 +2,12 @@ package main
import (
"bufio"
"errors"
"fmt"
"os"
"strings"
"time"
"github.com/nlopes/slack"
"github.com/slack-go/slack"
)
/* DB Functions */
@@ -73,6 +72,8 @@ func (m *BotModel) RequestSlackToken() {
func (m *BotModel) HandleRTMEvents() {
for msg := range m.slackRTM.IncomingEvents {
fmt.Printf("RTM Message: %v", msg)
switch ev := msg.Data.(type) {
case *slack.MessageEvent:
m.processMessageEvent(ev)
@@ -89,60 +90,57 @@ func (m *BotModel) HandleRTMEvents() {
}
}
func (m *BotModel) SendSlackChannelMessage(msg *slack.Message) error {
func (m *BotModel) SendSlackChannelMessage(msg string, cid string) error {
if DebugMode {
return m.SendSlackAdminMessage(msg)
}
// Send message to slack channel
m.PostSlackMessage(msg)
return nil
//m.PostSlackMessage(msg)
_, _, err := m.slackApi.PostMessage(
cid,
slack.MsgOptionText(msg, false),
slack.MsgOptionAsUser(true),
)
return err
}
func (m *BotModel) SendSlackAdminMessage(msg *slack.Message) error {
func (m *BotModel) SendSlackAdminMessage(msg string) error {
// Send message to slack admin
var err error
msg.Channel, err = m.GetSlackAdminDMId()
dmId, err := m.GetSlackAdminDMId()
if err != nil {
return err
}
m.PostSlackMessage(msg)
_, _, err = m.slackApi.PostMessage(
dmId,
slack.MsgOptionText(msg, false),
slack.MsgOptionAsUser(true),
)
return err
return nil
}
func (m *BotModel) LoadDirectMessages() {
cs, err := m.slackApi.GetIMChannels()
if err != nil {
return
}
for _, v := range cs {
uname, err := m.GetSlackUserName(v.User)
/*
cs, err := m.slackApi.GetIMChannels()
if err != nil {
uname = v.User
return
}
m.slackIdToFriendly[v.ID] = uname
}
for _, v := range cs {
uname, err := m.GetSlackUserName(v.User)
if err != nil {
uname = v.User
}
m.slackIdToFriendly[v.ID] = uname
}
*/
}
func (m *BotModel) processMessageEvent(ev *slack.MessageEvent) {
m.GetSlackUserName(ev.User)
m.GetSlackIdName(ev.Channel)
m.GetSlackChannelName(ev.User)
m.GetSlackChannelName(ev.Channel)
m.IncomingSlackMessages <- ev
}
func (m *BotModel) GetSlackIdName(id string) (string, error) {
switch id[0] {
case 'U':
return m.GetSlackUserName(id)
case 'G':
return m.GetSlackGroupName(id)
case 'C':
return m.GetSlackChannelName(id)
case 'D':
return m.GetSlackIMName(id)
}
return "", errors.New("Unknown ID Type")
}
func (m *BotModel) GetSlackUserName(id string) (string, error) {
if v, ok := m.slackIdToFriendly[id]; ok {
return v, nil
@@ -155,23 +153,11 @@ func (m *BotModel) GetSlackUserName(id string) (string, error) {
return user.Profile.DisplayName, nil
}
func (m *BotModel) GetSlackIMName(id string) (string, error) {
if v, ok := m.slackIdToFriendly[id]; ok {
return v, nil
}
c, err := m.slackApi.GetChannelInfo(id)
if err != nil {
return "", err
}
m.slackIdToFriendly[id] = c.Name
return c.Name, nil
}
func (m *BotModel) GetSlackChannelName(id string) (string, error) {
if v, ok := m.slackIdToFriendly[id]; ok {
return v, nil
}
c, err := m.slackApi.GetChannelInfo(id)
c, err := m.GetChannelInfo(id)
if err != nil {
return "", err
}
@@ -179,44 +165,17 @@ func (m *BotModel) GetSlackChannelName(id string) (string, error) {
return c.Name, nil
}
func (m *BotModel) GetSlackUserIM(id string) (string, error) {
for k, v := range m.slackIdToFriendly {
if v == id {
return k, nil
}
}
_, _, newId, err := m.slackApi.OpenIMChannel(id)
if err != nil {
return "", err
}
m.slackIdToFriendly[id] = newId
return newId, nil
}
func (m *BotModel) GetSlackGroupName(id string) (string, error) {
if v, ok := m.slackIdToFriendly[id]; ok {
return v, nil
}
g, err := m.slackApi.GetGroupInfo(id)
if err != nil {
return "", err
}
m.slackIdToFriendly[id] = g.Name
return g.Name, nil
}
func (m *BotModel) PostSlackMessage(msg *slack.Message) {
m.slackRTM.SendMessage(m.slackRTM.NewOutgoingMessage(msg.Text, msg.Channel))
}
func (m *BotModel) SendMessageToUser(msg *slack.Message, uid string) error {
dmId, err := m.GetSlackUserIM(uid)
func (m *BotModel) SendMessageToChannel(msg string, cid string) error {
dmId, err := m.GetSlackChannelName(cid)
if err != nil {
return err
}
msg.Channel = dmId
m.PostSlackMessage(msg)
return nil
_, _, err = m.slackApi.PostMessage(
dmId,
slack.MsgOptionText(msg, false),
slack.MsgOptionAsUser(true),
)
return err
}
func (m *BotModel) GetSlackUserInfo(uid string) (*slack.User, error) {