diff options
| author | 2022-07-19 09:47:55 +0100 | |
|---|---|---|
| committer | 2022-07-19 10:47:55 +0200 | |
| commit | 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 (patch) | |
| tree | 17036ad9db68c3080e1e91279c8bce9f9ea6e5c3 /internal/visibility | |
| parent | [bugfix] Markdown format fixes (#718) (diff) | |
| download | gotosocial-098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3.tar.xz | |
[chore] use our own logging implementation (#716)
* first commit
Signed-off-by: kim <grufwub@gmail.com>
* replace logging with our own log library
Signed-off-by: kim <grufwub@gmail.com>
* fix imports
Signed-off-by: kim <grufwub@gmail.com>
* fix log imports
Signed-off-by: kim <grufwub@gmail.com>
* add license text
Signed-off-by: kim <grufwub@gmail.com>
* fix package import cycle between config and log package
Signed-off-by: kim <grufwub@gmail.com>
* fix empty kv.Fields{} being passed to WithFields()
Signed-off-by: kim <grufwub@gmail.com>
* fix uses of log.WithFields() with whitespace issues and empty slices
Signed-off-by: kim <grufwub@gmail.com>
* *linter related grumbling*
Signed-off-by: kim <grufwub@gmail.com>
* gofmt the codebase! also fix more log.WithFields() formatting issues
Signed-off-by: kim <grufwub@gmail.com>
* update testrig code to match new changes
Signed-off-by: kim <grufwub@gmail.com>
* fix error wrapping in non fmt.Errorf function
Signed-off-by: kim <grufwub@gmail.com>
* add benchmarking of log.Caller() vs non-cached
Signed-off-by: kim <grufwub@gmail.com>
* fix syslog tests, add standard build tags to test runner to ensure consistency
Signed-off-by: kim <grufwub@gmail.com>
* make syslog tests more robust
Signed-off-by: kim <grufwub@gmail.com>
* fix caller depth arithmatic (is that how you spell it?)
Signed-off-by: kim <grufwub@gmail.com>
* update to use unkeyed fields in kv.Field{} instances
Signed-off-by: kim <grufwub@gmail.com>
* update go-kv library
Signed-off-by: kim <grufwub@gmail.com>
* update libraries list
Signed-off-by: kim <grufwub@gmail.com>
* fuck you linter get nerfed
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com>
Diffstat (limited to 'internal/visibility')
| -rw-r--r-- | internal/visibility/statusboostable.go | 14 | ||||
| -rw-r--r-- | internal/visibility/statushometimelineable.go | 11 | ||||
| -rw-r--r-- | internal/visibility/statuspublictimelineable.go | 11 | ||||
| -rw-r--r-- | internal/visibility/statusvisible.go | 11 | 
4 files changed, 23 insertions, 24 deletions
| diff --git a/internal/visibility/statusboostable.go b/internal/visibility/statusboostable.go index 9eed9e3e9..60699875d 100644 --- a/internal/visibility/statusboostable.go +++ b/internal/visibility/statusboostable.go @@ -23,15 +23,11 @@ import (  	"errors"  	"fmt" -	"github.com/sirupsen/logrus"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +	"github.com/superseriousbusiness/gotosocial/internal/log"  )  func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) { -	l := logrus.WithFields(logrus.Fields{ -		"func": "StatusBoostable", -	}) -  	// if the status isn't visible, it certainly isn't boostable  	visible, err := f.StatusVisible(ctx, targetStatus, requestingAccount)  	if err != nil { @@ -43,23 +39,23 @@ func (f *filter) StatusBoostable(ctx context.Context, targetStatus *gtsmodel.Sta  	// direct messages are never boostable, even if they're visible  	if targetStatus.Visibility == gtsmodel.VisibilityDirect { -		l.Trace("status is not boostable because it is a DM") +		log.Trace("status is not boostable because it is a DM")  		return false, nil  	}  	// the original account should always be able to boost its own non-DM statuses  	if requestingAccount.ID == targetStatus.Account.ID { -		l.Trace("status is boostable because author is booster") +		log.Trace("status is boostable because author is booster")  		return true, nil  	}  	// if status is followers-only and not the author's, it is not boostable  	if targetStatus.Visibility == gtsmodel.VisibilityFollowersOnly { -		l.Trace("status not boostable because it is followers-only") +		log.Trace("status not boostable because it is followers-only")  		return false, nil  	}  	// otherwise, status is as boostable as it says it is -	l.Trace("defaulting to status.boostable value") +	log.Trace("defaulting to status.boostable value")  	return targetStatus.Boostable, nil  } diff --git a/internal/visibility/statushometimelineable.go b/internal/visibility/statushometimelineable.go index af871bcaa..bd3c90b4d 100644 --- a/internal/visibility/statushometimelineable.go +++ b/internal/visibility/statushometimelineable.go @@ -22,15 +22,16 @@ import (  	"context"  	"fmt" -	"github.com/sirupsen/logrus" +	"codeberg.org/gruf/go-kv"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +	"github.com/superseriousbusiness/gotosocial/internal/log"  )  func (f *filter) StatusHometimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) { -	l := logrus.WithFields(logrus.Fields{ -		"func":     "StatusHometimelineable", -		"statusID": targetStatus.ID, -	}) +	l := log.WithFields(kv.Fields{ + +		{"statusID", targetStatus.ID}, +	}...)  	// status owner should always be able to see their own status in their timeline so we can return early if this is the case  	if targetStatus.AccountID == timelineOwnerAccount.ID { diff --git a/internal/visibility/statuspublictimelineable.go b/internal/visibility/statuspublictimelineable.go index 9991a9c3a..848842225 100644 --- a/internal/visibility/statuspublictimelineable.go +++ b/internal/visibility/statuspublictimelineable.go @@ -22,15 +22,16 @@ import (  	"context"  	"fmt" -	"github.com/sirupsen/logrus" +	"codeberg.org/gruf/go-kv"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +	"github.com/superseriousbusiness/gotosocial/internal/log"  )  func (f *filter) StatusPublictimelineable(ctx context.Context, targetStatus *gtsmodel.Status, timelineOwnerAccount *gtsmodel.Account) (bool, error) { -	l := logrus.WithFields(logrus.Fields{ -		"func":     "StatusPublictimelineable", -		"statusID": targetStatus.ID, -	}) +	l := log.WithFields(kv.Fields{ + +		{"statusID", targetStatus.ID}, +	}...)  	// Don't timeline boosted statuses  	if targetStatus.BoostOfID != "" { diff --git a/internal/visibility/statusvisible.go b/internal/visibility/statusvisible.go index 3d179eccd..fc8bfeaaa 100644 --- a/internal/visibility/statusvisible.go +++ b/internal/visibility/statusvisible.go @@ -22,18 +22,19 @@ import (  	"context"  	"fmt" -	"github.com/sirupsen/logrus" +	"codeberg.org/gruf/go-kv"  	"github.com/superseriousbusiness/gotosocial/internal/db"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +	"github.com/superseriousbusiness/gotosocial/internal/log"  )  func (f *filter) StatusVisible(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (bool, error) {  	const getBoosted = true -	l := logrus.WithFields(logrus.Fields{ -		"func":     "StatusVisible", -		"statusID": targetStatus.ID, -	}) +	l := log.WithFields(kv.Fields{ + +		{"statusID", targetStatus.ID}, +	}...)  	// Fetch any relevant accounts for the target status  	relevantAccounts, err := f.relevantAccounts(ctx, targetStatus, getBoosted) | 
