Skip to content

Commit 74ed114

Browse files
authored
Merge nightly branch with main for release (#32)
* sqlite DB interface and migration tool * external endpoint to get character by slot and steamid * option to turn off external auth * Update sqlite.go * add db test for sqlite and fix some issues * remove endpoint for getallusers * fix pebbleDB issues and add unit test * delete old database options * go mod tidy * Update db.go * automatically create sub directories for SQLite * error handling stuff * add postgreSQL schema * fix some stuff * setup for postgres * pass database logger to database struct * wip: posgres database interface * make migration use config file instead * don't migrate deleted characters * Revert "remove endpoint for getallusers" This reverts commit d131302. * actually fix GetAllUsers instead of removing it * optimize GetUser query * update insomnia scratch pad * handle no document error for getcharacter endpoint * idk what i was doing here, but it's wrong * Update character.go * fix SQL statement * get rid of unneeded test * fix SQLite error with GetCharacter * formatting * fix postgres GetCharacter * cleanup
1 parent 2c184a4 commit 74ed114

File tree

36 files changed

+4046
-1685
lines changed

36 files changed

+4046
-1685
lines changed
Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
type: collection.insomnia.rest/5.0
2+
schema_version: "5.1"
23
name: Scratch Pad
34
meta:
45
id: wrk_scratchpad
5-
created: 1750805884848
6-
modified: 1750805884848
6+
created: 1771818346679
7+
modified: 1771818346679
78
description: ""
89
collection:
910
- name: Internal
1011
meta:
11-
id: fld_3159eb11f7294b9199cf40ce3b1ec5f3
12+
id: fld_366cc23ffe9546379371e40c695ddfa2
1213
created: 1702091260653
1314
modified: 1702091260653
1415
sortKey: -1702091260653
@@ -17,7 +18,7 @@ collection:
1718
- url: http://127.0.0.1:1337/api/v2/internal/map/edana/1273
1819
name: Map Verify
1920
meta:
20-
id: req_777bfe1f5a79487b8900774313468de8
21+
id: req_81f6af598a504f91be75ab566ade0627
2122
created: 1701386023339
2223
modified: 1702091287346
2324
isPrivate: false
@@ -38,9 +39,9 @@ collection:
3839
- url: http://127.0.0.1:1337/api/v2/internal/character/
3940
name: New Character
4041
meta:
41-
id: req_9d205813904d4fefac747ba94f21be20
42+
id: req_b4937fca3b244d0ebc92d498b561f86b
4243
created: 1701668372562
43-
modified: 1750892580110
44+
modified: 1771885637277
4445
isPrivate: false
4546
description: ""
4647
sortKey: -1702091266935
@@ -49,8 +50,8 @@ collection:
4950
mimeType: application/json
5051
text: |-
5152
{
52-
"steamid": "1337",
53-
"slot": 1,
53+
"steamid": "76561197970271912",
54+
"slot": 2,
5455
"size": 180,
5556
"data": "THIS_TEST_DATA2J____DJHDHJFJK ALTERNATE"
5657
}
@@ -70,7 +71,7 @@ collection:
7071
- url: http://127.0.0.1:1337/api/v2/internal/ban/21743647643
7172
name: Ban Verify
7273
meta:
73-
id: req_9cb08d62e2234fdbac083dfb56afb847
74+
id: req_a67772aef4fe4e888db727c53c810db2
7475
created: 1701720818712
7576
modified: 1702091289643
7677
isPrivate: false
@@ -88,12 +89,12 @@ collection:
8889
send: true
8990
store: true
9091
rebuildPath: true
91-
- url: http://127.0.0.1:1337/api/v2/internal/character/531cdaaf-8368-47ca-b663-517af82d5ac6
92+
- url: http://127.0.0.1:1337/api/v2/internal/character/05752e13-31f4-4641-a93a-137785a37142
9293
name: Update Character
9394
meta:
94-
id: req_461281e9c7f34c1497e04d13264a5d66
95+
id: req_644de9363b6946e9b5e9387e52f5a1b1
9596
created: 1701855673965
96-
modified: 1750806152058
97+
modified: 1771819157808
9798
isPrivate: false
9899
description: ""
99100
sortKey: -1702091267035
@@ -102,8 +103,8 @@ collection:
102103
mimeType: application/json
103104
text: |-
104105
{
105-
"size": 1,
106-
"data": "UwU2"
106+
"size": 156,
107+
"data": "UwU2433"
107108
}
108109
headers:
109110
- name: Content-Type
@@ -118,12 +119,12 @@ collection:
118119
send: true
119120
store: true
120121
rebuildPath: true
121-
- url: http://127.0.0.1:1337/api/v2/internal/character/1337/65
122+
- url: http://127.0.0.1:1337/api/v2/internal/character/76561197970271912/0
122123
name: Get Character
123124
meta:
124-
id: req_29b4de3833cd451bb96dbfabff8c75f3
125+
id: req_251d3c7109f84c34a1143197616ff8e7
125126
created: 1702000504553
126-
modified: 1750896147253
127+
modified: 1771836126507
127128
isPrivate: false
128129
description: ""
129130
sortKey: -1702091266635
@@ -139,12 +140,12 @@ collection:
139140
send: true
140141
store: true
141142
rebuildPath: true
142-
- url: http://127.0.0.1:1337/api/v2/internal/character/f69ffd70-6fdb-443c-a071-7f17565291ad
143+
- url: http://127.0.0.1:1337/api/v2/internal/character/99d08d19-e67f-48f3-beb5-a424de24270e
143144
name: Delete Character
144145
meta:
145-
id: req_49f5dccb45464f7dbcdf405c0adc623a
146+
id: req_8661af7a260e4ee3b14763a182341e9d
146147
created: 1702014924846
147-
modified: 1750893194066
148+
modified: 1772004720934
148149
isPrivate: false
149150
description: ""
150151
sortKey: -1702091266885
@@ -162,18 +163,18 @@ collection:
162163
rebuildPath: true
163164
- name: External
164165
meta:
165-
id: fld_e7ca6945525a4e48aef91dd05982ab8e
166+
id: fld_1ed0be024ef849a083c6a199aeb570ff
166167
created: 1702091446572
167168
modified: 1702091446572
168169
sortKey: -1702091446572
169170
description: ""
170171
children:
171-
- url: http://127.0.0.1:1337/api/v2/character/7e094142-841d-48b3-b329-633c2707a593
172+
- url: 127.0.0.1:1337/api/v2/character/99d08d19-e67f-48f3-beb5-a424de24270e
172173
name: Get Character By ID
173174
meta:
174-
id: req_7fc6321551ee4ab69d8b84ad107051fc
175+
id: req_8acaacdd253546d58c45e5ba5bef0d88
175176
created: 1701720160986
176-
modified: 1750892516657
177+
modified: 1772005038219
177178
isPrivate: false
178179
description: ""
179180
sortKey: -1702091526359
@@ -189,12 +190,12 @@ collection:
189190
send: true
190191
store: true
191192
rebuildPath: true
192-
- url: http://127.0.0.1:1337/api/v2/character/1337
193+
- url: 127.0.0.1:1337/api/v2/character/76561197970271912
193194
name: Get Characters
194195
meta:
195-
id: req_4dec80d0d35c4d73ae3dcdc18077cf8e
196+
id: req_e76e2ec9e28e48dd904a7b48472e05bc
196197
created: 1702086161941
197-
modified: 1750806429298
198+
modified: 1771886210189
198199
isPrivate: false
199200
description: ""
200201
sortKey: -1702091526459
@@ -210,12 +211,12 @@ collection:
210211
send: true
211212
store: true
212213
rebuildPath: true
213-
- url: http://127.0.0.1:1337/api/v2/character/deleted/1337
214+
- url: 127.0.0.1:1337/api/v2/character/deleted/76561197970271912
214215
name: Get Deleted Characters
215216
meta:
216-
id: req_689e4ef6684544de881dd8cbf812bad0
217+
id: req_b713fe47f409407f96d71ea40ea3ac72
217218
created: 1702087289073
218-
modified: 1706317029283
219+
modified: 1771890691966
219220
isPrivate: false
220221
description: ""
221222
sortKey: -1702091526559
@@ -231,12 +232,12 @@ collection:
231232
send: true
232233
store: true
233234
rebuildPath: true
234-
- url: http://127.0.0.1:1337/api/v2/character/lookup/21743647643/1
235+
- url: http://127.0.0.1:1337/api/v2/character/lookup/76561197970271912/2
235236
name: Lookup Character ID
236237
meta:
237-
id: req_a34d6bfabace4bdf8f5a1aaff22a5463
238+
id: req_e5b0f88835cc47d2bdff6f4ab911a27b
238239
created: 1702092100803
239-
modified: 1702092128443
240+
modified: 1771885768138
240241
isPrivate: false
241242
description: ""
242243
sortKey: -1702091526659
@@ -255,7 +256,7 @@ collection:
255256
- url: http://127.0.0.1:1337/api/v2/unsafe/character/move/c5077373-ea54-4f37-a47d-5ab5dc140ff2/to/1234/2
256257
name: Move Character
257258
meta:
258-
id: req_6c1c5b72762845e4a90938705f8c8cc1
259+
id: req_54922995ef274d5a91dcca95fb2a0b9a
259260
created: 1702096471985
260261
modified: 1706398471300
261262
isPrivate: false
@@ -276,7 +277,7 @@ collection:
276277
- url: http://127.0.0.1:1337/api/v2/unsafe/character/copy/3a362194-5783-487c-a76d-49d2c2652d21/to/1337/2
277278
name: Copy Character
278279
meta:
279-
id: req_17255148af42494fbe6371dcef3e1472
280+
id: req_990e2daa835f44b184e500af526b4719
280281
created: 1702096766384
281282
modified: 1706398421538
282283
isPrivate: false
@@ -297,7 +298,7 @@ collection:
297298
- url: http://127.0.0.1:1337/api/v2/character/restore/f69ffd70-6fdb-443c-a071-7f17565291ad
298299
name: Restore Character
299300
meta:
300-
id: req_59b939ba33d5460981d6da5c9bcdf48d
301+
id: req_30ba1d0afc43438cb9d832561704dec2
301302
created: 1702165085087
302303
modified: 1750895319533
303304
isPrivate: false
@@ -315,31 +316,10 @@ collection:
315316
send: true
316317
store: true
317318
rebuildPath: true
318-
- url: http://127.0.0.1:1337/api/v2/character/504a7f9e-f7f3-47dc-9a2d-5b2f04d5fc54
319-
name: Get Character By ID
320-
meta:
321-
id: req_036feda3bf1f4037905aff008c29b8f9
322-
created: 1708814692952
323-
modified: 1727673808306
324-
isPrivate: false
325-
description: ""
326-
sortKey: -1708814692952
327-
method: GET
328-
headers:
329-
- name: User-Agent
330-
value: insomnia/8.6.1
331-
settings:
332-
renderRequestBody: true
333-
encodeUrl: true
334-
followRedirects: global
335-
cookies:
336-
send: true
337-
store: true
338-
rebuildPath: true
339319
- url: http://127.0.0.1:1337/api/v2/user/list
340320
name: Get All Users
341321
meta:
342-
id: req_fff03a9ede964b13aed660c70a89916f
322+
id: req_8173bbe03464471fafb4aa94542009c0
343323
created: 1727569473310
344324
modified: 1727569546238
345325
isPrivate: false
@@ -357,12 +337,12 @@ collection:
357337
send: true
358338
store: true
359339
rebuildPath: true
360-
- url: http://127.0.0.1:1337/api/v2/user/admin/1337
340+
- url: http://127.0.0.1:1337/api/v2/user/admin/76561197970271912
361341
name: Admin Steam ID
362342
meta:
363-
id: req_5be4ea11f82f402d8d8ae3799c3bd8f9
343+
id: req_d49e6fc52b104164b7af4dc846391dea
364344
created: 1727729676928
365-
modified: 1727729784226
345+
modified: 1772008652772
366346
isPrivate: false
367347
description: ""
368348
sortKey: -1727729676928
@@ -381,7 +361,7 @@ collection:
381361
- url: http://127.0.0.1:1337/api/v2/user/isdonor/1337
382362
name: Is Donor SteamID
383363
meta:
384-
id: req_f74a697f4ec84b6d86dcae9ef3d7bb49
364+
id: req_4852249f62884335a399d8ff36fd8538
385365
created: 1727730248138
386366
modified: 1727730392231
387367
isPrivate: false
@@ -399,12 +379,12 @@ collection:
399379
send: true
400380
store: true
401381
rebuildPath: true
402-
- url: http://127.0.0.1:1337/api/v2/user/1337
382+
- url: http://127.0.0.1:1337/api/v2/user/76561197970271912
403383
name: Get User
404384
meta:
405-
id: req_d28bcd23e95e430eba1bd0b1189ebbea
385+
id: req_cc8627bca082466e9884be61e4a4822c
406386
created: 1727730684341
407-
modified: 1727730713639
387+
modified: 1772004693901
408388
isPrivate: false
409389
description: ""
410390
sortKey: -1727730684341
@@ -420,20 +400,41 @@ collection:
420400
send: true
421401
store: true
422402
rebuildPath: true
403+
- url: 127.0.0.1:1337/api/v2/character/76561197970271912/2
404+
name: Get Character By STEAMID and SLOT
405+
meta:
406+
id: req_45c6c0d6fdf74fe1b477ca41f6ae5290
407+
created: 1772004912440
408+
modified: 1772004925147
409+
isPrivate: false
410+
description: ""
411+
sortKey: -1702091396797
412+
method: GET
413+
headers:
414+
- name: User-Agent
415+
value: insomnia/8.4.5
416+
settings:
417+
renderRequestBody: true
418+
encodeUrl: true
419+
followRedirects: global
420+
cookies:
421+
send: true
422+
store: true
423+
rebuildPath: true
423424
- name: Rollback
424425
meta:
425-
id: fld_b07124d8afaf476eba0569c78d52217b
426+
id: fld_256d4ddef2eb42a0a2c9b8967ec1f2c4
426427
created: 1702169927186
427428
modified: 1702169927186
428429
sortKey: -1702169927187
429430
description: ""
430431
children:
431-
- url: http://127.0.0.1:1337/api/v2/rollback/character/1ef7ffb5-a353-4fed-884c-49c191a78bdd
432+
- url: 127.0.0.1:1337/api/v2/rollback/character/b07ce88f-fe4b-48fc-8b0d-e23e04d35789
432433
name: Character Versions
433434
meta:
434-
id: req_e5f9fccff7d645049438ac8f9af6cc59
435+
id: req_8ba340a74190489d8d2d3c5268198180
435436
created: 1702169943633
436-
modified: 1708813512893
437+
modified: 1772006700822
437438
isPrivate: false
438439
description: ""
439440
sortKey: -1702169943633
@@ -453,12 +454,12 @@ cookieJar:
453454
name: Default Jar
454455
meta:
455456
id: jar_99d30891da4bdcebc63947a8fc17f076de878684
456-
created: 1750805916193
457-
modified: 1750805916193
457+
created: 1771818355962
458+
modified: 1771818355962
458459
environments:
459460
name: Base Environment
460461
meta:
461462
id: env_99d30891da4bdcebc63947a8fc17f076de878684
462-
created: 1750805916130
463-
modified: 1750805916130
463+
created: 1771818355961
464+
modified: 1771818355961
464465
isPrivate: false

0 commit comments

Comments
 (0)