Use new event API

arn/AnimeListItemAPI.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/aerogo/aero"
+	"github.com/aerogo/aero/event"
 	"github.com/aerogo/api"
 )
 
@@ -46,10 +47,8 @@ func (item *AnimeListItem) Edit(ctx aero.Context, key string, value reflect.Valu
 
 				// Broadcast event to all users so they can reload the activity page if needed.
 				for receiver := range StreamUsers() {
-					receiver.BroadcastEvent(&aero.Event{
-						Name: "activity",
-						Data: receiver.IsFollowing(user.ID),
-					})
+					activityEvent := event.New("activity", receiver.IsFollowing(user.ID))
+					receiver.BroadcastEvent(activityEvent)
 				}
 			}
 		} else if newEpisodes >= lastActivity.FromEpisode {

arn/User.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aerogo/aero"
+	"github.com/aerogo/aero/event"
 	"github.com/aerogo/http/client"
 	"github.com/animenotifier/ffxiv"
 	"github.com/animenotifier/notify.moe/arn/autocorrect"
@@ -61,7 +61,7 @@ type User struct {
 
 	eventStreams struct {
 		sync.Mutex
-		value []*aero.EventStream
+		value []*event.Stream
 	}
 }
 
@@ -219,10 +219,8 @@ func (user *User) SendNotification(pushNotification *PushNotification) {
 	// }
 
 	// Send an event to the user's open tabs
-	user.BroadcastEvent(&aero.Event{
-		Name: "notificationCount",
-		Data: userNotifications.CountUnseen(),
-	})
+	notificationCount := event.New("notificationCount", userNotifications.CountUnseen())
+	user.BroadcastEvent(notificationCount)
 }
 
 // RealName returns the real name of the user.

arn/UserEvents.go

@@ -1,14 +1,11 @@
 package arn
 
-import "github.com/aerogo/aero"
-
-// // EventStreams returns the user's active event streams.
-// func (user *User) EventStreams() []*aero.EventStream {
-// 	return user.eventStreams
-// }
+import (
+	"github.com/aerogo/aero/event"
+)
 
 // AddEventStream adds an event stream to the given user.
-func (user *User) AddEventStream(stream *aero.EventStream) {
+func (user *User) AddEventStream(stream *event.Stream) {
 	user.eventStreams.Lock()
 	defer user.eventStreams.Unlock()
 
@@ -17,7 +14,7 @@ func (user *User) AddEventStream(stream *aero.EventStream) {
 
 // RemoveEventStream removes an event stream from the given user
 // and returns true if it was removed, otherwise false.
-func (user *User) RemoveEventStream(stream *aero.EventStream) bool {
+func (user *User) RemoveEventStream(stream *event.Stream) bool {
 	user.eventStreams.Lock()
 	defer user.eventStreams.Unlock()
 
@@ -32,14 +29,14 @@ func (user *User) RemoveEventStream(stream *aero.EventStream) bool {
 }
 
 // BroadcastEvent sends the given event to all event streams for the given user.
-func (user *User) BroadcastEvent(event *aero.Event) {
+func (user *User) BroadcastEvent(evt *event.Event) {
 	user.eventStreams.Lock()
 	defer user.eventStreams.Unlock()
 
 	for _, stream := range user.eventStreams.value {
 		// Non-blocking send because we don't know if our listeners are still active.
 		select {
-		case stream.Events <- event:
+		case stream.Events <- evt:
 		default:
 		}
 	}

arn/Utils.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/aerogo/aero"
+	"github.com/aerogo/aero/event"
 	"github.com/aerogo/mirror"
 	"github.com/akyoto/color"
 	"github.com/animenotifier/kitsu"
@@ -201,9 +202,9 @@ func DateToSeason(date time.Time) string {
 }
 
 // BroadcastEvent sends the given event to the event streams of all users.
-func BroadcastEvent(event *aero.Event) {
+func BroadcastEvent(evt *event.Event) {
 	for user := range StreamUsers() {
-		user.BroadcastEvent(event)
+		user.BroadcastEvent(evt)
 	}
 }