UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4961 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-02-28 21:07:16 -07:00 committed by GitHub
commit e4f33e823d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 1763 additions and 1579 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

467
app/Http/Controllers/Admin/AdminReportController.php
View file

File diff suppressed because it is too large Load diff

63
resources/assets/components/admin/AdminReports.vue
View file

@ -427,6 +427,31 @@
</div>
</div>
<div v-else-if="viewingReport && viewingReport.object_type === 'App\\Story' && viewingReport.story" class="list-group mt-3">
<div v-if="viewingReport && viewingReport.story" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
<div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
<div>Reported Story</div>
<a class="font-weight-bold" :href="viewingReport.story.url" target="_blank">View</a>
</div>
<img
v-if="viewingReport.story.type === 'photo'"
:src="viewingReport.story.media_src"
height="140"
class="rounded"
style="object-fit: cover;"
onerror="this.src='/storage/no-preview.png';this.error=null;" />
<video
v-else-if="viewingReport.story.type === 'video'"
height="140"
controls
:src="viewingReport.story.media_src"
onerror="this.src='/storage/no-preview.png';this.onerror=null;"
></video>
</div>
</div>
<div v-if="viewingReport && viewingReport.admin_seen_at === null" class="mt-4">
<div v-if="viewingReport && viewingReport.object_type === 'App\\Profile'">
<button class="btn btn-dark btn-block rounded-pill" @click="handleAction('profile', 'ignore')">Ignore Report</button>
@ -454,7 +479,7 @@
</button>
</div>
<div v-if="viewingReport && viewingReport.object_type === 'App\\Status'">
<div v-else-if="viewingReport && viewingReport.object_type === 'App\\Status'">
<button class="btn btn-dark btn-block rounded-pill" @click="handleAction('post', 'ignore')">Ignore Report</button>
<hr v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin" class="mt-3 mb-1">
<div
@ -481,6 +506,24 @@
</div>
</div>
</div>
<div v-else-if="viewingReport && viewingReport.object_type === 'App\\Story'">
<button class="btn btn-dark btn-block rounded-pill" @click="handleAction('story', 'ignore')">Ignore Report</button>
<hr v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin" class="mt-3 mb-1">
<div v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin">
<div class="d-flex flex-row mt-2" style="gap:0.3rem;">
<button class="btn btn-danger btn-block rounded-pill mt-0" @click="handleAction('story', 'delete')">Delete Story</button>
<button class="btn btn-outline-danger btn-block rounded-pill mt-0" @click="handleAction('story', 'delete-all')">Delete All Stories</button>
</div>
</div>
<div v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin">
<hr class="my-2">
<div class="d-flex flex-row mt-2" style="gap:0.3rem;">
<button class="btn btn-outline-danger btn-sm btn-block rounded-pill mt-0" @click="handleAction('profile', 'delete')">Delete Account</button>
</div>
</div>
</div>
</div>
</template>
</b-modal>
@ -707,6 +750,9 @@
case 'App\\Status':
return `${report.type} Post`;
break;
case 'App\\Story':
return `${report.type} Story`;
break;
}
},
@ -766,6 +812,7 @@
}
this.loaded = false;
axios.post('/i/admin/api/reports/handle', {
id: this.viewingReport.id,
object_id: this.viewingReport.object_id,
@ -831,6 +878,20 @@
return 'Are you sure you want to delete this post?';
break;
}
} else if(type === 'story') {
switch(action) {
case 'ignore':
return 'Are you sure you want to ignore this story report?';
break;
case 'delete':
return 'Are you sure you want to delete this story?';
break;
case 'delete-all':
return 'Are you sure you want to delete all stories by this account?';
break;
}
}
},

16
resources/views/site/help/email-confirmation-issues.blade.php Normal file
View file

@ -0,0 +1,16 @@
@extends('site.help.partial.template', ['breadcrumb'=>'Email Confirmation Issues'])
@section('section')
<div class="title">
<h3 class="font-weight-bold">Email Confirmation Issues</h3>
</div>
<hr>
<p>If you have been redirected to this page, it may be due to one of the following reasons:</p>
<ul>
<li>The email confirmation link has already been used.</li>
<li>The email confirmation link may have expired, they are only valid for 24 hours.</li>
<li>You cannot confirm an email for another account while logged in to a different account. Try logging out, or use a different browser to open the email confirmation link.</li>
<li>The account the associated email belongs to may have been deleted, or the account may have changed the email address.</li>
</ul>
@endsection

2
routes/web.php
View file

@ -307,7 +307,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::view('instance-max-users-limit', 'site.help.instance-max-users')->name('help.instance-max-users-limit');
Route::view('import', 'site.help.import')->name('help.import');
Route::view('parental-controls', 'site.help.parental-controls');
// Route::view('email-confirmation-issues', 'site.help.email-confirmation-issues')->name('help.email-confirmation-issues');
Route::view('email-confirmation-issues', 'site.help.email-confirmation-issues')->name('help.email-confirmation-issues');
Route::view('curated-onboarding', 'site.help.curated-onboarding')->name('help.curated-onboarding');
});
Route::get('newsroom/{year}/{month}/{slug}', 'NewsroomController@show');