Commit Graph

267 Commits

Author SHA1 Message Date
shockrah
4703116e32 Verified that the join function is working as intended 2020-05-07 22:14:44 -07:00
shockrah
cd41dc64c3 create_new_user no longer checks id column when comparing against unix timestamps 2020-05-07 22:14:26 -07:00
shockrah
383fd59eba Removed dead new_user_id() function 2020-05-07 22:13:44 -07:00
shockrah
55a09b5e98 Removed static files route handlers as they'll never be used
added auth route
2020-05-06 22:22:40 -07:00
shockrah
281b734073 calls to create_new_user no longer require a connection to be copied 2020-05-06 22:19:42 -07:00
shockrah
040d58a7ad Cleaned up some verbosity 2020-05-06 22:19:12 -07:00
shockrah
22a1fd1730 Fixed issue with User database responses:
Added insertable to ensure compilation even though we dont use that trait
2020-05-06 22:18:51 -07:00
shockrah
81e6fd0a13 Invite are now consumed via a path with two dynamic params
/invite/join/<hash>/<name> is the real path to be used now but the app ui should this behavior in some clever way
2020-05-06 02:51:26 -07:00
shockrah
2f40da6c82 FromForm issue still there with /join route
Otherwise ready to integrate tests with auth module
2020-05-06 02:21:20 -07:00
shockrah
220bc11ef0 Fixed all 35 compile time issues with new auth module
Ready for testing
2020-05-06 02:20:32 -07:00
shockrah
306156407d auth module useable now 2020-05-06 01:46:06 -07:00
shockrah
b729537088 updated queries to use the new user schema columns
removed old tests which have to be rebuilt from scratch
2020-05-06 01:45:49 -07:00
shockrah
811c6902ac new users schema
changed column names to be more concise
2020-05-06 00:35:01 -07:00
shockrah
57dad692ae poc for a leave route for those that no longer want to be a part of a given server 2020-05-05 23:46:29 -07:00
shockrah
5652388f4c /join 'ing for new users code steramlined a bit
*mostly a coding qol change
2020-05-05 23:20:47 -07:00
shockrah
62204e52ca dumy commit as work will continue on new async branch 2020-05-05 17:09:18 -07:00
shockrah
83aafa9ff5 new user structs for interacting with end users/db 2020-04-26 18:08:01 -07:00
shockrah
a217c64666 Essential data now passable from server to client regarding channels 2020-03-31 17:15:01 -07:00
shockrah
972d79d44b more custom message support for error type responses 2020-03-31 17:13:07 -07:00
shockrah
5c20d30502 changed responder code to use the new error responder in crate::err 2020-03-31 17:09:45 -07:00
shockrah
fe7eb7e392 new error responder 2020-03-31 17:04:01 -07:00
shockrah
960233b7bc testing user list endpoint
new macro to shorten test code
2020-03-17 23:23:52 -07:00
shockrah
3b3059e6d2 new get_user_list endpoint to well, get the list of online users 2020-03-17 22:27:10 -07:00
shockrah
eb76c070bd clarified goals 2020-03-17 21:34:43 -07:00
shockrah
f343f6d252 new field for online status of users
new short structure describing online users
2020-03-17 21:34:32 -07:00
shockrah
9f586c2569 removing old depracated routes/features 2020-03-11 00:43:31 -07:00
shockrah
a1402e79bb router registration for get_voice_channels 2020-03-11 00:40:04 -07:00
shockrah
ce4ef515bd sample function to grab all the voice channels 2020-03-11 00:39:23 -07:00
shockrah
7c2e1abbc3 new channel schema which is meant to encompass both text and voice channels 2020-03-11 00:39:10 -07:00
shockrah
558a40523e net payloads for channels and online users 2020-03-10 18:06:33 -07:00
shockrah
7e04e6010a new schema to contain basic channel information 2020-03-10 17:59:27 -07:00
shockrah
8ae877f3f9 updated the response when creating new users 2020-03-10 16:48:21 -07:00
shockrah
924c15a436 No more nullable uses field(it was signed) so option was redundant 2020-03-09 00:52:09 -07:00
shockrah
2eb2a83c76 testing user generation on invite usage 2020-03-09 00:26:29 -07:00
shockrah
ae751a2d2b removed unused schema 2020-03-09 00:26:04 -07:00
shockrah
50cd718e8a more robust test to deal with invite generation 2020-03-08 23:01:41 -07:00
shockrah
12dd244f9c serde json used for testing purposes mainly 2020-03-08 22:53:43 -07:00
shockrah
e38f8a0a2b silly test 2020-03-08 20:20:57 -07:00
shockrah
e4f03b951e invites:
handling result from diesel
generally:
fixed pub/private issue in modles module
renamed rand_utils functions to be snake case
2020-03-08 20:07:26 -07:00
shockrah
89836449a1 createNewUser now returns a User(not payload::NewUser) 2020-03-08 19:50:47 -07:00
shockrah
d9e892b1e0 Updated blanknewUser macro
use_invite now returns a Json<User>
2020-03-08 19:50:17 -07:00
shockrah
d7c70afd68 rust code to go along with lack of optional fields 2020-03-08 19:49:36 -07:00
shockrah
50c2c1da0e removed optional fields 2020-03-08 19:49:22 -07:00
shockrah
b39a95f3a3 rand utils no longer using payload User struct 2020-03-08 19:49:10 -07:00
shockrah
8cbfa9520e new users no longer contain optional fields
only using completely necessary information
2020-03-08 19:20:08 -07:00
shockrah
23166a9e99 bcrypt used to hash user passes 2020-03-08 19:13:47 -07:00
shockrah
e9a880f6a9 user generation added
randomness is generated via /dev/urandom thru getrandom crate
2020-03-08 19:13:24 -07:00
shockrah
ec88a08391 new simplified users schema 2020-03-07 22:06:03 -08:00
shockrah
316c409796 new models for users table interface 2020-03-07 22:05:46 -08:00
shockrah
54f5b1bbe1 new route to create users
still requires some kind of auth however
2020-03-07 21:51:54 -08:00
shockrah
2fe1bb878e get random being used for crypto rng 2020-03-07 21:51:16 -08:00
shockrah
8220f1f745 depracation of website module 2020-03-07 20:52:41 -08:00
shockrah
f5264fbff7 goals for the invites module 2020-03-07 20:51:58 -08:00
shockrah
8abb8ca29c depracating the website module 2020-03-07 20:50:58 -08:00
shockrah
62fd63d3b5 invite generation cleaned and working
added a basic test for the fixed invite generation
2020-03-07 18:54:46 -08:00
shockrah
58fcb99e03 Rocket config changed to match the .env
build-sass configuration chanced from using sass to sassc
2020-03-07 18:50:48 -08:00
shockrah
b29cbed17c print things out when testing 2020-03-07 18:50:03 -08:00
shockrah
3a995fa469 removing users module for now because invites are getting reworked
a lot of structural changes are coming to how users are dealt with
2020-03-07 16:51:22 -08:00
shockrah
0a587da14c goals 2020-03-07 16:08:18 -08:00
shockrah
35a85be578 minor config change for development 2020-03-07 16:07:26 -08:00
shockrah
64f20f01ec structures for authentication payloads
added new temporary goal
slowly integrating payload module into invites and users modules
2020-02-13 17:13:41 -08:00
shockrah
6c10c2160b newuser structure for those that use an invite link 2020-02-08 16:49:18 -08:00
shockrah
57db968568 new_users fields are more explicit
also easier to work with given current goals
2020-02-07 15:43:46 -08:00
shockrah
c2c82aec9b new_users cache table
reset sql added for dev purposes
2020-02-07 15:23:05 -08:00
shockrah
3d7547007a updated table description 2020-02-07 15:17:28 -08:00
shockrah
dd3acb5abe Basic new user route with a sample test
Creating a payloads module as well
2020-02-07 14:57:44 -08:00
shockrah
6dd002171c pottentially depracating web routes soon 2020-02-05 17:50:45 -08:00
shockrah
b52de76a66 removed old migratiions from unsed internal library 2020-02-05 17:48:57 -08:00
shockrah
d2c45761dd invites usage route '/invite/<hash>' now usable 2020-02-05 17:45:12 -08:00
shockrah
da0af22ee5 removed pointless function 2020-02-05 16:31:35 -08:00
shockrah
1e1b9d4f72 changed model fields to pub
struct Invite now insertable
2020-02-05 16:31:26 -08:00
shockrah
c5461f16ad main now matches against dotenv return val
main also returns a Result<(), i32>
2020-02-05 16:30:50 -08:00
shockrah
03b111c4dd working route for generating invite links
return value may need to change slightly however
2020-02-05 16:30:09 -08:00
shockrah
fa58724533 update db url from rocket config 2020-02-05 16:29:42 -08:00
shockrah
8978b92efd models module 2020-02-05 15:11:56 -08:00
shockrah
f08d256f4e migrations reflecting previous commit's schema 2020-02-05 14:17:25 -08:00
shockrah
12b666518c schema(rust) first pass 2020-02-05 14:17:07 -08:00
shockrah
7c3420287e fixed incorrect dep from diesel_sqlite_pool to diesel_mysql_pool 2020-02-05 13:32:36 -08:00
shockrah
7ea474f044 sample db things and updated invites table structure to allow for greater entropy pools 2020-02-04 00:44:55 -08:00
shockrah
7b8d849758 simpler users table for now 2020-02-04 00:36:41 -08:00
shockrah
f3e0570182 removing sub library and moving this code into our master codebase 2020-02-04 00:30:58 -08:00
shockrah
b2ef7fd6d1 simple sql connection script: just to reduce typing 2020-02-04 00:26:44 -08:00
shockrah
d54913a26a registering routes for generating/usig invites 2020-02-04 00:25:59 -08:00
shockrah
6634641937 commiting old but nearly done work before goal shifting 2020-02-04 00:25:27 -08:00
shockrah
4c1820f910 reset scripts now in place 2020-02-04 00:21:58 -08:00
shockrah
abf573812f new struct for invites 2020-01-31 00:16:22 -08:00
shockrah
6584b50d49 dev files for this lib 2020-01-31 00:00:39 -08:00
shockrah
716f7e4cef removed fluff env file 2020-01-30 23:55:25 -08:00
shockrah
4309f9890e poc api code for generating invites 2020-01-30 23:54:53 -08:00
shockrah
ecc08cc3f1 invites added to schemas rust code 2020-01-30 23:54:18 -08:00
shockrah
b0ab68c134 basic invites migrations ready 2020-01-30 23:52:06 -08:00
shockrah
a1e6d6131d print flag now lets us control println output in test code 2020-01-30 17:30:27 -08:00
shockrah
b3bd800455 new deps 2020-01-30 17:30:00 -08:00
shockrah
0518a896d6 first steps into an invite system 2020-01-30 00:04:03 -08:00
shockrah
113aff4955 removed fluff modules 2020-01-30 00:03:51 -08:00
shockrah
289ab5c829 using .env config for now 2020-01-29 23:26:46 -08:00
shockrah
a3519e32a6 config issues are being ignored for now there are bigger things to deal with 2020-01-29 23:25:37 -08:00
shockrah
e0ede8d96b defaults are coded directly into templates 2020-01-29 23:25:18 -08:00
shockrah
857885789f removed old fluff 2020-01-29 22:40:57 -08:00
shockrah
320310e680 header using new config vars 2020-01-29 20:18:05 -08:00
shockrah
5dcc6b2096 its ugly but way more safe and uses the config properly 2020-01-29 20:16:50 -08:00
shockrah
955331323b new/simplified default website config 2020-01-29 20:16:20 -08:00
shockrah
42090cd6b1 removed unwanted/needed stuff 2020-01-29 20:15:36 -08:00
shockrah
10e4986ef2 beginning of change to new config for website 2020-01-29 16:41:46 -08:00
shockrah
5f281e587b support for configs now there but requries docs 2020-01-04 18:15:37 -08:00
shockrah
c4b1b20187 toml format on configs from now on 2020-01-04 16:26:01 -08:00
shockrah
a142ea435b ready to ready toml in ./configs/ for website at least 2020-01-04 16:25:18 -08:00
shockrah
6c88b04d6a removed unsed struct which was moved to website.rs anyway 2020-01-04 01:35:56 -08:00
shockrah
52f66c00b0 example config for the website 2020-01-03 21:50:03 -08:00
shockrah
c9ce8618cd new tables included with passing build 2019-12-08 23:34:37 -08:00
shockrah
5803fc4c53 passing all tests ready for wrapper implementation 2019-12-08 23:34:21 -08:00
shockrah
9b035f07a2 sample env file nothing exciting yet 2019-12-08 23:33:49 -08:00
shockrah
a05cc2b53a switching deps to mysql 2019-12-08 23:28:41 -08:00
shockrah
a6a597cc0c channels alongside users table 2019-12-08 23:28:20 -08:00
shockrah
e588d81383 building smarter 2019-12-08 23:27:59 -08:00
shockrah
a40321962f Merge branch 'master' of gitlab.com:shockrah/freechat 2019-12-08 21:28:45 -08:00
shockrah
3d8d8f93b9 lulw just setting up database schemas via diesel 2019-12-08 21:28:31 -08:00
shockrahwow
69633203f6 Merge branch 'master' of gitlab.com:shockrah/freechat 2019-12-05 11:15:53 -08:00
shockrahwow
a4f9a82477 more tests for jjs and more robust macro 2019-12-05 11:15:42 -08:00
shockrah
a765f8b9ff more diesel config - db url (localhost url) 2019-12-02 13:49:51 -08:00
shockrah
94ae9804b8 diesel config 2019-12-02 13:48:14 -08:00
shockrah
7dde72d3bc dev file which for now poses no quarrel in the repo 2019-12-02 13:47:58 -08:00
shockrah
6e5088354c removing fluff idea work 2019-12-02 13:47:36 -08:00
shockrah
a0ad1f9b47 more deps for diesel setup in a bit 2019-12-02 13:47:13 -08:00
shockrahwow
2bb9771cd3 Merge branch 'master' of gitlab.com:shockrah/freechat 2019-12-01 22:13:37 -08:00
shockrahwow
ba0673540d boilerplate for database functionality 2019-12-01 22:10:34 -08:00
shockrah
ebc7bf41b8 adding disel to package list 2019-12-01 22:07:31 -08:00
shockrah
cfb113b852 ignoring dev files for sql server 2019-12-01 21:53:07 -08:00
shockrahwow
91da2ac15f yea i know its silly but just roll with it for now i dun want to pay for server yet 2019-11-28 00:26:34 -08:00
shockrahwow
9206dab00e adding sql dependancy 2019-11-28 00:22:34 -08:00
shockrahwow
5a3899ffe2 all webroutes passing tests(yay!) 2019-11-27 23:46:06 -08:00
shockrahwow
ba166cf281 tests are more specific at this point yes i think so 2019-11-27 23:43:55 -08:00
shockrahwow
b6eaada2bf favicon now usesour own 2019-11-27 23:41:28 -08:00
shockrahwow
4a1be90cdf better test coverage for static resources 2019-11-27 23:41:16 -08:00
shockrahwow
f4ec6102c3 favicon 2019-11-27 23:40:47 -08:00
shockrahwow
9bdeedb3d8 added routes for js and random media
removed login logic from website as the app is needed for that
2019-11-27 23:13:07 -08:00
shockrahwow
1706efc619 adding some todos for the server
* in no particular order
2019-11-27 22:46:18 -08:00
shockrahwow
a5f78421c3 changed sass to be more 'dark" but still /comfy/ 2019-11-27 22:42:04 -08:00
shockrahwow
3f25ca913c general theming sass 2019-11-27 22:41:47 -08:00
shockrahwow
2252525244 our stylesheets can now override library defaults 2019-11-27 22:39:26 -08:00
shockrahwow
043e8547a9 live reloading added to backends website sass 2019-11-27 22:39:08 -08:00
shockrahwow
4e6712584e switched to using templates for header/navbar/footer 2019-11-27 22:15:22 -08:00
shockrahwow
8b6d461c2e adding set var 'stylesheet' to header
giving us more flexibility in our header
2019-11-27 22:13:43 -08:00
shockrahwow
a0f29e9ce0 navbar template 2019-11-27 22:10:21 -08:00
shockrahwow
8db16707ed removed height restriction on content 2019-11-27 21:50:31 -08:00
shockrahwow
db439f1c1a sample content w/ no proof reading lulw 2019-11-27 21:50:01 -08:00
shockrahwow
a1c81ef121 removed fluff from css and made framework look prettier
still need actual content tho
2019-11-27 21:37:36 -08:00
shockrahwow
080f76f15d basically just copied frontends sass build script 2019-11-27 21:37:14 -08:00
shockrahwow
780e8b26bb fixed typo and adding about page route in server 2019-11-27 21:28:04 -08:00
shockrahwow
38b7b7e26c about framework but still needs actual content 2019-11-27 21:27:48 -08:00