mirror
/
pixelfed
kopia lustrzana https://github.com/pixelfed/pixelfed
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

Frontend ui refactor
pull/676/head
daniel 2018-12-24 23:36:13 -07:00 zatwierdzone przez GitHub
rodzic ddfc868bb7 a6d48dc19f
commit 2b160f1765
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 19 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

38
app/Util/ActivityPub/Inbox.php
Wyświetl plik

@ -205,15 +205,15 @@ class Inbox
return; return;
} }
// send notification // send notification
$notification = new Notification(); Notification::firstOrCreate([
$notification->profile_id = $target->id; 'profile_id' => $target->id,
$notification->actor_id = $actor->id; 'actor_id' => $actor->id,
$notification->action = 'follow'; 'action' => 'follow',
$notification->message = $follower->toText(); 'message' => $follower->toText(),
$notification->rendered = $follower->toHtml(); 'rendered' => $follower->toHtml(),
$notification->item_id = $target->id; 'item_id' => $target->id,
$notification->item_type = "App\Profile"; 'item_type' => 'App\Profile'
$notification->save(); ]);
// send Accept to remote profile // send Accept to remote profile
$accept = [ $accept = [
@ -251,17 +251,15 @@ class Inbox
'in_reply_to_id' => $parent->id, 'in_reply_to_id' => $parent->id,
'type' => 'reply' 'type' => 'reply'
]); ]);
if($status->wasRecentlyCreated) { Notification::firstOrCreate([
$notification = new Notification(); 'profile_id' => $parent->profile->id,
$notification->profile_id = $parent->profile->id; 'actor_id' => $actor->id,
$notification->actor_id = $actor->id; 'action' => 'share',
$notification->action = 'comment'; 'message' => $status->replyToText(),
$notification->message = $status->toText(); 'rendered' => $status->replyToHtml(),
$notification->rendered = $status->toHtml(); 'item_id' => $parent->id,
$notification->item_id = $parent->id; 'item_type' => 'App\Status'
$notification->item_type = "App\Status"; ]);
$notification->save();
}
} }
public function handleAcceptActivity() public function handleAcceptActivity()

2
config/pixelfed.php
Wyświetl plik

@ -23,7 +23,7 @@ return [
| This value is the version of your PixelFed instance. | This value is the version of your PixelFed instance.
| |
*/ */
'version' => '0.7.1', 'version' => '0.7.2',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------