UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-03 19:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-06-27 00:47:29 -06:00 committed by GitHub
commit 0ea7328d85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,11 @@ class StatusController extends Controller
return view($template, compact('user', 'status')); return view($template, compact('user', 'status'));
} }
public function showEmbed(Request $request, $username, int $id)
{
return;
}
public function showObject(Request $request, $username, int $id) public function showObject(Request $request, $username, int $id)
{ {
$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail(); $user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();

2
app/Util/ActivityPub/Helpers.php
View file

@ -420,7 +420,7 @@ class Helpers {
$profile = Profile::whereRemoteUrl($res['id'])->first(); $profile = Profile::whereRemoteUrl($res['id'])->first();
if(!$profile) { if(!$profile) {
$profile = new Profile; $profile = new Profile();
$profile->domain = $domain; $profile->domain = $domain;
$profile->username = (string) Purify::clean($remoteUsername); $profile->username = (string) Purify::clean($remoteUsername);
$profile->name = Purify::clean($res['name']) ?? 'user'; $profile->name = Purify::clean($res['name']) ?? 'user';

2
app/Util/ActivityPub/Inbox.php
View file

@ -274,8 +274,10 @@ class Inbox
if(is_string($obj) && Helpers::validateUrl($obj)) { if(is_string($obj) && Helpers::validateUrl($obj)) {
// actor object detected // actor object detected
// todo delete actor // todo delete actor
return;
} else if (Helpers::validateUrl($obj['id']) && Helpers::validateObject($obj) && $obj['type'] == 'Tombstone') { } else if (Helpers::validateUrl($obj['id']) && Helpers::validateObject($obj) && $obj['type'] == 'Tombstone') {
// todo delete status or object // todo delete status or object
return;
} }
} }

2
app/Util/Lexer/Autolink.php
View file

@ -718,7 +718,7 @@ class Autolink extends Regex
// Replace the username // Replace the username
$linkText = Str::startsWith($screen_name, '@') ? $screen_name : '@'.$screen_name; $linkText = Str::startsWith($screen_name, '@') ? $screen_name : '@'.$screen_name;
$class = $this->class_user; $class = $this->class_user;
$url = $this->url_base_user.$screen_name;; $url = $this->url_base_user . $screen_name;
} }
if (!empty($class)) { if (!empty($class)) {
$attributes['class'] = $class; $attributes['class'] = $class;