Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
issues: write
pull-requests: write
id-token: write
outputs:
version: ${{ steps.semantic-release.outputs.new_release_version }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -22,3 +24,37 @@ jobs:
id: semantic-release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-types:
runs-on: ubuntu-latest
needs: [release]
permissions:
contents: read
packages: write
steps:
- name: Check out repository
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.4'
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 22
registry-url: 'https://npm.pkg.github.com'
- name: Install PHP dependencies
run: composer install --prefer-dist --no-progress
- name: Generate TypeScript types
run: php artisan typescript:transform
- name: Set package version from release tag
working-directory: resources/types
run: |
TAG="${{ needs.release.outputs.version }}"
jq --arg tag "$TAG" '.version = $tag' package.json > package.tmp.json
mv package.tmp.json package.json
- name: Publish to GitHub Packages (types only)
working-directory: resources/types
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions app/Data/ApplicationSubmissionData.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Carbon\Carbon as CCarbon;
use Illuminate\Support\Collection;
use Spatie\LaravelData\Data;
use Spatie\LaravelData\Lazy;
use Spatie\TypeScriptTransformer\Attributes\LiteralTypeScriptType;
use Spatie\TypeScriptTransformer\Attributes\TypeScript;

Expand All @@ -32,6 +33,7 @@ public function __construct(
/** @var ?Collection<array-key, ApplicationQuestionAnswerData> */
#[LiteralTypeScriptType('ApplicationQuestionAnswerData[]')]
public readonly ?Collection $application_question_answers,
public readonly Lazy|ApplicationResponseData $application_response,
public readonly ?CCarbon $created_at,
public readonly ?CCarbon $updated_at,
public readonly ?MemberData $member,
Expand Down Expand Up @@ -60,6 +62,7 @@ public static function fromApplicationSubmission(ApplicationSubmission $applicat
$applicationSubmission->application_id,
$applicationSubmission->application ? ApplicationData::from($applicationSubmission->application) : null,
ApplicationQuestionAnswerData::collect($applicationSubmission->applicationQuestionAnswers),
Lazy::whenLoaded('applicationResponse', $applicationSubmission, fn () => ApplicationResponseData::from($applicationSubmission->applicationResponse)),
$applicationSubmission->created_at,
$applicationSubmission->updated_at,
$member,
Expand Down
32 changes: 16 additions & 16 deletions app/Data/Requests/CreateApplicationRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ public function __construct(
public readonly string $confirmation_message,
public readonly string $completion_message,
public readonly ?string $activity_channel,
/** @var array<string> */
public readonly array $restricted_role_ids,
/** @var array<string> */
public readonly array $accepted_role_ids,
/** @var array<string> */
public readonly array $denied_role_ids,
/** @var array<string> */
public readonly array $ping_role_ids,
/** @var array<string> */
public readonly array $accept_removal_role_ids,
/** @var array<string> */
public readonly array $deny_removal_role_ids,
/** @var array<string> */
public readonly array $pending_role_ids,
/** @var array<string> */
public readonly array $required_role_ids,
/** @var ?array<string> */
public readonly ?array $restricted_role_ids,
/** @var ?array<string> */
public readonly ?array $accepted_role_ids,
/** @var ?array<string> */
public readonly ?array $denied_role_ids,
/** @var ?array<string> */
public readonly ?array $ping_role_ids,
/** @var ?array<string> */
public readonly ?array $accept_removal_role_ids,
/** @var ?array<string> */
public readonly ?array $deny_removal_role_ids,
/** @var ?array<string> */
public readonly ?array $pending_role_ids,
/** @var ?array<string> */
public readonly ?array $required_role_ids,
#[Max(20)]
public readonly ?string $embed_channel_id,
#[Max(100)]
Expand Down
8 changes: 6 additions & 2 deletions app/Http/Controllers/TicketConfigController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ public function __construct(

/**
* Display a listing of the resource.
*
* @return TicketConfigData|array{data:null}
*/
public function index(ReadTicketConfigRequest $request): TicketConfigData
public function index(ReadTicketConfigRequest $request): TicketConfigData|array
{
$guild_id = config('services.discord.server_id');

if (request()->user()?->hasRole('Bot')) {
$guild_id = request()->input('filter[guild_id]', $guild_id);
}

return TicketConfigData::from(TicketConfig::where('guild_id', $guild_id)->first())->wrap('data');
$ticketConfig = TicketConfig::where('guild_id', $guild_id)->first();

return $ticketConfig ? TicketConfigData::from($ticketConfig)->wrap('data') : ['data' => null];
}

/**
Expand Down