🚚 Rename http package to web

pkg/internal/grpc/stream.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"

pkg/internal/services/channels.go

@@ -19,8 +19,8 @@ import (
 )
 
 type channelIdentityCacheEntry struct {
-	Channel       models.Channel
-	ChannelMember models.ChannelMember
+	Channel       models.Channel       `json:"channel"`
+	ChannelMember models.ChannelMember `json:"channel_member"`
 }
 
 func GetChannelIdentityCacheKey(channel string, user uint, realm ...uint) string {

pkg/internal/web/api/calls_api.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"

pkg/internal/web/api/channel_members_api.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/cruda"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit"

pkg/internal/web/api/channels_api.go

@@ -8,7 +8,7 @@ import (
 	"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"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"

pkg/internal/web/api/direct_channels_api.go

@@ -7,7 +7,7 @@ import (
 	"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"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"

pkg/internal/web/api/events_api.go

@@ -7,7 +7,7 @@ import (
 	authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"github.com/samber/lo"
 
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"

pkg/internal/web/api/events_message_api.go

@@ -5,7 +5,7 @@ import (
 	authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
 	"strings"
 
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"

pkg/internal/web/api/quick_actions_api.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/exts"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/exts"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"

pkg/internal/web/server.go

@@ -1,4 +1,4 @@
-package http
+package web
 
 import (
 	"strings"
@@ -6,7 +6,7 @@ import (
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit"
 
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http/api"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web/api"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/idempotency"

pkg/main.go

@@ -15,7 +15,7 @@ import (
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/services"
 	"github.com/robfig/cron/v3"
 
-	"git.solsynth.dev/hypernet/messaging/pkg/internal/http"
+	"git.solsynth.dev/hypernet/messaging/pkg/internal/web"
 
 	pkg "git.solsynth.dev/hypernet/messaging/pkg/internal"
 	"git.solsynth.dev/hypernet/messaging/pkg/internal/cache"
@@ -57,7 +57,7 @@ func main() {
 	if reader, err := sec.NewInternalTokenReader(viper.GetString("security.internal_public_key")); err != nil {
 		log.Error().Err(err).Msg("An error occurred when reading internal public key for jwt. Authentication related features will be disabled.")
 	} else {
-		http.IReader = reader
+		web.IReader = reader
 		log.Info().Msg("Internal jwt public key loaded.")
 	}
 
@@ -77,7 +77,7 @@ func main() {
 	services.SetupLiveKit()
 
 	// Server
-	go http.NewServer().Listen()
+	go web.NewServer().Listen()
 
 	go grpc.NewGrpc().Listen()