Merge pull request #3185 from pixelfed/staging

Staging
This commit is contained in:
daniel 2022-01-24 23:27:28 -07:00 committed by GitHub
commit daeccef756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 33 additions and 6 deletions

View file

@ -9,12 +9,15 @@
- Added Hovercards ([16ced7b4](https://github.com/pixelfed/pixelfed/commit/16ced7b4)) - Added Hovercards ([16ced7b4](https://github.com/pixelfed/pixelfed/commit/16ced7b4))
- Fix word-break on statuses ([16ced7b4](https://github.com/pixelfed/pixelfed/commit/16ced7b4)) - Fix word-break on statuses ([16ced7b4](https://github.com/pixelfed/pixelfed/commit/16ced7b4))
- Add pronouns to hovercards ([33f863e8](https://github.com/pixelfed/pixelfed/commit/33f863e8)) - Add pronouns to hovercards ([33f863e8](https://github.com/pixelfed/pixelfed/commit/33f863e8))
- Improved onboarding ([042c5b6c](https://github.com/pixelfed/pixelfed/commit/042c5b6c))
### Updated ### Updated
- Updated MediaStorageService, fix remote avatar bug. ([1c20d696](https://github.com/pixelfed/pixelfed/commit/1c20d696)) - Updated MediaStorageService, fix remote avatar bug. ([1c20d696](https://github.com/pixelfed/pixelfed/commit/1c20d696))
- Updated WebfingerService. Fixes #3167. ([aff74566](https://github.com/pixelfed/pixelfed/commit/aff74566)) - Updated WebfingerService. Fixes #3167. ([aff74566](https://github.com/pixelfed/pixelfed/commit/aff74566))
- Updated ComposeModal, add max file size and allowed mime types. Fixes #3162. ([879281cc](https://github.com/pixelfed/pixelfed/commit/879281cc)) - Updated ComposeModal, add max file size and allowed mime types. Fixes #3162. ([879281cc](https://github.com/pixelfed/pixelfed/commit/879281cc))
- Updated profile embeds, fix NaN bug and improve performance. ([3bd211d7](https://github.com/pixelfed/pixelfed/commit/3bd211d7)) - Updated profile embeds, fix NaN bug and improve performance. ([3bd211d7](https://github.com/pixelfed/pixelfed/commit/3bd211d7))
- Updated ApiV1Controller, improve follow count cache invalidation. ([4b6effb9](https://github.com/pixelfed/pixelfed/commit/4b6effb9))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2) ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

View file

@ -662,6 +662,8 @@ class ApiV1Controller extends Controller
Cache::forget('profile:follower_count:'.$user->profile_id); Cache::forget('profile:follower_count:'.$user->profile_id);
Cache::forget('profile:following_count:'.$target->id); Cache::forget('profile:following_count:'.$target->id);
Cache::forget('profile:following_count:'.$user->profile_id); Cache::forget('profile:following_count:'.$user->profile_id);
AccountService::del($user->profile_id);
AccountService::del($target->id);
$res = RelationshipService::get($user->profile_id, $target->id); $res = RelationshipService::get($user->profile_id, $target->id);
@ -685,7 +687,6 @@ class ApiV1Controller extends Controller
->whereNull('status') ->whereNull('status')
->findOrFail($id); ->findOrFail($id);
$private = (bool) $target->is_private; $private = (bool) $target->is_private;
$remote = (bool) $target->domain; $remote = (bool) $target->domain;
@ -705,6 +706,8 @@ class ApiV1Controller extends Controller
abort(400, 'You can only follow or unfollow ' . Follower::FOLLOW_PER_HOUR . ' users per hour'); abort(400, 'You can only follow or unfollow ' . Follower::FOLLOW_PER_HOUR . ' users per hour');
} }
$user->profile->decrement('following_count');
FollowRequest::whereFollowerId($user->profile_id) FollowRequest::whereFollowerId($user->profile_id)
->whereFollowingId($target->id) ->whereFollowingId($target->id)
->delete(); ->delete();
@ -725,6 +728,12 @@ class ApiV1Controller extends Controller
Cache::forget('api:local:exp:rec:'.$user->profile_id); Cache::forget('api:local:exp:rec:'.$user->profile_id);
Cache::forget('user:account:id:'.$target->user_id); Cache::forget('user:account:id:'.$target->user_id);
Cache::forget('user:account:id:'.$user->id); Cache::forget('user:account:id:'.$user->id);
Cache::forget('profile:follower_count:'.$target->id);
Cache::forget('profile:follower_count:'.$user->profile_id);
Cache::forget('profile:following_count:'.$target->id);
Cache::forget('profile:following_count:'.$user->profile_id);
AccountService::del($user->profile_id);
AccountService::del($target->id);
$res = RelationshipService::get($user->profile_id, $target->id); $res = RelationshipService::get($user->profile_id, $target->id);

View file

@ -27,7 +27,7 @@ class LoginController extends Controller
* *
* @var string * @var string
*/ */
protected $redirectTo = '/'; protected $redirectTo = '/i/web';
protected $maxAttempts = 5; protected $maxAttempts = 5;
protected $decayMinutes = 60; protected $decayMinutes = 60;

View file

@ -32,7 +32,7 @@ class RegisterController extends Controller
* *
* @var string * @var string
*/ */
protected $redirectTo = '/'; protected $redirectTo = '/i/web';
/** /**
* Create a new controller instance. * Create a new controller instance.

Binary file not shown.

BIN
public/js/spa.js vendored

Binary file not shown.

BIN
public/js/timeline.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -77,7 +77,8 @@
"groupPost": "group post", "groupPost": "group post",
"modlog": "modlog", "modlog": "modlog",
"post": "post", "post": "post",
"story": "story" "story": "story",
"noneFound": "No notifications found"
}, },
"post": { "post": {
"shareToFollowers": "Share to followers", "shareToFollowers": "Share to followers",
@ -146,7 +147,13 @@
"add": "Add Story" "add": "Add Story"
}, },
"timeline": { "timeline": {
"peopleYouMayKnow": "People you may know" "peopleYouMayKnow": "People you may know",
"onboarding": {
"welcome": "Welcome",
"thisIsYourHomeFeed": "This is your home feed, a chronological feed of posts from accounts you follow.",
"letUsHelpYouFind": "Let us help you find some interesting people to follow",
"refreshFeed": "Refresh my feed"
}
}, },
"hashtags": { "hashtags": {
"emptyFeed": "We can't seem to find any posts for this hashtag" "emptyFeed": "We can't seem to find any posts for this hashtag"

View file

@ -101,6 +101,7 @@ return [
'modlog' => 'modlog', 'modlog' => 'modlog',
'post' => 'post', 'post' => 'post',
'story' => 'story', 'story' => 'story',
'noneFound' => 'No notifications found',
], ],
'post' => [ 'post' => [
@ -180,7 +181,14 @@ return [
], ],
'timeline' => [ 'timeline' => [
'peopleYouMayKnow' => 'People you may know' 'peopleYouMayKnow' => 'People you may know',
'onboarding' => [
'welcome' => 'Welcome',
'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
'refreshFeed' => 'Refresh my feed',
],
], ],
'hashtags' => [ 'hashtags' => [