Merge pull request #925 from pixelfed/frontend-ui-refactor
Frontend ui refactor
This commit is contained in:
commit
c2d7fa3c6a
|
@ -95,7 +95,11 @@ class StatusEntityLexer implements ShouldQueue
|
||||||
['name' => $tag, 'slug' => $slug]
|
['name' => $tag, 'slug' => $slug]
|
||||||
);
|
);
|
||||||
StatusHashtag::firstOrCreate(
|
StatusHashtag::firstOrCreate(
|
||||||
['status_id' => $status->id, 'hashtag_id' => $hashtag->id]
|
[
|
||||||
|
'status_id' => $status->id,
|
||||||
|
'hashtag_id' => $hashtag->id,
|
||||||
|
'profile_id' => $status->profile_id
|
||||||
|
]
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,11 @@ use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class StatusHashtag extends Model
|
class StatusHashtag extends Model
|
||||||
{
|
{
|
||||||
public $fillable = ['status_id', 'hashtag_id'];
|
public $fillable = [
|
||||||
|
'status_id',
|
||||||
|
'hashtag_id',
|
||||||
|
'profile_id'
|
||||||
|
];
|
||||||
|
|
||||||
public function status()
|
public function status()
|
||||||
{
|
{
|
||||||
|
@ -17,4 +21,9 @@ class StatusHashtag extends Model
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Hashtag::class);
|
return $this->belongsTo(Hashtag::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function profile()
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Profile::class);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue