Skip to content

Commit 0b65707

Browse files
yorukotyorukot
committed
update real time chat
1 parent 0e52f55 commit 0b65707

File tree

14 files changed

+300
-124
lines changed

14 files changed

+300
-124
lines changed

‎cloudflared.deb‎

16.9 MB
Binary file not shown.

‎config/dbConnection.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ import (
44
"context"
55
"database/sql"
66
"fmt"
7+
_ "github.com/lib/pq"
8+
"github.com/redis/go-redis/v9"
79
"log"
810
"os"
911
"strconv"
10-
_ "github.com/lib/pq"
11-
"github.com/redis/go-redis/v9"
1212
)
1313

1414
var DB *sql.DB
1515
var Redis *redis.Client
16-
1716
func Connect() {
1817
// ** DATABASE SETTINGS & CONNECT**
1918
//load environment variables

‎go.mod‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,47 @@ require (
1818
cloud.google.com/go/compute v1.20.1 // indirect
1919
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2020
github.com/MicahParks/keyfunc/v2 v2.1.0 // indirect
21+
github.com/aws/aws-sdk-go-v2 v1.25.3 // indirect
22+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect
23+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 // indirect
24+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.3 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.5 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.3 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect
35+
github.com/aws/smithy-go v1.20.1 // indirect
2136
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
2237
github.com/cespare/xxhash/v2 v2.2.0 // indirect
38+
github.com/cloudinary/cloudinary-go/v2 v2.7.0 // indirect
39+
github.com/creasty/defaults v1.5.1 // indirect
2340
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
41+
github.com/fasthttp/websocket v1.5.7 // indirect
42+
github.com/gofiber/contrib/websocket v1.3.0 // indirect
2443
github.com/gofiber/storage v1.3.3 // indirect
2544
github.com/gofiber/storage/redis/v3 v3.1.0 // indirect
2645
github.com/golang/protobuf v1.5.3 // indirect
46+
github.com/gorilla/schema v1.2.0 // indirect
2747
github.com/pusher/pusher-http-go/v5 v5.1.1 // indirect
48+
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
2849
golang.org/x/net v0.19.0 // indirect
2950
google.golang.org/appengine v1.6.7 // indirect
3051
google.golang.org/protobuf v1.31.0 // indirect
3152
)
3253

3354
require (
3455
github.com/andybalholm/brotli v1.0.5 // indirect
56+
github.com/aws/aws-sdk-go-v2/config v1.27.7
57+
github.com/aws/aws-sdk-go-v2/credentials v1.17.7
58+
github.com/aws/aws-sdk-go-v2/service/s3 v1.51.4
3559
github.com/gofiber/contrib/jwt v1.0.7
3660
github.com/google/uuid v1.4.0 // indirect
37-
github.com/klauspost/compress v1.16.7 // indirect
61+
github.com/klauspost/compress v1.17.3 // indirect
3862
github.com/mattn/go-colorable v0.1.13 // indirect
3963
github.com/mattn/go-isatty v0.0.20 // indirect
4064
github.com/mattn/go-runewidth v0.0.15 // indirect
@@ -43,7 +67,7 @@ require (
4367
github.com/rivo/uniseg v0.2.0 // indirect
4468
github.com/tinylib/msgp v1.1.8 // indirect
4569
github.com/valyala/bytebufferpool v1.0.0 // indirect
46-
github.com/valyala/fasthttp v1.50.0 // indirect
70+
github.com/valyala/fasthttp v1.51.0 // indirect
4771
github.com/valyala/tcplisten v1.0.0 // indirect
4872
github.com/xlzd/gotp v0.1.0
4973
golang.org/x/sys v0.15.0 // indirect

‎go.sum‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,62 @@ github.com/MicahParks/keyfunc/v2 v2.1.0 h1:6ZXKb9Rp6qp1bDbJefnG7cTH8yMN1IC/4nf+G
66
github.com/MicahParks/keyfunc/v2 v2.1.0/go.mod h1:rW42fi+xgLJ2FRRXAfNx9ZA8WpD4OeE/yHVMteCkw9k=
77
github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
88
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
9+
github.com/aws/aws-sdk-go-v2 v1.25.3 h1:xYiLpZTQs1mzvz5PaI6uR0Wh57ippuEthxS4iK5v0n0=
10+
github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I=
11+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 h1:gTK2uhtAPtFcdRRJilZPx8uJLL2J85xK11nKtWL0wfU=
12+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1/go.mod h1:sxpLb+nZk7tIfCWChfd+h4QwHNUR57d8hA1cleTkjJo=
13+
github.com/aws/aws-sdk-go-v2/config v1.27.7 h1:JSfb5nOQF01iOgxFI5OIKWwDiEXWTyTgg1Mm1mHi0A4=
14+
github.com/aws/aws-sdk-go-v2/config v1.27.7/go.mod h1:PH0/cNpoMO+B04qET699o5W92Ca79fVtbUnvMIZro4I=
15+
github.com/aws/aws-sdk-go-v2/credentials v1.17.7 h1:WJd+ubWKoBeRh7A5iNMnxEOs982SyVKOJD+K8HIezu4=
16+
github.com/aws/aws-sdk-go-v2/credentials v1.17.7/go.mod h1:UQi7LMR0Vhvs+44w5ec8Q+VS+cd10cjwgHwiVkE0YGU=
17+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3 h1:p+y7FvkK2dxS+FEwRIDHDe//ZX+jDhP8HHE50ppj4iI=
18+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.3/go.mod h1:/fYB+FZbDlwlAiynK9KDXlzZl3ANI9JkD0Uhz5FjNT4=
19+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3 h1:ifbIbHZyGl1alsAhPIYsHOg5MuApgqOvVeI8wIugXfs=
20+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.3/go.mod h1:oQZXg3c6SNeY6OZrDY+xHcF4VGIEoNotX2B4PrDeoJI=
21+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3 h1:Qvodo9gHG9F3E8SfYOspPeBt0bjSbsevK8WhRAUHcoY=
22+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.3/go.mod h1:vCKrdLXtybdf/uQd/YfVR2r5pcbNuEYKzMQpcxmeSJw=
23+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
24+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
25+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.3 h1:mDnFOE2sVkyphMWtTH+stv0eW3k0OTx94K63xpxHty4=
26+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.3/go.mod h1:V8MuRVcCRt5h1S+Fwu8KbC7l/gBGo3yBAyUbJM2IJOk=
27+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 h1:EyBZibRTVAs6ECHZOw5/wlylS9OcTzwyjeQMudmREjE=
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1/go.mod h1:JKpmtYhhPs7D97NL/ltqz7yCkERFW5dOlHyVl66ZYF8=
29+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.5 h1:mbWNpfRUTT6bnacmvOTKXZjR/HycibdWzNpfbrbLDIs=
30+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.5/go.mod h1:FCOPWGjsshkkICJIn9hq9xr6dLKtyaWpuUojiN3W1/8=
31+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5 h1:K/NXvIftOlX+oGgWGIa3jDyYLDNsdVhsjHmsBH2GLAQ=
32+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.5/go.mod h1:cl9HGLV66EnCmMNzq4sYOti+/xo8w34CsgzVtm2GgsY=
33+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.3 h1:4t+QEX7BsXz98W8W1lNvMAG+NX8qHz2CjLBxQKku40g=
34+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.3/go.mod h1:oFcjjUq5Hm09N9rpxTdeMeLeQcxS7mIkBkL8qUKng+A=
35+
github.com/aws/aws-sdk-go-v2/service/s3 v1.51.4 h1:lW5xUzOPGAMY7HPuNF4FdyBwRc3UJ/e8KsapbesVeNU=
36+
github.com/aws/aws-sdk-go-v2/service/s3 v1.51.4/go.mod h1:MGTaf3x/+z7ZGugCGvepnx2DS6+caCYYqKhzVoLNYPk=
37+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc=
38+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0=
39+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE=
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2/go.mod h1:JYzLoEVeLXk+L4tn1+rrkfhkxl6mLDEVaDSvGq9og90=
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 h1:Ppup1nVNAOWbBOrcoOxaxPeEnSFB2RnnQdguhXpmeQk=
42+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.4/go.mod h1:+K1rNPVyGxkRuv9NNiaZ4YhBFuyw2MMA9SlIJ1Zlpz8=
43+
github.com/aws/smithy-go v1.20.1 h1:4SZlSlMr36UEqC7XOyRVb27XMeZubNcBNN+9IgEPIQw=
44+
github.com/aws/smithy-go v1.20.1/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
945
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
1046
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
1147
github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
1248
github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
1349
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
1450
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
51+
github.com/cloudinary/cloudinary-go/v2 v2.7.0 h1:8Fuh/SOen6IQgqH8CLso2E+kuKi2xjbdiyXOspwXFTM=
52+
github.com/cloudinary/cloudinary-go/v2 v2.7.0/go.mod h1:jtSxa6xbzvu4IwChRJVDcXwVXrTRczhbvq3Z1VSoFdk=
53+
github.com/creasty/defaults v1.5.1 h1:j8WexcS3d/t4ZmllX4GEkl4wIB/trOr035ajcLHCISM=
54+
github.com/creasty/defaults v1.5.1/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqLPvXUZGfY=
1555
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1656
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
1757
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
58+
github.com/fasthttp/websocket v1.5.7 h1:0a6o2OfeATvtGgoMKleURhLT6JqWPg7fYfWnH4KHau4=
59+
github.com/fasthttp/websocket v1.5.7/go.mod h1:bC4fxSono9czeXHQUVKxsC0sNjbm7lPJR04GDFqClfU=
60+
github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
1861
github.com/gofiber/contrib/jwt v1.0.7 h1:LZuCnjEq8AjiDTUjBQSd2zg3H5uDWjHxSXjo7nj9iAc=
1962
github.com/gofiber/contrib/jwt v1.0.7/go.mod h1:fA1apg9zQlUhax+Foc0BHATCDzBsemga1Yr9X0KSvrQ=
63+
github.com/gofiber/contrib/websocket v1.3.0 h1:XADFAGorer1VJ1bqC4UkCjqS37kwRTV0415+050NrMk=
64+
github.com/gofiber/contrib/websocket v1.3.0/go.mod h1:xguaOzn2ZZ759LavtosEP+rcxIgBEE/rdumPINhR+Xo=
2065
github.com/gofiber/fiber/v2 v2.51.0 h1:JNACcZy5e2tGApWB2QrRpenTWn0fq0hkFm6k0C86gKQ=
2166
github.com/gofiber/fiber/v2 v2.51.0/go.mod h1:xaQRZQJGqnKOQnbQw+ltvku3/h8QxvNi8o6JiJ7Ll0U=
2267
github.com/gofiber/storage v1.3.3 h1:XvcaYqEVcoXllhnkvH8sTIbuB1IbidIe3UlxzMvzBrE=
@@ -32,12 +77,19 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
3277
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
3378
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
3479
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
80+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
81+
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
3582
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
3683
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
84+
github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
85+
github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
86+
github.com/heimdalr/dag v1.0.1/go.mod h1:t+ZkR+sjKL4xhlE1B9rwpvwfo+x+2R0363efS+Oghns=
3787
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
3888
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
3989
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
4090
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
91+
github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
92+
github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
4193
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
4294
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
4395
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -60,14 +112,19 @@ github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0
60112
github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
61113
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
62114
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
115+
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk=
116+
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g=
63117
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
64118
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
119+
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
65120
github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
66121
github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
67122
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
68123
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
69124
github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M=
70125
github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
126+
github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA=
127+
github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g=
71128
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
72129
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
73130
github.com/xlzd/gotp v0.1.0 h1:37blvlKCh38s+fkem+fFh7sMnceltoIEBYTVXyoa5Po=
@@ -124,4 +181,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
124181
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
125182
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
126183
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
184+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
127185
gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU=
186+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎main.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"os"
55
"time"
6-
76
"github.com/gofiber/fiber/v2"
87
"github.com/gofiber/fiber/v2/middleware/cors"
98
"github.com/gofiber/fiber/v2/middleware/csrf"

‎routes.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"github.com/returnone-x/server/routes/auth"
66
"github.com/returnone-x/server/routes/public"
77
"github.com/returnone-x/server/routes/user"
8+
"github.com/returnone-x/server/routes/websocket"
89
)
910

1011
func routes(app *fiber.App){
@@ -21,4 +22,8 @@ func routes(app *fiber.App){
2122
// set user controller
2223
user_group := api_v1.Group("/user")
2324
user.Setup(user_group)
25+
26+
// set websocket controller
27+
websocket_group := api_v1.Group("/ws")
28+
chat.Setup(websocket_group)
2429
}

‎routes/user/question/chat/controller.go‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎routes/user/question/chat/handler.go‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎routes/user/question/controller.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package question
33
import (
44
"github.com/gofiber/fiber/v2"
55
"github.com/returnone-x/server/routes/user/question/answer"
6-
questionChat "github.com/returnone-x/server/routes/user/question/chat"
76
questionComment "github.com/returnone-x/server/routes/user/question/comment"
87
)
98

@@ -22,7 +21,4 @@ func Setup(app fiber.Router) {
2221

2322
answer_group := app.Group("/answer")
2423
questionAnswer.Setup(answer_group)
25-
26-
chat_group := app.Group("/chat")
27-
questionChat.Setup(chat_group)
2824
}

‎routes/user/setting/handler.go‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@ func GetUser(c *fiber.Ctx) error {
308308
"phone_2fa": user_data.Phone_2fa,
309309
"totp_2fa": user_data.Totp_2fa,
310310
"default_2fa": user_data.Default_2fa,
311-
"bio": user_data.Bio,
312-
"public_email": user_data.Public_email,
313-
"pronouns": user_data.Pronouns,
314-
"related_links": user_data.Related_links,
311+
"bio": user_data.Bio,
312+
"public_email": user_data.Public_email,
313+
"pronouns": user_data.Pronouns,
314+
"related_links": user_data.Related_links,
315315
"create_at": user_data.Create_at,
316316
"update_at": user_data.Update_at,
317317
}
@@ -473,10 +473,16 @@ func ResetRelatedLinks(c *fiber.Ctx) error {
473473
return c.Status(400).JSON(utils.RequestValueValid("related_links"))
474474
}
475475

476-
if len(data.Related_links) > 6 {
476+
if len(data.Related_links) > 5 {
477477
return c.Status(400).JSON(utils.RequestValueValid("related_links"))
478478
}
479479

480+
for _, link := range data.Related_links {
481+
if len(link) > 150 {
482+
return c.Status(400).JSON(utils.RequestValueValid("related_links"))
483+
}
484+
}
485+
480486
token := c.Locals("access_token_context").(*jwt.Token)
481487
claims := token.Claims.(jwt.MapClaims)
482488
user_id := claims["user_id"].(string)
@@ -574,35 +580,20 @@ func ResetAllProfile(c *fiber.Ctx) error {
574580
})
575581
}
576582

577-
if len(data.Related_links) == 0 {
578-
return c.Status(400).JSON(utils.RequestValueValid("related_links"))
579-
}
580-
581583
if len(data.Related_links) > 6 {
582584
return c.Status(400).JSON(utils.RequestValueValid("related_links"))
583585
}
584586

585-
if len(data.Pronouns) == 0 {
586-
return c.Status(400).JSON(utils.RequestValueValid("pronouns"))
587-
}
588587

589588
if len(data.Pronouns) > 20 {
590589
return c.Status(400).JSON(utils.RequestValueValid("pronouns"))
591590
}
592591

593-
if len(data.Bio) == 0 {
594-
return c.Status(400).JSON(utils.RequestValueValid("bio"))
595-
}
596-
597592
if len(data.Bio) > 150 {
598593
return c.Status(400).JSON(utils.RequestValueValid("bio"))
599594
}
600595

601-
if len(data.Public_email) == 0 {
602-
return c.Status(400).JSON(utils.RequestValueValid("public_email"))
603-
}
604-
605-
if len(data.Public_email) > 150 || !utils.IsValidEmail(data.Public_email) {
596+
if (len(data.Public_email) > 150 || !utils.IsValidEmail(data.Public_email)) && data.Public_email != "" {
606597
return c.Status(400).JSON(utils.RequestValueValid("public_email"))
607598
}
608599

0 commit comments

Comments
 (0)