Compare commits
No commits in common. "3d401d97516602d4e79f7e68c7b08d58ba286b8e" and "a584139c81925c4f7cae8f73bc0dbc2a9b3f0058" have entirely different histories.
3d401d9751
...
a584139c81
4 changed files with 22 additions and 207 deletions
|
|
@ -442,7 +442,7 @@ func SwitchGuild(session *discordgo.Session, input string) {
|
|||
ListChannelsCommand(session)
|
||||
ListUsersCommand(session)
|
||||
|
||||
lib.UpdatePresence(session)
|
||||
// TODO: update presence
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -486,7 +486,7 @@ func SwitchChannelsCommand(session *discordgo.Session) {
|
|||
|
||||
ListUsersCommand(session)
|
||||
|
||||
lib.UpdatePresence(session)
|
||||
// TODO: update presence
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
159
lib/presence.go
159
lib/presence.go
|
|
@ -1,159 +0,0 @@
|
|||
package lib
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"sync"
|
||||
"time"
|
||||
"unsafe"
|
||||
|
||||
"github.com/Cynosphere/comcord/state"
|
||||
"github.com/bwmarrin/discordgo"
|
||||
"github.com/gorilla/websocket"
|
||||
)
|
||||
|
||||
type ActivityMetadata struct {
|
||||
ButtonURLs []string `json:"button_urls,omitempty"`
|
||||
}
|
||||
|
||||
type Activity struct {
|
||||
Name string `json:"name"`
|
||||
Type discordgo.ActivityType `json:"type"`
|
||||
//URL string `json:"url,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
ApplicationID string `json:"application_id,omitempty"`
|
||||
State string `json:"state,omitempty"`
|
||||
Details string `json:"details,omitempty"`
|
||||
Timestamps discordgo.TimeStamps `json:"timestamps,omitempty"`
|
||||
//Emoji discordgo.Emoji `json:"emoji,omitempty"`
|
||||
//Party discordgo.Party `json:"party,omitempty"`
|
||||
Assets discordgo.Assets `json:"assets,omitempty"`
|
||||
//Secrets discordgo.Secrets `json:"secrets,omitempty"`
|
||||
//Instance bool `json:"instance,omitempty"`
|
||||
//Flags int `json:"flags,omitempty"`
|
||||
Buttons []string `json:"buttons,omitempty"`
|
||||
Metadata ActivityMetadata `json:"metadata,omitempty"`
|
||||
}
|
||||
|
||||
type GatewayPresenceUpdate struct {
|
||||
Since int `json:"since"`
|
||||
Activities []Activity `json:"activities,omitempty"`
|
||||
Status string `json:"status"`
|
||||
AFK bool `json:"afk"`
|
||||
Broadcast string `json:"broadcast,omitempty"`
|
||||
}
|
||||
|
||||
type presenceOp struct {
|
||||
Op int `json:"op"`
|
||||
Data GatewayPresenceUpdate `json:"d"`
|
||||
}
|
||||
|
||||
func getUnexportedField(field reflect.Value) interface{} {
|
||||
return reflect.NewAt(field.Type(), unsafe.Pointer(field.UnsafeAddr())).Elem().Interface()
|
||||
}
|
||||
|
||||
func UpdatePresence(session *discordgo.Session) {
|
||||
// there is a way to send presence without reflecting to grab the websocket
|
||||
// connection, but theres an issue with the serialization that because a value
|
||||
// isn't being considered "null" that its trying to apply and failing because
|
||||
// the default doesn't make sense in this context, even if omitempty is set
|
||||
//
|
||||
// this doesnt happen with bot accounts because they have certain fields
|
||||
// stripped
|
||||
values := reflect.ValueOf(session)
|
||||
fieldWsConn := reflect.Indirect(values).FieldByName("wsConn")
|
||||
fieldWsMutex := reflect.Indirect(values).FieldByName("wsMutex")
|
||||
|
||||
wsConn := getUnexportedField(fieldWsConn).(*websocket.Conn)
|
||||
wsMutex := getUnexportedField(fieldWsMutex).(sync.Mutex)
|
||||
|
||||
afk := state.IsAFK()
|
||||
presence := GatewayPresenceUpdate{
|
||||
Since: 0,
|
||||
AFK: afk,
|
||||
Activities: make([]Activity, 0),
|
||||
}
|
||||
|
||||
currentGuild := state.GetCurrentGuild()
|
||||
currentChannel := state.GetCurrentChannel()
|
||||
|
||||
var activity Activity
|
||||
|
||||
startTime := state.GetStartTime()
|
||||
|
||||
if session.State.User.Bot {
|
||||
activity = Activity{
|
||||
Type: 0,
|
||||
Name: "comcord",
|
||||
}
|
||||
|
||||
if currentGuild != "" && currentChannel != "" {
|
||||
guild, guildErr := session.State.Guild(currentGuild)
|
||||
channel, channelErr := session.State.Channel(currentChannel)
|
||||
|
||||
if guildErr == nil && channelErr == nil {
|
||||
activity.Type = 3
|
||||
activity.Name = fmt.Sprintf("#%s in %s | comcord", channel.Name, guild.Name)
|
||||
}
|
||||
}
|
||||
|
||||
if afk {
|
||||
activity.Name = activity.Name + " [AFK]"
|
||||
}
|
||||
} else {
|
||||
activity = Activity{
|
||||
Type: 0,
|
||||
ApplicationID: "1026163285877325874",
|
||||
Name: "comcord",
|
||||
Timestamps: discordgo.TimeStamps{
|
||||
StartTimestamp: startTime.Unix(),
|
||||
},
|
||||
Buttons: make([]string, 0),
|
||||
Metadata: ActivityMetadata{
|
||||
ButtonURLs: make([]string, 0),
|
||||
},
|
||||
}
|
||||
|
||||
activity.Buttons = append(activity.Buttons, "comcord Repo")
|
||||
activity.Metadata.ButtonURLs = append(activity.Metadata.ButtonURLs, "https://gitdab.com/Cynosphere/comcord")
|
||||
|
||||
if currentGuild != "" && currentChannel != "" {
|
||||
guild, guildErr := session.State.Guild(currentGuild)
|
||||
channel, channelErr := session.State.Channel(currentChannel)
|
||||
|
||||
if guildErr == nil && channelErr == nil {
|
||||
activity.Details = fmt.Sprintf("#%s - %s", channel.Name, guild.Name)
|
||||
|
||||
activity.Assets = discordgo.Assets{}
|
||||
activity.Assets.LargeText = guild.Name
|
||||
if guild.Icon != "" {
|
||||
activity.Assets.LargeImageID = fmt.Sprintf("mp:icons/%s/%s.png?size=1024", guild.ID, guild.Icon)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if afk {
|
||||
activity.State = "AFK"
|
||||
}
|
||||
}
|
||||
|
||||
activity.CreatedAt = startTime
|
||||
|
||||
presence.Activities = append(presence.Activities, activity)
|
||||
|
||||
defaultStatus := state.GetConfigValue("defaultStatus")
|
||||
if defaultStatus != "" {
|
||||
presence.Status = defaultStatus
|
||||
} else {
|
||||
if afk {
|
||||
presence.Status = "idle"
|
||||
} else {
|
||||
presence.Status = "online"
|
||||
}
|
||||
}
|
||||
|
||||
op := presenceOp{3, presence}
|
||||
wsMutex.Lock()
|
||||
wsConn.WriteJSON(op)
|
||||
wsMutex.Unlock()
|
||||
}
|
||||
56
main.go
56
main.go
|
|
@ -63,15 +63,8 @@ func main() {
|
|||
state.Setup(config)
|
||||
commands.Setup()
|
||||
|
||||
allowUserAccounts := config["allowUserAccounts"] == "true"
|
||||
tokenPrefix := "Bot "
|
||||
if allowUserAccounts {
|
||||
tokenPrefix = ""
|
||||
}
|
||||
|
||||
fullToken := tokenPrefix + token
|
||||
|
||||
client, err := discordgo.New(fullToken)
|
||||
// TODO: user account support
|
||||
client, err := discordgo.New("Bot " + token)
|
||||
if err != nil {
|
||||
fmt.Println("% Failed to create client:", err)
|
||||
fmt.Print("\r")
|
||||
|
|
@ -79,41 +72,22 @@ func main() {
|
|||
return
|
||||
}
|
||||
|
||||
//client.LogLevel = discordgo.LogDebug
|
||||
|
||||
// TODO: dont set for user accounts(? never really tested if it matters)
|
||||
client.Identify.Intents = discordgo.IntentsAll
|
||||
|
||||
client.Identify.Properties = discordgo.IdentifyProperties{
|
||||
OS: runtime.GOOS,
|
||||
}
|
||||
statusType := config["statusType"]
|
||||
if statusType == "mobile" {
|
||||
client.Identify.Properties.Browser = "Discord Android"
|
||||
} else if statusType == "embedded" {
|
||||
client.Identify.Properties.Browser = "Discord Embedded"
|
||||
} else if statusType == "desktop" {
|
||||
client.Identify.Properties.Browser = "Discord Client"
|
||||
if config["useMobile"] == "true" {
|
||||
client.Identify.Properties = discordgo.IdentifyProperties{
|
||||
OS: "Android",
|
||||
Browser: "Discord Android",
|
||||
Device: "Pixel, raven",
|
||||
}
|
||||
} else {
|
||||
client.Identify.Properties.Browser = "comcord"
|
||||
}
|
||||
|
||||
status := "online"
|
||||
defaultStatus := config["defaultStatus"]
|
||||
if defaultStatus != "" {
|
||||
status = defaultStatus
|
||||
}
|
||||
startTime := state.GetStartTime()
|
||||
|
||||
client.Identify.Presence = discordgo.GatewayStatusUpdate{
|
||||
Since: 0,
|
||||
Status: status,
|
||||
AFK: false,
|
||||
Game: discordgo.Activity{
|
||||
Type: 0,
|
||||
Name: "comcord",
|
||||
ApplicationID: "1026163285877325874",
|
||||
CreatedAt: startTime,
|
||||
},
|
||||
// TODO: user account support
|
||||
client.Identify.Properties = discordgo.IdentifyProperties{
|
||||
OS: runtime.GOOS,
|
||||
Browser: "comcord",
|
||||
Device: "comcord",
|
||||
}
|
||||
}
|
||||
|
||||
events.Setup(client)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
package state
|
||||
|
||||
import (
|
||||
"time"
|
||||
"time"
|
||||
|
||||
"github.com/bwmarrin/discordgo"
|
||||
"github.com/bwmarrin/discordgo"
|
||||
)
|
||||
|
||||
type ComcordState struct {
|
||||
Config map[string]string
|
||||
Connected bool
|
||||
RPCConnected bool
|
||||
StartTime time.Time
|
||||
StartTime int64
|
||||
CurrentGuild string
|
||||
CurrentChannel string
|
||||
NameLength int
|
||||
|
|
@ -30,7 +30,7 @@ func Setup(config map[string]string) {
|
|||
state.Config = config
|
||||
state.Connected = true
|
||||
state.RPCConnected = false
|
||||
state.StartTime = time.Now()
|
||||
state.StartTime = time.Now().Unix()
|
||||
state.CurrentGuild = ""
|
||||
state.CurrentChannel = ""
|
||||
state.NameLength = 2
|
||||
|
|
@ -59,7 +59,7 @@ func SetRPCConnected(value bool) {
|
|||
state.RPCConnected = value
|
||||
}
|
||||
|
||||
func GetStartTime() time.Time {
|
||||
func GetStartTime() int64 {
|
||||
return state.StartTime
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue