From c24ed1e7e631371b65cf3c43410dd3553631ba98 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Sat, 29 Mar 2025 14:45:12 +0800 Subject: [PATCH] :truck: Rename http package to web --- go.mod | 15 +++++---- go.sum | 33 +++++++++---------- pkg/internal/grpc/stream.go | 2 +- pkg/internal/services/channels.go | 4 +-- pkg/internal/{http => web}/api/calls_api.go | 2 +- .../{http => web}/api/channel_members_api.go | 2 +- .../{http => web}/api/channels_api.go | 2 +- .../{http => web}/api/direct_channels_api.go | 2 +- pkg/internal/{http => web}/api/events_api.go | 2 +- .../{http => web}/api/events_message_api.go | 2 +- pkg/internal/{http => web}/api/index.go | 0 .../{http => web}/api/quick_actions_api.go | 2 +- pkg/internal/{http => web}/api/realms_api.go | 0 .../{http => web}/api/whats_new_api.go | 0 pkg/internal/{http => web}/exts/utils.go | 0 pkg/internal/{http => web}/server.go | 4 +-- pkg/main.go | 6 ++-- 17 files changed, 39 insertions(+), 39 deletions(-) rename pkg/internal/{http => web}/api/calls_api.go (99%) rename pkg/internal/{http => web}/api/channel_members_api.go (99%) rename pkg/internal/{http => web}/api/channels_api.go (99%) rename pkg/internal/{http => web}/api/direct_channels_api.go (97%) rename pkg/internal/{http => web}/api/events_api.go (98%) rename pkg/internal/{http => web}/api/events_message_api.go (98%) rename pkg/internal/{http => web}/api/index.go (100%) rename pkg/internal/{http => web}/api/quick_actions_api.go (97%) rename pkg/internal/{http => web}/api/realms_api.go (100%) rename pkg/internal/{http => web}/api/whats_new_api.go (100%) rename pkg/internal/{http => web}/exts/utils.go (100%) rename pkg/internal/{http => web}/server.go (96%) diff --git a/go.mod b/go.mod index e597432..0a32271 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module git.solsynth.dev/hypernet/messaging go 1.23.2 require ( - git.solsynth.dev/hypernet/nexus v0.0.0-20250301065153-8ac88413e0e1 + git.solsynth.dev/hypernet/nexus v0.0.0-20250329053929-488793a2dc56 git.solsynth.dev/hypernet/paperclip v0.0.0-20250310151112-1d866f317f47 git.solsynth.dev/hypernet/passport v0.0.0-20250315083747-32e91e26013c git.solsynth.dev/hypernet/pusher v0.0.0-20250216145944-5fb769823a88 github.com/dgraph-io/ristretto v0.2.0 - github.com/eko/gocache/lib/v4 v4.1.6 + github.com/eko/gocache/lib/v4 v4.2.0 github.com/eko/gocache/store/ristretto/v4 v4.2.2 github.com/fatih/color v1.18.0 github.com/go-playground/validator/v10 v10.22.1 @@ -100,11 +100,11 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.19.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.52.3 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect - github.com/redis/go-redis/v9 v9.5.1 // indirect + github.com/redis/go-redis/v9 v9.7.3 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -119,10 +119,11 @@ require ( github.com/twitchtv/twirp v8.1.3+incompatible // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.59.0 // indirect - github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect + github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.uber.org/atomic v1.11.0 // indirect + go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.uber.org/zap/exp v0.2.0 // indirect diff --git a/go.sum b/go.sum index 6438fc9..3fdc2cd 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,9 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -git.solsynth.dev/hypernet/nexus v0.0.0-20250301065153-8ac88413e0e1 h1:Jf5yQr8Yln2YkDQ9CwJhVYNstR2vNKPViGnR2YAZLsE= -git.solsynth.dev/hypernet/nexus v0.0.0-20250301065153-8ac88413e0e1/go.mod h1:AXafZRL/2DISS37ZNngY0DreFAuBoeKu8mEDmCie8kw= +git.solsynth.dev/hypernet/nexus v0.0.0-20250329053929-488793a2dc56 h1:SnT9NVcXQ1WDka9kKAA+lH/r2UJouND7FDugu4ZZwLc= +git.solsynth.dev/hypernet/nexus v0.0.0-20250329053929-488793a2dc56/go.mod h1:5tk62VQ1DcbR0EAN2jAOqYxHiegUPEC805JlfQ/G19I= git.solsynth.dev/hypernet/paperclip v0.0.0-20250310151112-1d866f317f47 h1:fvu+bNKPTNtQocssnKbEZ66MqR0iBfAxY3HwlqnmYyE= git.solsynth.dev/hypernet/paperclip v0.0.0-20250310151112-1d866f317f47/go.mod h1:jvxq2qftz2v72x+24+cTFJdQKr9eHQTdk3KVR7cx36s= -git.solsynth.dev/hypernet/passport v0.0.0-20250304125607-1ed9816b12c4 h1:Yuydts3ON/dlhZDUHgFf59v8LOUP8mAQ+nY2C3oKd6o= -git.solsynth.dev/hypernet/passport v0.0.0-20250304125607-1ed9816b12c4/go.mod h1:iGN0Zf21niAsdaowbpX5p2gALqVoJIV5QL8seQQ5LKc= git.solsynth.dev/hypernet/passport v0.0.0-20250315083747-32e91e26013c h1:XB8EBX34WB2skmjaVFot5IlxKF2qFZ2SueG/Y9SiJ6Y= git.solsynth.dev/hypernet/passport v0.0.0-20250315083747-32e91e26013c/go.mod h1:k7MZQWYBpxlk3g9bx0HTh5C3m+MG/wr0hAiRM/VyAqs= git.solsynth.dev/hypernet/pusher v0.0.0-20250216145944-5fb769823a88 h1:2HEENe9KUrdaJeNBzx9lsuXQGyzWqCgnLTKQnr8xFr8= @@ -41,8 +39,8 @@ github.com/eapache/channels v1.1.0 h1:F1taHcn7/F0i8DYqKXJnyhJcVpp2kgFcNePxXtnyu4 github.com/eapache/channels v1.1.0/go.mod h1:jMm2qB5Ubtg9zLd+inMZd2/NUvXgzmWXsDaLyQIGfH0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eko/gocache/lib/v4 v4.1.6 h1:5WWIGISKhE7mfkyF+SJyWwqa4Dp2mkdX8QsZpnENqJI= -github.com/eko/gocache/lib/v4 v4.1.6/go.mod h1:HFxC8IiG2WeRotg09xEnPD72sCheJiTSr4Li5Ameg7g= +github.com/eko/gocache/lib/v4 v4.2.0 h1:MNykyi5Xw+5Wu3+PUrvtOCaKSZM1nUSVftbzmeC7Yuw= +github.com/eko/gocache/lib/v4 v4.2.0/go.mod h1:7ViVmbU+CzDHzRpmB4SXKyyzyuJ8A3UW3/cszpcqB4M= github.com/eko/gocache/store/ristretto/v4 v4.2.2 h1:lXFzoZ5ck6Gy6ON7f5DHSkNt122qN7KoroCVgVwF7oo= github.com/eko/gocache/store/ristretto/v4 v4.2.2/go.mod h1:uIvBVJzqRepr5L0RsbkfQ2iYfbyos2fuji/s4yM+aUM= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -254,16 +252,16 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.52.3 h1:5f8uj6ZwHSscOGNdIQg6OiZv/ybiK2CO2q2drVZAQSA= +github.com/prometheus/common v0.52.3/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4= github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= -github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8= -github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM= +github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= @@ -297,7 +295,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -318,8 +315,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.59.0 h1:Qu0qYHfXvPk1mSLNqcFtEk6DpxgA26hy6bmydotDpRI= github.com/valyala/fasthttp v1.59.0/go.mod h1:GTxNb9Bc6r2a9D0TWNSPwDz78UxnTGBViY3xZNEqyYU= -github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= -github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= +github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= @@ -345,6 +342,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= diff --git a/pkg/internal/grpc/stream.go b/pkg/internal/grpc/stream.go index bce3bc6..3d0821a 100644 --- a/pkg/internal/grpc/stream.go +++ b/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" diff --git a/pkg/internal/services/channels.go b/pkg/internal/services/channels.go index 1e93f0f..f69133b 100644 --- a/pkg/internal/services/channels.go +++ b/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 { diff --git a/pkg/internal/http/api/calls_api.go b/pkg/internal/web/api/calls_api.go similarity index 99% rename from pkg/internal/http/api/calls_api.go rename to pkg/internal/web/api/calls_api.go index 6baa51a..aeb633c 100644 --- a/pkg/internal/http/api/calls_api.go +++ b/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" diff --git a/pkg/internal/http/api/channel_members_api.go b/pkg/internal/web/api/channel_members_api.go similarity index 99% rename from pkg/internal/http/api/channel_members_api.go rename to pkg/internal/web/api/channel_members_api.go index 7515a9b..bfe4608 100644 --- a/pkg/internal/http/api/channel_members_api.go +++ b/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" diff --git a/pkg/internal/http/api/channels_api.go b/pkg/internal/web/api/channels_api.go similarity index 99% rename from pkg/internal/http/api/channels_api.go rename to pkg/internal/web/api/channels_api.go index b6404c7..6357346 100644 --- a/pkg/internal/http/api/channels_api.go +++ b/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" diff --git a/pkg/internal/http/api/direct_channels_api.go b/pkg/internal/web/api/direct_channels_api.go similarity index 97% rename from pkg/internal/http/api/direct_channels_api.go rename to pkg/internal/web/api/direct_channels_api.go index 63f7051..896030f 100644 --- a/pkg/internal/http/api/direct_channels_api.go +++ b/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" diff --git a/pkg/internal/http/api/events_api.go b/pkg/internal/web/api/events_api.go similarity index 98% rename from pkg/internal/http/api/events_api.go rename to pkg/internal/web/api/events_api.go index 5bcc674..4773096 100644 --- a/pkg/internal/http/api/events_api.go +++ b/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" diff --git a/pkg/internal/http/api/events_message_api.go b/pkg/internal/web/api/events_message_api.go similarity index 98% rename from pkg/internal/http/api/events_message_api.go rename to pkg/internal/web/api/events_message_api.go index 84e7142..e8d7c6b 100644 --- a/pkg/internal/http/api/events_message_api.go +++ b/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" diff --git a/pkg/internal/http/api/index.go b/pkg/internal/web/api/index.go similarity index 100% rename from pkg/internal/http/api/index.go rename to pkg/internal/web/api/index.go diff --git a/pkg/internal/http/api/quick_actions_api.go b/pkg/internal/web/api/quick_actions_api.go similarity index 97% rename from pkg/internal/http/api/quick_actions_api.go rename to pkg/internal/web/api/quick_actions_api.go index 90798f9..26f5c18 100644 --- a/pkg/internal/http/api/quick_actions_api.go +++ b/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" diff --git a/pkg/internal/http/api/realms_api.go b/pkg/internal/web/api/realms_api.go similarity index 100% rename from pkg/internal/http/api/realms_api.go rename to pkg/internal/web/api/realms_api.go diff --git a/pkg/internal/http/api/whats_new_api.go b/pkg/internal/web/api/whats_new_api.go similarity index 100% rename from pkg/internal/http/api/whats_new_api.go rename to pkg/internal/web/api/whats_new_api.go diff --git a/pkg/internal/http/exts/utils.go b/pkg/internal/web/exts/utils.go similarity index 100% rename from pkg/internal/http/exts/utils.go rename to pkg/internal/web/exts/utils.go diff --git a/pkg/internal/http/server.go b/pkg/internal/web/server.go similarity index 96% rename from pkg/internal/http/server.go rename to pkg/internal/web/server.go index c8ec747..41d9218 100644 --- a/pkg/internal/http/server.go +++ b/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" diff --git a/pkg/main.go b/pkg/main.go index 8d586ef..49f5592 100644 --- a/pkg/main.go +++ b/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()