Unverified Commit 79150418 authored by Kevin Lyda's avatar Kevin Lyda
Browse files

Add docs to the storage functions

Remove excess storage routines.  Change sqlc configs which changes
how params work.
parent 2cefbd8a
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -95,11 +95,7 @@ the first user.`)
	if err != nil {
		system.ExpireLimit = 365
	}
	err = q.SetSystem(ctx, storage.SetSystemParams{
		Name:          system.Name,
		DefaultExpire: system.DefaultExpire,
		ExpireLimit:   system.ExpireLimit,
	})
	err = q.SetSystem(ctx, system.Name, system.DefaultExpire, system.ExpireLimit)
	ask.CheckErr(err)

	login, err := ask.GetLine("Enter login of initial user: ")
+3 −12
Original line number Diff line number Diff line
@@ -78,10 +78,7 @@ func IsFolderReadable(name, login string) bool {
	if admin == 1 {
		return true
	}
	found, _ := this.Q.IsFolderReadable(ctx, storage.IsFolderReadableParams{
		Name:  name,
		Owner: login,
	})
	found, _ := this.Q.IsFolderReadable(ctx, name, login)
	return found == 1
}

@@ -92,10 +89,7 @@ func IsFolderWriteable(name, login string) bool {
	if admin == 1 {
		return true
	}
	found, _ := this.Q.IsFolderWriteable(ctx, storage.IsFolderWriteableParams{
		Name:  name,
		Owner: login,
	})
	found, _ := this.Q.IsFolderWriteable(ctx, name, login)
	return found == 1
}

@@ -106,10 +100,7 @@ func IsFolderOwner(folder, login string) bool {
	if admin == 1 {
		return true
	}
	found, _ := this.Q.IsFolderOwner(ctx, storage.IsFolderOwnerParams{
		Name:  folder,
		Owner: login,
	})
	found, _ := this.Q.IsFolderOwner(ctx, folder, login)
	return found == 1
}

+10 −47
Original line number Diff line number Diff line
@@ -40,10 +40,7 @@ func CreateMessage(author, subject, message, folder string, permanent, shutdown
// GetMessage reads a message for a user.
func GetMessage(login, folder string, msgid int64) (*storage.Message, error) {
	ctx := storage.Context()
	msg, err := this.Q.ReadMessage(ctx, storage.ReadMessageParams{
		Folder: folder,
		ID:     msgid,
	})
	msg, err := this.Q.ReadMessage(ctx, folder, msgid)
	if err != nil {
		return nil, err
	}
@@ -60,11 +57,7 @@ func MarkSeen(msgids []int64) error {
	ctx := storage.Context()

	for _, msgid := range msgids {
		this.Q.SetMessageSeen(ctx, storage.SetMessageSeenParams{
			Login:  this.User.Login,
			Folder: this.Folder.Name,
			Msgid:  msgid,
		})
		this.Q.SetMessageSeen(ctx, this.User.Login, this.Folder.Name, msgid)
	}
	return nil
}
@@ -74,11 +67,7 @@ func MarkUnseen(msgids []int64) error {
	ctx := storage.Context()

	for _, msgid := range msgids {
		this.Q.UnsetMessageSeen(ctx, storage.UnsetMessageSeenParams{
			Login:  this.User.Login,
			Folder: this.Folder.Name,
			Msgid:  msgid,
		})
		this.Q.UnsetMessageSeen(ctx, this.User.Login, this.Folder.Name, msgid)
	}
	return nil
}
@@ -86,11 +75,7 @@ func MarkUnseen(msgids []int64) error {
// NextMsgid gets the next message id.
func NextMsgid(login, folder string, msgid int64) int64 {
	ctx := storage.Context()
	newid, err := this.Q.NextMsgid(ctx, storage.NextMsgidParams{
		Folder: folder,
		Login:  login,
		ID:     msgid,
	})
	newid, err := this.Q.NextMsgid(ctx, folder, msgid, login)
	if err != nil {
		return 0
	}
@@ -100,11 +85,7 @@ func NextMsgid(login, folder string, msgid int64) int64 {
// PrevMsgid gets the next message id.
func PrevMsgid(login, folder string, msgid int64) int64 {
	ctx := storage.Context()
	newid, err := this.Q.PrevMsgid(ctx, storage.PrevMsgidParams{
		Folder: folder,
		Login:  login,
		ID:     msgid,
	})
	newid, err := this.Q.PrevMsgid(ctx, folder, msgid, login)
	if err != nil {
		return 0
	}
@@ -114,11 +95,7 @@ func PrevMsgid(login, folder string, msgid int64) int64 {
// FirstMessage gets the first message in a folder.
func FirstMessage(folder string) int64 {
	ctx := storage.Context()
	first, err := this.Q.NextMsgidIgnoringSeen(ctx,
		storage.NextMsgidIgnoringSeenParams{
			Folder: folder,
			ID:     0,
		})
	first, err := this.Q.NextMsgidIgnoringSeen(ctx, folder, 0)
	if err != nil {
		return 0
	}
@@ -147,10 +124,7 @@ func WroteAllMessages(login string, msgids []int64) bool {
	ctx := storage.Context()

	for _, msgid := range msgids {
		msg, err := this.Q.GetMessage(ctx, storage.GetMessageParams{
			ID:     msgid,
			Folder: this.Folder.Name,
		})
		msg, err := this.Q.GetMessage(ctx, msgid, this.Folder.Name)
		if err != nil {
			return false
		}
@@ -166,10 +140,7 @@ func DeleteMessages(msgids []int64) error {
	ctx := storage.Context()

	for _, msgid := range msgids {
		this.Q.DeleteMessage(ctx, storage.DeleteMessageParams{
			Folder: this.Folder.Name,
			ID:     msgid,
		})
		this.Q.DeleteMessage(ctx, msgid, this.Folder.Name)
	}
	return nil
}
@@ -187,11 +158,7 @@ func SetMark(msgids []int64) error {
	ctx := storage.Context()

	for _, msgid := range msgids {
		this.Q.AddMark(ctx, storage.AddMarkParams{
			Folder: this.Folder.Name,
			Login:  this.User.Login,
			Msgid:  msgid,
		})
		this.Q.AddMark(ctx, this.Folder.Name, this.User.Login, msgid)
	}
	return nil
}
@@ -201,11 +168,7 @@ func UnsetMark(msgids []int64) error {
	ctx := storage.Context()

	for _, msgid := range msgids {
		this.Q.DeleteMark(ctx, storage.DeleteMarkParams{
			Folder: this.Folder.Name,
			Login:  this.User.Login,
			Msgid:  msgid,
		})
		this.Q.DeleteMark(ctx, this.Folder.Name, this.User.Login, msgid)
	}
	return nil
}
+4 −17
Original line number Diff line number Diff line
@@ -100,10 +100,7 @@ func actionUserEnable(cmd *dclish.Command, disabled int64, doing string) error {
		return nil
	}
	ctx := storage.Context()
	err = this.Q.UpdateUserDisabled(ctx, storage.UpdateUserDisabledParams{
		Login:    u.Login,
		Disabled: disabled,
	})
	err = this.Q.UpdateUserDisabled(ctx, disabled, u.Login)
	if err != nil {
		fmt.Printf("ERROR: Failed to %s user (%s).\n", doing, err)
		return nil
@@ -137,10 +134,7 @@ func actionUserAdmin(cmd *dclish.Command, admin int64, doing string) error {
		return nil
	}
	ctx := storage.Context()
	err = this.Q.UpdateUserAdmin(ctx, storage.UpdateUserAdminParams{
		Login: u.Login,
		Admin: admin,
	})
	err = this.Q.UpdateUserAdmin(ctx, admin, u.Login)
	if err != nil {
		fmt.Printf("ERROR: Failed to make user %s (%s).\n", doing, err)
		return nil
@@ -174,10 +168,7 @@ func actionUserMod(cmd *dclish.Command, mod int64, doing string) error {
		return nil
	}
	ctx := storage.Context()
	err = this.Q.UpdateUserMod(ctx, storage.UpdateUserModParams{
		Login:     u.Login,
		Moderator: mod,
	})
	err = this.Q.UpdateUserMod(ctx, mod, u.Login)
	if err != nil {
		fmt.Printf("ERROR: Failed to make user %s (%s).\n", doing, err)
		return nil
@@ -214,11 +205,7 @@ func ActionUserName(cmd *dclish.Command) error {
		}
	}
	ctx := storage.Context()
	err := this.Q.UpdateUserName(ctx,
		storage.UpdateUserNameParams{
			Login: login,
			Name:  name,
		})
	err := this.Q.UpdateUserName(ctx, name, login)
	if err != nil {
		fmt.Printf("ERROR: Failed to update user name (%s).\n", err)
	}
+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ header. If a "search-string" is not specified, a search is made using
the previously specified string, starting with the message following the
one  you are  currently reading  (or have  just read).  Once started,  a
search can be aborted by typing a CTRL-C.`,
		MinArgs: 0,
		MinArgs: 1,
		MaxArgs: 1,
		Action:  ActionSearch,
		Flags: dclish.Flags{
Loading