Преглед на файлове

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

Frontend ui refactor
daniel преди 6 години
родител
ревизия
0ea7328d85
променени са 4 файла, в които са добавени 9 реда и са изтрити 2 реда
  1. 5 0
      app/Http/Controllers/StatusController.php
  2. 1 1
      app/Util/ActivityPub/Helpers.php
  3. 2 0
      app/Util/ActivityPub/Inbox.php
  4. 1 1
      app/Util/Lexer/Autolink.php

+ 5 - 0
app/Http/Controllers/StatusController.php

@@ -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();

+ 1 - 1
app/Util/ActivityPub/Helpers.php

@@ -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 - 0
app/Util/ActivityPub/Inbox.php

@@ -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;
         }
         }
     }
     }
 
 

+ 1 - 1
app/Util/Lexer/Autolink.php

@@ -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;