+19 -37

appview/db/reaction.go

··· 2 2 3 3 import ( 4 4 "fmt" 5 5 - "log" 6 5 "time" 7 6 8 7 "github.com/bluesky-social/indigo/atproto/syntax" ··· 24 23 reaction.Created.Format(time.RFC3339), 25 24 ) 26 25 return err 27 27 - } 28 28 - 29 29 - // Get a reaction record 30 30 - func GetReaction(e Execer, did string, subjectAt syntax.ATURI, kind models.ReactionKind) (*models.Reaction, error) { 31 31 - query := ` 32 32 - select did, subject_at, created, rkey 33 33 - from reactions 34 34 - where did = ? and subject_at = ? and kind = ?` 35 35 - row := e.QueryRow(query, did, subjectAt, kind) 36 36 - 37 37 - var reaction models.Reaction 38 38 - var created string 39 39 - err := row.Scan(&reaction.ReactedByDid, &reaction.ThreadAt, &created, &reaction.Rkey) 40 40 - if err != nil { 41 41 - return nil, err 42 42 - } 43 43 - 44 44 - createdAtTime, err := time.Parse(time.RFC3339, created) 45 45 - if err != nil { 46 46 - log.Println("unable to determine followed at time") 47 47 - reaction.Created = time.Now() 48 48 - } else { 49 49 - reaction.Created = createdAtTime 50 50 - } 51 51 - 52 52 - return &reaction, nil 53 26 } 54 27 55 28 // Remove a reaction ··· 133 106 return reactionMap, rows.Err() 134 107 } 135 108 136 136 - func GetReactionStatus(e Execer, userDid string, threadAt syntax.ATURI, kind models.ReactionKind) bool { 137 137 - if _, err := GetReaction(e, userDid, threadAt, kind); err != nil { 138 138 - return false 139 139 - } else { 140 140 - return true 141 141 - } 109 109 + func GetReactionStatus(e Execer, userDid string, threadAt syntax.ATURI, kind models.ReactionKind) (bool, error) { 110 110 + var exists bool 111 111 + err := e.QueryRow( 112 112 + `select exists ( 113 113 + select 1 from reactions 114 114 + where did = ? and subject_at = ? and kind = ? 115 115 + )`, 116 116 + userDid, 117 117 + threadAt, 118 118 + kind, 119 119 + ).Scan(&exists) 120 120 + return exists, err 142 121 } 143 122 144 144 - func GetReactionStatusMap(e Execer, userDid string, threadAt syntax.ATURI) map[models.ReactionKind]bool { 123 123 + func GetReactionStatusMap(e Execer, userDid string, threadAt syntax.ATURI) (map[models.ReactionKind]bool, error) { 145 124 statusMap := map[models.ReactionKind]bool{} 146 125 for _, kind := range models.OrderedReactionKinds { 147 147 - count := GetReactionStatus(e, userDid, threadAt, kind) 148 148 - statusMap[kind] = count 126 126 + reacted, err := GetReactionStatus(e, userDid, threadAt, kind) 127 127 + if err != nil { 128 128 + return nil, err 129 129 + } 130 130 + statusMap[kind] = reacted 149 131 } 150 150 - return statusMap 132 132 + return statusMap, nil 151 133 }

+4 -1

appview/issues/issues.go

··· 98 98 99 99 userReactions := map[models.ReactionKind]bool{} 100 100 if user != nil { 101 101 - userReactions = db.GetReactionStatusMap(rp.db, user.Active.Did, issue.AtUri()) 101 101 + userReactions, err = db.GetReactionStatusMap(rp.db, user.Active.Did, issue.AtUri()) 102 102 + if err != nil { 103 103 + l.Error("failed to get issue reaction status", "err", err) 104 104 + } 102 105 } 103 106 104 107 backlinks, err := db.GetBacklinks(rp.db, issue.AtUri())

+5 -2

appview/pulls/pulls.go

··· 223 223 224 224 reactionMap, err := db.GetReactionMap(s.db, 20, pull.AtUri()) 225 225 if err != nil { 226 226 - log.Println("failed to get pull reactions") 226 226 + s.logger.Error("failed to get pull reaction status", "err", err) 227 227 s.pages.Notice(w, "pulls", "Failed to load pull. Try again later.") 228 228 } 229 229 230 230 userReactions := map[models.ReactionKind]bool{} 231 231 if user != nil { 232 232 - userReactions = db.GetReactionStatusMap(s.db, user.Active.Did, pull.AtUri()) 232 232 + userReactions, err = db.GetReactionStatusMap(s.db, user.Active.Did, pull.AtUri()) 233 233 + if err != nil { 234 234 + s.logger.Error("failed to get pull reaction status", "err", err) 235 235 + } 233 236 } 234 237 235 238 labelDefs, err := db.GetLabelDefinitions(