-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add sorting functionality (RecentStickers)
- Loading branch information
1 parent
8970bc4
commit 7c8eb94
Showing
6 changed files
with
308 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| db "github.com/koenigskraut/piktagbot/database" | ||
| "github.com/koenigskraut/piktagbot/util" | ||
| "net/http" | ||
| ) | ||
|
|
||
| type TagOrderUpdate struct { | ||
| UserSession Session `json:"session"` | ||
| Order []int64 `json:"order"` | ||
| NewFirst bool `json:"new_first"` | ||
| } | ||
|
|
||
| func handleOrderUpdate(writer http.ResponseWriter, request *http.Request) { | ||
| fmt.Println("order called") | ||
| var update TagOrderUpdate | ||
| dec := json.NewDecoder(request.Body) | ||
| if dec.Decode(&update) != nil { | ||
| http.Error(writer, "malformed json", http.StatusBadRequest) | ||
| return | ||
| } | ||
| // verification | ||
| hashCompareTo := update.UserSession.Hash | ||
| update.UserSession.Hash = "" | ||
| hashCalculated, err := util.HashOfJSON(update.UserSession) | ||
| if err != nil { | ||
| http.Error(writer, "server error", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| if hashCalculated != hashCompareTo { | ||
| http.Error(writer, "hash mismatch", http.StatusBadRequest) | ||
| return | ||
| } | ||
| // get session | ||
| verifiedSession, ok := oneTimeSessions.peek(update.UserSession.SessionID) | ||
| if !ok { | ||
| http.Error(writer, "session expired", http.StatusBadRequest) | ||
| return | ||
| } | ||
| // check ip and user-agent | ||
| userHash := util.HashOfRequestUser(request) | ||
| if verifiedSession.clientHash != userHash { | ||
| http.Error(writer, "bad user", http.StatusBadRequest) | ||
| return | ||
| } | ||
| // get user | ||
| dbUser := db.User{UserID: verifiedSession.userID} | ||
| if _, err := dbUser.Get(); err != nil { | ||
| http.Error(writer, "server error", http.StatusInternalServerError) | ||
| return | ||
| } | ||
|
|
||
| order, err := dbUser.GetOrder("") | ||
| if err != nil { | ||
| http.Error(writer, "server error", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| b, err := db.WriteTagOrder(update.Order) | ||
| if err != nil { | ||
| http.Error(writer, "server error", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| order.TagOrder, order.NewFirst = b, update.NewFirst | ||
| if err := order.Save(); err != nil { | ||
| http.Error(writer, "server error", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package database | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/binary" | ||
| "fmt" | ||
| ) | ||
|
|
||
| // mysql> describe sticker_orders; | ||
| // +-----------+--------------+------+-----+---------+----------------+ | ||
| // | Field | Type | Null | Key | Default | Extra | | ||
| // +-----------+--------------+------+-----+---------+----------------+ | ||
| // | id | int unsigned | NO | PRI | NULL | auto_increment | | ||
| // | user | bigint | NO | | NULL | | | ||
| // | tag | text | YES | | NULL | | | ||
| // | new_first | tinyint(1) | NO | | 1 | | | ||
| // | tag_order | blob | YES | | NULL | | | ||
| // +-----------+--------------+------+-----+---------+----------------+ | ||
|
|
||
| type StickerOrder struct { | ||
| ID uint64 `gorm:"primaryKey"` | ||
| User int64 | ||
| Tag string | ||
| NewFirst bool | ||
| TagOrder []byte | ||
| } | ||
|
|
||
| func readTagOrder(serialized []byte) (tagOrder []int64, err error) { | ||
| tagOrder = make([]int64, len(serialized)/8) | ||
| buf := bytes.NewReader(serialized) | ||
| err = binary.Read(buf, binary.LittleEndian, tagOrder) | ||
| return | ||
| } | ||
|
|
||
| func writeTagOrder(order []int64) ([]byte, error) { | ||
| buf := &bytes.Buffer{} | ||
| err := binary.Write(buf, binary.LittleEndian, order) | ||
| return buf.Bytes(), err | ||
| } | ||
|
|
||
| func ReadTagOrder(serialized []byte) (tagOrder []int64, err error) { | ||
| return readTagOrder(serialized) | ||
| } | ||
|
|
||
| func WriteTagOrder(order []int64) (serialized []byte, err error) { | ||
| return writeTagOrder(order) | ||
| } | ||
|
|
||
| func sortByOrder(toSort []*StickerTag, order []int64, unorderedFirst bool) { | ||
| sortedMap := make(map[int64]*StickerTag) | ||
| for _, s := range toSort { | ||
| sortedMap[s.Sticker.DocumentID] = s | ||
| } | ||
| results := make([]*StickerTag, 0, len(toSort)) | ||
| for _, o := range order { | ||
| if s, ok := sortedMap[o]; ok { | ||
| results = append(results, s) | ||
| delete(sortedMap, o) | ||
| } | ||
| } | ||
| i := 0 | ||
| for _, v := range toSort { | ||
| if s, ok := sortedMap[v.Sticker.DocumentID]; ok { | ||
| toSort[i] = s | ||
| i++ | ||
| } | ||
| } | ||
| if unorderedFirst { | ||
| copy(toSort[i:], results) | ||
| } else { | ||
| copy(toSort[len(toSort)-i:], toSort[:i]) | ||
| copy(toSort, results) | ||
| } | ||
| } | ||
|
|
||
| func (so *StickerOrder) SortStickers(stickers []*StickerTag) error { | ||
| order, err := readTagOrder(so.TagOrder) | ||
| if err != nil { | ||
| fmt.Println(err) | ||
| return err | ||
| } | ||
| sortByOrder(stickers, order, so.NewFirst) | ||
| return nil | ||
| } | ||
|
|
||
| func (so *StickerOrder) Save() error { | ||
| return DB.Save(so).Error | ||
| } | ||
|
|
||
| func (so *StickerOrder) UpdateFromOrder(order []int64) error { | ||
| serialized, err := writeTagOrder(order) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return DB.Model(so).Where(&StickerOrder{ID: so.ID}).Update("tag_order", serialized).Error | ||
| } | ||
|
|
||
| func (so *StickerOrder) UpdateFromStickers(stickers []*StickerTag) error { | ||
| order := make([]int64, len(stickers)) | ||
| for i, s := range stickers { | ||
| order[i] = s.Sticker.DocumentID | ||
| } | ||
| return so.UpdateFromOrder(order) | ||
| } |
Oops, something went wrong.