UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-30 02:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2768 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-05-24 19:42:35 -06:00 committed by GitHub
commit d8a169870e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 637 additions and 525 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Controllers/StatusController.php
View file

@ -403,20 +403,28 @@ class StatusController extends Controller
public function storeView(Request $request) public function storeView(Request $request)
{ {
abort_if(!$request->user(), 403); abort_if(!$request->user(), 403);
$this->validate($request, [ $this->validate($request, [
'status_id' => 'required|integer|exists:statuses,id', '_v' => 'required|array'
'profile_id' => 'required|integer|exists:profiles,id'
]); ]);
$sid = (int) $request->input('status_id'); $views = $request->input('_v');
$pid = (int) $request->input('profile_id'); $uid = $request->user()->profile_id;
if(empty($views)) {
return;
}
foreach($views as $view) {
if(!isset($view['sid']) || !isset($view['pid'])) {
continue;
}
StatusView::firstOrCreate([ StatusView::firstOrCreate([
'status_id' => $sid, 'status_id' => $view['sid'],
'status_profile_id' => $pid, 'status_profile_id' => $view['pid'],
'profile_id' => $request->user()->profile_id 'profile_id' => $uid
]); ]);
}
return response()->json(1); return response()->json(1);
} }

1124
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

10
resources/assets/js/components/Timeline.vue
View file

@ -1076,13 +1076,14 @@
if (res.data.length && this.loading == false) { if (res.data.length && this.loading == false) {
let data = res.data; let data = res.data;
let self = this; let self = this;
let vids = [];
data.forEach((d, index) => { data.forEach((d, index) => {
if(self.ids.indexOf(d.id) == -1) { if(self.ids.indexOf(d.id) == -1) {
self.feed.push(d); self.feed.push(d);
self.ids.push(d.id); self.ids.push(d.id);
axios.post('/api/status/view', { vids.push({
'status_id': d.id, sid: d.id,
'profile_id': d.account.id pid: d.account.id
}); });
} }
}); });
@ -1091,6 +1092,9 @@
this.page += 1; this.page += 1;
$state.loaded(); $state.loaded();
this.loading = false; this.loading = false;
axios.post('/api/status/view', {
'_v': vids,
});
} else { } else {
$state.complete(); $state.complete();
} }