PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 04:58:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Notification API correctly handles invalid resources

Browse source
This commit is contained in:
Josef Citrine 2016-08-28 01:01:37 +01:00
parent 5311577aa2
commit d0b356be2c
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/Web/NotificationsController.php
View file

@ -42,7 +42,9 @@ class NotificationsController extends ApiControllerBase
->take(20) ->take(20)
->get(); ->get();
return ['notifications' => $notifications->toArray()]; $outputArray = $notifications->toArray();
return ['notifications' => array_values(array_filter($outputArray))];
} }
/** /**

4
app/Models/Activity.php
View file

@ -151,9 +151,6 @@ class Activity extends Model {
public function getThumbnailUrlAttribute() public function getThumbnailUrlAttribute()
{ {
if (is_null($this->resource))
return "/images/icons/profile_small.png";
switch ($this->resource_type) { switch ($this->resource_type) {
case User::class: case User::class:
return $this->resource->getAvatarUrl(Image::THUMBNAIL); return $this->resource->getAvatarUrl(Image::THUMBNAIL);
@ -172,6 +169,7 @@ class Activity extends Model {
} }
public function getTitleFromActivityType() { public function getTitleFromActivityType() {
switch($this->activity_type) { switch($this->activity_type) {
case static::TYPE_PUBLISHED_TRACK: case static::TYPE_PUBLISHED_TRACK:
return "Pony.fm - New track"; return "Pony.fm - New track";

4
app/Models/Notification.php
View file

@ -76,6 +76,10 @@ class Notification extends Model {
} }
public function toArray() { public function toArray() {
if (is_null($this->activity->resource)) {
return '';
}
return [ return [
'id' => $this->id, 'id' => $this->id,
'date' => $this->activity->created_at->toAtomString(), 'date' => $this->activity->created_at->toAtomString(),