From f5baa1ce7a8ab2c7f9a9c41b70fdc9468d978ed3 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sat, 19 Oct 2019 11:13:39 +0200 Subject: [PATCH] Remove old migration code --- messaging/repository/message.go | 31 ---------------------------- messaging/repository/message_flag.go | 14 ------------- messaging/repository/unread.go | 30 --------------------------- 3 files changed, 75 deletions(-) diff --git a/messaging/repository/message.go b/messaging/repository/message.go index 28f2e1c51..d2bf7106d 100644 --- a/messaging/repository/message.go +++ b/messaging/repository/message.go @@ -2,7 +2,6 @@ package repository import ( "context" - "fmt" "io" "strings" "time" @@ -33,11 +32,6 @@ type ( IncReplyCount(ID uint64) error DecReplyCount(ID uint64) error - - CountOwned(userID uint64) (c int, err error) - ChangeOwner(userID, target uint64) error - CountUserTags(userID uint64) (c int, err error) - ChangeUserTag(userID, target uint64) error } message struct { @@ -339,28 +333,3 @@ func (r *message) DecReplyCount(ID uint64) error { _, err := r.db().Exec(sqlMessageRepliesDecCount, ID) return err } - -func (r *message) CountOwned(userID uint64) (c int, err error) { - return c, r.db().Get(&c, - "SELECT COUNT(*) FROM messaging_message WHERE rel_user = ?", - userID) -} - -func (r *message) CountUserTags(userID uint64) (c int, err error) { - return c, r.db().Get(&c, - "SELECT COUNT(*) FROM messaging_message WHERE message LIKE ?", - fmt.Sprintf("%%@%d%%", userID)) -} - -func (r *message) ChangeOwner(userID, target uint64) error { - _, err := r.db().Exec("UPDATE messaging_message SET rel_user = ? WHERE rel_user = ?", target, userID) - return err -} - -func (r *message) ChangeUserTag(userID, target uint64) error { - _, err := r.db().Exec("UPDATE messaging_message SET message = replace(message, ?, ?) WHERE message LIKE ?", - fmt.Sprintf("@%d", userID), - fmt.Sprintf("@%d", target), - fmt.Sprintf("%%@%d%%", userID)) - return err -} diff --git a/messaging/repository/message_flag.go b/messaging/repository/message_flag.go index 008e4b46b..08b58fdf4 100644 --- a/messaging/repository/message_flag.go +++ b/messaging/repository/message_flag.go @@ -19,9 +19,6 @@ type ( FindByFlag(messageID, userID uint64, flag string) (*types.MessageFlag, error) Create(mod *types.MessageFlag) (*types.MessageFlag, error) DeleteByID(ID uint64) error - - CountOwned(userID uint64) (c int, err error) - ChangeOwner(userID, target uint64) error } messageFlag struct { @@ -88,14 +85,3 @@ func (r *messageFlag) Create(mod *types.MessageFlag) (*types.MessageFlag, error) func (r *messageFlag) DeleteByID(ID uint64) error { return exec(r.db().Exec("DELETE FROM messaging_message_flag WHERE id = ?", ID)) } - -func (r *messageFlag) CountOwned(userID uint64) (c int, err error) { - return c, r.db().Get(&c, - "SELECT COUNT(*) FROM message_flag WHERE rel_user = ?", - userID) -} - -func (r *messageFlag) ChangeOwner(userID, target uint64) error { - _, err := r.db().Exec("UPDATE message_flag SET rel_user = ? WHERE rel_user = ?", target, userID) - return err -} diff --git a/messaging/repository/unread.go b/messaging/repository/unread.go index bcd394752..55f1da0d3 100644 --- a/messaging/repository/unread.go +++ b/messaging/repository/unread.go @@ -22,9 +22,6 @@ type ( Inc(channelID, replyTo, userID uint64) error Dec(channelID, replyTo, userID uint64) error ClearThreads(channelID, userID uint64) (err error) - - CountOwned(userID uint64) (c int, err error) - ChangeOwner(userID, target uint64) error } unread struct { @@ -229,30 +226,3 @@ func (r *unread) Dec(channelID, threadID, userID uint64) (err error) { return nil } - -func (r *unread) CountOwned(userID uint64) (c int, err error) { - return c, r.db().Get(&c, - "SELECT COUNT(*) FROM messaging_unread WHERE rel_user = ?", - userID) -} - -func (r *unread) ChangeOwner(userID, target uint64) (err error) { - // Remove dups - // with an ugly mysql workaround - _, err = r.db().Exec( - "DELETE FROM messaging_unread WHERE rel_user = ? "+ - "AND rel_channel IN (SELECT rel_channel FROM (SELECT * FROM messaging_unread) AS workaround WHERE rel_user = ?)", - userID, - target) - - if err != nil { - return err - } - - _, err = r.db().Exec( - "UPDATE messaging_unread SET rel_user = ? WHERE rel_user = ?", - target, - userID) - - return err -}