6935637867
Cascade delete replied to topic events for replies properly. Cascade delete likes on topic posts properly. Cascade delete replies and their children properly. Recalculate user stats properly when items are deleted. Users can now unlike topic opening posts. Add a recalculator to fix abnormalities across upgrades. Try fixing a last_ip daily update bug. Add Existable interface. Add Delete method to LikeStore. Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore. Add CountUser, CountMegaUser, CountBigUser methods to TopicStore. Add Each method to UserStore. Add Add, Delete and DeleteResource methods to SubscriptionStore. Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream. Add Exists method to ProfileReplyStore. Add DropColumn, RenameColumn and ChangeColumn to the database adapters. Shorten ipaddress column names to ip. - topics table. - replies table - users_replies table. - polls_votes table. Add extra column to activity_stream table. Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find. You need to run the updater / patcher for this commit.
83 lines
2.0 KiB
Go
83 lines
2.0 KiB
Go
package common
|
|
|
|
import (
|
|
"database/sql"
|
|
|
|
qgen "github.com/Azareal/Gosora/query_gen"
|
|
)
|
|
|
|
var IPSearch IPSearcher
|
|
|
|
type IPSearcher interface {
|
|
Lookup(ip string) (uids []int, err error)
|
|
}
|
|
|
|
type DefaultIPSearcher struct {
|
|
searchUsers *sql.Stmt
|
|
searchTopics *sql.Stmt
|
|
searchReplies *sql.Stmt
|
|
searchUsersReplies *sql.Stmt
|
|
}
|
|
|
|
// NewDefaultIPSearcher gives you a new instance of DefaultIPSearcher
|
|
func NewDefaultIPSearcher() (*DefaultIPSearcher, error) {
|
|
acc := qgen.NewAcc()
|
|
uu := "users"
|
|
return &DefaultIPSearcher{
|
|
searchUsers: acc.Select(uu).Columns("uid").Where("last_ip=? OR last_ip LIKE CONCAT('%-',?)").Prepare(),
|
|
searchTopics: acc.Select(uu).Columns("uid").InQ("uid", acc.Select("topics").Columns("createdBy").Where("ip=?")).Prepare(),
|
|
searchReplies: acc.Select(uu).Columns("uid").InQ("uid", acc.Select("replies").Columns("createdBy").Where("ip=?")).Prepare(),
|
|
searchUsersReplies: acc.Select(uu).Columns("uid").InQ("uid", acc.Select("users_replies").Columns("createdBy").Where("ip=?")).Prepare(),
|
|
}, acc.FirstError()
|
|
}
|
|
|
|
func (s *DefaultIPSearcher) Lookup(ip string) (uids []int, err error) {
|
|
var uid int
|
|
reqUserList := make(map[int]bool)
|
|
runQuery2 := func(rows *sql.Rows, err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer rows.Close()
|
|
|
|
for rows.Next() {
|
|
err := rows.Scan(&uid)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
reqUserList[uid] = true
|
|
}
|
|
return rows.Err()
|
|
}
|
|
runQuery := func(stmt *sql.Stmt) error {
|
|
return runQuery2(stmt.Query(ip))
|
|
}
|
|
|
|
err = runQuery2(s.searchUsers.Query(ip, ip))
|
|
if err != nil {
|
|
return uids, err
|
|
}
|
|
err = runQuery(s.searchTopics)
|
|
if err != nil {
|
|
return uids, err
|
|
}
|
|
err = runQuery(s.searchReplies)
|
|
if err != nil {
|
|
return uids, err
|
|
}
|
|
err = runQuery(s.searchUsersReplies)
|
|
if err != nil {
|
|
return uids, err
|
|
}
|
|
|
|
// Convert the user ID map to a slice, then bulk load the users
|
|
uids = make([]int, len(reqUserList))
|
|
var i int
|
|
for userID := range reqUserList {
|
|
uids[i] = userID
|
|
i++
|
|
}
|
|
|
|
return uids, nil
|
|
}
|