Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
fix: version checker
Steven342d1aeefb3f
diff --git a/server/server.go b/server/server.goindex 62e89662f..080d3f741 100644--- a/server/server.go+++ b/server/server.go@@ -110,7 +110,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store}func (s *Server) Start(ctx context.Context) error {- go versionchecker.NewVersionChecker(s.Store).Start(ctx)+ go versionchecker.NewVersionChecker(s.Store, s.Profile).Start(ctx)go s.telegramBot.Start(ctx)go s.backupRunner.Run(ctx)diff --git a/server/service/version_checker/version_checker.go b/server/service/version_checker/version_checker.goindex 73494261d..0c3459a2c 100644--- a/server/service/version_checker/version_checker.go+++ b/server/service/version_checker/version_checker.go@@ -11,18 +11,21 @@ import ("github.com/pkg/errors"storepb "github.com/usememos/memos/proto/gen/store"+ "github.com/usememos/memos/server/profile""github.com/usememos/memos/server/version""github.com/usememos/memos/store")// nolinttype VersionChecker struct {- Store *store.Store+ Store *store.Store+ Profile *profile.Profile}-func NewVersionChecker(store *store.Store) *VersionChecker {+func NewVersionChecker(store *store.Store, profile *profile.Profile) *VersionChecker {return &VersionChecker{- Store: store,+ Store: store,+ Profile: profile,}}@@ -47,20 +50,11 @@ func (*VersionChecker) GetLatestVersion() (string, error) {}func (c *VersionChecker) Check(ctx context.Context) {- migrationHistories, err := c.Store.FindMigrationHistoryList(ctx, &store.FindMigrationHistory{})- if err != nil {- return- }- if len(migrationHistories) == 0 {- return- }-- lastVersion := migrationHistories[0].VersionlatestVersion, err := c.GetLatestVersion()if err != nil {return}- if !version.IsVersionGreaterThan(latestVersion, lastVersion) {+ if !version.IsVersionGreaterThan(latestVersion, version.GetCurrentVersion(c.Profile.Mode)) {return}@@ -71,15 +65,16 @@ func (c *VersionChecker) Check(ctx context.Context) {if err != nil {return}- if len(list) == 0 {- return- }- latestVersionUpdateActivity := list[0]- if latestVersionUpdateActivity.Payload == nil {- return+ shouldNotify := true+ if len(list) > 0 {+ latestVersionUpdateActivity := list[0]+ if latestVersionUpdateActivity.Payload != nil && version.IsVersionGreaterOrEqualThan(latestVersionUpdateActivity.Payload.VersionUpdate.Version, latestVersion) {+ shouldNotify = false+ }}- if version.IsVersionGreaterOrEqualThan(latestVersionUpdateActivity.Payload.VersionUpdate.Version, latestVersion) {++ if !shouldNotify {return}diff --git a/server/service/version_checker/version_checker_test.go b/server/service/version_checker/version_checker_test.goindex 9ddde295b..19a7dc35b 100644--- a/server/service/version_checker/version_checker_test.go+++ b/server/service/version_checker/version_checker_test.go@@ -7,6 +7,6 @@ import ()func TestGetLatestVersion(t *testing.T) {- _, err := NewVersionChecker(nil).GetLatestVersion()+ _, err := NewVersionChecker(nil, nil).GetLatestVersion()require.NoError(t, err)}