Cleanup

arn/AMV.go

@@ -1,6 +1,7 @@
 package arn
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -10,7 +11,7 @@ import (
 
 	"github.com/aerogo/nano"
 	"github.com/animenotifier/notify.moe/arn/video"
-	"github.com/minio/minio-go/v6"
+	"github.com/minio/minio-go/v7"
 )
 
 // AMV is an anime music video.
@@ -120,7 +121,7 @@ func (amv *AMV) SetVideoReader(reader io.Reader) error {
 	}
 
 	// Upload the file to our storage server
-	_, err = Spaces.FPutObject("arn", fmt.Sprintf("videos/amvs/%s.webm", amv.ID), optimizedFile, minio.PutObjectOptions{
+	_, err = Spaces.FPutObject(context.TODO(), "arn", fmt.Sprintf("videos/amvs/%s.webm", amv.ID), optimizedFile, minio.PutObjectOptions{
 		ContentType:  "video/webm",
 		UserMetadata: userMetaData,
 	})
@@ -190,7 +191,7 @@ func (amv *AMV) Publish() error {
 	}
 
 	// No file uploaded
-	_, err := Spaces.StatObject("arn", fmt.Sprintf("videos/amvs/%s", amv.File), minio.StatObjectOptions{})
+	_, err := Spaces.StatObject(context.TODO(), "arn", fmt.Sprintf("videos/amvs/%s", amv.File), minio.StatObjectOptions{})
 
 	if err != nil {
 		return errors.New("You need to upload a WebM file for this AMV")

arn/AMVAPI.go

@@ -1,12 +1,14 @@
 package arn
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"reflect"
 
 	"github.com/aerogo/aero"
 	"github.com/aerogo/api"
+	"github.com/minio/minio-go/v7"
 )
 
 // Force interface implementations
@@ -103,7 +105,7 @@ func (amv *AMV) Delete() error {
 
 	// Remove file
 	if amv.File != "" && Spaces != nil {
-		err := Spaces.RemoveObject("arn", fmt.Sprintf("videos/amvs/%s", amv.File))
+		err := Spaces.RemoveObject(context.TODO(), "arn", fmt.Sprintf("videos/amvs/%s", amv.File), minio.RemoveObjectOptions{})
 
 		if err != nil {
 			return err

arn/EmailRenderer.go

@@ -1,33 +0,0 @@
-package arn
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/mailgun/mailgun-go/v3"
-)
-
-// HTMLEmailRenderer is the instance used for rendering emails.
-var HTMLEmailRenderer EmailRenderer
-
-// EmailRenderer is an interface for rendering HTML emails.
-type EmailRenderer interface {
-	Notification(notification *Notification) string
-}
-
-// SendEmail sends an e-mail.
-func SendEmail(email string, subject string, html string) error {
-	mg := mailgun.NewMailgun(APIKeys.Mailgun.Domain, APIKeys.Mailgun.PrivateKey)
-	sender := fmt.Sprintf("Anime Notifier <notifications@%s>", APIKeys.Mailgun.Domain)
-	message := mg.NewMessage(sender, subject, "", email)
-	message.SetHtml(html)
-
-	// Allow a 10-second timeout
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
-	defer cancel()
-
-	// Send the message
-	_, _, err := mg.Send(ctx, message)
-	return err
-}

arn/Spaces.go

@@ -3,7 +3,8 @@ package arn
 import (
 	"log"
 
-	"github.com/minio/minio-go/v6"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
 // Spaces represents our file storage server.
@@ -18,10 +19,12 @@ func initSpaces() {
 	go func() {
 		var err error
 		endpoint := "sfo2.digitaloceanspaces.com"
-		ssl := true
 
 		// Initiate a client using DigitalOcean Spaces.
-		Spaces, err = minio.New(endpoint, APIKeys.S3.ID, APIKeys.S3.Secret, ssl)
+		Spaces, err = minio.New(endpoint, &minio.Options{
+			Secure: true,
+			Creds:  credentials.NewStaticV4(APIKeys.S3.ID, APIKeys.S3.Secret, ""),
+		})
 
 		if err != nil {
 			log.Fatal(err)

arn/User.go

@@ -203,17 +203,6 @@ func (user *User) SendNotification(pushNotification *PushNotification) {
 	// Save changes
 	subs.Save()
 
-	// Send email notification
-	// if IsDevelopment() && user.ID == "4J6qpK1ve" {
-	// 	subject := notification.Title
-	// 	html := HTMLEmailRenderer.Notification(notification)
-	// 	err := SendEmail(user.Email, subject, html)
-
-	// 	if err != nil {
-	// 		fmt.Println(err)
-	// 	}
-	// }
-
 	// Send an event to the user's open tabs
 	notificationCount := event.New("notificationCount", userNotifications.CountUnseen())
 	user.BroadcastEvent(notificationCount)