rename logrus & use latest blackfriday

README.md

@@ -7,7 +7,7 @@
 
 ```bash
 echo 'for logging'
-go get -u "github.com/Sirupsen/logrus"
+go get -u "github.com/sirupsen/logrus"
 go get -u "github.com/fatih/color"
 
 echo 'networking'
@@ -33,7 +33,9 @@ sudo apt get install ffmpeg
 #   sudo yum install ffmpeg ffmpeg-devel
 
 echo 'embedding markdown'
-go get -u "github.com/russross/blackfriday"
+go get -u "gopkg.in/russross/blackfriday.v2"
+echo 'workaround: https://github.com/russross/blackfriday/issues/491'
+go mod edit -replace=gopkg.in/russross/[email protected]=github.com/russross/blackfriday/[email protected]
 ```
 
 ### ClientSide

cmds/garbage-collect/main.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/fairy-rockets/the-gear-of-seasons/fml"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	shelfPkg "github.com/fairy-rockets/the-gear-of-seasons/shelf"
 	"github.com/fatih/color"

cmds/sanity-check/main.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/fairy-rockets/the-gear-of-seasons/fml"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	shelfPkg "github.com/fairy-rockets/the-gear-of-seasons/shelf"
 	"github.com/fatih/color"

cmds/the-gear-of-seasons/main.go

@@ -8,7 +8,7 @@ import (
 	_ "image/png"
 	"os"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"os/signal"
 	"syscall"

go.mod

@@ -0,0 +1,20 @@
+module github.com/fairy-rockets/the-gear-of-seasons
+
+go 1.12
+
+replace gopkg.in/russross/blackfriday.v2 v2.0.1 => github.com/russross/blackfriday/v2 v2.0.1
+
+require (
+	github.com/disintegration/imaging v1.6.0
+	github.com/fatih/color v1.7.0
+	github.com/julienschmidt/httprouter v1.2.0
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
+	github.com/oliamb/cutter v0.2.2
+	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.4.2
+	golang.org/x/net v0.0.0-20190603091049-60506f45cf65
+	gopkg.in/russross/blackfriday.v2 v2.0.1
+	gopkg.in/yaml.v2 v2.2.2
+)

go.sum

@@ -0,0 +1,26 @@
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/oliamb/cutter v0.2.2/go.mod h1:4BenG2/4GuRBDbVm/OPahDVqbrOemzpPiG5mi1iryBU=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

shelf/entity_shelf.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )
 

shelf/entity_shelf.image.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/fairy-rockets/the-gear-of-seasons/util"
 	"gopkg.in/yaml.v2"
 )

shelf/moment_shelf.go

@@ -8,7 +8,7 @@ import (
 
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )
 

web/cache/init.go

@@ -1,6 +1,6 @@
 package cache
 
-import "github.com/Sirupsen/logrus"
+import "github.com/sirupsen/logrus"
 
 func log() *logrus.Entry {
 	return logrus.WithField("Module", "Cache")

web/cache/remote.markdown.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/russross/blackfriday"
+	"gopkg.in/russross/blackfriday.v2"
 )
 
 func fetchMarkdown(url string) (string, error) {
@@ -18,6 +18,6 @@ func fetchMarkdown(url string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	html := blackfriday.MarkdownCommon(body)
+	html := blackfriday.Run(body)
 	return string(html), nil
 }

web/omote/server._.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/fairy-rockets/the-gear-of-seasons/web/util"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"github.com/fairy-rockets/the-gear-of-seasons/shelf"
 	"github.com/fairy-rockets/the-gear-of-seasons/web/cache"

web/server.go

@@ -12,7 +12,7 @@ import (
 
 	"sync"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/fairy-rockets/the-gear-of-seasons/shelf"
 	"github.com/fairy-rockets/the-gear-of-seasons/web/cache"
 	"golang.org/x/net/context"

web/ura/server._.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/fairy-rockets/the-gear-of-seasons/web/util"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"github.com/fairy-rockets/the-gear-of-seasons/shelf"
 	"github.com/fairy-rockets/the-gear-of-seasons/web/cache"