mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[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>
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user