UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #851 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-15 13:59:13 -07:00 committed by GitHub
commit ecebb05db7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/CommentController.php
View file

@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Auth; use Auth;
use Cache;
use App\Comment; use App\Comment;
use App\Jobs\CommentPipeline\CommentPipeline; use App\Jobs\CommentPipeline\CommentPipeline;
@ -50,6 +51,8 @@ class CommentController extends Controller
$profile = $user->profile; $profile = $user->profile;
$status = Status::findOrFail($statusId); $status = Status::findOrFail($statusId);
Cache::forget('transform:status:'.$status->url());
$reply = new Status(); $reply = new Status();
$reply->profile_id = $profile->id; $reply->profile_id = $profile->id;
$reply->caption = e($comment); $reply->caption = e($comment);

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

@ -26,6 +26,8 @@ class LikeController extends Controller
$profile = Auth::user()->profile; $profile = Auth::user()->profile;
$status = Status::withCount('likes')->findOrFail($request->input('item')); $status = Status::withCount('likes')->findOrFail($request->input('item'));
Cache::forget('transform:status:'.$status->url());
$count = $status->likes_count; $count = $status->likes_count;
if ($status->likes()->whereProfileId($profile->id)->count() !== 0) { if ($status->likes()->whereProfileId($profile->id)->count() !== 0) {

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

@ -218,6 +218,8 @@ class StatusController extends Controller
$profile = Auth::user()->profile; $profile = Auth::user()->profile;
$status = Status::withCount('shares')->findOrFail($request->input('item')); $status = Status::withCount('shares')->findOrFail($request->input('item'));
Cache::forget('transform:status:'.$status->url());
$count = $status->shares_count; $count = $status->shares_count;
$exists = Status::whereProfileId(Auth::user()->profile->id) $exists = Status::whereProfileId(Auth::user()->profile->id)

55
app/Transformer/Api/StatusTransformer.php
View file

@ -4,6 +4,7 @@ namespace App\Transformer\Api;
use App\Status; use App\Status;
use League\Fractal; use League\Fractal;
use Cache;
class StatusTransformer extends Fractal\TransformerAbstract class StatusTransformer extends Fractal\TransformerAbstract
{ {
@ -16,33 +17,35 @@ class StatusTransformer extends Fractal\TransformerAbstract
public function transform(Status $status) public function transform(Status $status)
{ {
return [ return Cache::remember('transform:status:'. $status->url(), 60, function() use($status) {
'id' => (string) $status->id, return [
'uri' => $status->url(), 'id' => (string) $status->id,
'url' => $status->url(), 'uri' => $status->url(),
'in_reply_to_id' => $status->in_reply_to_id, 'url' => $status->url(),
'in_reply_to_account_id' => $status->in_reply_to_profile_id, 'in_reply_to_id' => $status->in_reply_to_id,
'reblog' => $status->reblog_of_id || $status->in_reply_to_id ? $this->transform($status->parent()) : null, 'in_reply_to_account_id' => $status->in_reply_to_profile_id,
'content' => $status->rendered ?? $status->caption, 'reblog' => $status->reblog_of_id || $status->in_reply_to_id ? $this->transform($status->parent()) : null,
'created_at' => $status->created_at->format('c'), 'content' => $status->rendered ?? $status->caption,
'emojis' => [], 'created_at' => $status->created_at->format('c'),
'reblogs_count' => $status->shares()->count(), 'emojis' => [],
'favourites_count' => $status->likes()->count(), 'reblogs_count' => $status->shares()->count(),
'reblogged' => $status->shared(), 'favourites_count' => $status->likes()->count(),
'favourited' => $status->liked(), 'reblogged' => $status->shared(),
'muted' => null, 'favourited' => $status->liked(),
'sensitive' => (bool) $status->is_nsfw, 'muted' => null,
'spoiler_text' => $status->cw_summary, 'sensitive' => (bool) $status->is_nsfw,
'visibility' => $status->visibility, 'spoiler_text' => $status->cw_summary,
'application' => [ 'visibility' => $status->visibility,
'name' => 'web', 'application' => [
'website' => null 'name' => 'web',
], 'website' => null
'language' => null, ],
'pinned' => null, 'language' => null,
'pinned' => null,
'pf_type' => $status->type ?? $status->setType(), 'pf_type' => $status->type ?? $status->setType(),
]; ];
});
} }
public function includeAccount(Status $status) public function includeAccount(Status $status)

2
contrib/docker/Dockerfile.fpm
View file

@ -32,7 +32,7 @@ COPY . /var/www/
WORKDIR /var/www/ WORKDIR /var/www/
RUN cp -r storage storage.skel \ RUN cp -r storage storage.skel \
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
&& composer install --prefer-source --no-interaction \ && composer install --prefer-dist --no-interaction \
&& rm -rf html && ln -s public html && rm -rf html && ln -s public html
VOLUME ["/var/www/storage", "/var/www/public.ext"] VOLUME ["/var/www/storage", "/var/www/public.ext"]