Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/rpc rewrite #324

Closed
Closed
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
67a461e
fix: linux path missing slash
dennisrijsdijk Oct 7, 2023
a7612e4
api: synchronous api for commands
dennisrijsdijk Oct 9, 2023
2ccebcc
api: start on type safety, update example name
dennisrijsdijk Oct 9, 2023
d023f6d
api: add guilds and examples
dennisrijsdijk Oct 9, 2023
ba996d9
chore: remove interface and expose struct
dennisrijsdijk Oct 9, 2023
bbcd9d7
chore: arguments in functions
dennisrijsdijk Oct 9, 2023
de45df7
fix: open the client
dennisrijsdijk Oct 9, 2023
3de5690
broken: get_channel
dennisrijsdijk Oct 9, 2023
5b42f0a
actually add the scope that breaks it
dennisrijsdijk Oct 10, 2023
fb11486
Merge branch 'master' into feature/rpc-rewrite
dennisrijsdijk Oct 22, 2023
9074aaa
fix messages for get_channel and add get_channels example
dennisrijsdijk Oct 23, 2023
fddf28f
voice settings
dennisrijsdijk Oct 23, 2023
93d3e4c
user voice settings
dennisrijsdijk Oct 23, 2023
63ed6c3
voice channels
dennisrijsdijk Oct 24, 2023
fb5ce7b
select text channel
dennisrijsdijk Oct 24, 2023
ddc3881
rich presence set activity
dennisrijsdijk Oct 24, 2023
e2172cc
activity join invite and close activity request
dennisrijsdijk Oct 24, 2023
5347e72
set certified device
dennisrijsdijk Oct 25, 2023
c3f48d8
cleanup
dennisrijsdijk Oct 25, 2023
c822652
implement subscribes and unsubscribes, abstract away send, subscribe …
dennisrijsdijk Oct 26, 2023
6a68811
update pipe_unix to support optional trailing slash (darwin vs linux)
dennisrijsdijk Oct 29, 2023
58ee2d9
Merge branch 'feature/rpc' into feature/rpc-rewrite
dennisrijsdijk Oct 29, 2023
f531263
inline sendBytes into send
dennisrijsdijk Oct 30, 2023
4761252
naming changes
dennisrijsdijk Oct 30, 2023
4ef8ffc
pointer return values, reduce else when not needed
dennisrijsdijk Oct 30, 2023
ca68a83
remove EmptyArgs
dennisrijsdijk Oct 30, 2023
fb13deb
reduce duplicate structs
dennisrijsdijk Oct 30, 2023
b25f57f
unpointer discord.Attachment in rpc.Attachment
dennisrijsdijk Nov 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
59 changes: 59 additions & 0 deletions _examples/rpc/get_channel/example.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package main

import (
"os"

"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/rpc"
)

var (
clientID = snowflake.GetEnv("disgo_client_id")
clientSecret = os.Getenv("disgo_client_secret")
channelID = snowflake.GetEnv("disgo_channel_id")
)

func main() {
log.SetLevel(log.LevelDebug)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Info("example is starting...")

oauth2Client := rest.NewOAuth2(rest.NewClient(""))

client, err := rpc.New(clientID)
if err != nil {
log.Fatal(err)
return
}

err = client.Open()
if err != nil {
log.Fatal(err)
}
defer client.Close()

var tokenRs *discord.AccessTokenResponse
codeRs, err := client.Authorize([]discord.OAuth2Scope{discord.OAuth2ScopeRPC, discord.OAuth2ScopeMessagesRead}, "", "")
if err != nil {
log.Fatal(err)
}

tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, codeRs.Code, "http://localhost")
if err != nil {
log.Fatal(err)
}

if _, err := client.Authenticate(tokenRs.AccessToken); err != nil {
log.Fatal(err)
}

channel, err := client.GetChannel(channelID)
if err != nil {
log.Fatal(err)
}
log.Info(channel)
}
59 changes: 59 additions & 0 deletions _examples/rpc/get_channels/example.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package main

import (
"os"

"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/rpc"
)

var (
clientID = snowflake.GetEnv("disgo_client_id")
clientSecret = os.Getenv("disgo_client_secret")
guildID = snowflake.GetEnv("disgo_guild_id")
)

func main() {
log.SetLevel(log.LevelDebug)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Info("example is starting...")

oauth2Client := rest.NewOAuth2(rest.NewClient(""))

client, err := rpc.New(clientID)
if err != nil {
log.Fatal(err)
return
}

err = client.Open()
if err != nil {
log.Fatal(err)
}
defer client.Close()

var tokenRs *discord.AccessTokenResponse
codeRs, err := client.Authorize([]discord.OAuth2Scope{discord.OAuth2ScopeRPC}, "", "")
if err != nil {
log.Fatal(err)
}

tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, codeRs.Code, "http://localhost")
if err != nil {
log.Fatal(err)
}

if _, err := client.Authenticate(tokenRs.AccessToken); err != nil {
log.Fatal(err)
}

channels, err := client.GetChannels(guildID)
if err != nil {
log.Fatal(err)
}
log.Info(channels)
}
64 changes: 64 additions & 0 deletions _examples/rpc/get_guild/example.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package main

import (
"fmt"
"os"

"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/rpc"
)

var (
clientID = snowflake.GetEnv("disgo_client_id")
clientSecret = os.Getenv("disgo_client_secret")
guildId = snowflake.GetEnv("disgo_guild_id")
)

