-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1894 from H1rono/add-bot-events
BOTイベントを追加
- Loading branch information
Showing
27 changed files
with
1,156 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package payload | ||
|
||
import ( | ||
"github.com/gofrs/uuid" | ||
"time" | ||
) | ||
|
||
// UserGroupAdminAdded USER_GROUP_ADMIN_ADDEDイベントペイロード | ||
type UserGroupAdminAdded struct { | ||
Base | ||
GroupMember `json:"groupMember"` | ||
} | ||
|
||
func MakeUserGroupAdminAdded(eventTime time.Time, groupID, userID uuid.UUID) *UserGroupAdminAdded { | ||
return &UserGroupAdminAdded{ | ||
Base: MakeBase(eventTime), | ||
GroupMember: MakeGroupMember(groupID, userID), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package payload | ||
|
||
import ( | ||
"github.com/gofrs/uuid" | ||
"time" | ||
) | ||
|
||
// UserGroupAdminRemoved USER_GROUP_ADMIN_REMOVEDイベントペイロード | ||
type UserGroupAdminRemoved struct { | ||
Base | ||
GroupMember `json:"groupMember"` | ||
} | ||
|
||
func MakeUserGroupAdminRemoved(eventTime time.Time, groupID, userID uuid.UUID) *UserGroupAdminRemoved { | ||
return &UserGroupAdminRemoved{ | ||
Base: MakeBase(eventTime), | ||
GroupMember: MakeGroupMember(groupID, userID), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package payload | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/traPtitech/traQ/model" | ||
) | ||
|
||
// UserGroupCreated USER_GROUP_CREATEDイベントペイロード | ||
type UserGroupCreated struct { | ||
Base | ||
Group UserGroup `json:"group"` | ||
} | ||
|
||
func MakeUserGroupCreated(eventTime time.Time, group model.UserGroup) *UserGroupCreated { | ||
return &UserGroupCreated{ | ||
Base: MakeBase(eventTime), | ||
Group: MakeUserGroup(group), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package payload | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/gofrs/uuid" | ||
"github.com/traPtitech/traQ/model" | ||
) | ||
|
||
// UserGroupDeleted USER_GROUP_DELETEDイベントペイロード | ||
type UserGroupDeleted struct { | ||
Base | ||
GroupID uuid.UUID `json:"groupId"` | ||
} | ||
|
||
func MakeUserGroupDeleted(eventTime time.Time, group model.UserGroup) *UserGroupDeleted { | ||
return &UserGroupDeleted{ | ||
Base: MakeBase(eventTime), | ||
GroupID: group.ID, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package payload | ||
|
||
import ( | ||
"github.com/gofrs/uuid" | ||
"time" | ||
) | ||
|
||
// UserGroupMemberAdded USER_GROUP_MEMBER_ADDEDイベントペイロード | ||
type UserGroupMemberAdded struct { | ||
Base | ||
GroupMember `json:"groupMember"` | ||
} | ||
|
||
func MakeUserGroupMemberAdded(eventTime time.Time, groupID, userID uuid.UUID) *UserGroupMemberAdded { | ||
return &UserGroupMemberAdded{ | ||
Base: MakeBase(eventTime), | ||
GroupMember: MakeGroupMember(groupID, userID), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package payload | ||
|
||
import ( | ||
"github.com/gofrs/uuid" | ||
"time" | ||
) | ||
|
||
// UserGroupMemberRemoved USER_GROUP_MEMBER_REMOVEDイベントペイロード | ||
type UserGroupMemberRemoved struct { | ||
Base | ||
GroupMember `json:"groupMember"` | ||
} | ||
|
||
func MakeUserGroupMemberRemoved(eventTime time.Time, groupID, userID uuid.UUID) *UserGroupMemberRemoved { | ||
return &UserGroupMemberRemoved{ | ||
Base: MakeBase(eventTime), | ||
GroupMember: MakeGroupMember(groupID, userID), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package payload | ||
|
||
import ( | ||
"github.com/gofrs/uuid" | ||
"time" | ||
) | ||
|
||
// UserGroupMemberUpdated USER_GROUP_MEMBER_UPDATEDイベントペイロード | ||
type UserGroupMemberUpdated struct { | ||
Base | ||
GroupMember `json:"groupMember"` | ||
} | ||
|
||
func MakeUserGroupMemberUpdated(eventTime time.Time, groupID, userID uuid.UUID) *UserGroupMemberUpdated { | ||
return &UserGroupMemberUpdated{ | ||
Base: MakeBase(eventTime), | ||
GroupMember: MakeGroupMember(groupID, userID), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package payload | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/gofrs/uuid" | ||
) | ||
|
||
// UserGroupUpdated USER_GROUP_UPDATEDイベントペイロード | ||
type UserGroupUpdated struct { | ||
Base | ||
GroupID uuid.UUID `json:"groupId"` | ||
} | ||
|
||
func MakeUserGroupUpdated(eventTime time.Time, groupID uuid.UUID) *UserGroupUpdated { | ||
return &UserGroupUpdated{ | ||
Base: MakeBase(eventTime), | ||
GroupID: groupID, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package handler | ||
|
||
import ( | ||
"fmt" | ||
"github.com/gofrs/uuid" | ||
"time" | ||
|
||
"github.com/leandro-lugaresi/hub" | ||
|
||
"github.com/traPtitech/traQ/service/bot/event" | ||
"github.com/traPtitech/traQ/service/bot/event/payload" | ||
) | ||
|
||
func UserGroupAdminAdded(ctx Context, datetime time.Time, _ string, fields hub.Fields) error { | ||
groupID := fields["group_id"].(uuid.UUID) | ||
userID := fields["user_id"].(uuid.UUID) | ||
bots, err := ctx.GetBots(event.UserGroupAdminAdded) | ||
if err != nil { | ||
return fmt.Errorf("failed to GetBots: %w", err) | ||
} | ||
if len(bots) == 0 { | ||
return nil | ||
} | ||
|
||
if err := ctx.Multicast( | ||
event.UserGroupAdminAdded, | ||
payload.MakeUserGroupAdminAdded(datetime, groupID, userID), | ||
bots, | ||
); err != nil { | ||
return fmt.Errorf("failed to multicast: %w", err) | ||
} | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package handler | ||
|
||
import ( | ||
"testing" | ||
"time" | ||
|
||
"github.com/gofrs/uuid" | ||
"github.com/golang/mock/gomock" | ||
"github.com/leandro-lugaresi/hub" | ||
"github.com/stretchr/testify/assert" | ||
|
||
intevent "github.com/traPtitech/traQ/event" | ||
"github.com/traPtitech/traQ/model" | ||
"github.com/traPtitech/traQ/service/bot/event" | ||
"github.com/traPtitech/traQ/service/bot/event/payload" | ||
"github.com/traPtitech/traQ/service/bot/handler/mock_handler" | ||
) | ||
|
||
func TestUserGroupAdminAdded(t *testing.T) { | ||
t.Parallel() | ||
|
||
b := &model.Bot{ | ||
ID: uuid.NewV3(uuid.Nil, "b"), | ||
BotUserID: uuid.NewV3(uuid.Nil, "bu"), | ||
SubscribeEvents: model.BotEventTypesFromArray([]string{event.UserGroupAdminAdded.String()}), | ||
State: model.BotActive, | ||
} | ||
|
||
t.Run("success", func(t *testing.T) { | ||
t.Parallel() | ||
ctrl := gomock.NewController(t) | ||
handlerCtx := mock_handler.NewMockContext(ctrl) | ||
registerBot(t, handlerCtx, b) | ||
|
||
userID := uuid.NewV3(uuid.Nil, "u") | ||
groupID := uuid.NewV3(uuid.Nil, "g") | ||
et := time.Now() | ||
|
||
expectMulticast(handlerCtx, event.UserGroupAdminAdded, payload.MakeUserGroupAdminAdded(et, groupID, userID), []*model.Bot{b}) | ||
assert.NoError(t, UserGroupAdminAdded(handlerCtx, et, intevent.UserGroupAdminAdded, hub.Fields{ | ||
"group_id": groupID, | ||
"user_id": userID, | ||
})) | ||
}) | ||
|
||
t.Run("not subscribe USER_GROUP_ADMIN_ADDED", func(t *testing.T) { | ||
t.Parallel() | ||
ctrl := gomock.NewController(t) | ||
handlerCtx := mock_handler.NewMockContext(ctrl) | ||
b2 := &model.Bot{ | ||
ID: uuid.NewV3(uuid.Nil, "b2"), | ||
BotUserID: uuid.NewV3(uuid.Nil, "bu2"), | ||
SubscribeEvents: model.BotEventTypesFromArray([]string{event.MessageCreated.String()}), | ||
State: model.BotActive, | ||
} | ||
registerBot(t, handlerCtx, b) | ||
registerBot(t, handlerCtx, b2) | ||
|
||
userID := uuid.NewV3(uuid.Nil, "u") | ||
groupID := uuid.NewV3(uuid.Nil, "g") | ||
et := time.Now() | ||
|
||
expectMulticast(handlerCtx, event.UserGroupAdminAdded, payload.MakeUserGroupAdminAdded(et, groupID, userID), []*model.Bot{b}) | ||
assert.NoError(t, UserGroupAdminAdded(handlerCtx, et, intevent.UserGroupAdminAdded, hub.Fields{ | ||
"group_id": groupID, | ||
"user_id": userID, | ||
})) | ||
}) | ||
} |
Oops, something went wrong.