Merge branch 'devel'

.air.toml

@@ -3,24 +3,7 @@ testdata_dir = "testdata"
 tmp_dir = "tmp"
 
 [build]
-args_bin = [
-    "-aes tmp/cpolis.aes",
-    "-articles tmp/articles",
-    "-banner-width 512",
-    "-config tmp/config.toml",
-    "-desc 'Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität'",
-    "-domain localhost",
-    "-feed tmp/cpolis.atom",
-    "-firebase tmp/firebase.json",
-    "-img-width 256",
-    "-link https://distrikt-ni-st.de",
-    "-log tmp/cpolis.log",
-    "-pdfs tmp/pdfs",
-    "-pics tmp/pics",
-    "-port 8080",
-    "-title 'Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt'",
-    "-web web",
-]
+args_bin = ["-config tmp/config.toml"]
 bin = "./tmp/main"
 cmd = "go build -o ./tmp/main ./cmd/main.go"
 delay = 0

cmd/backend/articles.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/google/uuid"
@@ -174,6 +175,10 @@ func (db *DB) GetCertainArticles(attribute string, value bool) ([]*Article, erro
 		articleList = append(articleList, article)
 	}
 
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
 	return articleList, nil
 }
 
@@ -242,6 +247,13 @@ func (db *DB) GetCurrentIssueArticles() ([]*Article, error) {
 				articleList = append(articleList, article)
 			}
 
+			if err = rows.Err(); err != nil {
+				if rollbackErr := tx.Rollback(); rollbackErr != nil {
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
+				}
+				return nil, fmt.Errorf("error iterating over rows: %v", err)
+			}
+
 			if err = tx.Commit(); err != nil {
 				return nil, fmt.Errorf("error committing transaction when getting articles of issue %v: %v", issueID, err)
 			}
@@ -333,10 +345,51 @@ func (db *DB) DeleteArticle(id int64) error {
 	return nil
 }
 
-func WriteArticleToFile(c *Config, articleUUID uuid.UUID, content []byte) error {
-	articleAbsName := fmt.Sprint(c.ArticleDir, "/", articleUUID, ".md")
+func (db *DB) GetAllArticles() ([]*Article, error) {
+	query := `
+    SELECT title, created, banner_link, summary, published, creator_id, issue_id, edited_id, clicks, is_in_issue, auto_generated, uuid
+    FROM articles
+    `
 
-	if err := os.WriteFile(articleAbsName, content, 0644); err != nil {
+	rows, err := db.Query(query)
+	if err != nil {
+		return nil, fmt.Errorf("error querying DB: %v", err)
+	}
+
+	var created []byte
+	var uuidString string
+
+	articles := make([]*Article, 0)
+	for rows.Next() {
+		article := new(Article)
+		if err = rows.Scan(&article.Title, &created, &article.BannerLink, &article.Summary, &article.Published, &article.CreatorID, &article.IssueID, &article.EditedID, &article.Clicks, &article.IsInIssue, &article.AutoGenerated, &uuidString); err != nil {
+			return nil, fmt.Errorf("error scanning rows: %v", err)
+		}
+
+		article.Created, err = time.Parse("2006-01-02 15:04:05", string(created))
+		if err != nil {
+			return nil, fmt.Errorf("error parsing created: %v", err)
+		}
+
+		article.UUID, err = uuid.Parse(uuidString)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing uuid: %v", err)
+		}
+
+		articles = append(articles, article)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
+	return articles, nil
+}
+
+func WriteArticleToFile(c *Config, articleUUID uuid.UUID, content []byte) error {
+	articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(articleUUID, ".md"))
+
+	if err := os.WriteFile(articlePath, content, 0644); err != nil {
 		return fmt.Errorf("error writing article %v to file: %v", articleUUID, err)
 	}
 

cmd/backend/articles_authors.go

@@ -68,6 +68,10 @@ func (db *DB) GetArticleAuthors(c *Config, articleID int64) ([]*User, error) {
 		authors = append(authors, author)
 	}
 
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
 	return authors, nil
 }
 

cmd/backend/articles_contributors.go

@@ -68,6 +68,10 @@ func (db *DB) GetArticleContributors(c *Config, articleID int64) ([]*User, error
 		contributors = append(contributors, contributor)
 	}
 
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
 	return contributors, nil
 }
 

cmd/backend/articles_tags.go

@@ -61,6 +61,10 @@ func (db *DB) GetArticleTags(articleID int64) ([]*Tag, error) {
 		tags = append(tags, tag)
 	}
 
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
 	return tags, nil
 }
 

cmd/backend/atom.go

@@ -1,9 +1,9 @@
 package backend
 
 import (
+	"errors"
 	"fmt"
 	"io"
-	"log"
 	"os"
 
 	"git.streifling.com/jason/atom"
@@ -13,6 +13,9 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 	feed := atom.NewFeed(c.Title)
 	feed.ID = atom.NewID("urn:feed:1")
 	feed.Subtitle = atom.NewText("text", c.Description)
+	if feed.Subtitle == nil {
+		return nil, errors.New("feed subtitle was not created")
+	}
 
 	linkID := feed.AddLink(atom.NewLink(c.Link))
 	feed.Links[linkID].Rel = "self"
@@ -23,81 +26,82 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 
 	articles, err := db.GetCertainArticles("published", true)
 	if err != nil {
-		log.Printf("Error retrieving published articles for Atom feed: %v", err)
-		return nil, fmt.Errorf("error getting published articles for Atom feed: %w", err)
+		return nil, fmt.Errorf("error getting published articles for Atom feed: %v", err)
 	}
 
 	for _, article := range articles {
 		articleTitle, err := ConvertToPlain(article.Title)
 		if err != nil {
-			log.Printf("Error converting article title to plain text for Atom feed: %v", err)
-			return nil, fmt.Errorf("error converting title to plain text for Atom feed: %w", err)
+			return nil, fmt.Errorf("error converting title to plain text for Atom feed: %v", err)
 		}
 		entry := atom.NewEntry(articleTitle)
-		entry.ID = atom.NewID(fmt.Sprintf("urn:entry:%d", article.ID))
+		entry.ID = atom.NewID(fmt.Sprint("urn:entry:", article.ID))
 		entry.Published = atom.NewDate(article.Created)
-		entry.Content = atom.NewContent(atom.OutOfLine, "text/html", fmt.Sprintf("%s/article/serve/%s", c.Domain, article.UUID))
+		entry.Content = atom.NewContent(atom.OutOfLine, "text/html", fmt.Sprint(c.Domain, "/article/serve/", article.UUID))
+		if entry.Content == nil {
+			return nil, errors.New("entry content was not created")
+		}
 
 		if article.AutoGenerated {
 			entry.Summary = atom.NewText("text", "automatically generated")
+			if entry.Summary == nil {
+				return nil, errors.New("entry summary was not created")
+			}
 		} else {
 			articleSummary, err := ConvertToPlain(article.Summary)
 			if err != nil {
-				log.Printf("Error converting article summary to plain text for Atom feed: %v", err)
-				return nil, fmt.Errorf("error converting description to plain text for Atom feed: %w", err)
+				return nil, fmt.Errorf("error converting description to plain text for Atom feed: %v", err)
 			}
 			entry.Summary = atom.NewText("text", articleSummary)
+			if entry.Summary == nil {
+				return nil, errors.New("entry summary was not created")
+			}
 		}
 
 		if len(article.BannerLink) > 0 {
-			linkID := entry.AddLink(atom.NewLink(fmt.Sprintf("%s/image/serve/%s", c.Domain, article.BannerLink)))
+			linkID := entry.AddLink(atom.NewLink(c.Domain + "/image/serve/" + article.BannerLink))
 			entry.Links[linkID].Rel = "enclosure"
 			entry.Links[linkID].Type = "image/webp"
 		}
 
 		authors, err := db.GetArticleAuthors(c, article.ID)
 		if err != nil {
-			log.Printf("Error retrieving authors for article ID %d for Atom feed: %v", article.ID, err)
-			return nil, fmt.Errorf("error getting article's authors for Atom feed: %w", err)
+			return nil, fmt.Errorf("error getting article's authors for Atom feed: %v", err)
 		}
 		for _, author := range authors {
 			user, err := db.GetUser(c, author.ID)
 			if err != nil {
-				log.Printf("Error retrieving user info for author ID %d for Atom feed: %v", author.ID, err)
-				return nil, fmt.Errorf("error getting user info for Atom feed: %w", err)
+				return nil, fmt.Errorf("error getting user info for Atom feed: %v", err)
 			}
 
-			authorID := entry.AddAuthor(atom.NewPerson(fmt.Sprintf("%s %s", user.FirstName, user.LastName)))
-			entry.Authors[authorID].URI = fmt.Sprintf("%s/image/serve/%s", c.Domain, user.ProfilePicLink)
+			authorID := entry.AddAuthor(atom.NewPerson(user.FirstName + " " + user.LastName))
+			entry.Authors[authorID].URI = c.Domain + "/image/serve/" + user.ProfilePicLink
 		}
 
 		contributors, err := db.GetArticleContributors(c, article.ID)
 		if err != nil {
-			log.Printf("Error retrieving contributors for article ID %d for Atom feed: %v", article.ID, err)
-			return nil, fmt.Errorf("error getting article's contributors for Atom feed: %w", err)
+			return nil, fmt.Errorf("error getting article's contributors for Atom feed: %v", err)
 		}
 		for _, contributor := range contributors {
 			user, err := db.GetUser(c, contributor.ID)
 			if err != nil {
-				log.Printf("Error retrieving user info for contributor ID %d for Atom feed: %v", contributor.ID, err)
-				return nil, fmt.Errorf("error getting user info for Atom feed: %w", err)
+				return nil, fmt.Errorf("error getting user info for Atom feed: %v", err)
 			}
 
-			contributorID := entry.AddContributor(atom.NewPerson(fmt.Sprintf("%s %s", user.FirstName, user.LastName)))
-			entry.Contributors[contributorID].URI = fmt.Sprintf("%s/image/serve/%s", c.Domain, user.ProfilePicLink)
+			contributorID := entry.AddContributor(atom.NewPerson(user.FirstName + " " + user.LastName))
+			entry.Contributors[contributorID].URI = c.Domain + "/image/serve/" + user.ProfilePicLink
 		}
 
 		tags, err := db.GetArticleTags(article.ID)
 		if err != nil {
-			log.Printf("Error retrieving tags for article ID %d for Atom feed: %v", article.ID, err)
-			return nil, fmt.Errorf("error getting tags for articles for Atom feed: %w", err)
+			return nil, fmt.Errorf("error getting tags for articles for Atom feed: %v", err)
 		}
 		for _, tag := range tags {
 			entry.AddCategory(atom.NewCategory(tag.Name))
 		}
 
 		if article.IsInIssue || article.AutoGenerated {
-			entry.AddCategory(atom.NewCategory(fmt.Sprintf("Orient Express %d", article.IssueID)))
+			entry.AddCategory(atom.NewCategory(fmt.Sprint("Orient Express ", article.IssueID)))
 		}
 		if article.AutoGenerated {
 			entry.AddCategory(atom.NewCategory("autogenerated"))
@@ -108,39 +112,29 @@ func GenerateAtomFeed(c *Config, db *DB) (*string, error) {
 	}
 
 	if err = feed.Check(); err != nil {
-		log.Printf("Error checking Atom feed: %v", err)
-		return nil, fmt.Errorf("error checking Atom feed: %w", err)
+		return nil, fmt.Errorf("error checking Atom feed: %v", err)
 	}
 
-	atomXML, err := feed.ToXML("UTF-8")
+	atom, err := feed.ToXML("UTF-8")
 	if err != nil {
-		log.Printf("Error converting Atom feed to XML: %v", err)
-		return nil, fmt.Errorf("error converting Atom feed to XML: %w", err)
+		return nil, fmt.Errorf("error converting Atom feed to XML: %v", err)
 	}
 
-	return &atomXML, nil
+	return &atom, nil
 }
 
 func SaveAtomFeed(filename string, feed *string) error {
 	file, err := os.Create(filename)
 	if err != nil {
-		log.Printf("Error creating file for Atom feed: %v", err)
-		return fmt.Errorf("error creating file for Atom feed: %w", err)
+		return fmt.Errorf("error creating file for Atom feed: %v", err)
 	}
-	defer func() {
-		if cerr := file.Close(); cerr != nil {
-			log.Printf("Error closing file for Atom feed: %v", cerr)
-		}
-	}()
-
+	defer file.Close()
 	if err = file.Chmod(0644); err != nil {
-		log.Printf("Error setting permissions for Atom file '%s': %v", filename, err)
-		return fmt.Errorf("error setting permissions for Atom file: %w", err)
+		return fmt.Errorf("error setting permissions for Atom file: %v", err)
 	}
 
 	if _, err = io.WriteString(file, *feed); err != nil {
-		log.Printf("Error writing to Atom file '%s': %v", filename, err)
-		return fmt.Errorf("error writing to Atom file: %w", err)
+		return fmt.Errorf("error writing to Atom file: %v", err)
 	}
 
 	return nil

cmd/backend/config.go

@@ -17,13 +17,15 @@ type Config struct {
 	AtomFile          string
 	ConfigFile        string
 	DBName            string
+	DBPass            string
+	DBUser            string
 	Description       string
 	Domain            string
 	FirebaseKey       string
+	ImgDir            string
 	Link              string
 	LogFile           string
 	PDFDir            string
-	PicsDir           string
 	Port              string
 	Title             string
 	Version           string
@@ -43,27 +45,25 @@ func newConfig() *Config {
 		ConfigFile:        "/etc/cpolis/config.toml",
 		CookieExpiryHours: 24 * 30,
 		DBName:            "cpolis",
-		FirebaseKey:       "/var/www/cpolis/serviceAccountKey.json",
+		DBUser:            "cpolis",
+		FirebaseKey:       "/etc/cpolis/serviceAccountKey.json",
+		ImgDir:            "/var/www/cpolis/images",
 		LogFile:           "/var/log/cpolis.log",
 		MaxBannerHeight:   1080,
 		MaxBannerWidth:    1920,
 		MaxImgHeight:      1080,
 		MaxImgWidth:       1920,
 		PDFDir:            "/var/www/cpolis/pdfs",
-		PicsDir:           "/var/www/cpolis/pics",
-		Port:              ":8080",
-		Version:           "v0.15.3",
+		Port:              ":1664",
+		Version:           "v0.16.2",
 		WebDir:            "/var/www/cpolis/web",
 	}
 }
 
 func mkDir(path string, perm fs.FileMode) (string, error) {
-	var err error
+	name := filepath.Base(path)
 
-	stringSlice := strings.Split(path, "/")
-	name := stringSlice[len(stringSlice)-1]
-
-	path, err = filepath.Abs(path)
+	path, err := filepath.Abs(path)
 	if err != nil {
 		return "", fmt.Errorf("error finding absolute path for %v directory: %v", name, err)
 	}
@@ -82,20 +82,20 @@ func mkFile(path string, filePerm, dirPerm fs.FileMode) (string, error) {
 		return "", fmt.Errorf("error finding absolute path for %v: %v", path, err)
 	}
 
-	stringSlice := strings.Split(path, "/")
 	_, err = os.Stat(path)
 	if os.IsNotExist(err) {
-		dir := strings.Join(stringSlice[:len(stringSlice)-1], "/")
+		dir := filepath.Dir(path)
 		if err = os.MkdirAll(dir, dirPerm); err != nil {
 			return "", fmt.Errorf("error creating %v: %v", dir, err)
 		}
 
-		fileName := stringSlice[len(stringSlice)-1]
+		fileName := filepath.Base(path)
 		file, err := os.Create(filepath.Join(dir, fileName))
 		if err != nil {
 			return "", fmt.Errorf("error creating %v: %v", fileName, err)
 		}
 		defer file.Close()
+
 		if err = file.Chmod(filePerm); err != nil {
 			return "", fmt.Errorf("error setting permissions for %v: %v", fileName, err)
 		}
@@ -113,13 +113,15 @@ func (c *Config) handleCliArgs() error {
 	flag.StringVar(&c.AtomFile, "feed", c.AtomFile, "atom feed file")
 	flag.StringVar(&c.ConfigFile, "config", c.ConfigFile, "config file")
 	flag.StringVar(&c.DBName, "db", c.DBName, "DB name")
+	flag.StringVar(&c.DBPass, "db-pass", c.DBPass, "DB password")
+	flag.StringVar(&c.DBUser, "db-user", c.DBUser, "DB username")
 	flag.StringVar(&c.Description, "desc", c.Description, "channel description")
 	flag.StringVar(&c.Domain, "domain", c.Domain, "domain name")
 	flag.StringVar(&c.FirebaseKey, "firebase", c.FirebaseKey, "Firebase service account key file")
+	flag.StringVar(&c.ImgDir, "images", c.ImgDir, "images directory")
 	flag.StringVar(&c.Link, "link", c.Link, "channel Link")
 	flag.StringVar(&c.LogFile, "log", c.LogFile, "log file")
 	flag.StringVar(&c.PDFDir, "pdfs", c.PDFDir, "pdf directory")
-	flag.StringVar(&c.PicsDir, "pics", c.PicsDir, "pictures directory")
 	flag.StringVar(&c.Title, "title", c.Title, "channel title")
 	flag.StringVar(&c.WebDir, "web", c.WebDir, "web directory")
 	flag.IntVar(&c.CookieExpiryHours, "cookie-expiry-hours", c.CookieExpiryHours, "cookies expire after this amount of hours")
@@ -199,6 +201,14 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		c.DBName = cliConfig.DBName
 	}
 
+	if cliConfig.DBPass != defaultConfig.DBPass {
+		c.DBPass = cliConfig.DBPass
+	}
+
+	if cliConfig.DBUser != defaultConfig.DBUser {
+		c.DBUser = cliConfig.DBUser
+	}
+
 	if cliConfig.Description != defaultConfig.Description {
 		c.Description = cliConfig.Description
 	}
@@ -223,6 +233,18 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		return fmt.Errorf("error setting up file: %v", err)
 	}
 
+	if cliConfig.ImgDir != defaultConfig.ImgDir {
+		c.ImgDir = cliConfig.ImgDir
+	}
+	c.ImgDir, err = filepath.Abs(c.ImgDir)
+	if err != nil {
+		return fmt.Errorf("error setting absolute filepath for PicsDir: %v", err)
+	}
+	c.ImgDir, err = mkDir(c.ImgDir, 0700)
+	if err != nil {
+		return fmt.Errorf("error setting up directory: %v", err)
+	}
+
 	if cliConfig.Link != defaultConfig.Link {
 		c.Link = cliConfig.Link
 	}
@@ -267,18 +289,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 		return fmt.Errorf("error setting up directory: %v", err)
 	}
 
-	if cliConfig.PicsDir != defaultConfig.PicsDir {
-		c.PicsDir = cliConfig.PicsDir
-	}
-	c.PicsDir, err = filepath.Abs(c.PicsDir)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for PicsDir: %v", err)
-	}
-	c.PicsDir, err = mkDir(c.PicsDir, 0700)
-	if err != nil {
-		return fmt.Errorf("error setting up directory: %v", err)
-	}
-
 	if cliConfig.Port != defaultConfig.Port {
 		c.Port = cliConfig.Port
 	}

cmd/backend/db.go

@@ -30,45 +30,32 @@ type (
 	}
 )
 
-func getUsername() (string, error) {
-	user := os.Getenv("DB_USER")
-	if user == "" {
+func getDBUsername(c *Config) error {
+	if c.DBUser == "" {
 		var err error
+
 		fmt.Printf("DB Benutzer: ")
-		user, err = bufio.NewReader(os.Stdin).ReadString('\n')
+		c.DBUser, err = bufio.NewReader(os.Stdin).ReadString('\n')
 		if err != nil {
-			return "", fmt.Errorf("error reading username: %v", err)
+			return fmt.Errorf("error reading username: %v", err)
 		}
 	}
-	return strings.TrimSpace(user), nil
+
+	return nil
 }
 
-func getPassword() (string, error) {
-	pass := os.Getenv("DB_PASS")
-	if pass == "" {
+func getDBPassword(c *Config) error {
+	if c.DBPass == "" {
 		fmt.Printf("DB Passwort: ")
 		bytePass, err := term.ReadPassword(int(syscall.Stdin))
 		if err != nil {
-			return "", fmt.Errorf("error reading password: %v", err)
+			return fmt.Errorf("error reading password: %v", err)
 		}
+
 		fmt.Println()
-		pass = strings.TrimSpace(string(bytePass))
+		c.DBPass = strings.TrimSpace(string(bytePass))
 	}
-	return pass, nil
-}
-
-func getCredentials() (string, string, error) {
-	user, err := getUsername()
-	if err != nil {
-		return "", "", fmt.Errorf("error getting username: %v", err)
-	}
-
-	pass, err := getPassword()
-	if err != nil {
-		return "", "", fmt.Errorf("error getting password: %v", err)
-	}
-
-	return user, pass, nil
+	return nil
 }
 
 func wait(iteration int) {
@@ -77,26 +64,33 @@ func wait(iteration int) {
 	time.Sleep(waitTime + jitter)
 }
 
-func OpenDB(dbName string) (*DB, error) {
+func OpenDB(c *Config) (*DB, error) {
 	var err error
-	db := DB{DB: new(sql.DB)}
+	db := new(DB)
+
+	if err := getDBUsername(c); err != nil {
+		return nil, fmt.Errorf("error getting DB username: %v", err)
+	}
+
+	if err := getDBPassword(c); err != nil {
+		return nil, fmt.Errorf("error getting DB password: %v", err)
+	}
 
 	cfg := mysql.NewConfig()
-	cfg.DBName = dbName
-	cfg.User, cfg.Passwd, err = getCredentials()
-	if err != nil {
-		return nil, fmt.Errorf("error reading user credentials for DB: %v", err)
-	}
+	cfg.DBName = c.DBName
+	cfg.User = c.DBUser
+	cfg.Passwd = c.DBPass
 
 	db.DB, err = sql.Open("mysql", cfg.FormatDSN())
 	if err != nil {
 		return nil, fmt.Errorf("error opening DB: %v", err)
 	}
+
 	if err = db.Ping(); err != nil {
 		return nil, fmt.Errorf("error pinging DB: %v", err)
 	}
 
-	return &db, nil
+	return db, nil
 }
 
 func (db *DB) UpdateAttributes(a ...*Attribute) error {

cmd/backend/docx.go

@@ -21,7 +21,7 @@ func ConvertToMarkdown(c *Config, filename string) ([]byte, error) {
 	defer os.RemoveAll(tmpDir)
 
 	articleFileName := filepath.Join(os.TempDir(), fmt.Sprint(uuid.New(), ".md"))
-	cmd := exec.Command("pandoc", "-s", "-f", "docx", "-t", "commonmark_x", "-o", articleFileName, "--extract-media", tmpDir, filename) // TODO: Is writing to a file necessary?
+	cmd := exec.Command("pandoc", "-s", "-L", filepath.Join("scripts", "create_toc.lua"), "-f", "docx", "-t", "commonmark_x", "-o", articleFileName, "--extract-media", tmpDir, filename) // TODO: Is writing to a file necessary?
 	cmd.Stderr = &stderr
 	if err = cmd.Run(); err != nil {
 		return nil, fmt.Errorf("error converting docx to markdown: %v: %v", err, stderr.String())
@@ -33,7 +33,10 @@ func ConvertToMarkdown(c *Config, filename string) ([]byte, error) {
 		return nil, fmt.Errorf("error reading markdown file: %v", err)
 	}
 
-	imageNames, err := filepath.Glob(filepath.Join(tmpDir, "/media/*"))
+	re := regexp.MustCompile(`\{width=[^}]+height=[^}]+\}`)
+	articleContent = re.ReplaceAll(articleContent, []byte(""))
+
+	imageNames, err := filepath.Glob(filepath.Join(tmpDir, "media", "*"))
 	if err != nil {
 		return nil, fmt.Errorf("error getting docx images from temporary directory: %v", err)
 	}
@@ -45,7 +48,7 @@ func ConvertToMarkdown(c *Config, filename string) ([]byte, error) {
 		}
 		defer image.Close()
 
-		newImageName, err := SaveImage(image, c.MaxImgHeight, c.MaxImgWidth, c.PicsDir)
+		newImageName, err := SaveImage(image, c.MaxImgHeight, c.MaxImgWidth, c.ImgDir)
 		if err != nil {
 			return nil, fmt.Errorf("error saving image %v: %v", name, err)
 		}

cmd/backend/images.go

@@ -17,6 +17,66 @@ import (
 
 var ErrUnsupportedFormat error = image.ErrFormat // used internally by imaging
 
+func checkImageUsage(c *Config, db *DB, name string) (bool, error) {
+	imageWasFound := false
+
+	if err := filepath.Walk(c.ArticleDir, func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			return fmt.Errorf("error walking articles filepath: %v", err)
+		}
+
+		if !info.IsDir() {
+			mdFile, err := os.Open(path)
+			if err != nil {
+				return fmt.Errorf("error opening article %v: %v", info.Name(), err)
+			}
+			defer mdFile.Close()
+
+			scanner := bufio.NewScanner(mdFile)
+			for scanner.Scan() {
+				if strings.Contains(scanner.Text(), name) {
+					imageWasFound = true
+					return nil
+				}
+			}
+
+			return scanner.Err()
+		}
+
+		return nil
+	}); err != nil {
+		return false, fmt.Errorf("error walking articles filepath: %v", err)
+	}
+
+	if !imageWasFound {
+		users, err := db.GetAllUsers(c)
+		if err != nil {
+			return false, fmt.Errorf("error getting all users: %v", err)
+		}
+
+		for _, user := range users {
+			if name == user.ProfilePicLink {
+				imageWasFound = true
+			}
+		}
+	}
+
+	if !imageWasFound {
+		articles, err := db.GetAllArticles()
+		if err != nil {
+			return false, fmt.Errorf("error getting all articles: %v", err)
+		}
+
+		for _, article := range articles {
+			if name == article.BannerLink {
+				imageWasFound = true
+			}
+		}
+	}
+
+	return imageWasFound, nil
+}
+
 func SaveImage(src io.Reader, maxHeight, maxWidth int, path string) (string, error) {
 	img, err := imaging.Decode(src, imaging.AutoOrientation(true))
 	if err != nil {
@@ -48,7 +108,7 @@ func SaveImage(src io.Reader, maxHeight, maxWidth int, path string) (string, err
 }
 
 func CleanUpImages(c *Config, db *DB) error {
-	if err := filepath.Walk(c.PicsDir, func(path string, info fs.FileInfo, err error) error {
+	if err := filepath.Walk(c.ImgDir, func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return fmt.Errorf("error walking images filepath: %v", err)
 		}
@@ -56,45 +116,10 @@ func CleanUpImages(c *Config, db *DB) error {
 		if !info.IsDir() {
 			imageName := info.Name()
 			imagePath := path
-			imageWasFound := false
 
-			if err = filepath.Walk(c.ArticleDir, func(path string, info fs.FileInfo, err error) error {
-				if err != nil {
-					return fmt.Errorf("error walking articles filepath: %v", err)
-				}
-
-				if !info.IsDir() {
-					mdFile, err := os.Open(path)
-					if err != nil {
-						return fmt.Errorf("error opening article %v: %v", info.Name(), err)
-					}
-					defer mdFile.Close()
-
-					scanner := bufio.NewScanner(mdFile)
-
-					for scanner.Scan() {
-						if strings.Contains(scanner.Text(), imageName) {
-							imageWasFound = true
-						}
-					}
-
-					return scanner.Err()
-				}
-
-				return nil
-			}); err != nil {
-				return fmt.Errorf("error walking articles filepath: %v", err)
-			}
-
-			users, err := db.GetAllUsers(c)
+			imageWasFound, err := checkImageUsage(c, db, imageName)
 			if err != nil {
-				return fmt.Errorf("error getting all users: %v", err)
-			}
-
-			for _, user := range users {
-				if imageName == user.ProfilePicLink {
-					imageWasFound = true
-				}
+				return fmt.Errorf("error checking image usage: %v", err)
 			}
 
 			if !imageWasFound {

cmd/backend/tags.go

@@ -31,5 +31,9 @@ func (db *DB) GetTagList() ([]*Tag, error) {
 		tagList = append(tagList, tag)
 	}
 
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over rows: %v", err)
+	}
+
 	return tagList, nil
 }

cmd/backend/users.go

@@ -37,19 +37,15 @@ type User struct {
 func readKey(filename string) ([]byte, error) {
 	key, err := os.ReadFile(filename)
 	if err != nil {
-		log.Printf("Error reading AES key file '%s': %v", filename, err)
-		return nil, fmt.Errorf("error reading from AES key file: %v", err)
+		return nil, fmt.Errorf("error reading from aes key file: %v", err)
 	}
 
 	if len(key) != 44 {
-		errMsg := "key is not 32 bytes long"
-		log.Println(errMsg)
-		return nil, errors.New(errMsg)
+		return nil, errors.New("key is not 32 bytes long")
 	}
 
 	key, err = base64.StdEncoding.DecodeString(string(key))
 	if err != nil {
-		log.Printf("Error base64 decoding key: %v", err)
 		return nil, fmt.Errorf("error base64 decoding key: %v", err)
 	}
 
@@ -59,17 +55,14 @@ func readKey(filename string) ([]byte, error) {
 func key(c *Config) ([]byte, error) {
 	key, err := readKey(c.AESKeyFile)
 	if err != nil {
-		log.Printf("Error reading key: %v", err)
 		key = make([]byte, 32)
 		if _, err := rand.Read(key); err != nil {
-			log.Printf("Error generating random key: %v", err)
 			return nil, fmt.Errorf("error generating random key: %v", err)
 		}
 
 		fileKey := make([]byte, 44)
 		base64.StdEncoding.Encode(fileKey, key)
 		if err = os.WriteFile(c.AESKeyFile, fileKey, 0600); err != nil {
-			log.Printf("Error writing key to file '%s': %v", c.AESKeyFile, err)
 			return nil, fmt.Errorf("error writing key to file: %v", err)
 		}
 	}
@@ -80,25 +73,21 @@ func key(c *Config) ([]byte, error) {
 func aesEncrypt(c *Config, plaintext string) (string, error) {
 	key, err := key(c)
 	if err != nil {
-		log.Printf("Error retrieving key: %v", err)
 		return "", fmt.Errorf("error retrieving key: %v", err)
 	}
 
 	block, err := aes.NewCipher(key)
 	if err != nil {
-		log.Printf("Error creating cipher block: %v", err)
 		return "", fmt.Errorf("error creating cipher block: %v", err)
 	}
 
 	gcm, err := cipher.NewGCM(block)
 	if err != nil {
-		log.Printf("Error creating GCM: %v", err)
-		return "", fmt.Errorf("error creating new GCM: %v", err)
+		return "", fmt.Errorf("error creating new gcm: %v", err)
 	}
 
 	nonce := make([]byte, gcm.NonceSize())
 	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
-		log.Printf("Error creating nonce: %v", err)
 		return "", fmt.Errorf("error creating nonce: %v", err)
 	}
 
@@ -109,40 +98,33 @@ func aesEncrypt(c *Config, plaintext string) (string, error) {
 func aesDecrypt(c *Config, ciphertext string) (string, error) {
 	key, err := key(c)
 	if err != nil {
-		log.Printf("Error retrieving key: %v", err)
 		return "", fmt.Errorf("error retrieving key: %v", err)
 	}
 
 	block, err := aes.NewCipher(key)
 	if err != nil {
-		log.Printf("Error creating cipher block: %v", err)
 		return "", fmt.Errorf("error creating cipher block: %v", err)
 	}
 
 	gcm, err := cipher.NewGCM(block)
 	if err != nil {
-		log.Printf("Error creating GCM: %v", err)
-		return "", fmt.Errorf("error creating new GCM: %v", err)
+		return "", fmt.Errorf("error creating new gcm: %v", err)
 	}
 
 	data, err := base64.StdEncoding.DecodeString(ciphertext)
 	if err != nil {
-		log.Printf("Error base64 decoding ciphertext: %v", err)
 		return "", fmt.Errorf("error base64 decoding ciphertext: %v", err)
 	}
 
 	nonceSize := gcm.NonceSize()
 	if len(data) < nonceSize {
-		errMsg := "ciphertext too short"
-		log.Println(errMsg)
-		return "", fmt.Errorf(errMsg)
+		return "", errors.New("ciphertext too short")
 	}
 	nonce, cipherText := data[:nonceSize], data[nonceSize:]
 
 	plaintext, err := gcm.Open(nil, nonce, cipherText, nil)
 	if err != nil {
-		log.Printf("Error AES decoding ciphertext: %v", err)
-		return "", fmt.Errorf("error AES decoding ciphertext: %v", err)
+		return "", fmt.Errorf("error aes decoding ciphertext: %v", err)
 	}
 
 	return string(plaintext), nil
@@ -151,41 +133,35 @@ func aesDecrypt(c *Config, ciphertext string) (string, error) {
 func (db *DB) AddUser(c *Config, u *User, pass string) (int64, error) {
 	hashedPass, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
 	if err != nil {
-		log.Printf("Error creating password hash: %v", err)
 		return 0, fmt.Errorf("error creating password hash: %v", err)
 	}
 
 	aesFirstName, err := aesEncrypt(c, u.FirstName)
 	if err != nil {
-		log.Printf("Error encrypting first name: %v", err)
 		return 0, fmt.Errorf("error encrypting first name: %v", err)
 	}
 
 	aesLastName, err := aesEncrypt(c, u.LastName)
 	if err != nil {
-		log.Printf("Error encrypting last name: %v", err)
 		return 0, fmt.Errorf("error encrypting last name: %v", err)
 	}
 
 	aesEmail, err := aesEncrypt(c, u.Email)
 	if err != nil {
-		log.Printf("Error encrypting email: %v", err)
 		return 0, fmt.Errorf("error encrypting email: %v", err)
 	}
 
 	query := `
-        INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        `
+    INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+    `
 
 	result, err := db.Exec(query, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.ProfilePicLink, u.Role)
 	if err != nil {
-		log.Printf("Error inserting new user '%v' into DB: %v", u.UserName, err)
 		return 0, fmt.Errorf("error inserting new user %v into DB: %v", u.UserName, err)
 	}
 	id, err := result.LastInsertId()
 	if err != nil {
-		log.Printf("Error retrieving last insert ID: %v", err)
 		return 0, fmt.Errorf("error inserting user into DB: %v", err)
 	}
 
@@ -196,13 +172,12 @@ func (db *DB) GetID(userName string) int64 {
 	var id int64
 
 	query := `
-        SELECT id
-        FROM users
-        WHERE username = ?
-        `
+    SELECT id
+    FROM users
+    WHERE username = ?
+    `
 	row := db.QueryRow(query, userName)
 	if err := row.Scan(&id); err != nil { // seems like the only possible error is ErrNoRows
-		log.Printf("Error retrieving ID for user '%v': %v", userName, err)
 		return 0
 	}
 
@@ -213,18 +188,16 @@ func (db *DB) CheckPassword(id int64, pass string) error {
 	var queriedPass string
 
 	query := `
-        SELECT password
-        FROM users
-        WHERE id = ?
-        `
+    SELECT password
+    FROM users
+    WHERE id = ?
+    `
 	row := db.QueryRow(query, id)
 	if err := row.Scan(&queriedPass); err != nil {
-		log.Printf("Error reading password from DB for ID '%v': %v", id, err)
 		return fmt.Errorf("error reading password from DB: %v", err)
 	}
 
 	if err := bcrypt.CompareHashAndPassword([]byte(queriedPass), []byte(pass)); err != nil {
-		log.Printf("Incorrect password for ID '%v': %v", id, err)
 		return fmt.Errorf("incorrect password: %v", err)
 	}
 
@@ -234,45 +207,41 @@ func (db *DB) CheckPassword(id int64, pass string) error {
 func (tx *Tx) ChangePassword(id int64, oldPass, newPass string) error {
 	var queriedPass string
 	getQuery := `
-        SELECT password
-        FROM users
-        WHERE id = ?
-        `
+    SELECT password
+    FROM users
+    WHERE id = ?
+    `
 	row := tx.QueryRow(getQuery, id)
 	if err := row.Scan(&queriedPass); err != nil {
-		log.Printf("Error reading password from DB during password change for ID '%v': %v", id, err)
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+			log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 		}
 		return fmt.Errorf("error reading password from DB: %v", err)
 	}
 
 	if err := bcrypt.CompareHashAndPassword([]byte(queriedPass), []byte(oldPass)); err != nil {
-		log.Printf("Incorrect old password for ID '%v': %v", id, err)
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+			log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 		}
 		return fmt.Errorf("incorrect password: %v", err)
 	}
 
 	newHashedPass, err := bcrypt.GenerateFromPassword([]byte(newPass), bcrypt.DefaultCost)
 	if err != nil {
-		log.Printf("Error creating new password hash for ID '%v': %v", id, err)
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+			log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 		}
 		return fmt.Errorf("error creating password hash: %v", err)
 	}
 
 	setQuery := `
-        UPDATE users
-        SET password = ?
-        WHERE id = ?
-        `
+    UPDATE users
+    SET password = ?
+    WHERE id = ?
+    `
 	if _, err = tx.Exec(setQuery, string(newHashedPass), id); err != nil {
-		log.Printf("Error updating password in DB for ID '%v': %v", id, err)
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+			log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 		}
 		return fmt.Errorf("error updating password in DB: %v", err)
 	}
@@ -287,32 +256,28 @@ func (db *DB) GetUser(c *Config, id int64) (*User, error) {
 
 	user := new(User)
 	query := `
-        SELECT id, username, first_name, last_name, email, profile_pic_link, role
-        FROM users
-        WHERE id = ?
-        `
+    SELECT id, username, first_name, last_name, email, profile_pic_link, role
+    FROM users
+    WHERE id = ?
+    `
 
 	row := db.QueryRow(query, id)
 	if err := row.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &user.Role); err != nil {
-		log.Printf("Error reading user information from DB for ID '%v': %v", id, err)
 		return nil, fmt.Errorf("error reading user information: %v", err)
 	}
 
 	user.FirstName, err = aesDecrypt(c, aesFirstName)
 	if err != nil {
-		log.Printf("Error decrypting first name for ID '%v': %v", id, err)
 		return nil, fmt.Errorf("error decrypting first name: %v", err)
 	}
 
 	user.LastName, err = aesDecrypt(c, aesLastName)
 	if err != nil {
-		log.Printf("Error decrypting last name for ID '%v': %v", id, err)
 		return nil, fmt.Errorf("error decrypting last name: %v", err)
 	}
 
 	user.Email, err = aesDecrypt(c, aesEmail)
 	if err != nil {
-		log.Printf("Error decrypting email for ID '%v': %v", id, err)
 		return nil, fmt.Errorf("error decrypting email: %v", err)
 	}
 
@@ -328,15 +293,13 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 		err := func() error {
 			tx.Tx, err = db.Begin()
 			if err != nil {
-				log.Printf("Error starting transaction: %v", err)
 				return fmt.Errorf("error starting transaction: %v", err)
 			}
 
 			if !passwordEmpty {
 				if err = tx.ChangePassword(id, oldPass, newPass); err != nil {
-					log.Printf("Error changing password for ID '%v': %v", id, err)
 					if rollbackErr := tx.Rollback(); rollbackErr != nil {
-						log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+						log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 					}
 					return fmt.Errorf("error changing password: %v", err)
 				}
@@ -344,27 +307,24 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 
 			aesFirstName, err := aesEncrypt(c, firstName)
 			if err != nil {
-				log.Printf("Error encrypting first name for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error encrypting first name: %v", err)
 			}
 
 			aesLastName, err := aesEncrypt(c, lastName)
 			if err != nil {
-				log.Printf("Error encrypting last name for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error encrypting last name: %v", err)
 			}
 
 			aesEmail, err := aesEncrypt(c, email)
 			if err != nil {
-				log.Printf("Error encrypting email for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error encrypting email: %v", err)
 			}
@@ -376,15 +336,13 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 				&Attribute{Table: "users", ID: id, AttName: "email", Value: aesEmail},
 				&Attribute{Table: "users", ID: id, AttName: "profile_pic_link", Value: profilePicLink},
 			); err != nil {
-				log.Printf("Error updating attributes in DB for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error updating attributes in DB: %v", err)
 			}
 
 			if err = tx.Commit(); err != nil {
-				log.Printf("Error committing transaction for ID '%v': %v", id, err)
 				return fmt.Errorf("error committing transaction: %v", err)
 			}
 
@@ -398,9 +356,7 @@ func (db *DB) UpdateOwnUserAttributes(c *Config, id int64, userName, firstName,
 		wait(i)
 	}
 
-	errMsg := fmt.Sprintf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
-	log.Println(errMsg)
-	return fmt.Errorf(errMsg)
+	return fmt.Errorf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
 }
 
 func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
@@ -408,28 +364,25 @@ func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
 	txOptions := &sql.TxOptions{Isolation: sql.LevelSerializable}
 	selectQuery := "SELECT COUNT(*) FROM users"
 	insertQuery := `
-        INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        `
+    INSERT INTO users (username, password, first_name, last_name, email, profile_pic_link, role)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+    `
 
 	for i := 0; i < TxMaxRetries; i++ {
 		id, err := func() (int64, error) {
 			tx, err := db.BeginTx(context.Background(), txOptions)
 			if err != nil {
-				log.Printf("Error starting transaction: %v", err)
 				return 0, fmt.Errorf("error starting transaction: %v", err)
 			}
 
 			if err := tx.QueryRow(selectQuery).Scan(&numUsers); err != nil {
-				log.Printf("Error retrieving number of users: %v", err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error getting ID of %v: %v", u.UserName, err)
 			}
 			if numUsers != 0 {
 				if err = tx.Commit(); err != nil {
-					log.Printf("Error committing transaction: %v", err)
 					return 0, fmt.Errorf("error committing transaction: %v", err)
 				}
 				return -1, nil
@@ -437,60 +390,53 @@ func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
 
 			hashedPass, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
 			if err != nil {
-				log.Printf("Error creating password hash: %v", err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error creating password hash: %v", err)
 			}
 
 			aesFirstName, err := aesEncrypt(c, u.FirstName)
 			if err != nil {
-				log.Printf("Error encrypting first name: %v", err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error encrypting first name: %v", err)
 			}
 
 			aesLastName, err := aesEncrypt(c, u.LastName)
 			if err != nil {
-				log.Printf("Error encrypting last name: %v", err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error encrypting last name: %v", err)
 			}
 
 			aesEmail, err := aesEncrypt(c, u.Email)
 			if err != nil {
-				log.Printf("Error encrypting email: %v", err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error encrypting email: %v", err)
 			}
 
 			result, err := tx.Exec(insertQuery, u.UserName, string(hashedPass), aesFirstName, aesLastName, aesEmail, u.ProfilePicLink, u.Role)
 			if err != nil {
-				log.Printf("Error inserting new user '%v' into DB: %v", u.UserName, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error inserting new user %v into DB: %v", u.UserName, err)
 			}
 
 			id, err := result.LastInsertId()
 			if err != nil {
-				log.Printf("Error retrieving last insert ID: %v", err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return 0, fmt.Errorf("error inserting user into DB: %v", err)
 			}
 
 			if err = tx.Commit(); err != nil {
-				log.Printf("Error committing transaction: %v", err)
 				return 0, fmt.Errorf("error committing transaction: %v", err)
 			}
 			return id, nil
@@ -502,47 +448,37 @@ func (db *DB) AddFirstUser(c *Config, u *User, pass string) (int64, error) {
 		log.Println(err)
 		wait(i)
 	}
-	errMsg := fmt.Sprintf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
-	log.Println(errMsg)
-	return 0, fmt.Errorf(errMsg)
+	return 0, fmt.Errorf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
 }
 
 func (db *DB) GetAllUsers(c *Config) ([]*User, error) {
 	var aesFirstName, aesLastName, aesEmail string
-	var err error
-
 	query := "SELECT id, username, first_name, last_name, email, profile_pic_link, role FROM users"
 
 	rows, err := db.Query(query)
 	if err != nil {
-		log.Printf("Error retrieving all users from DB: %v", err)
 		return nil, fmt.Errorf("error getting all users from DB: %v", err)
 	}
-	defer rows.Close()
 
 	users := make([]*User, 0)
 	for rows.Next() {
 		user := new(User)
 		if err = rows.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &user.Role); err != nil {
-			log.Printf("Error scanning user information: %v", err)
 			return nil, fmt.Errorf("error getting user info: %v", err)
 		}
 
 		user.FirstName, err = aesDecrypt(c, aesFirstName)
 		if err != nil {
-			log.Printf("Error decrypting first name for user ID '%v': %v", user.ID, err)
 			return nil, fmt.Errorf("error decrypting first name: %v", err)
 		}
 
 		user.LastName, err = aesDecrypt(c, aesLastName)
 		if err != nil {
-			log.Printf("Error decrypting last name for user ID '%v': %v", user.ID, err)
 			return nil, fmt.Errorf("error decrypting last name: %v", err)
 		}
 
 		user.Email, err = aesDecrypt(c, aesEmail)
 		if err != nil {
-			log.Printf("Error decrypting email for user ID '%v': %v", user.ID, err)
 			return nil, fmt.Errorf("error decrypting email: %v", err)
 		}
 
@@ -550,7 +486,6 @@ func (db *DB) GetAllUsers(c *Config) ([]*User, error) {
 	}
 
 	if err = rows.Err(); err != nil {
-		log.Printf("Error iterating over rows: %v", err)
 		return nil, fmt.Errorf("error iterating over rows: %v", err)
 	}
 
@@ -565,34 +500,28 @@ func (db *DB) GetAllUsersMap(c *Config) (map[int64]*User, error) {
 
 	rows, err := db.Query(query)
 	if err != nil {
-		log.Printf("Error retrieving all users from DB: %v", err)
 		return nil, fmt.Errorf("error getting all users from DB: %v", err)
 	}
-	defer rows.Close()
 
-	users := make(map[int64]*User)
+	users := make(map[int64]*User, 0)
 	for rows.Next() {
 		user := new(User)
 		if err = rows.Scan(&user.ID, &user.UserName, &aesFirstName, &aesLastName, &aesEmail, &user.ProfilePicLink, &user.Role); err != nil {
-			log.Printf("Error scanning user information: %v", err)
 			return nil, fmt.Errorf("error getting user info: %v", err)
 		}
 
 		user.FirstName, err = aesDecrypt(c, aesFirstName)
 		if err != nil {
-			log.Printf("Error decrypting first name for user ID '%v': %v", user.ID, err)
 			return nil, fmt.Errorf("error decrypting first name: %v", err)
 		}
 
 		user.LastName, err = aesDecrypt(c, aesLastName)
 		if err != nil {
-			log.Printf("Error decrypting last name for user ID '%v': %v", user.ID, err)
 			return nil, fmt.Errorf("error decrypting last name: %v", err)
 		}
 
 		user.Email, err = aesDecrypt(c, aesEmail)
 		if err != nil {
-			log.Printf("Error decrypting email for user ID '%v': %v", user.ID, err)
 			return nil, fmt.Errorf("error decrypting email: %v", err)
 		}
 
@@ -600,7 +529,6 @@ func (db *DB) GetAllUsersMap(c *Config) (map[int64]*User, error) {
 	}
 
 	if err = rows.Err(); err != nil {
-		log.Printf("Error iterating over rows: %v", err)
 		return nil, fmt.Errorf("error iterating over rows: %v", err)
 	}
 
@@ -610,18 +538,16 @@ func (db *DB) GetAllUsersMap(c *Config) (map[int64]*User, error) {
 func (tx *Tx) SetPassword(id int64, newPass string) error {
 	hashedPass, err := bcrypt.GenerateFromPassword([]byte(newPass), bcrypt.DefaultCost)
 	if err != nil {
-		log.Printf("Error creating password hash for ID '%v': %v", id, err)
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+			log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 		}
 		return fmt.Errorf("error creating password hash: %v", err)
 	}
 
 	setQuery := "UPDATE users SET password = ? WHERE id = ?"
 	if _, err = tx.Exec(setQuery, string(hashedPass), id); err != nil {
-		log.Printf("Error updating password in DB for ID '%v': %v", id, err)
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+			log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 		}
 		return fmt.Errorf("error updating password in DB: %v", err)
 	}
@@ -638,15 +564,13 @@ func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, las
 		err := func() error {
 			tx.Tx, err = db.Begin()
 			if err != nil {
-				log.Printf("Error starting transaction: %v", err)
 				return fmt.Errorf("error starting transaction: %v", err)
 			}
 
 			if !passwordEmpty {
 				if err = tx.SetPassword(id, newPass); err != nil {
-					log.Printf("Error setting new password for ID '%v': %v", id, err)
 					if rollbackErr := tx.Rollback(); rollbackErr != nil {
-						log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+						log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 					}
 					return fmt.Errorf("error changing password: %v", err)
 				}
@@ -654,27 +578,24 @@ func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, las
 
 			aesFirstName, err := aesEncrypt(c, firstName)
 			if err != nil {
-				log.Printf("Error encrypting first name for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error encrypting first name: %v", err)
 			}
 
 			aesLastName, err := aesEncrypt(c, lastName)
 			if err != nil {
-				log.Printf("Error encrypting last name for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error encrypting last name: %v", err)
 			}
 
 			aesEmail, err := aesEncrypt(c, email)
 			if err != nil {
-				log.Printf("Error encrypting email for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error encrypting email: %v", err)
 			}
@@ -687,15 +608,13 @@ func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, las
 				&Attribute{Table: "users", ID: id, AttName: "profile_pic_link", Value: profilePicLink},
 				&Attribute{Table: "users", ID: id, AttName: "role", Value: role},
 			); err != nil {
-				log.Printf("Error updating attributes in DB for ID '%v': %v", id, err)
 				if rollbackErr := tx.Rollback(); rollbackErr != nil {
-					log.Fatalf("Transaction error: %v, Rollback error: %v", err, rollbackErr)
+					log.Fatalf("transaction error: %v, rollback error: %v", err, rollbackErr)
 				}
 				return fmt.Errorf("error updating attributes in DB: %v", err)
 			}
 
 			if err = tx.Commit(); err != nil {
-				log.Printf("Error committing transaction for ID '%v': %v", id, err)
 				return fmt.Errorf("error committing transaction: %v", err)
 			}
 
@@ -709,9 +628,7 @@ func (db *DB) UpdateUserAttributes(c *Config, id int64, userName, firstName, las
 		wait(i)
 	}
 
-	errMsg := fmt.Sprintf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
-	log.Println(errMsg)
-	return fmt.Errorf(errMsg)
+	return fmt.Errorf("error: %v unsuccessful retries for DB operation, aborting", TxMaxRetries)
 }
 
 func (db *DB) DeleteUser(id int64) error {
@@ -719,7 +636,6 @@ func (db *DB) DeleteUser(id int64) error {
 
 	_, err := db.Exec(query, id)
 	if err != nil {
-		log.Printf("Error deleting user with ID '%v' from DB: %v", id, err)
 		return fmt.Errorf("error deleting user %v from DB: %v", id, err)
 	}
 

cmd/calls/articles.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 
 	"github.com/google/uuid"
 	b "streifling.com/jason/cpolis/cmd/backend"
@@ -56,8 +57,8 @@ func ServeArticle(c *b.Config, db *b.DB) http.HandlerFunc {
 			return
 		}
 
-		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.UUID, ".md")
-		contentBytes, err := os.ReadFile(articleAbsName)
+		articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(article.UUID, ".md"))
+		contentBytes, err := os.ReadFile(articlePath)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/calls/images.go

@@ -10,12 +10,12 @@ import (
 
 func ServeImage(c *b.Config, s map[string]*f.Session) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if _, err := f.ManageSession(w, r, c, s); err != nil {
+		if !f.SessionIsActive(r, s) {
 			if !tokenIsVerified(w, r, c) {
 				return
 			}
 		}
 
-		http.ServeFile(w, r, filepath.Join(c.PicsDir, r.PathValue("pic")))
+		http.ServeFile(w, r, filepath.Join(c.ImgDir, r.PathValue("pic")))
 	}
 }

cmd/calls/pdf.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
@@ -42,6 +43,6 @@ func ServePDF(c *b.Config) http.HandlerFunc {
 			return
 		}
 
-		http.ServeFile(w, r, c.PDFDir+"/"+r.PathValue("id"))
+		http.ServeFile(w, r, filepath.Join(c.PDFDir, r.PathValue("id")))
 	}
 }

cmd/frontend/articles.go

@@ -456,8 +456,8 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s map[string]*Session) http.Ha
 
 		data.Image = data.Article.BannerLink
 
-		articleAbsName := fmt.Sprint(c.ArticleDir, "/", data.Article.UUID, ".md")
-		content, err := os.ReadFile(articleAbsName)
+		articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(data.Article.UUID, ".md"))
+		content, err := os.ReadFile(articlePath)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -587,7 +587,7 @@ func PublishArticle(c *b.Config, db *b.DB, s map[string]*Session) http.HandlerFu
 				return
 			}
 
-			if err = os.Remove(fmt.Sprint(c.ArticleDir, "/", oldArticle.UUID, ".md")); err != nil {
+			if err = os.Remove(filepath.Join(c.ArticleDir, fmt.Sprint(oldArticle.UUID, ".md"))); err != nil {
 				log.Println(err)
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
@@ -765,8 +765,8 @@ func ReviewArticle(c *b.Config, db *b.DB, s map[string]*Session, action, title,
 			return
 		}
 
-		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.UUID, ".md")
-		content, err := os.ReadFile(articleAbsName)
+		articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(article.UUID, ".md"))
+		content, err := os.ReadFile(articlePath)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -840,7 +840,7 @@ func DeleteArticle(c *b.Config, db *b.DB, s map[string]*Session) http.HandlerFun
 			return
 		}
 
-		if err = os.Remove(fmt.Sprint(c.ArticleDir, "/", article.UUID, ".md")); err != nil {
+		if err = os.Remove(filepath.Join(c.ArticleDir, article.UUID.String()+".md")); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -901,6 +901,7 @@ func AllowEditArticle(c *b.Config, db *b.DB, s map[string]*Session) http.Handler
 		}
 
 		newArticle := *oldArticle
+		newArticle.UUID = uuid.New()
 		newArticle.Published = false
 		newArticle.Rejected = true
 		newArticle.EditedID = oldArticle.ID
@@ -918,8 +919,8 @@ func AllowEditArticle(c *b.Config, db *b.DB, s map[string]*Session) http.Handler
 			return
 		}
 
-		src := fmt.Sprint(c.ArticleDir, "/", oldArticle.UUID, ".md")
-		dst := fmt.Sprint(c.ArticleDir, "/", newArticle.UUID, ".md")
+		src := filepath.Join(c.ArticleDir, fmt.Sprint(oldArticle.UUID, ".md"))
+		dst := filepath.Join(c.ArticleDir, fmt.Sprint(newArticle.UUID, ".md"))
 		if err = b.CopyFile(src, dst); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -995,7 +996,7 @@ func EditArticle(c *b.Config, db *b.DB, s map[string]*Session) http.HandlerFunc
 
 		data.Image = data.Article.BannerLink
 
-		content, err := os.ReadFile(fmt.Sprint(c.ArticleDir, "/", data.Article.UUID, ".md"))
+		content, err := os.ReadFile(filepath.Join(c.ArticleDir, fmt.Sprint(data.Article.UUID, ".md")))
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

cmd/frontend/images.go

@@ -25,7 +25,7 @@ func UploadEasyMDEImage(c *b.Config, s map[string]*Session) http.HandlerFunc {
 		}
 		defer file.Close()
 
-		filename, err := b.SaveImage(file, c.MaxImgHeight, c.MaxImgWidth, c.PicsDir+"/")
+		filename, err := b.SaveImage(file, c.MaxImgHeight, c.MaxImgWidth, c.ImgDir)
 		if err != nil {
 			if err == b.ErrUnsupportedFormat {
 				http.Error(w, "Das Dateiformat wird nicht unterstützt.", http.StatusBadRequest)
@@ -57,7 +57,7 @@ func UploadImage(c *b.Config, s map[string]*Session, fileKey, htmlFile, htmlTemp
 		}
 		defer file.Close()
 
-		filename, err := b.SaveImage(file, c.MaxBannerHeight, c.MaxBannerWidth, c.PicsDir+"/")
+		filename, err := b.SaveImage(file, c.MaxBannerHeight, c.MaxBannerWidth, c.ImgDir)
 		if err != nil {
 			if err == b.ErrUnsupportedFormat {
 				http.Error(w, "Das Dateiformat wird nicht unterstützt.", http.StatusBadRequest)

cmd/frontend/issues.go

@@ -58,8 +58,8 @@ func PublishLatestIssue(c *b.Config, db *b.DB, s map[string]*Session) http.Handl
 			return
 		}
 
-		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.UUID, ".md")
-		if err = os.WriteFile(articleAbsName, content, 0644); err != nil {
+		articlePath := filepath.Join(c.ArticleDir, fmt.Sprint(article.UUID, ".md"))
+		if err = os.WriteFile(articlePath, content, 0644); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/sessions.go

@@ -64,6 +64,18 @@ func StartSessions() (map[string]*Session, chan string) {
 	return sessions, sessionExpiryChan
 }
 
+// SessionIsActive is used for verifying that the user is logged in and returns
+// a bool.
+func SessionIsActive(r *http.Request, s map[string]*Session) bool {
+	cookie, err := r.Cookie("cpolis_session")
+	if err != nil {
+		return false
+	}
+
+	_, ok := s[cookie.Value]
+	return ok
+}
+
 // ManageSession is used for verifying that the user is logged in and returns
 // their session and an error. It also handles cases where the user is not
 // logged in.

cmd/main.go

@@ -24,7 +24,7 @@ func main() {
 	defer logFile.Close()
 	log.SetOutput(logFile)
 
-	db, err := b.OpenDB(config.DBName)
+	db, err := b.OpenDB(config)
 	if err != nil {
 		log.Fatalln(err)
 	}

go.mod

@@ -4,7 +4,7 @@ go 1.23.2
 
 require (
 	firebase.google.com/go/v4 v4.15.1
-	git.streifling.com/jason/atom v1.0.0
+	git.streifling.com/jason/atom v1.0.1
 	github.com/BurntSushi/toml v1.4.0
 	github.com/chai2010/webp v1.1.1
 	github.com/disintegration/imaging v1.6.2
@@ -14,31 +14,31 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/yuin/goldmark v1.7.8
 	golang.org/x/crypto v0.32.0
-	golang.org/x/term v0.28.0
-	google.golang.org/api v0.216.0
+	golang.org/x/term v0.29.0
+	google.golang.org/api v0.220.0
 )
 
 require (
-	cel.dev/expr v0.19.1 // indirect
-	cloud.google.com/go v0.118.0 // indirect
-	cloud.google.com/go/auth v0.14.0 // indirect
+	cel.dev/expr v0.19.2 // indirect
+	cloud.google.com/go v0.118.2 // indirect
+	cloud.google.com/go/auth v0.14.1 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
 	cloud.google.com/go/firestore v1.18.0 // indirect
 	cloud.google.com/go/iam v1.3.1 // indirect
 	cloud.google.com/go/longrunning v0.6.4 // indirect
-	cloud.google.com/go/monitoring v1.22.1 // indirect
+	cloud.google.com/go/monitoring v1.24.0 // indirect
 	cloud.google.com/go/storage v1.50.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
 	github.com/MicahParks/keyfunc v1.9.0 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
-	github.com/envoyproxy/go-control-plane/envoy v1.32.3 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
+	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -51,25 +51,25 @@ require (
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.33.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	golang.org/x/image v0.23.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	golang.org/x/image v0.24.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/oauth2 v0.26.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
 	google.golang.org/appengine/v2 v2.0.6 // indirect
-	google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	google.golang.org/genproto v0.0.0-20250204164813-702378808489 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )

go.sum

@@ -1,9 +1,15 @@
 cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
 cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
+cel.dev/expr v0.19.2 h1:V354PbqIXr9IQdwy4SYA4xa0HXaWq1BUPAGzugBY5V4=
+cel.dev/expr v0.19.2/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
 cloud.google.com/go v0.118.0 h1:tvZe1mgqRxpiVa3XlIGMiPcEUbP1gNXELgD4y/IXmeQ=
 cloud.google.com/go v0.118.0/go.mod h1:zIt2pkedt/mo+DQjcT4/L3NDxzHPR29j5HcclNH+9PM=
+cloud.google.com/go v0.118.2 h1:bKXO7RXMFDkniAAvvuMrAPtQ/VHrs9e7J5UT3yrGdTY=
+cloud.google.com/go v0.118.2/go.mod h1:CFO4UPEPi8oV21xoezZCrd3d81K4fFkDTEJu4R8K+9M=
 cloud.google.com/go/auth v0.14.0 h1:A5C4dKV/Spdvxcl0ggWwWEzzP7AZMJSEIgrkngwhGYM=
 cloud.google.com/go/auth v0.14.0/go.mod h1:CYsoRL1PdiDuqeQpZE0bP2pnPrGqFcOkI0nldEQis+A=
+cloud.google.com/go/auth v0.14.1 h1:AwoJbzUdxA/whv1qj3TLKwh3XX5sikny2fc40wUl+h0=
+cloud.google.com/go/auth v0.14.1/go.mod h1:4JHUxlGXisL0AW8kXPtUF6ztuOksyfUQNFjfsOCXkPM=
 cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74z6cBk9Rw6M=
 cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc=
 cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
@@ -16,8 +22,10 @@ cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXH
 cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
 cloud.google.com/go/longrunning v0.6.4 h1:3tyw9rO3E2XVXzSApn1gyEEnH2K9SynNQjMlBi3uHLg=
 cloud.google.com/go/longrunning v0.6.4/go.mod h1:ttZpLCe6e7EXvn9OxpBRx7kZEB0efv8yBO6YnVMfhJs=
-cloud.google.com/go/monitoring v1.22.1 h1:KQbnAC4IAH+5x3iWuPZT5iN9VXqKMzzOgqcYB6fqPDE=
-cloud.google.com/go/monitoring v1.22.1/go.mod h1:AuZZXAoN0WWWfsSvET1Cpc4/1D8LXq8KRDU87fMS6XY=
+cloud.google.com/go/monitoring v1.23.0 h1:M3nXww2gn9oZ/qWN2bZ35CjolnVHM3qnSbu6srCPgjk=
+cloud.google.com/go/monitoring v1.23.0/go.mod h1:034NnlQPDzrQ64G2Gavhl0LUHZs9H3rRmhtnp7jiJgg=
+cloud.google.com/go/monitoring v1.24.0 h1:csSKiCJ+WVRgNkRzzz3BPoGjFhjPY23ZTcaenToJxMM=
+cloud.google.com/go/monitoring v1.24.0/go.mod h1:Bd1PRK5bmQBQNnuGwHBfUamAV1ys9049oEPHnn4pcsc=
 cloud.google.com/go/storage v1.50.0 h1:3TbVkzTooBvnZsk7WaAQfOsNrdoM8QHusXA1cpk6QJs=
 cloud.google.com/go/storage v1.50.0/go.mod h1:l7XeiD//vx5lfqE3RavfmU9yvk5Pp0Zhcv482poyafY=
 cloud.google.com/go/trace v1.11.3 h1:c+I4YFjxRQjvAhRmSsmjpASUKq88chOX854ied0K/pE=
@@ -26,18 +34,25 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 firebase.google.com/go/v4 v4.15.1 h1:tR2dzKw1MIfCfG2bhAyxa5KQ57zcE7iFKmeYClET6ZM=
 firebase.google.com/go/v4 v4.15.1/go.mod h1:eunxbsh4UXI2rA8po3sOiebvWYuW0DVxAdZFO0I6wdY=
-git.streifling.com/jason/atom v1.0.0 h1:E88z4S7JeT6T+WuAaJWnGwCWTx+vzSJ6giUL51MdptI=
-git.streifling.com/jason/atom v1.0.0/go.mod h1:FNTYJfatYaIOQn4OKy8y+Mtohqm3MeyEGZUu4bMtZ9E=
+git.streifling.com/jason/atom v1.0.1 h1:G1PtNt1+qlzxpwjlD6iDeseFmzoac1IYxdq9twofTFY=
+git.streifling.com/jason/atom v1.0.1/go.mod h1:FNTYJfatYaIOQn4OKy8y+Mtohqm3MeyEGZUu4bMtZ9E=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 h1:3c8yed4lgqTt+oTQ+JNMDo+F4xprBf+O/il4ZC0nRLw=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0/go.mod h1:obipzmGjfSjam60XLwGfqUkJsfiheAl+TUjG+4yzyPM=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 h1:f2Qw/Ehhimh5uO1fayV0QIW7DShEQqhtUfhYc+cBPlw=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0/go.mod h1:2bIszWvQRlJVmJLiuLhukLImRjKPcYdzzsx6darK02A=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 h1:o90wcURuxekmXrtxmYWTyNla0+ZEHhud6DI1ZTxd1vI=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0/go.mod h1:6fTWu4m3jocfUZLYF5KsZC1TUfRvEjs7lM4crme/irw=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 h1:5IT7xOdq17MtcdtL/vtl6mGfzhaq4m4vpollPRmlsBQ=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0/go.mod h1:ZV4VOm0/eHR06JLrXWe09068dHpr3TRpY9Uo7T+anuA=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0 h1:jJKWl98inONJAr/IZrdFQUWcwUO95DLY1XMD1ZIut+g=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0/go.mod h1:l2fIqmwB+FKSfvn3bAD/0i+AXAxhIZjTK2svT/mgUXs=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0 h1:nNMpRpnkWDAaqcpxMJvxa/Ud98gjbYwayJY4/9bdjiU=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 h1:GYUJLfvd++4DMuMhCFLgLXvFwofIxh/qOwoGuS/LTew=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 h1:ig/FpDD2JofP/NExKQUbn7uOSZzJAQqogfqluZK4ed4=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID3+o=
 github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
@@ -46,8 +61,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chai2010/webp v1.1.1 h1:jTRmEccAJ4MGrhFOrPMpNGIJ/eybIgwKpcACsrTEapk=
 github.com/chai2010/webp v1.1.1/go.mod h1:0XVwvZWdjjdxpUEIf7b9g9VkHFnInUSYujwqTLEuldU=
-github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 h1:boJj011Hh+874zpIySeApCX4GeOjPl9qhRF3QuIZq+Q=
-github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
+github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
@@ -56,10 +71,12 @@ github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+
 github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
 github.com/envoyproxy/go-control-plane/envoy v1.32.3 h1:hVEaommgvzTjTd4xCaFd+kEQ2iYBtGxP6luyLrx6uOk=
 github.com/envoyproxy/go-control-plane/envoy v1.32.3/go.mod h1:F6hWupPfh75TBXGKA++MCT/CZHFq5r9/uwt/kQYkZfE=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
+github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
 github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
 github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
-github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=
-github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
+github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
+github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
@@ -109,24 +126,24 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/detectors/gcp v1.33.0 h1:FVPoXEoILwgbZUu4X7YSgsESsAmGRgoYcnXkzgQPhP4=
-go.opentelemetry.io/contrib/detectors/gcp v1.33.0/go.mod h1:ZHrLmr4ikK2AwRj9QL+c9s2SOlgoSRyMpNVzUj2fZqI=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
+go.opentelemetry.io/contrib/detectors/gcp v1.34.0 h1:JRxssobiPg23otYU5SbWtQC//snGVIM3Tx6QRzlQBao=
+go.opentelemetry.io/contrib/detectors/gcp v1.34.0/go.mod h1:cV4BMFcscUR/ckqLkbfQmF0PRsq8w/lMGzdbCSveBHo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I=
-go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
-go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
@@ -134,6 +151,8 @@ golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ug
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
 golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
+golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
+golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -142,10 +161,14 @@ golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
 golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -153,38 +176,57 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
 golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
 golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.216.0 h1:xnEHy+xWFrtYInWPy8OdGFsyIfWJjtVnO39g7pz2BFY=
-google.golang.org/api v0.216.0/go.mod h1:K9wzQMvWi47Z9IU7OgdOofvZuw75Ge3PPITImZR/UyI=
+google.golang.org/api v0.218.0 h1:x6JCjEWeZ9PFCRe9z0FBrNwj7pB7DOAqT35N+IPnAUA=
+google.golang.org/api v0.218.0/go.mod h1:5VGHBAkxrA/8EFjLVEYmMUJ8/8+gWWQ3s4cFH0FxG2M=
+google.golang.org/api v0.220.0 h1:3oMI4gdBgB72WFVwE1nerDD8W3HUOS4kypK6rRLbGns=
+google.golang.org/api v0.220.0/go.mod h1:26ZAlY6aN/8WgpCzjPNy18QpYaz7Zgg1h0qe1GkZEmY=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
 google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4NtuBIw=
 google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
-google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422 h1:6GUHKGv2huWOHKmDXLMNE94q3fBDlEHI+oTRIZSebK0=
-google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422/go.mod h1:1NPAxoesyw/SgLPqaUp9u1f9PWCLAk/jVmhx7gJZStg=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
-google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/genproto v0.0.0-20250124145028-65684f501c47 h1:SI8Hf7K4+uVYchXqZiMfP44PZ83xomMWovbcFfm0P8Q=
+google.golang.org/genproto v0.0.0-20250124145028-65684f501c47/go.mod h1:qbZzneIOXSq+KFAFut9krLfRLZiFLzZL5u2t8SV83EE=
+google.golang.org/genproto v0.0.0-20250204164813-702378808489 h1:nQcbCCOg2h2CQ0yA8SY3AHqriNKDvsetuq9mE/HFjtc=
+google.golang.org/genproto v0.0.0-20250204164813-702378808489/go.mod h1:wkQ2Aj/xvshAUDtO/JHvu9y+AaN9cqs28QuSVSHtZSY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250124145028-65684f501c47 h1:5iw9XJTD4thFidQmFVvx0wi4g5yOHk76rNRUxz1ZG5g=
+google.golang.org/genproto/googleapis/api v0.0.0-20250124145028-65684f501c47/go.mod h1:AfA77qWLcidQWywD0YgqfpJzf50w2VjzBml3TybHeJU=
+google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 h1:fCuMM4fowGzigT89NCIsW57Pk9k2D12MMi2ODn+Nk+o=
+google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 h1:91mG8dNTpkC0uChJUQ9zCiRqx3GEEFOWaRZ0mI6Oj2I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 h1:5bKytslY8ViY0Cj/ewmRtrWHW64bNF03cAatUUFCdFI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

scripts/create_toc.lua

@@ -0,0 +1,33 @@
+-- Helper function: remove all image inlines from a list of inlines.
+local function remove_images(inlines)
+	local result = {}
+	for _, item in ipairs(inlines) do
+		if item.t ~= "Image" then
+			table.insert(result, item)
+		end
+	end
+	return result
+end
+
+-- Build a bullet list representing the table of contents.
+local function build_toc(doc)
+	local toc_items = {}
+	for _, block in ipairs(doc.blocks) do
+		if block.t == "Header" then
+			local clean_inlines = remove_images(block.content)
+			local header_text = pandoc.utils.stringify(clean_inlines)
+			if header_text ~= "" then
+				local link = pandoc.Link(clean_inlines, "#" .. block.identifier)
+				table.insert(toc_items, { link })
+			end
+		end
+	end
+	return pandoc.BulletList(toc_items)
+end
+
+-- The Pandoc function runs after the document is fully constructed.
+function Pandoc(doc)
+	local toc = build_toc(doc)
+	table.insert(doc.blocks, 1, toc) -- Insert the TOC at the very beginning of the document.
+	return doc
+end

update.sh

@@ -1,58 +0,0 @@
-#! /bin/sh -
-
-CPOLIS_REPO_URL="https://git.streifling.com/api/v1/repos/jason/cpolis/releases"
-EXTRACTION_DIR=$HOME
-CPOLIS_DIR=$EXTRACTION_DIR/cpolis
-TAILWINDCSS_REPO_URL=https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest
-TMP_DIR=/tmp
-BIN_DIR=/usr/local/bin
-SYSTEMD_DIR=/etc/systemd/system
-
-check_dependency() {
-    if ! which $1 >/dev/null 2>&1; then
-        echo "$1 needs to be installed" >&2
-        exit 1
-    fi
-}
-
-if ! groups | grep -E 'root|wheel|sudo' >/dev/null; then
-    echo "You need administrative privileges for this script" >&2
-    exit 1
-fi
-
-check_dependency curl
-check_dependency go
-check_dependency jq
-check_dependency tar
-check_dependency xargs
-
-echo '\nDownloading cpolis...' >&2
-rm -fr $CPOLIS_DIR/*
-latest_release=$(curl -s $CPOLIS_REPO_URL | jq -r '.[0].tag_name')
-curl -Lo $TMP_DIR/cpolis.tar.gz https://git.streifling.com/jason/cpolis/archive/$latest_release.tar.gz
-tar -xzf $TMP_DIR/cpolis.tar.gz -C $EXTRACTION_DIR
-rm $TMP_DIR/cpolis.tar.gz
-
-echo '\nDownloading TailwindCSS...' >&2
-curl -s $TAILWINDCSS_REPO_URL |
-    grep -F browser_download_url |
-    grep -F linux-x64 |
-    cut -d'"' -f4 |
-    xargs -r curl -Lo $CPOLIS_DIR/tailwindcss
-chmod +x $CPOLIS_DIR/tailwindcss
-$CPOLIS_DIR/tailwindcss -i $CPOLIS_DIR/web/static/css/input.css -o $CPOLIS_DIR/web/static/css/style.css
-
-echo '\nBuilding cpolis...' >&2
-cd $CPOLIS_DIR
-go build -o $BIN_DIR/cpolis cmd/main.go
-cd
-
-echo '\nSetting up system files...' >&2
-sudo chown root:root $BIN_DIR/cpolis
-chmod +x $BIN_DIR/cpolis
-
-echo '\nSetting up service...' >&2
-sudo mv $CPOLIS_DIR/cpolis.service $SYSTEMD_DIR
-sudo chown root:root $SYSTEMD_DIR/cpolis.service
-sudo systemctl daemon-reload
-sudo systemctl is-active --quiet cpolis.service && sudo systemctl restart cpolis.service

web/templates/index.html

@@ -42,7 +42,7 @@
         <p>{{.Version}} - <strong>Alpha: Drastische Änderungen und Fehler vorbehalten.</strong></p>
     </footer>
 
-    <script src="https://unpkg.com/htmx.org@latest"></script>
+    <script src="https://unpkg.com/htmx.org@2.0.4"></script>
     <script src="https://unpkg.com/easymde/dist/easymde.min.js"></script>
     <script>
         document.addEventListener('DOMContentLoaded', () => {