UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-26 00:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2900 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-09-04 02:00:02 -06:00 committed by GitHub
commit 78a277d125
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -104,6 +104,7 @@
- Updated snowflake id generation to improve randomness. ([e5aea490](https://github.com/pixelfed/pixelfed/commit/e5aea490)) - Updated snowflake id generation to improve randomness. ([e5aea490](https://github.com/pixelfed/pixelfed/commit/e5aea490))
- Updated Timeline, remove recent posts. ([7641b731](https://github.com/pixelfed/pixelfed/commit/7641b731)) - Updated Timeline, remove recent posts. ([7641b731](https://github.com/pixelfed/pixelfed/commit/7641b731))
- Updated InstanceCrawlPipeline, remove unused variable. ([e73cf531](https://github.com/pixelfed/pixelfed/commit/e73cf531)) - Updated InstanceCrawlPipeline, remove unused variable. ([e73cf531](https://github.com/pixelfed/pixelfed/commit/e73cf531))
- Updated StoryComposeController, fix expiry bug. ([7dee8f58](https://github.com/pixelfed/pixelfed/commit/7dee8f58))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0) ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

2
app/Console/Commands/StoryGC.php
View file

@ -51,7 +51,7 @@ class StoryGC extends Command
protected function archiveExpiredStories() protected function archiveExpiredStories()
{ {
$stories = Story::whereActive(true) $stories = Story::whereActive(true)
->where('expires_at', '<', now()) ->where('created_at', '<', now()->subHours(24))
->get(); ->get();
foreach($stories as $story) { foreach($stories as $story) {

2
app/Http/Controllers/StoryComposeController.php
View file

@ -68,6 +68,7 @@ class StoryComposeController extends Controller
$story->local = true; $story->local = true;
$story->size = $photo->getSize(); $story->size = $photo->getSize();
$story->bearcap_token = str_random(64); $story->bearcap_token = str_random(64);
$story->expires_at = now()->addMinutes(1440);
$story->save(); $story->save();
$url = $story->path; $url = $story->path;
@ -179,7 +180,6 @@ class StoryComposeController extends Controller
->findOrFail($id); ->findOrFail($id);
$story->active = true; $story->active = true;
$story->expires_at = now()->addMinutes(1440);
$story->duration = $request->input('duration', 10); $story->duration = $request->input('duration', 10);
$story->can_reply = $request->input('can_reply'); $story->can_reply = $request->input('can_reply');
$story->can_react = $request->input('can_react'); $story->can_react = $request->input('can_react');