mirrors/Plume
1
0
Fork 0
mirror of https://git.joinplu.me/Plume/Plume.git synced 2024-11-25 04:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
1129 commits 23 branches 8 tags 19 MiB
Commit graph

1129 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeb Rosen
4f904b7ac7 Work around a difficult lifetime interaction between closures and async blocks. 2020-05-25 12:11:14 -07:00
Jeb Rosen
e322d9509a Change '&' to '&mut'. 
Key changes:
* `find plume-models -name '*.rs' -exec sed -i -e 's/&PlumeRocket/\&mut PlumeRocket/' '{}' \;`
* Remove `let conn = &*rockets.conn;` lines
* Change `conn` to `&mut *rockets.conn` where `conn` was used
 2020-05-25 12:07:37 -07:00
Mina Galić
b596e77f03
remove redundant use statements 2020-05-25 20:00:57 +02:00
Mina Galić
41f97b01f0
unroll filter_map() to easier .await 2020-05-25 20:00:28 +02:00
Mina Galić
a508a4150c
remove redundant use statements 2020-05-25 19:18:24 +02:00
Mina Galić
25c40adf20
yet another dubious clippy warnings fix re returns 2020-05-25 19:17:32 +02:00
Mina Galić
7490567a21
fix warnings about unused doc comments 
we do this by making the macro parse and generate doc comments
 2020-05-25 15:44:32 +02:00
Mina Galić
492bbb1ba6
make clippy happy with a weird quirk wrt return 
not happy about this lint or rust behaviour where the return statement
must not have a `;`
 2020-05-25 15:23:55 +02:00
Mina Galić
cf3708e1c6
make clippy happy by removing unused imports 2020-05-25 13:40:35 +02:00
Mina Galić
df442002c2
replace .map().map_err() with a match 
so we can .await without worries.
plus, it changes nothing about the code, other than making the intent
clearer at first sight.
 2020-05-24 22:16:42 +02:00
Mina Galić
07036b5fad
upgrade validator: it now uses types! in macros!! 2020-05-24 22:03:26 +02:00
Mina Galić
0726375859
add another async (and correctly convert followers_count) 2020-05-24 21:03:59 +02:00
Mina Galić
cb1c260692
remove an experiment of disabling Send… it makes no sense 2020-05-24 21:03:02 +02:00
Mina Galić
de6bfca084
removed a few unused imports 2020-05-24 21:01:16 +02:00
Mina Galić
7aabb9661e
upgrade webfinger everywhere, and implement async 2020-05-24 20:27:39 +02:00
Mina Galić
18bb413011
add async/.await until all our errors are the same: 
that our Connection is not Send-safe.
 2020-05-24 19:40:02 +02:00
Mina Galić
d2881ee3f7
add async/.await until all our errors are the same: that our Connection is not Send-safe. 2020-05-23 23:32:10 +02:00
Mina Galić
850b3c1337
add async/.await until all our errors are the same: 
that our Connection is not Send-safe.
once we get there, we can start thinking about restructing the way we
pass along our connection, or consider using #[database].
 2020-05-22 21:41:33 +02:00
Igor Galić
44ebce516c
fix some, break some compiling by adding async/await in front of it 
i forgot that we can't `Send` diesel connections over threads, so this
is going to require some rethinking.
 2020-05-16 12:06:58 +02:00
Igor Galić
3c830ab0ce
move towards using #[rocket::async_trait] 
this also upgrades some dependencies
some of that fixes stuff, others breaks stuff.
 2020-05-15 22:38:21 +02:00
Igor Galić
097d0ea9ce
make plume-models async (again) 2020-05-06 22:33:10 +02:00
Igor Galić
6fe16c9f84
upgrade and use futures… then block_on .await in a trait? 2020-05-06 22:32:59 +02:00
Igor Galić
43cb9f700c
update webfinger 
as requested in https://github.com/Plume-org/webfinger/issues/8
and provided in https://github.com/Plume-org/webfinger/pull/9