func main() {
log.SetLevel(log.LevelDebug)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Info("example is starting...")

oauth2Client := rest.NewOAuth2(rest.NewClient(""))

client, err := rpc.New(clientID)
if err != nil {
log.Fatal(err)
return
}

err = client.Open()
if err != nil {
log.Fatal(err)
}
defer client.Close()

var tokenRs *discord.AccessTokenResponse
codeRs, err := client.Authorize([]discord.OAuth2Scope{discord.OAuth2ScopeRPC, discord.OAuth2ScopeGuilds}, "", "")
if err != nil {
log.Fatal(err)
}

tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, codeRs.Code, "http://localhost")
if err != nil {
log.Fatal(err)
}

if _, err := client.Authenticate(tokenRs.AccessToken); err != nil {
log.Fatal(err)
}

guild, err := client.GetGuild(guildId, 0)
if err != nil {
log.Fatal(err)
}
if guild.IconURL == nil {
log.Info(guild.Name)
return
}
log.Info(fmt.Sprintf("%s: %s", guild.Name, *guild.IconURL))
}
65 changes: 65 additions & 0 deletions _examples/rpc/get_guilds/example.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package main

import (
"fmt"
"os"

"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/rpc"
)

var (
clientID = snowflake.GetEnv("disgo_client_id")
clientSecret = os.Getenv("disgo_client_secret")
)

func main() {
log.SetLevel(log.LevelDebug)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Info("example is starting...")

oauth2Client := rest.NewOAuth2(rest.NewClient(""))

client, err := rpc.New(clientID)
if err != nil {
log.Fatal(err)
return
}

err = client.Open()
if err != nil {
log.Fatal(err)
}
defer client.Close()

var tokenRs *discord.AccessTokenResponse
codeRs, err := client.Authorize([]discord.OAuth2Scope{discord.OAuth2ScopeRPC, discord.OAuth2ScopeGuilds}, "", "")
if err != nil {
log.Fatal(err)
}

tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, codeRs.Code, "http://localhost")
if err != nil {
log.Fatal(err)
}

if _, err := client.Authenticate(tokenRs.AccessToken); err != nil {
log.Fatal(err)
}

guildsRs, err := client.GetGuilds()
if err != nil {
log.Fatal(err)
}
for _, guild := range guildsRs.Guilds {
if guild.IconURL == nil {
log.Info(guild.Name)
continue
}
log.Info(fmt.Sprintf("%s: %s", guild.Name, *guild.IconURL))
}
}
62 changes: 62 additions & 0 deletions _examples/rpc/get_selected_voice_channel/example.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package main

import (
"os"

"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/rpc"
)

var (
clientID = snowflake.GetEnv("disgo_client_id")
clientSecret = os.Getenv("disgo_client_secret")
)

func main() {
log.SetLevel(log.LevelDebug)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Info("example is starting...")

oauth2Client := rest.NewOAuth2(rest.NewClient(""))

client, err := rpc.New(clientID)
if err != nil {
log.Fatal(err)
return
}

err = client.Open()
if err != nil {
log.Fatal(err)
}
defer client.Close()

var tokenRs *discord.AccessTokenResponse
codeRs, err := client.Authorize([]discord.OAuth2Scope{discord.OAuth2ScopeRPC}, "", "")
if err != nil {
log.Fatal(err)
}

tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, codeRs.Code, "http://localhost")
if err != nil {
log.Fatal(err)
}

if _, err := client.Authenticate(tokenRs.AccessToken); err != nil {
log.Fatal(err)
}

channel, err := client.GetSelectedVoiceChannel()
if err != nil {
log.Fatal(err)
}
if channel == nil {
log.Info("User is not in a voice channel.")
return
}
log.Info(*channel)
}
58 changes: 58 additions & 0 deletions _examples/rpc/get_voice_settings/example.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package main

import (
"os"

"github.com/disgoorg/log"
"github.com/disgoorg/snowflake/v2"

"github.com/disgoorg/disgo/discord"
"github.com/disgoorg/disgo/rest"
"github.com/disgoorg/disgo/rpc"
)

var (
clientID = snowflake.GetEnv("disgo_client_id")
clientSecret = os.Getenv("disgo_client_secret")
)

func main() {
log.SetLevel(log.LevelDebug)
log.SetFlags(log.LstdFlags | log.Lshortfile)
log.Info("example is starting...")

oauth2Client := rest.NewOAuth2(rest.NewClient(""))

client, err := rpc.New(clientID)
if err != nil {
log.Fatal(err)
return
}

err = client.Open()
if err != nil {
log.Fatal(err)
}
defer client.Close()

var tokenRs *discord.AccessTokenResponse
codeRs, err := client.Authorize([]discord.OAuth2Scope{discord.OAuth2ScopeRPC, discord.OAuth2ScopeMessagesRead}, "", "")
if err != nil {
log.Fatal(err)
}

tokenRs, err = oauth2Client.GetAccessToken(clientID, clientSecret, codeRs.Code, "http://localhost")
if err != nil {
log.Fatal(err)
}

if _, err := client.Authenticate(tokenRs.AccessToken); err != nil {
log.Fatal(err)
}

voiceSettings, err := client.GetVoiceSettings()
if err != nil {
log.Fatal(err)
}
log.Info(voiceSettings)
}