watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating to latest groupme-lib which shares a single websocket for all faye subscriptions for all users
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Brandon Watson
2023-09-20 16:06:04 -05:00
parent 8797e96b22
commit 5e71ad974c
6 changed files with 134 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
groupmeext/client.go
View File

@ -11,35 +11,35 @@ type Client struct {
}
// NewClient creates a new GroupMe API Client
func NewClient(authToken string) *Client {
func NewClient() *Client {
n := Client{
Client: groupme.NewClient(authToken),
Client: groupme.NewClient(),
}
return &n
}
func (c Client) IndexAllGroups() ([]*groupme.Group, error) {
func (c Client) IndexAllGroups(authToken string) ([]*groupme.Group, error) {
return c.IndexGroups(context.TODO(), &groupme.GroupsQuery{
// Omit: "memberships",
PerPage: 100, //TODO: Configurable and add multipage support
})
}, authToken)
}
func (c Client) IndexAllRelations() ([]*groupme.User, error) {
return c.IndexRelations(context.TODO())
func (c Client) IndexAllRelations(authToken string) ([]*groupme.User, error) {
return c.IndexRelations(context.TODO(), authToken)
}
func (c Client) IndexAllChats() ([]*groupme.Chat, error) {
func (c Client) IndexAllChats(authToken string) ([]*groupme.Chat, error) {
return c.IndexChats(context.TODO(), &groupme.IndexChatsQuery{
PerPage: 100, //TODO?
})
}, authToken)
}
func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, lastMessageFromMe bool, private bool) ([]*groupme.Message, error) {
func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, lastMessageFromMe bool, private bool, authToken string) ([]*groupme.Message, error) {
if private {
ans, e := c.IndexDirectMessages(context.TODO(), groupID.String(), &groupme.IndexDirectMessagesQuery{
SinceID: groupme.ID(lastMessageID),
//Limit: num,
})
}, authToken)
//fmt.Println(groupID, lastMessageID, num, i.Count, e)
if e != nil {
return nil, e
@ -54,7 +54,7 @@ func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, last
AfterID: groupme.ID(lastMessageID),
//20 for consistency with dms
Limit: 20,
})
}, authToken)
//fmt.Println(groupID, lastMessageID, num, i.Count, e)
if e != nil {
return nil, e
@ -63,12 +63,12 @@ func (c Client) LoadMessagesAfter(groupID groupme.ID, lastMessageID string, last
}
}
func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool) ([]*groupme.Message, error) {
func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool, authToken string) ([]*groupme.Message, error) {
if private {
i, e := c.IndexDirectMessages(context.TODO(), groupID, &groupme.IndexDirectMessagesQuery{
BeforeID: groupme.ID(lastMessageID),
//Limit: num,
})
}, authToken)
//fmt.Println(groupID, lastMessageID, num, i.Count, e)
if e != nil {
return nil, e
@ -80,7 +80,7 @@ func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool)
BeforeID: groupme.ID(lastMessageID),
//20 for consistency with dms
Limit: 20,
})
}, authToken)
//fmt.Println(groupID, lastMessageID, num, i.Count, e)
if e != nil {
return nil, e
@ -89,10 +89,10 @@ func (c Client) LoadMessagesBefore(groupID, lastMessageID string, private bool)
}
}
func (c *Client) RemoveFromGroup(uid, groupID groupme.ID) error {
group, err := c.ShowGroup(context.TODO(), groupID)
func (c *Client) RemoveFromGroup(uid, groupID groupme.ID, authToken string) error {
group, err := c.ShowGroup(context.TODO(), groupID, authToken)
if err != nil {
return err
}
return c.RemoveMember(context.TODO(), groupID, group.GetMemberByUserID(uid).ID)
return c.RemoveMember(context.TODO(), groupID, group.GetMemberByUserID(uid).ID, authToken)
}