HyperNet/Interactive
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Bug fixes on publishers and removal of dealer

Browse Source
This commit is contained in:
LittleSheep
2024-10-31 22:48:51 +08:00
parent 001c9a8140
commit 1bd2da2850
11 changed files with 99 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/internal/grpc/health.go
View File

@ -6,13 +6,13 @@ import (
"time"
)
func (v *Server) Check(ctx context.Context, request *health.HealthCheckRequest) (*health.HealthCheckResponse, error) {
func (v *App) Check(ctx context.Context, request *health.HealthCheckRequest) (*health.HealthCheckResponse, error) {
return &health.HealthCheckResponse{
Status: health.HealthCheckResponse_SERVING,
}, nil
}
func (v *Server) Watch(request *health.HealthCheckRequest, server health.Health_WatchServer) error {
func (v *App) Watch(request *health.HealthCheckRequest, server health.Health_WatchServer) error {
for {
if server.Send(&health.HealthCheckResponse{
Status: health.HealthCheckResponse_SERVING,

8
pkg/internal/grpc/server.go
View File

@ -9,14 +9,14 @@ import (
"net"
)
type Server struct {
type App struct {
proto.UnimplementedDirectoryServiceServer
srv *grpc.Server
}
func NewGrpc() *Server {
server := &Server{
func NewGrpc() *App {
server := &App{
srv: grpc.NewServer(),
}
@ -28,7 +28,7 @@ func NewGrpc() *Server {
return server
}
func (v *Server) Listen() error {
func (v *App) Listen() error {
listener, err := net.Listen("tcp", viper.GetString("grpc_bind"))
if err != nil {
return err

41
pkg/internal/grpc/services.go
View File

@ -2,29 +2,40 @@ package grpc
import (
"context"
"git.solsynth.dev/hydrogen/dealer/pkg/proto"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hypernet/nexus/pkg/proto"
"strconv"
)
func (v *Server) BroadcastDeletion(ctx context.Context, request *proto.DeletionRequest) (*proto.DeletionResponse, error) {
switch request.GetResourceType() {
case "account":
numericId, err := strconv.Atoi(request.GetResourceId())
if err != nil {
func (v *App) BroadcastEvent(ctx context.Context, in *proto.EventInfo) (*proto.EventResponse, error) {
switch in.GetEvent() {
case "deletion":
data := nex.DecodeMap(in.GetData())
resType, ok := data["type"].(string)
if !ok {
break
}
for _, model := range database.AutoMaintainRange {
switch model.(type) {
case *models.Post:
database.C.Delete(model, "author_id = ?", numericId)
default:
database.C.Delete(model, "account_id = ?", numericId)
switch resType {
case "account":
id, ok := data["id"].(string)
if !ok {
break
}
numericId, err := strconv.Atoi(id)
if err != nil {
break
}
tx := database.C.Begin()
for _, model := range database.AutoMaintainRange {
switch model.(type) {
default:
tx.Delete(model, "account_id = ?", numericId)
}
}
tx.Commit()
}
database.C.Delete(&models.Publisher{}, "id = ?", numericId)
}
return &proto.DeletionResponse{}, nil
return &proto.EventResponse{}, nil
}

3
pkg/internal/http/api/posts_api.go
View File

@ -10,7 +10,6 @@ import (
"strconv"
"strings"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/http/exts"
@ -35,7 +34,7 @@ func universalPostFilter(c *fiber.Ctx, tx *gorm.DB) (*gorm.DB, error) {
if len(c.Query("author")) > 0 {
var author models.Publisher
if err := database.C.Where(&hyper.BaseUser{Name: c.Query("author")}).First(&author).Error; err != nil {
if err := database.C.Where("name = ?", c.Query("author")).First(&author).Error; err != nil {
return tx, fiber.NewError(fiber.StatusNotFound, err.Error())
}
tx = tx.Where("author_id = ?", author.ID)

6
pkg/internal/http/api/replies_api.go
View File

@ -2,8 +2,6 @@ package api
import (
"fmt"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
@ -24,7 +22,7 @@ func listPostReplies(c *fiber.Ctx) error {
if len(c.Query("author")) > 0 {
var author models.Publisher
if err := database.C.Where(&hyper.BaseUser{Name: c.Query("author")}).First(&author).Error; err != nil {
if err := database.C.Where("name = ?", c.Query("author")).First(&author).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
tx = tx.Where("author_id = ?", author.ID)
@ -67,7 +65,7 @@ func listPostFeaturedReply(c *fiber.Ctx) error {
if len(c.Query("author")) > 0 {
var author models.Publisher
if err := database.C.Where(&hyper.BaseUser{Name: c.Query("author")}).First(&author).Error; err != nil {
if err := database.C.Where("name = ?", c.Query("author")).First(&author).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
tx = tx.Where("author_id = ?", author.ID)

3
pkg/internal/http/api/users_api.go
View File

@ -1,7 +1,6 @@
package api
import (
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
@ -13,7 +12,7 @@ func listUserPinnedPost(c *fiber.Ctx) error {
var user models.Publisher
if err := database.C.
Where(&hyper.BaseUser{Name: account}).
Where("name = ?", account).
First(&user).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}

2
pkg/internal/http/server.go
View File

@ -57,7 +57,7 @@ func NewServer() *App {
}))
app.Use(sec.ContextMiddleware(IReader))
app.Use(authkit.GetAccountFromUserInfo)
app.Use(authkit.ParseAccountMiddleware)
api.MapAPIs(app, "/api")

4
pkg/internal/models/publishers.go
View File

@ -19,9 +19,7 @@ type Publisher struct {
Avatar string `json:"avatar"`
Banner string `json:"banner"`
Posts []Post `json:"posts" gorm:"foreignKey:AuthorID"`
Reactions []Reaction `json:"reactions"`
Subscriptions []Subscription `json:"subscriptions" gorm:"foreginKey:FollowerID"`
Posts []Post `json:"posts"`
TotalUpvote int `json:"total_upvote"`
TotalDownvote int `json:"total_downvote"`