···4747 return err4848}49495050+// Remove a follow5151+func DeleteFollowByRkey(e Execer, userDid, rkey string) error {5252+ _, err := e.Exec(`delete from follows where user_did = ? and rkey = ?`, userDid, rkey)5353+ return err5454+}5555+5056func GetFollowerFollowing(e Execer, did string) (int, int, error) {5157 followers, following := 0, 05258 err := e.QueryRow(
+9-1
appview/db/pubkeys.go
···1313 return err1414}15151616-func RemovePublicKey(e Execer, did, name, key string) error {1616+func DeletePublicKey(e Execer, did, name, key string) error {1717 _, err := e.Exec(`1818 delete from public_keys 1919 where did = ? and name = ? and key = ?`,2020 did, name, key)2121+ return err2222+}2323+2424+func DeletePublicKeyByRkey(e Execer, did, rkey string) error {2525+ _, err := e.Exec(`2626+ delete or ignore from public_keys 2727+ where did = ? and name = ? and rkey = ?`,2828+ did, rkey)2129 return err2230}2331
+6
appview/db/star.go
···6969 return err7070}71717272+// Remove a star7373+func DeleteStarByRkey(e Execer, starredByDid string, rkey string) error {7474+ _, err := e.Exec(`delete or ignore from stars where starred_by_did = ? and rkey = ?`, starredByDid, rkey)7575+ return err7676+}7777+7278func GetStarCount(e Execer, repoAt syntax.ATURI) (int, error) {7379 stars := 07480 err := e.QueryRow(
+1-1
appview/settings/settings.go
···422422423423 client, _ := s.Auth.AuthorizedClient(r)424424425425- if err := db.RemovePublicKey(s.Db, did, name, key); err != nil {425425+ if err := db.DeletePublicKey(s.Db, did, name, key); err != nil {426426 log.Printf("removing public key: %s", err)427427 s.Pages.Notice(w, "settings-keys", "Failed to remove public key.")428428 return
+1-1
appview/state/follow.go
···8686 return8787 }88888989- err = db.DeleteFollow(s.db, currentUser.Did, subjectIdent.DID.String())8989+ err = db.DeleteFollowByRkey(s.db, currentUser.Did, follow.Rkey)9090 if err != nil {9191 log.Println("failed to delete follow from DB")9292 // this is not an issue, the firehose event might have already done this
+1-1
appview/state/star.go
···9191 return9292 }93939494- err = db.DeleteStar(s.db, currentUser.Did, subjectUri)9494+ err = db.DeleteStarByRkey(s.db, currentUser.Did, star.Rkey)9595 if err != nil {9696 log.Println("failed to delete star from DB")9797 // this is not an issue, the firehose event might have already done this