Fix typos

docs/Contribute.md

@@ -45,7 +45,7 @@ Then, run the following command:
 make styles
 ```
 
-The `style.css`/`archive.css` will be updated and changes **needs to be commited** to the repository.
+The `style.css`/`archive.css` will be updated and changes **needs to be committed** to the repository.
 
 ## Lint the code
 

internal/core/ebook_test.go

@@ -101,7 +101,7 @@ func TestGenerateEbook(t *testing.T) {
 		})
 	})
 	t.Run("specific ebook generate case", func(t *testing.T) {
-		t.Run("unvalid bookmarkId that return Error", func(t *testing.T) {
+		t.Run("invalid bookmarkId that return Error", func(t *testing.T) {
 			tempDir := t.TempDir()
 			mockRequest := core.ProcessRequest{
 				Bookmark: model.Bookmark{

internal/database/database.go

@@ -83,7 +83,7 @@ type DB interface {
 	// DeleteBookmarks removes all record with matching ids from database.
 	DeleteBookmarks(ctx context.Context, ids ...int) error
 
-	// GetBookmark fetchs bookmark based on its ID or URL.
+	// GetBookmark fetches bookmark based on its ID or URL.
 	GetBookmark(ctx context.Context, id int, url string) (model.Bookmark, bool, error)
 
 	// SaveAccount saves new account in database

internal/database/database_test.go

@@ -23,7 +23,7 @@ func testDatabase(t *testing.T, dbFactory testDatabaseFactory) {
 		"testUpdateBookmark":                testUpdateBookmark,
 		"testUpdateBookmarkWithContent":     testUpdateBookmarkWithContent,
 		"testGetBookmark":                   testGetBookmark,
-		"testGetBookmarkNotExistant":        testGetBookmarkNotExistant,
+		"testGetBookmarkNotExistent":        testGetBookmarkNotExistent,
 		"testGetBookmarks":                  testGetBookmarks,
 		"testGetBookmarksWithSQLCharacters": testGetBookmarksWithSQLCharacters,
 		"testGetBookmarksCount":             testGetBookmarksCount,
@@ -231,7 +231,7 @@ func testGetBookmark(t *testing.T, db DB) {
 	assert.Equal(t, book.URL, savedBookmark.URL, "Retrieved bookmark should be the same")
 }
 
-func testGetBookmarkNotExistant(t *testing.T, db DB) {
+func testGetBookmarkNotExistent(t *testing.T, db DB) {
 	ctx := context.TODO()
 
 	savedBookmark, exists, err := db.GetBookmark(ctx, 1, "")

internal/database/mysql.go

@@ -500,7 +500,7 @@ func (db *MySQLDatabase) DeleteBookmarks(ctx context.Context, ids ...int) (err e
 	return nil
 }
 
-// GetBookmark fetchs bookmark based on its ID or URL.
+// GetBookmark fetches bookmark based on its ID or URL.
 // Returns the bookmark and boolean whether it's exist or not.
 func (db *MySQLDatabase) GetBookmark(ctx context.Context, id int, url string) (model.Bookmark, bool, error) {
 	args := []interface{}{id}

internal/database/pg.go

@@ -509,7 +509,7 @@ func (db *PGDatabase) DeleteBookmarks(ctx context.Context, ids ...int) (err erro
 	return nil
 }
 
-// GetBookmark fetchs bookmark based on its ID or URL.
+// GetBookmark fetches bookmark based on its ID or URL.
 // Returns the bookmark and boolean whether it's exist or not.
 func (db *PGDatabase) GetBookmark(ctx context.Context, id int, url string) (model.Bookmark, bool, error) {
 	args := []interface{}{id}

internal/http/routes/api/v1/bookmarks.go

@@ -28,7 +28,7 @@ func (r *BookmarksAPIRoutes) Setup(g *gin.RouterGroup) model.Routes {
 func (r *BookmarksAPIRoutes) listHandler(c *gin.Context) {
 	bookmarks, err := r.deps.Database.GetBookmarks(c, database.GetBookmarksOptions{})
 	if err != nil {
-		r.logger.WithError(err).Error("error getting bookmakrs")
+		r.logger.WithError(err).Error("error getting bookmarks")
 		response.SendInternalServerError(c)
 		return
 	}

internal/http/server.go

@@ -79,7 +79,7 @@ func (s *HttpServer) Start(_ context.Context) error {
 }
 
 func (s *HttpServer) Stop(ctx context.Context) error {
-	s.logger.WithField("addr", s.http.Addr).Info("stoppping http server")
+	s.logger.WithField("addr", s.http.Addr).Info("stopping http server")
 	return s.http.Shutdown(ctx)
 }
 

internal/view/assets/less/archive.less

@@ -12,7 +12,7 @@
 
 @header-height: 60px;
 @screen-sm-max: 600px;
-@screen-sm-header-hight: 50px;
+@screen-sm-header-height: 50px;
 
 #shiori-archive-header {
 	top             : 0;
@@ -69,7 +69,7 @@
 
 	@media (max-width: @screen-sm-max) {
 		font-size: 14px;
-		height   : @screen-sm-header-hight;
+		height   : @screen-sm-header-height;
 
 		#shiori-logo {
 			font-size: 1.5em;
@@ -81,6 +81,6 @@ body.shiori-archive-content {
 	margin-top: @header-height !important;
 
 	@media (max-width: @screen-sm-max) {
-		margin-top: @screen-sm-header-hight !important;
+		margin-top: @screen-sm-header-height !important;
 	}
 }

internal/webserver/handler-api.go

@@ -437,7 +437,7 @@ func (h *Handler) ApiDownloadEbook(w http.ResponseWriter, r *http.Request, ps ht
 				ContentType: contentType,
 			}
 
-			// if file exist book return avilable file
+			// if file exist book return available file
 			strID := strconv.Itoa(book.ID)
 			ebookPath := fp.Join(request.DataDir, "ebook", strID+".epub")
 			_, err = os.Stat(ebookPath)

internal/webserver/handler-ui.go

@@ -278,15 +278,15 @@ func (h *Handler) ServeBookmarkArchive(w http.ResponseWriter, r *http.Request, p
 		// Gzip it again and send to response writer
 		gzipWriter := gzip.NewWriter(w)
 		if _, err := gzipWriter.Write([]byte(outerHTML)); err != nil {
-			log.Printf("error writting gzip file: %s", err)
+			log.Printf("error writing gzip file: %s", err)
 		}
 		gzipWriter.Flush()
 		return
 	}
 
 	// Serve content
 	if _, err := w.Write(content); err != nil {
-		log.Printf("error writting response: %s", err)
+		log.Printf("error writing response: %s", err)
 	}
 }
 

internal/webserver/handler.go

@@ -25,7 +25,7 @@ type Handler struct {
 	ArchiveCache *cch.Cache
 	Log          bool
 
-	depenencies *config.Dependencies
+	dependencies *config.Dependencies
 
 	templates map[string]*template.Template
 }
@@ -113,7 +113,7 @@ func (h *Handler) validateSession(r *http.Request) error {
 			return fmt.Errorf("session has been expired")
 		}
 
-		account, err := h.depenencies.Domains.Auth.CheckToken(r.Context(), authParts[1])
+		account, err := h.dependencies.Domains.Auth.CheckToken(r.Context(), authParts[1])
 		if err != nil {
 			return err
 		}
@@ -122,7 +122,7 @@ func (h *Handler) validateSession(r *http.Request) error {
 			return fmt.Errorf("account level is not sufficient")
 		}
 
-		h.depenencies.Log.WithFields(logrus.Fields{
+		h.dependencies.Log.WithFields(logrus.Fields{
 			"username": account.Username,
 			"method":   r.Method,
 			"path":     r.URL.Path,

internal/webserver/server.go

@@ -27,6 +27,6 @@ func GetLegacyHandler(cfg Config, dependencies *config.Dependencies) *Handler {
 		ArchiveCache: cch.New(time.Minute, 5*time.Minute),
 		RootPath:     cfg.RootPath,
 		Log:          cfg.Log,
-		depenencies:  dependencies,
+		dependencies: dependencies,
 	}
 }