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.

4 files changed, 0 insertions, 239 deletions

diff --git a/internal/storage/inmem.go b/internal/storage/inmem.go
deleted file mode 100644
index a596c3d97..000000000
--- a/internal/storage/inmem.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package storage
-
-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/storage/local.go b/internal/storage/local.go
deleted file mode 100644
index 3b64524f6..000000000
--- a/internal/storage/local.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package storage
-
-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/storage/mock_Storage.go b/internal/storage/mock_Storage.go
deleted file mode 100644
index 2444f030a..000000000
--- a/internal/storage/mock_Storage.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Code generated by mockery v2.7.4. DO NOT EDIT.
-
-package storage
-
-import mock "github.com/stretchr/testify/mock"
-
-// MockStorage is an autogenerated mock type for the Storage type
-type MockStorage struct {
-	mock.Mock
-}
-
-// ListKeys provides a mock function with given fields:
-func (_m *MockStorage) ListKeys() ([]string, error) {
-	ret := _m.Called()
-
-	var r0 []string
-	if rf, ok := ret.Get(0).(func() []string); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]string)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// RemoveFileAt provides a mock function with given fields: path
-func (_m *MockStorage) RemoveFileAt(path string) error {
-	ret := _m.Called(path)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(path)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// RetrieveFileFrom provides a mock function with given fields: path
-func (_m *MockStorage) RetrieveFileFrom(path string) ([]byte, error) {
-	ret := _m.Called(path)
-
-	var r0 []byte
-	if rf, ok := ret.Get(0).(func(string) []byte); ok {
-		r0 = rf(path)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(path)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// StoreFileAt provides a mock function with given fields: path, data
-func (_m *MockStorage) StoreFileAt(path string, data []byte) error {
-	ret := _m.Called(path, data)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string, []byte) error); ok {
-		r0 = rf(path, data)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
deleted file mode 100644
index 409c90b37..000000000
--- a/internal/storage/storage.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-   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 storage contains an interface and implementations for storing and retrieving files and attachments.
-package storage
-
-// 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
-}