Merge branch 'main' into feature/bucket-paginate

go.mod

@@ -47,10 +47,10 @@ require (
 	github.com/imdario/mergo v0.3.11
 	github.com/jgautheron/goconst v1.4.0
 	github.com/kr/text v0.2.0 // indirect
-	github.com/labstack/echo/v4 v4.2.0
+	github.com/labstack/echo/v4 v4.2.1
 	github.com/labstack/gommon v0.3.0
 	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef
-	github.com/lib/pq v1.9.0
+	github.com/lib/pq v1.10.0
 	github.com/magefile/mage v1.11.0
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect

go.sum

@@ -496,6 +496,8 @@ github.com/labstack/echo/v4 v4.1.16 h1:8swiwjE5Jkai3RPfZoahp8kjVCRNq+y7Q0hPji2Kz
 github.com/labstack/echo/v4 v4.1.16/go.mod h1:awO+5TzAjvL8XpibdsfXxPgHr+orhtXZJZIQCVjogKI=
 github.com/labstack/echo/v4 v4.2.0 h1:jkCSsjXmBmapVXF6U4BrSz/cgofWM0CU3Q74wQvXkIc=
 github.com/labstack/echo/v4 v4.2.0/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
+github.com/labstack/echo/v4 v4.2.1 h1:LF5Iq7t/jrtUuSutNuiEWtB5eiHfZ5gSe2pcu5exjQw=
+github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef h1:RZnRnSID1skF35j/15KJ6hKZkdIC/teQClJK5wP5LU4=
@@ -512,6 +514,8 @@ github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
 github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8=
 github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
+github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
 github.com/lithammer/shortuuid/v3 v3.0.4 h1:uj4xhotfY92Y1Oa6n6HUiFn87CdoEHYUlTy0+IgbLrs=

pkg/log/watermill_logger.go

@@ -60,7 +60,7 @@ func concatFields(fields watermill.LogFields) string {
 	full := ""
 
 	for key, val := range fields {
-		full += fmt.Sprintf("%s=%s, ", key, val)
+		full += fmt.Sprintf("%s=%v, ", key, val)
 	}
 
 	if full != "" {

pkg/models/kanban.go

@@ -119,9 +119,11 @@ func (b *Bucket) ReadAll(s *xorm.Session, auth web.Auth, search string, page int
 
 	// Get all users
 	users := make(map[int64]*user.User)
-	err = s.In("id", userIDs).Find(&users)
-	if err != nil {
-		return
+	if len(userIDs) > 0 {
+		err = s.In("id", userIDs).Find(&users)
+		if err != nil {
+			return
+		}
 	}
 
 	for _, bb := range buckets {

pkg/models/label_task.go

@@ -218,9 +218,11 @@ func getLabelsByTaskIDs(s *xorm.Session, opts *LabelByTaskIDsOptions) (ls []*lab
 		userids = append(userids, l.CreatedByID)
 	}
 	users := make(map[int64]*user.User)
-	err = s.In("id", userids).Find(&users)
-	if err != nil {
-		return nil, 0, 0, err
+	if len(userids) > 0 {
+		err = s.In("id", userids).Find(&users)
+		if err != nil {
+			return nil, 0, 0, err
+		}
 	}
 
 	// Obfuscate all user emails

pkg/models/link_sharing.go

@@ -182,9 +182,11 @@ func (share *LinkSharing) ReadAll(s *xorm.Session, a web.Auth, search string, pa
 	}
 
 	users := make(map[int64]*user.User)
-	err = s.In("id", userIDs).Find(&users)
-	if err != nil {
-		return nil, 0, 0, err
+	if len(userIDs) > 0 {
+		err = s.In("id", userIDs).Find(&users)
+		if err != nil {
+			return nil, 0, 0, err
+		}
 	}
 
 	for _, s := range shares {

pkg/models/list.go

@@ -290,6 +290,11 @@ func GetListSimplByTaskID(s *xorm.Session, taskID int64) (l *List, err error) {
 // GetListsByIDs returns a map of lists from a slice with list ids
 func GetListsByIDs(s *xorm.Session, listIDs []int64) (lists map[int64]*List, err error) {
 	lists = make(map[int64]*List, len(listIDs))
+
+	if len(listIDs) == 0 {
+		return
+	}
+
 	err = s.In("id", listIDs).Find(&lists)
 	return
 }
@@ -405,9 +410,11 @@ func addListDetails(s *xorm.Session, lists []*List) (err error) {
 
 	// Get all list owners
 	owners := map[int64]*user.User{}
-	err = s.In("id", ownerIDs).Find(&owners)
-	if err != nil {
-		return
+	if len(ownerIDs) > 0 {
+		err = s.In("id", ownerIDs).Find(&owners)
+		if err != nil {
+			return
+		}
 	}
 
 	var fileIDs []int64

pkg/models/namespace.go

@@ -657,6 +657,13 @@ func (n *Namespace) Delete(s *xorm.Session, a web.Auth) (err error) {
 		listIDs = append(listIDs, l.ID)
 	}
 
+	if len(listIDs) == 0 {
+		return events.Dispatch(&NamespaceDeletedEvent{
+			Namespace: n,
+			Doer:      a,
+		})
+	}
+
 	// Delete tasks
 	_, err = s.In("list_id", listIDs).Delete(&Task{})
 	if err != nil {

pkg/models/task_attachment.go

@@ -128,6 +128,10 @@ func (ta *TaskAttachment) ReadAll(s *xorm.Session, a web.Auth, search string, pa
 		return nil, 0, 0, err
 	}
 
+	if len(attachments) == 0 {
+		return
+	}
+
 	fileIDs := make([]int64, 0, len(attachments))
 	userIDs := make([]int64, 0, len(attachments))
 	for _, r := range attachments {
@@ -228,9 +232,11 @@ func getTaskAttachmentsByTaskIDs(s *xorm.Session, taskIDs []int64) (attachments
 	}
 
 	users := make(map[int64]*user.User)
-	err = s.In("id", userIDs).Find(&users)
-	if err != nil {
-		return
+	if len(userIDs) > 0 {
+		err = s.In("id", userIDs).Find(&users)
+		if err != nil {
+			return
+		}
 	}
 
 	// Obfuscate all user emails

pkg/models/task_reminder.go

@@ -49,6 +49,10 @@ type taskUser struct {
 }
 
 func getTaskUsersForTasks(s *xorm.Session, taskIDs []int64) (taskUsers []*taskUser, err error) {
+	if len(taskIDs) == 0 {
+		return
+	}
+
 	// Get all creators of tasks
 	creators := make(map[int64]*user.User, len(taskIDs))
 	err = s.

pkg/models/user_list.go

@@ -96,12 +96,20 @@ func ListUsersFromList(s *xorm.Session, l *List, search string) (users []*user.U
 		uids = append(uids, id)
 	}
 
+	var cond builder.Cond = builder.Like{"username", "%" + search + "%"}
+
+	if len(uids) > 0 {
+		cond = builder.And(
+			builder.In("id", uids),
+			cond,
+		)
+	}
+
 	// Get all users
 	err = s.
 		Table("users").
 		Select("*").
-		In("id", uids).
-		And("username LIKE ?", "%"+search+"%").
+		Where(cond).
 		GroupBy("id").
 		OrderBy("id").
 		Find(&users)

pkg/user/user.go

@@ -182,6 +182,11 @@ func GetUserWithEmail(s *xorm.Session, user *User) (userOut *User, err error) {
 // GetUsersByIDs returns a map of users from a slice of user ids
 func GetUsersByIDs(s *xorm.Session, userIDs []int64) (users map[int64]*User, err error) {
 	users = make(map[int64]*User)
+
+	if len(userIDs) == 0 {
+		return users, nil
+	}
+
 	err = s.In("id", userIDs).Find(&users)
 	if err != nil {
 		return