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

♻️ Refactored remain modules and make it up and running

Browse Source
This commit is contained in:
LittleSheep
2024-11-02 13:40:37 +08:00
parent 06031620b7
commit 2d05be679d
23 changed files with 82 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/internal/http/api/channel_members_api.go
View File

@ -2,10 +2,11 @@ package api
import (
"fmt"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
@ -19,7 +20,7 @@ func listChannelMembers(c *fiber.Ctx) error {
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
@ -44,7 +45,7 @@ func getMyChannelMembership(c *fiber.Ctx) error {
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
@ -91,9 +92,7 @@ func addChannelMember(c *fiber.Ctx) error {
}
var account authm.Account
if err := database.C.Where(&hyper.BaseUser{
Name: data.Target,
}).First(&account).Error; err != nil {
if err := database.C.Where("name = ?", data.Target).First(&account).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
@ -136,9 +135,7 @@ func removeChannelMember(c *fiber.Ctx) error {
}
var account authm.Account
if err := database.C.Where(&hyper.BaseUser{
Name: data.Target,
}).First(&account).Error; err != nil {
if err := database.C.Where("name = ?", data.Target).First(&account).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
@ -167,7 +164,7 @@ func editMyChannelMembership(c *fiber.Ctx) error {
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
@ -218,9 +215,7 @@ func joinChannel(c *fiber.Ctx) error {
}
if channel.RealmID != nil {
if realm, err := services.GetRealmWithExtID(channel.Realm.ID); err != nil {
return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("invalid channel, related realm was not found: %v", err))
} else if _, err := services.GetRealmMember(realm.ID, user.ID); err != nil {
if _, err := authkit.GetRealmMember(gap.Nx, *channel.RealmID, user.ID); err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("you are not a part of the realm: %v", err))
}
}

37
pkg/internal/http/api/channels_api.go
View File

@ -2,10 +2,11 @@ package api
import (
"fmt"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
@ -20,7 +21,7 @@ func getChannel(c *fiber.Ctx) error {
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
@ -42,7 +43,7 @@ func getChannelIdentity(c *fiber.Ctx) error {
var err error
var member models.ChannelMember
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
_, member, err = services.GetChannelIdentity(alias, user.ID, val)
} else {
_, member, err = services.GetChannelIdentity(alias, user.ID)
@ -63,7 +64,7 @@ func listChannel(c *fiber.Ctx) error {
var err error
var channels []models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channels, err = services.ListChannel(user, val.ID)
} else {
channels, err = services.ListChannel(user)
@ -83,7 +84,7 @@ func listOwnedChannel(c *fiber.Ctx) error {
var err error
var channels []models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channels, err = services.ListChannelWithUser(user, val.ID)
} else {
channels, err = services.ListChannelWithUser(user)
@ -111,7 +112,7 @@ func listAvailableChannel(c *fiber.Ctx) error {
var err error
var channels []models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channels, err = services.ListAvailableChannel(tx, user, val.ID)
} else {
channels, err = services.ListAvailableChannel(tx, user)
@ -143,11 +144,11 @@ func createChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
var realm *models.Realm
if val, ok := c.Locals("realm").(models.Realm); ok {
if info, err := services.GetRealmMember(val.ID, user.ID); err != nil {
var realm *authm.Realm
if val, ok := c.Locals("realm").(authm.Realm); ok {
if info, err := authkit.GetRealmMember(gap.Nx, val.ID, user.ID); err != nil {
return fiber.NewError(fiber.StatusForbidden, "you must be a part of that realm then can create channel related to it")
} else if info.GetPowerLevel() < 50 {
} else if info.PowerLevel < 50 {
return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of that realm then can create channel related to it")
} else {
realm = &val
@ -198,12 +199,12 @@ func editChannel(c *fiber.Ctx) error {
return err
}
tx := database.C.Where(&models.Channel{BaseModel: hyper.BaseModel{ID: uint(id)}})
tx := database.C.Where("id = ?", id)
if val, ok := c.Locals("realm").(models.Realm); ok {
if info, err := services.GetRealmMember(val.ID, user.ID); err != nil {
if val, ok := c.Locals("realm").(authm.Realm); ok {
if info, err := authkit.GetRealmMember(gap.Nx, val.ID, user.ID); err != nil {
return fiber.NewError(fiber.StatusForbidden, "you must be a part of that realm then can edit channel related to it")
} else if info.GetPowerLevel() < 50 {
} else if info.PowerLevel < 50 {
return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of that realm then can edit channel related to it")
} else {
tx = tx.Where("realm_id = ?", val.ID)
@ -240,12 +241,12 @@ func deleteChannel(c *fiber.Ctx) error {
user := c.Locals("user").(authm.Account)
id, _ := c.ParamsInt("channelId", 0)
tx := database.C.Where(&models.Channel{BaseModel: hyper.BaseModel{ID: uint(id)}})
tx := database.C.Where("id = ?", id)
if val, ok := c.Locals("realm").(models.Realm); ok {
if info, err := services.GetRealmMember(val.ID, user.ID); err != nil {
if val, ok := c.Locals("realm").(authm.Realm); ok {
if info, err := authkit.GetRealmMember(gap.Nx, val.ID, user.ID); err != nil {
return fmt.Errorf("you must be a part of that realm then can delete channel related to it")
} else if info.GetPowerLevel() < 50 {
} else if info.PowerLevel < 50 {
return fmt.Errorf("you must be a moderator of that realm then can delete channel related to it")
} else {
tx = tx.Where("realm_id = ?", val.ID)

10
pkg/internal/http/api/direct_channels_api.go
View File

@ -2,7 +2,9 @@ package api
import (
"fmt"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
@ -33,11 +35,11 @@ func createDirectChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
var realm *models.Realm
if val, ok := c.Locals("realm").(models.Realm); ok {
if info, err := services.GetRealmMember(val.ID, user.ID); err != nil {
var realm *authm.Realm
if val, ok := c.Locals("realm").(authm.Realm); ok {
if info, err := authkit.GetRealmMember(gap.Nx, val.ID, user.ID); err != nil {
return fiber.NewError(fiber.StatusForbidden, "you must be a part of that realm then can create channel related to it")
} else if info.GetPowerLevel() < 50 {
} else if info.PowerLevel < 50 {
return fiber.NewError(fiber.StatusForbidden, "you must be a moderator of that realm then can create channel related to it")
} else {
realm = &val

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

@ -21,7 +21,7 @@ func getEvent(c *fiber.Ctx) error {
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
@ -51,7 +51,7 @@ func listEvent(c *fiber.Ctx) error {
var err error
var channel models.Channel
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, err = services.GetChannelWithAlias(alias, val.ID)
} else {
channel, err = services.GetChannelWithAlias(alias)
@ -97,7 +97,7 @@ func newRawEvent(c *fiber.Ctx) error {
var channel models.Channel
var member models.ChannelMember
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, member, err = services.GetChannelIdentity(alias, user.ID, val)
} else {
channel, member, err = services.GetChannelIdentity(alias, user.ID)

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

@ -40,7 +40,7 @@ func newMessageEvent(c *fiber.Ctx) error {
var channel models.Channel
var member models.ChannelMember
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, member, err = services.GetChannelIdentity(alias, user.ID, val)
} else {
channel, member, err = services.GetChannelIdentity(alias, user.ID)
@ -99,7 +99,7 @@ func editMessageEvent(c *fiber.Ctx) error {
var channel models.Channel
var member models.ChannelMember
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, member, err = services.GetChannelIdentity(alias, user.ID, val)
} else {
channel, member, err = services.GetChannelIdentity(alias, user.ID)
@ -134,7 +134,7 @@ func deleteMessageEvent(c *fiber.Ctx) error {
var channel models.Channel
var member models.ChannelMember
if val, ok := c.Locals("realm").(models.Realm); ok {
if val, ok := c.Locals("realm").(authm.Realm); ok {
channel, member, err = services.GetChannelIdentity(alias, user.ID, val)
} else {
channel, member, err = services.GetChannelIdentity(alias, user.ID)

5
pkg/internal/http/api/realms_api.go
View File

@ -2,15 +2,16 @@ package api
import (
"fmt"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
"github.com/gofiber/fiber/v2"
)
func realmMiddleware(c *fiber.Ctx) error {
realmAlias := c.Params("realm")
if len(realmAlias) > 0 && realmAlias != "global" {
realm, err := services.GetRealmWithAlias(realmAlias)
realm, err := authkit.GetRealmByAlias(gap.Nx, realmAlias)
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("requested channel with realm, but realm was not found: %v", err))
} else {

1
pkg/internal/http/api/whats_new_api.go
View File

@ -55,7 +55,6 @@ func getWhatsNew(c *fiber.Ctx) error {
Limit(take).
Order("created_at DESC").
Preload("Sender").
Preload("Sender.Account").
Preload("Channel").
Preload("Channel.Realm").
Find(&items).Error; err != nil {