Merge branch 'go' of https://github.com/animenotifier/notify.moe into go

Yet again forgot merge before committing...

pages/anime/episodes.pixy

@@ -15,11 +15,10 @@ component AnimeEpisodes(anime *arn.Anime, episodes []*arn.AnimeEpisode, user *ar
 							if episode.Number != -1
 								span= episode.Number
 						
-						.episode-title
-							if episode.Title.Japanese != ""
-								span= episode.Title.Japanese
-							else
-								span -
+						if episode.Title.Japanese != ""
+							span.episode-title= episode.Title.Japanese
+						else
+							span.episode-title -
 						
 						if validate.DateTime(episode.AiringDate.Start)
 							.episode-airing-date-start.utc-airing-date.no-tip(data-start-date=episode.AiringDate.Start, data-end-date=episode.AiringDate.End, data-episode-number=episode.Number)= episode.AiringDate.StartDateHuman()

pages/anime/episodes.scarlet

@@ -10,7 +10,7 @@ const episode-margin = 0.5rem
 	button-hover
 	margin episode-margin
 	padding 0.5rem
-	flex-basis calc(50% - episode-margin * 2)
+	width calc(50% - episode-margin * 2)
 	overflow hidden
 	color text-color
 	box-shadow shadow-light
@@ -28,7 +28,7 @@ const episode-margin = 0.5rem
 		justify-content flex-start
 
 	.episode
-		flex-basis 190px
+		width 190px
 
 .episode-number
 	display flex

pages/episode/episode.pixy

@@ -1,5 +1,6 @@
 component AnimeEpisode(anime *arn.Anime, episode *arn.AnimeEpisode, user *arn.User)
-	h1= anime.Title.ByUser(user)
+	h1
+		a(href=anime.Link())= anime.Title.ByUser(user)
 
 	.episode-view-image-container
 		a(href=anime.Link(), title=anime.Title.ByUser(user))

scripts/AnimeNotifier.ts

@@ -1058,13 +1058,21 @@ export default class AnimeNotifier {
 
 
 		// "+" = Audio speed up
+<<<<<<< HEAD
 		if(e.keyCode === 107 || e.keyCode === 187 || e.key == "+") {
+=======
+		if(e.key == "+") {
+>>>>>>> bd6291290bff210ed9ae2e70fc3820181899470d
 			this.audioPlayer.addSpeed(0.05)
 			return preventDefault()
 		}
 
 		// "-" = Audio speed down
+<<<<<<< HEAD
 		if(e.keyCode === 109 || e.keyCode === 189 || e.key == "-") {
+=======
+		if(e.key == "-") {
+>>>>>>> bd6291290bff210ed9ae2e70fc3820181899470d
 			this.audioPlayer.addSpeed(-0.05)
 			return preventDefault()
 		}