```
meena@76ix ~/s/a/plume (go/async) [101]> cargo update --package webfinger
    Updating crates.io index
    Updating git repository `https://github.com/Plume-org/webfinger`
    Removing bytes v0.4.12
    Removing cookie v0.12.0
    Removing cookie_store v0.7.0
    Removing crossbeam-deque v0.7.2
    Removing crossbeam-epoch v0.8.0
    Removing crossbeam-queue v0.1.2
    Removing crossbeam-utils v0.7.0
    Removing h2 v0.1.26
    Removing http v0.1.21
    Removing http-body v0.1.0
    Removing hyper v0.12.35
    Removing hyper-tls v0.3.2
    Removing publicsuffix v1.5.4
    Removing reqwest v0.9.24
    Removing serde_urlencoded v0.5.5
    Removing string v0.2.1
    Removing tokio v0.1.22
    Removing tokio-buf v0.1.1
    Removing tokio-current-thread v0.1.6
    Removing tokio-executor v0.1.9
    Removing tokio-io v0.1.12
    Removing tokio-reactor v0.1.11
    Removing tokio-sync v0.1.7
    Removing tokio-tcp v0.1.3
    Removing tokio-threadpool v0.1.17
    Removing tokio-timer v0.2.12
    Removing try_from v0.3.2
    Removing want v0.2.0
      Adding webfinger v0.5.0 (https://github.com/Plume-org/webfinger?rev=update-deps#cdaab95e)
    Removing webfinger v0.5.0
meena@76ix ~/s/a/plume (go/async)>
```
 2020-05-06 22:30:33 +02:00
Igor Galić
2c285b9aca
start async-ifying routes 
template utils and error routes
 2020-05-06 22:29:36 +02:00
Igor Galić
e4bb73d22e
cargo clippy 2020-05-06 22:29:36 +02:00
Igor Galić
e9c7259ffb
cargo fmt 2020-05-06 22:29:35 +02:00
Igor Galić
be8c67ee9a
move reqwest client out of thread spawning 
this way, we only spawn one, and reuse that.
 2020-05-06 22:29:34 +02:00
Igor Galić
65b2c38c29
.await? result from read_to_string() 2020-05-06 22:29:33 +02:00
Jeb Rosen
8aa99cea35
move signature outside the spawning 
this allows us to actually move stuff into the async block
and we can drop the 'static life-time.
 2020-05-06 22:29:32 +02:00
Igor Galić
a010025074
asyncify reqwest calls (again?) 2020-05-06 22:29:32 +02:00
Igor Galić
82088596a8
asyncify from_activity calls (i.e.: block_on()) 2020-05-06 22:29:31 +02:00
Igor Galić
87ce3a7b51
asyncify plume-models: media upload is now async 
including the use of tokio!
 2020-05-06 22:29:27 +02:00
Igor Galić
3472a58299
move ClientBuilder into thread, since we cannot Copy it 2020-05-06 22:26:37 +02:00
Igor Galić
a3f165f9f4
Use blocking reqwest API in defer 
defer, or, trait functions such as it in general(?) cannot be async (yet)
 2020-05-06 22:26:32 +02:00
Igor Galić
25c5da1a7c
add tokio (0.2) as dependency to further async-ify our FromData code 
i'm using this opportunity to also update reqwest (0.10), but it's
turning out to be a little trickier, as it requires more modern async
setup, and that appears to need a lot of thinking…
 2020-05-06 22:23:35 +02:00
Igor Galić
022e037eea
when using macros!() we need to import the things that they use 2020-05-06 22:20:49 +02:00
Igor Galić
45c335e17b
"manually" create ETag and Cache-Control headers 2020-05-06 22:20:48 +02:00
Igor Galić
b51551973a
start fixing tests in plume-models 2020-05-06 22:20:47 +02:00
Igor Galić
59e5c49aa8
convert plume-models to all async 
where sensible! note that State has no asynchronous work to do, so
wrapping it up in async makes no sense.
 2020-05-06 22:20:47 +02:00
Igor Galić
ce119ffe50
start making PlumeRocket async 2020-05-06 22:20:46 +02:00
Igor Galić
944f8c42fa
plume-models: convert api-tokens. use DbConn::from_request() directly 
there doesn't seem to be a request.guard_async (yet?)
 2020-05-06 22:17:25 +02:00
Igor Galić
909f677bdd
plume-models: convert admin & api-tokens to async 
n.b.: I do *not* like the error handling in api_tokens 😒️
 2020-05-06 22:17:24 +02:00
Igor Galić
fd9764ff17
plume-common: also make requests async 2020-05-06 22:17:24 +02:00
Igor Galić
75722abc9e
rocket does not need decl_macro anymore 2020-05-06 22:17:23 +02:00
Igor Galić
ec9b699c6e
convert plume-common to rocket async 
it only took 3 hours of @jebrosen's patient help.
 2020-05-06 22:17:22 +02:00
Igor Galić
bb5c2b69a7
update rocket* everywhere! 
and run cargo update
 2020-05-06 22:17:17 +02:00
Igor Galić
e52944e477
update rocket*; which gets us stuck in dependency conflicts 2020-05-06 21:01:25 +02:00
Igor Galić
928470610e
remove csrf for now, so we can update the rest 2020-05-06 21:01:18 +02:00
KITAITI Makoto
3be842c653
Make database connections configurable by environment variables (#768) 
* Make env DB_MAX_SIZE and DB_MIN_IDLE recognizable

* Make database max size and minimum idle configurable

* Restore file permission

* Fail fast
 2020-05-06 19:27:59 +02:00
KITAITI Makoto
dabe904642
Escape expressions in @Html (#767) 2020-05-05 23:48:29 +02:00