fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-03-01 22:29:15 -07:00 committed by GitHub
parent 5bbd3d803b e6b4e7670d
commit c2d7fa3c6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Jobs/StatusPipeline/StatusEntityLexer.php
View file

@ -95,7 +95,11 @@ class StatusEntityLexer implements ShouldQueue
['name' => $tag, 'slug' => $slug]
);
StatusHashtag::firstOrCreate(
['status_id' => $status->id, 'hashtag_id' => $hashtag->id]
[
'status_id' => $status->id,
'hashtag_id' => $hashtag->id,
'profile_id' => $status->profile_id
]
);
});
}

11
app/StatusHashtag.php
View file

@ -6,7 +6,11 @@ use Illuminate\Database\Eloquent\Model;
class StatusHashtag extends Model
{
public $fillable = ['status_id', 'hashtag_id'];
public $fillable = [
'status_id',
'hashtag_id',
'profile_id'
];
public function status()
{
@ -17,4 +21,9 @@ class StatusHashtag extends Model
{
return $this->belongsTo(Hashtag::class);
}
public function profile()
{
return $this->belongsTo(Profile::class);
}
}