Move a lot of stuff + tidy stuff (#37)

Lots of renaming and moving stuff, some bug fixes, more lenient parsing of notifications and home timeline.

3 files changed, 154 insertions, 0 deletions

diff --git a/internal/blob/inmem.go b/internal/blob/inmem.go
new file mode 100644
index 000000000..6ea64bcfe
--- /dev/null
+++ b/internal/blob/inmem.go
@@ -0,0 +1,55 @@
+package blob
+
+import (
+	"fmt"
+
+	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
+)
+
+// NewInMem returns an in-memory implementation of the Storage interface.
+// This is good for testing and whatnot but ***SHOULD ABSOLUTELY NOT EVER
+// BE USED IN A PRODUCTION SETTING***, because A) everything will be wiped out
+// if you restart the server and B) if you store lots of images your RAM use
+// will absolutely go through the roof.
+func NewInMem(c *config.Config, log *logrus.Logger) (Storage, error) {
+	return &inMemStorage{
+		stored: make(map[string][]byte),
+		log:    log,
+	}, nil
+}
+
+type inMemStorage struct {
+	stored map[string][]byte
+	log    *logrus.Logger
+}
+
+func (s *inMemStorage) StoreFileAt(path string, data []byte) error {
+	l := s.log.WithField("func", "StoreFileAt")
+	l.Debugf("storing at path %s", path)
+	s.stored[path] = data
+	return nil
+}
+
+func (s *inMemStorage) RetrieveFileFrom(path string) ([]byte, error) {
+	l := s.log.WithField("func", "RetrieveFileFrom")
+	l.Debugf("retrieving from path %s", path)
+	d, ok := s.stored[path]
+	if !ok || len(d) == 0 {
+		return nil, fmt.Errorf("no data found at path %s", path)
+	}
+	return d, nil
+}
+
+func (s *inMemStorage) ListKeys() ([]string, error) {
+	keys := []string{}
+	for k := range s.stored {
+		keys = append(keys, k)
+	}
+	return keys, nil
+}
+
+func (s *inMemStorage) RemoveFileAt(path string) error {
+	delete(s.stored, path)
+	return nil
+}
diff --git a/internal/blob/local.go b/internal/blob/local.go
new file mode 100644
index 000000000..01f82f8d2
--- /dev/null
+++ b/internal/blob/local.go
@@ -0,0 +1,70 @@
+package blob
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
+)
+
+// NewLocal returns an implementation of the Storage interface that uses
+// the local filesystem for storing and retrieving files, attachments, etc.
+func NewLocal(c *config.Config, log *logrus.Logger) (Storage, error) {
+	return &localStorage{
+		config: c,
+		log:    log,
+	}, nil
+}
+
+type localStorage struct {
+	config *config.Config
+	log    *logrus.Logger
+}
+
+func (s *localStorage) StoreFileAt(path string, data []byte) error {
+	l := s.log.WithField("func", "StoreFileAt")
+	l.Debugf("storing at path %s", path)
+	components := strings.Split(path, "/")
+	dir := strings.Join(components[0:len(components)-1], "/")
+	if err := os.MkdirAll(dir, 0777); err != nil {
+		return fmt.Errorf("error writing file at %s: %s", path, err)
+	}
+	if err := os.WriteFile(path, data, 0777); err != nil {
+		return fmt.Errorf("error writing file at %s: %s", path, err)
+	}
+	return nil
+}
+
+func (s *localStorage) RetrieveFileFrom(path string) ([]byte, error) {
+	l := s.log.WithField("func", "RetrieveFileFrom")
+	l.Debugf("retrieving from path %s", path)
+	b, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("error reading file at %s: %s", path, err)
+	}
+	return b, nil
+}
+
+func (s *localStorage) ListKeys() ([]string, error) {
+	keys := []string{}
+	err := filepath.Walk(s.config.StorageConfig.BasePath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() {
+			keys = append(keys, path)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return keys, nil
+}
+
+func (s *localStorage) RemoveFileAt(path string) error {
+	return os.Remove(path)
+}
diff --git a/internal/blob/storage.go b/internal/blob/storage.go
new file mode 100644
index 000000000..d1deb740f
--- /dev/null
+++ b/internal/blob/storage.go
@@ -0,0 +1,29 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package blob
+
+// Storage is an interface for storing and retrieving blobs
+// such as images, videos, and any other attachments/documents
+// that shouldn't be stored in a database.
+type Storage interface {
+	StoreFileAt(path string, data []byte) error
+	RetrieveFileFrom(path string) ([]byte, error)
+	ListKeys() ([]string, error)
+	RemoveFileAt(path string) error
+}