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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-12-24 23:36:13 -07:00 committed by GitHub
commit 2b160f1765
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
config/pixelfed.php
View file

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