Moved server packages to a separate folder

pages/amv/amv.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get a single AMV.

pages/anime/anime.go

@@ -8,7 +8,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 const (

pages/animelist/animelist.go

@@ -8,7 +8,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils/infinitescroll"
 )
 

pages/character/character.go

@@ -9,7 +9,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils"
 )
 

pages/company/company.go

@@ -8,7 +8,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils"
 )
 

pages/company/edit.go

@@ -7,7 +7,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils/editform"
 )
 

pages/frontpage/frontpage.go

@@ -5,7 +5,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get ...

pages/group/feed.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Feed shows the group front page.

pages/group/info.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Info shows the group information page.

pages/group/members.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Members shows the group members.

pages/post/post.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get post.

pages/profile/profile.go

@@ -8,7 +8,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils"
 )
 

pages/quote/edit.go

@@ -3,7 +3,7 @@ package quote
 import (
 	"net/http"
 
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"

pages/quote/quote.go

@@ -7,7 +7,7 @@ import (
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get quote.

pages/soundtrack/edit.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils/editform"
 
 	"github.com/aerogo/aero"

pages/soundtrack/lyrics.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils"
 )
 

pages/soundtrack/soundtrack.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get track.

pages/thread/thread.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/components"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get thread.

server/Main.go

@@ -1,5 +1,6 @@
 package server
 
+// Main runs the main loop of the web server.
 func Main() {
 	app := New()
 	app.Run()

server/New.go

@@ -9,15 +9,16 @@ import (
 	"github.com/akyoto/color"
 	"github.com/animenotifier/notify.moe/arn"
 	"github.com/animenotifier/notify.moe/assets"
-	"github.com/animenotifier/notify.moe/auth"
-	"github.com/animenotifier/notify.moe/graphql"
-	"github.com/animenotifier/notify.moe/middleware"
 	"github.com/animenotifier/notify.moe/pages"
+	"github.com/animenotifier/notify.moe/server/auth"
+	"github.com/animenotifier/notify.moe/server/graphql"
+	"github.com/animenotifier/notify.moe/server/https"
+	"github.com/animenotifier/notify.moe/server/middleware"
 	"github.com/animenotifier/notify.moe/utils/htmlemail"
-	"github.com/animenotifier/notify.moe/utils/https"
 	"github.com/animenotifier/notify.moe/utils/routetests"
 )
 
+// New creates a new web server.
 func New() *aero.Application {
 	app := aero.New()
 

utils/README.md

@@ -0,0 +1,3 @@
+# utils
+
+This folder should be deleted in future versions.

utils/page/page.go

@@ -2,7 +2,7 @@ package page
 
 import (
 	"github.com/aerogo/aero"
-	"github.com/animenotifier/notify.moe/middleware"
+	"github.com/animenotifier/notify.moe/server/middleware"
 )
 
 // Get registers a layout rendered route and a contents-only route.