Compare commits
2 Commits
88218c7798
...
9937da6a7b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9937da6a7b | ||
|
|
c3ce549264 |
@@ -21,6 +21,7 @@ class AdminAnalyticsController extends Controller
|
||||
if ($token === '' || $provided === '' || ! hash_equals($token, $provided)) {
|
||||
return response()->json(['ok' => false, 'error' => 'unauthorized'], 401);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,9 +9,7 @@ use Illuminate\Http\Request;
|
||||
|
||||
class AdminSettingsController extends Controller
|
||||
{
|
||||
public function __construct(private readonly SettingsService $settings)
|
||||
{
|
||||
}
|
||||
public function __construct(private readonly SettingsService $settings) {}
|
||||
|
||||
private function authorizeAdmin(Request $request): ?JsonResponse
|
||||
{
|
||||
@@ -20,6 +18,7 @@ class AdminSettingsController extends Controller
|
||||
if ($token === '' || $provided === '' || ! hash_equals($token, $provided)) {
|
||||
return response()->json(['ok' => false, 'error' => 'unauthorized'], 401);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,8 +15,7 @@ class AdminSubscriptionController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
private function authorizeAdmin(Request $request): ?JsonResponse
|
||||
{
|
||||
@@ -25,6 +24,7 @@ class AdminSubscriptionController extends Controller
|
||||
if ($token === '' || $provided === '' || ! hash_equals($token, $provided)) {
|
||||
return response()->json(['ok' => false, 'error' => 'unauthorized'], 401);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -104,6 +104,7 @@ class AdminSubscriptionController extends Controller
|
||||
}
|
||||
$sub->update(['status' => 'revoked', 'expires_at' => $now]);
|
||||
$this->syncUserTier($sub->user_id);
|
||||
|
||||
return response()->json(['ok' => true, 'revoked' => true]);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,8 +12,7 @@ class AdminUserController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
private function authorizeAdmin(Request $request): ?JsonResponse
|
||||
{
|
||||
|
||||
@@ -10,9 +10,7 @@ use Illuminate\Http\Request;
|
||||
|
||||
class AdminWebhookController extends Controller
|
||||
{
|
||||
public function __construct(private readonly PaypalWebhookProcessor $processor)
|
||||
{
|
||||
}
|
||||
public function __construct(private readonly PaypalWebhookProcessor $processor) {}
|
||||
|
||||
private function authorizeAdmin(Request $request): ?JsonResponse
|
||||
{
|
||||
@@ -21,6 +19,7 @@ class AdminWebhookController extends Controller
|
||||
if ($token === '' || $provided === '' || ! hash_equals($token, $provided)) {
|
||||
return response()->json(['ok' => false, 'error' => 'unauthorized'], 401);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Services\Auth\ApiKeyService;
|
||||
use App\Services\System\SettingsService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -13,6 +13,7 @@ use RuntimeException;
|
||||
class EmojiApiController extends Controller
|
||||
{
|
||||
private const TIER_FREE = 'free';
|
||||
|
||||
private const TIER_PRO = 'pro';
|
||||
|
||||
/** @var array<string,mixed>|null */
|
||||
@@ -20,8 +21,7 @@ class EmojiApiController extends Controller
|
||||
|
||||
public function __construct(
|
||||
private readonly ApiKeyService $apiKeys
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
/** @var array<string,string> */
|
||||
private const CATEGORY_MAP = [
|
||||
@@ -413,6 +413,7 @@ class EmojiApiController extends Controller
|
||||
private function isNotModified(Request $request, string $etag): bool
|
||||
{
|
||||
$ifNoneMatch = trim((string) $request->header('If-None-Match', ''));
|
||||
|
||||
return $ifNoneMatch !== '' && $ifNoneMatch === $etag;
|
||||
}
|
||||
|
||||
@@ -446,6 +447,7 @@ class EmojiApiController extends Controller
|
||||
}
|
||||
|
||||
self::$dataset = $decoded;
|
||||
|
||||
return self::$dataset;
|
||||
}
|
||||
|
||||
@@ -464,6 +466,7 @@ class EmojiApiController extends Controller
|
||||
$value = strtolower(trim($text));
|
||||
$value = str_replace('&', 'and', $value);
|
||||
$value = preg_replace('/[^a-z0-9]+/', '-', $value) ?? '';
|
||||
|
||||
return trim($value, '-');
|
||||
}
|
||||
|
||||
@@ -510,6 +513,7 @@ class EmojiApiController extends Controller
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}));
|
||||
}
|
||||
@@ -583,7 +587,7 @@ class EmojiApiController extends Controller
|
||||
return $text;
|
||||
}
|
||||
|
||||
return rtrim(mb_substr($text, 0, $max - 1), " ,.;:-").'…';
|
||||
return rtrim(mb_substr($text, 0, $max - 1), ' ,.;:-').'…';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -9,9 +9,7 @@ use Illuminate\Http\Request;
|
||||
|
||||
class ExtensionController extends Controller
|
||||
{
|
||||
public function __construct(private readonly ExtensionVerificationService $verifier)
|
||||
{
|
||||
}
|
||||
public function __construct(private readonly ExtensionVerificationService $verifier) {}
|
||||
|
||||
public function verify(Request $request): JsonResponse
|
||||
{
|
||||
|
||||
@@ -10,9 +10,7 @@ use Illuminate\Http\Request;
|
||||
|
||||
class PaypalWebhookController extends Controller
|
||||
{
|
||||
public function __construct(private readonly PaypalWebhookProcessor $processor)
|
||||
{
|
||||
}
|
||||
public function __construct(private readonly PaypalWebhookProcessor $processor) {}
|
||||
|
||||
public function handle(Request $request): JsonResponse
|
||||
{
|
||||
|
||||
@@ -83,6 +83,7 @@ class SystemController extends Controller
|
||||
$key = 'dw_metrics_ping';
|
||||
Cache::put($key, 'ok', 60);
|
||||
$val = Cache::get($key);
|
||||
|
||||
return $val === 'ok' ? 'ok' : 'degraded';
|
||||
} catch (\Throwable) {
|
||||
return 'down';
|
||||
|
||||
@@ -15,8 +15,7 @@ class UserController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly ApiKeyService $keys
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function register(Request $request): JsonResponse
|
||||
{
|
||||
|
||||
@@ -14,8 +14,7 @@ class UserKeywordController extends Controller
|
||||
public function __construct(
|
||||
private readonly ApiKeyService $keys,
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
private function ensureUser(Request $request): ?array
|
||||
{
|
||||
@@ -186,6 +185,7 @@ class UserKeywordController extends Controller
|
||||
|
||||
if (! $existing && $targetActive && $limit !== null && $activeCount >= $limit) {
|
||||
$skipped += 1;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\User;
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
@@ -21,6 +21,7 @@ class BillingPaymentController extends Controller
|
||||
}
|
||||
|
||||
$provider = strtolower((string) $payment->provider);
|
||||
|
||||
return match ($provider) {
|
||||
'paypal' => $this->resumePayPal($payment),
|
||||
'pakasir' => $this->resumePakasir($payment),
|
||||
|
||||
@@ -22,8 +22,7 @@ class PakasirController extends Controller
|
||||
public function __construct(
|
||||
private readonly SubscriptionTransitionService $subscriptionTransition,
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function createTransaction(Request $request): JsonResponse
|
||||
{
|
||||
@@ -94,6 +93,7 @@ class PakasirController extends Controller
|
||||
'endpoint' => $endpoint,
|
||||
'body' => $res->body(),
|
||||
]);
|
||||
|
||||
return response()->json(['error' => 'pakasir_create_failed'], 502);
|
||||
}
|
||||
|
||||
@@ -103,6 +103,7 @@ class PakasirController extends Controller
|
||||
'endpoint' => $endpoint,
|
||||
'body' => $res->body(),
|
||||
]);
|
||||
|
||||
return response()->json(['error' => 'pakasir_invalid_response'], 502);
|
||||
}
|
||||
|
||||
@@ -112,6 +113,7 @@ class PakasirController extends Controller
|
||||
'endpoint' => $endpoint,
|
||||
'body' => $body,
|
||||
]);
|
||||
|
||||
return response()->json(['error' => 'pakasir_invalid_response'], 502);
|
||||
}
|
||||
|
||||
@@ -324,6 +326,7 @@ class PakasirController extends Controller
|
||||
'status' => $status,
|
||||
'payload_status' => $payload['status'] ?? null,
|
||||
]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -338,6 +341,7 @@ class PakasirController extends Controller
|
||||
));
|
||||
if ($orderId === '') {
|
||||
Log::warning('Pakasir webhook paid event missing order reference', ['payload' => $payload]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -349,6 +353,7 @@ class PakasirController extends Controller
|
||||
}
|
||||
if (! $order) {
|
||||
Log::warning('Pakasir webhook order not found', ['order_id' => $orderId, 'payload' => $payload]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,6 @@ use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class PayPalController extends Controller
|
||||
@@ -25,8 +24,7 @@ class PayPalController extends Controller
|
||||
public function __construct(
|
||||
private readonly SubscriptionTransitionService $subscriptionTransition,
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function createSubscription(Request $request): RedirectResponse|JsonResponse
|
||||
{
|
||||
@@ -106,6 +104,7 @@ class PayPalController extends Controller
|
||||
'body' => $res->body(),
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json(['error' => 'paypal_invalid_response'], 502);
|
||||
}
|
||||
|
||||
@@ -163,6 +162,7 @@ class PayPalController extends Controller
|
||||
}
|
||||
|
||||
$status = (string) $request->query('status', 'success');
|
||||
|
||||
return redirect()->route('dashboard.billing', ['status' => $status]);
|
||||
}
|
||||
|
||||
@@ -267,6 +267,7 @@ class PayPalController extends Controller
|
||||
$sub->canceled_at = now();
|
||||
$sub->save();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -340,6 +341,7 @@ class PayPalController extends Controller
|
||||
if ($rate <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return (int) round($plan->amount / $rate);
|
||||
}
|
||||
|
||||
@@ -394,6 +396,7 @@ class PayPalController extends Controller
|
||||
private function billingMode(): string
|
||||
{
|
||||
$settings = app(SettingsService::class);
|
||||
|
||||
return (string) ($settings->get('billing_mode', config('dewemoji.billing.mode', 'sandbox')) ?: 'sandbox');
|
||||
}
|
||||
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
namespace App\Http\Controllers\Dashboard;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\PricingChange;
|
||||
use App\Models\PricingPlan;
|
||||
use App\Models\AdminAuditLog;
|
||||
use App\Models\Order;
|
||||
use App\Models\Payment;
|
||||
use App\Models\PricingChange;
|
||||
use App\Models\PricingPlan;
|
||||
use App\Models\Subscription;
|
||||
use App\Models\User;
|
||||
use App\Models\UserApiKey;
|
||||
use App\Models\UserKeyword;
|
||||
use App\Models\WebhookEvent;
|
||||
use App\Models\AdminAuditLog;
|
||||
use App\Services\Billing\PayPalPlanSyncService;
|
||||
use App\Services\Keywords\KeywordQuotaService;
|
||||
use App\Services\System\SettingsService;
|
||||
@@ -30,9 +30,7 @@ class AdminDashboardController extends Controller
|
||||
public function __construct(
|
||||
private readonly SettingsService $settings,
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
)
|
||||
{
|
||||
}
|
||||
) {}
|
||||
|
||||
public function users(Request $request): View
|
||||
{
|
||||
@@ -257,6 +255,7 @@ class AdminDashboardController extends Controller
|
||||
'subscription_id' => $sub->id,
|
||||
'user_id' => $sub->user_id,
|
||||
]);
|
||||
|
||||
return back()->with('status', 'Subscription revoked.');
|
||||
}
|
||||
|
||||
@@ -565,7 +564,7 @@ class AdminDashboardController extends Controller
|
||||
public function exportCsv(Request $request, string $type): StreamedResponse
|
||||
{
|
||||
$type = strtolower($type);
|
||||
$filename = "dewemoji-{$type}-export-".now()->format('Ymd_His').".csv";
|
||||
$filename = "dewemoji-{$type}-export-".now()->format('Ymd_His').'.csv';
|
||||
|
||||
return response()->streamDownload(function () use ($type, $request): void {
|
||||
$out = fopen('php://output', 'w');
|
||||
@@ -692,6 +691,7 @@ class AdminDashboardController extends Controller
|
||||
private function sanitizeSort(mixed $value, array $allowed, string $fallback): string
|
||||
{
|
||||
$sort = is_string($value) ? $value : '';
|
||||
|
||||
return in_array($sort, $allowed, true) ? $sort : $fallback;
|
||||
}
|
||||
|
||||
@@ -706,6 +706,7 @@ class AdminDashboardController extends Controller
|
||||
private function splitCsv(string $value): array
|
||||
{
|
||||
$items = array_filter(array_map('trim', explode(',', $value)));
|
||||
|
||||
return array_values($items);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,16 +10,15 @@ use Illuminate\Contracts\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Throwable;
|
||||
use Illuminate\View\View;
|
||||
use Throwable;
|
||||
|
||||
class AdminEmojiCatalogController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly EmojiCatalogService $catalog,
|
||||
private readonly SettingsService $settings
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function index(Request $request): View
|
||||
{
|
||||
@@ -64,6 +63,7 @@ class AdminEmojiCatalogController extends Controller
|
||||
$emojiId = $this->catalog->saveItem($validated);
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
|
||||
return back()->withInput()->with('error', $e->getMessage() ?: 'Failed to create catalog item.');
|
||||
}
|
||||
|
||||
@@ -85,6 +85,7 @@ class AdminEmojiCatalogController extends Controller
|
||||
$savedId = $this->catalog->saveItem($validated);
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
|
||||
return back()
|
||||
->withInput()
|
||||
->with('error', $e->getMessage() ?: 'Failed to save catalog item.');
|
||||
@@ -105,6 +106,7 @@ class AdminEmojiCatalogController extends Controller
|
||||
$this->catalog->deleteItem($emojiId);
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
|
||||
return back()->with('error', $e->getMessage() ?: 'Failed to delete catalog item.');
|
||||
}
|
||||
|
||||
@@ -123,6 +125,7 @@ class AdminEmojiCatalogController extends Controller
|
||||
$result = $this->catalog->importFromDataFile($path);
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
|
||||
return back()->with('error', $e->getMessage() ?: 'Failed to import dataset.');
|
||||
}
|
||||
|
||||
@@ -145,6 +148,7 @@ class AdminEmojiCatalogController extends Controller
|
||||
$result = $this->catalog->publishSnapshot($request->user()?->email);
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
|
||||
return back()->with('error', $e->getMessage() ?: 'Failed to publish snapshot.');
|
||||
}
|
||||
|
||||
@@ -163,6 +167,7 @@ class AdminEmojiCatalogController extends Controller
|
||||
$result = $this->catalog->activateSnapshot($validated['snapshot'], $request->user()?->email);
|
||||
} catch (Throwable $e) {
|
||||
report($e);
|
||||
|
||||
return back()->with('error', $e->getMessage() ?: 'Failed to activate snapshot.');
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers\Dashboard;
|
||||
|
||||
use App\Http\Controllers\Api\V1\EmojiApiController;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Order;
|
||||
use App\Models\Payment;
|
||||
@@ -10,7 +11,6 @@ use App\Models\User;
|
||||
use App\Models\UserApiKey;
|
||||
use App\Models\UserKeyword;
|
||||
use App\Models\WebhookEvent;
|
||||
use App\Http\Controllers\Api\V1\EmojiApiController;
|
||||
use App\Services\Auth\ApiKeyService;
|
||||
use App\Services\Keywords\KeywordQuotaService;
|
||||
use Carbon\Carbon;
|
||||
@@ -27,8 +27,7 @@ class UserDashboardController extends Controller
|
||||
public function __construct(
|
||||
private readonly ApiKeyService $keys,
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
public function overview(Request $request): View
|
||||
{
|
||||
@@ -317,6 +316,7 @@ class UserDashboardController extends Controller
|
||||
|
||||
if (! $existing && $targetActive && $limit !== null && $activeCount >= $limit) {
|
||||
$skipped += 1;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Http\Requests\ProfileUpdateRequest;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Redirect;
|
||||
|
||||
@@ -32,7 +32,12 @@ class SiteController extends Controller
|
||||
private function billingMode(): string
|
||||
{
|
||||
$settings = app(SettingsService::class);
|
||||
$preferred = (string) ($settings->get('billing_mode', config('dewemoji.billing.mode', 'sandbox')) ?: 'sandbox');
|
||||
$preferred =
|
||||
(string) ($settings->get(
|
||||
'billing_mode',
|
||||
config('dewemoji.billing.mode', 'sandbox'),
|
||||
) ?:
|
||||
'sandbox');
|
||||
if ($this->paypalConfiguredMode($preferred)) {
|
||||
return $preferred;
|
||||
}
|
||||
@@ -50,7 +55,9 @@ class SiteController extends Controller
|
||||
return view('site.home', [
|
||||
'initialQuery' => trim((string) $request->query('q', '')),
|
||||
'initialCategory' => trim((string) $request->query('category', '')),
|
||||
'initialSubcategory' => trim((string) $request->query('subcategory', '')),
|
||||
'initialSubcategory' => trim(
|
||||
(string) $request->query('subcategory', ''),
|
||||
),
|
||||
'canonicalPath' => '/',
|
||||
'userTier' => $request->user()?->tier,
|
||||
]);
|
||||
@@ -59,14 +66,20 @@ class SiteController extends Controller
|
||||
public function browse(Request $request): RedirectResponse|View
|
||||
{
|
||||
$cat = strtolower(trim((string) $request->query('cat', 'all')));
|
||||
if ($cat !== '' && $cat !== 'all' && array_key_exists($cat, $this->categorySlugMap())) {
|
||||
if (
|
||||
$cat !== '' &&
|
||||
$cat !== 'all' &&
|
||||
array_key_exists($cat, $this->categorySlugMap())
|
||||
) {
|
||||
return redirect('/'.$cat, 301);
|
||||
}
|
||||
|
||||
return view('site.home', [
|
||||
'initialQuery' => trim((string) $request->query('q', '')),
|
||||
'initialCategory' => trim((string) $request->query('category', '')),
|
||||
'initialSubcategory' => trim((string) $request->query('subcategory', '')),
|
||||
'initialSubcategory' => trim(
|
||||
(string) $request->query('subcategory', ''),
|
||||
),
|
||||
'canonicalPath' => '/browse',
|
||||
'userTier' => $request->user()?->tier,
|
||||
]);
|
||||
@@ -96,8 +109,10 @@ class SiteController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function categorySubcategory(string $categorySlug, string $subcategorySlug): View
|
||||
{
|
||||
public function categorySubcategory(
|
||||
string $categorySlug,
|
||||
string $subcategorySlug,
|
||||
): View {
|
||||
if ($categorySlug === 'all') {
|
||||
abort(404);
|
||||
}
|
||||
@@ -135,7 +150,8 @@ class SiteController extends Controller
|
||||
|
||||
$getPlanAmount = function (string $code) use ($plans, $fallback): int {
|
||||
$plan = $plans->get($code) ?? $fallback->get($code);
|
||||
return (int) ($plan['amount'] ?? $plan->amount ?? 0);
|
||||
|
||||
return (int) ($plan['amount'] ?? ($plan->amount ?? 0));
|
||||
};
|
||||
|
||||
$pricing = [
|
||||
@@ -151,7 +167,8 @@ class SiteController extends Controller
|
||||
];
|
||||
|
||||
foreach ($pricing as $key => $row) {
|
||||
$pricing[$key]['usd'] = $rate > 0 ? round($row['idr'] / $rate, 2) : 0;
|
||||
$pricing[$key]['usd'] =
|
||||
$rate > 0 ? round($row['idr'] / $rate, 2) : 0;
|
||||
}
|
||||
|
||||
$hasActiveLifetime = false;
|
||||
@@ -163,7 +180,8 @@ class SiteController extends Controller
|
||||
->where('plan', 'personal_lifetime')
|
||||
->where('status', 'active')
|
||||
->where(function ($query) {
|
||||
$query->whereNull('expires_at')
|
||||
$query
|
||||
->whereNull('expires_at')
|
||||
->orWhere('expires_at', '>', now());
|
||||
})
|
||||
->exists();
|
||||
@@ -171,7 +189,10 @@ class SiteController extends Controller
|
||||
->where('user_id', $user->id)
|
||||
->where('status', 'pending')
|
||||
->exists();
|
||||
$cooldown = (int) config('dewemoji.billing.pending_cooldown_seconds', 120);
|
||||
$cooldown = (int) config(
|
||||
'dewemoji.billing.pending_cooldown_seconds',
|
||||
120,
|
||||
);
|
||||
if ($cooldown > 0) {
|
||||
$latestPending = Payment::query()
|
||||
->where('user_id', $user->id)
|
||||
@@ -179,7 +200,11 @@ class SiteController extends Controller
|
||||
->orderByDesc('id')
|
||||
->first();
|
||||
if ($latestPending && $latestPending->created_at) {
|
||||
$age = max(0, now()->getTimestamp() - $latestPending->created_at->getTimestamp());
|
||||
$age = max(
|
||||
0,
|
||||
now()->getTimestamp() -
|
||||
$latestPending->created_at->getTimestamp(),
|
||||
);
|
||||
$pendingCooldownRemaining = max(0, $cooldown - $age);
|
||||
}
|
||||
}
|
||||
@@ -191,14 +216,31 @@ class SiteController extends Controller
|
||||
'pricing' => $pricing,
|
||||
'payments' => [
|
||||
'qris_url' => (string) config('dewemoji.payments.qris_url', ''),
|
||||
'paypal_url' => (string) config('dewemoji.payments.paypal_url', ''),
|
||||
'paypal_url' => (string) config(
|
||||
'dewemoji.payments.paypal_url',
|
||||
'',
|
||||
),
|
||||
],
|
||||
'pakasirEnabled' => (bool) config('dewemoji.billing.providers.pakasir.enabled', false)
|
||||
&& (string) config('dewemoji.billing.providers.pakasir.api_base', '') !== ''
|
||||
&& (string) config('dewemoji.billing.providers.pakasir.api_key', '') !== ''
|
||||
&& (string) config('dewemoji.billing.providers.pakasir.project', '') !== '',
|
||||
'pakasirEnabled' => (bool) config(
|
||||
'dewemoji.billing.providers.pakasir.enabled',
|
||||
false,
|
||||
) &&
|
||||
(string) config(
|
||||
'dewemoji.billing.providers.pakasir.api_base',
|
||||
'',
|
||||
) !== '' &&
|
||||
(string) config(
|
||||
'dewemoji.billing.providers.pakasir.api_key',
|
||||
'',
|
||||
) !== '' &&
|
||||
(string) config(
|
||||
'dewemoji.billing.providers.pakasir.project',
|
||||
'',
|
||||
) !== '',
|
||||
'paypalEnabled' => $this->paypalEnabled($this->billingMode()),
|
||||
'paypalPlans' => $this->paypalPlanAvailability($this->billingMode()),
|
||||
'paypalPlans' => $this->paypalPlanAvailability(
|
||||
$this->billingMode(),
|
||||
),
|
||||
'hasActiveLifetime' => $hasActiveLifetime,
|
||||
'hasPendingPayment' => $hasPendingPayment,
|
||||
'pendingCooldownRemaining' => $pendingCooldownRemaining,
|
||||
@@ -212,22 +254,43 @@ class SiteController extends Controller
|
||||
}
|
||||
|
||||
$fallback = $mode === 'live' ? 'sandbox' : 'live';
|
||||
|
||||
return $this->paypalConfiguredMode($fallback);
|
||||
}
|
||||
|
||||
private function paypalConfiguredMode(string $mode): bool
|
||||
{
|
||||
$enabled = (bool) config('dewemoji.billing.providers.paypal.enabled', false);
|
||||
$clientId = (string) config("dewemoji.billing.providers.paypal.{$mode}.client_id", '');
|
||||
$clientSecret = (string) config("dewemoji.billing.providers.paypal.{$mode}.client_secret", '');
|
||||
$apiBase = (string) config("dewemoji.billing.providers.paypal.{$mode}.api_base", '');
|
||||
$enabled = (bool) config(
|
||||
'dewemoji.billing.providers.paypal.enabled',
|
||||
false,
|
||||
);
|
||||
$clientId = (string) config(
|
||||
"dewemoji.billing.providers.paypal.{$mode}.client_id",
|
||||
'',
|
||||
);
|
||||
$clientSecret = (string) config(
|
||||
"dewemoji.billing.providers.paypal.{$mode}.client_secret",
|
||||
'',
|
||||
);
|
||||
$apiBase = (string) config(
|
||||
"dewemoji.billing.providers.paypal.{$mode}.api_base",
|
||||
'',
|
||||
);
|
||||
|
||||
return $enabled && $clientId !== '' && $clientSecret !== '' && $apiBase !== '';
|
||||
return $enabled &&
|
||||
$clientId !== '' &&
|
||||
$clientSecret !== '' &&
|
||||
$apiBase !== '';
|
||||
}
|
||||
|
||||
private function paypalPlanAvailability(string $mode): array
|
||||
{
|
||||
$plans = PricingPlan::whereIn('code', ['personal_monthly', 'personal_annual'])->get()->keyBy('code');
|
||||
$plans = PricingPlan::whereIn('code', [
|
||||
'personal_monthly',
|
||||
'personal_annual',
|
||||
])
|
||||
->get()
|
||||
->keyBy('code');
|
||||
|
||||
$fromDb = function (string $code) use ($plans, $mode): bool {
|
||||
$plan = $plans->get($code);
|
||||
@@ -235,11 +298,15 @@ class SiteController extends Controller
|
||||
return false;
|
||||
}
|
||||
$meta = $plan->meta ?? [];
|
||||
|
||||
return (string) ($meta['paypal'][$mode]['plan']['id'] ?? '') !== '';
|
||||
};
|
||||
|
||||
$fromEnv = function (string $code) use ($mode): bool {
|
||||
return (string) config("dewemoji.billing.providers.paypal.plan_ids.{$mode}.{$code}", '') !== '';
|
||||
return (string) config(
|
||||
"dewemoji.billing.providers.paypal.plan_ids.{$mode}.{$code}",
|
||||
'',
|
||||
) !== '';
|
||||
};
|
||||
|
||||
return [
|
||||
@@ -255,6 +322,7 @@ class SiteController extends Controller
|
||||
]);
|
||||
|
||||
session(['pricing_currency' => $data['currency']]);
|
||||
|
||||
return back();
|
||||
}
|
||||
|
||||
@@ -265,21 +333,32 @@ class SiteController extends Controller
|
||||
|
||||
public function download(): View
|
||||
{
|
||||
$downloadBaseUrl = rtrim((string) config('dewemoji.apk_release.public_base_url', ''), '/');
|
||||
$androidEnabled = (bool) config('dewemoji.apk_release.enabled', false) && $downloadBaseUrl !== '';
|
||||
$downloadBaseUrl = rtrim(
|
||||
(string) config('dewemoji.apk_release.public_base_url', ''),
|
||||
'/',
|
||||
);
|
||||
$androidEnabled = false;
|
||||
|
||||
return view('site.download', [
|
||||
'androidEnabled' => $androidEnabled,
|
||||
'androidVersionJsonUrl' => $androidEnabled ? $downloadBaseUrl.'/version.json' : '',
|
||||
'androidLatestApkUrl' => $androidEnabled ? $downloadBaseUrl.'/dewemoji-latest.apk' : '',
|
||||
'androidVersionJsonUrl' => $androidEnabled
|
||||
? $downloadBaseUrl.'/version.json'
|
||||
: '',
|
||||
'androidLatestApkUrl' => $androidEnabled
|
||||
? $downloadBaseUrl.'/dewemoji-latest.apk'
|
||||
: '',
|
||||
]);
|
||||
}
|
||||
|
||||
public function downloadVersionJson(Request $request): RedirectResponse|JsonResponse
|
||||
{
|
||||
public function downloadVersionJson(
|
||||
Request $request,
|
||||
): RedirectResponse|JsonResponse {
|
||||
$target = $this->apkReleaseTargetUrl('version_json');
|
||||
if ($target === '') {
|
||||
return response()->json(['ok' => false, 'error' => 'apk_release_not_configured'], 404);
|
||||
return response()->json(
|
||||
['ok' => false, 'error' => 'apk_release_not_configured'],
|
||||
404,
|
||||
);
|
||||
}
|
||||
|
||||
return redirect()->away($target, 302, [
|
||||
@@ -288,11 +367,15 @@ class SiteController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function downloadLatestApk(Request $request): RedirectResponse|JsonResponse
|
||||
{
|
||||
public function downloadLatestApk(
|
||||
Request $request,
|
||||
): RedirectResponse|JsonResponse {
|
||||
$target = $this->apkReleaseTargetUrl('latest_apk');
|
||||
if ($target === '') {
|
||||
return response()->json(['ok' => false, 'error' => 'apk_release_not_configured'], 404);
|
||||
return response()->json(
|
||||
['ok' => false, 'error' => 'apk_release_not_configured'],
|
||||
404,
|
||||
);
|
||||
}
|
||||
|
||||
return redirect()->away($target, 302, [
|
||||
@@ -304,10 +387,15 @@ class SiteController extends Controller
|
||||
public function assetLinks(): JsonResponse
|
||||
{
|
||||
$appId = trim((string) config('dewemoji.apk_release.app_id', ''));
|
||||
$rawFingerprints = (array) config('dewemoji.apk_release.assetlinks.fingerprints', []);
|
||||
$rawFingerprints = (array) config(
|
||||
'dewemoji.apk_release.assetlinks.fingerprints',
|
||||
[],
|
||||
);
|
||||
$fingerprints = [];
|
||||
foreach ($rawFingerprints as $fingerprint) {
|
||||
$normalized = $this->normalizeApkCertFingerprint((string) $fingerprint);
|
||||
$normalized = $this->normalizeApkCertFingerprint(
|
||||
(string) $fingerprint,
|
||||
);
|
||||
if ($normalized !== '') {
|
||||
$fingerprints[] = $normalized;
|
||||
}
|
||||
@@ -321,7 +409,8 @@ class SiteController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
return response()->json(
|
||||
[
|
||||
[
|
||||
'relation' => [
|
||||
'delegate_permission/common.handle_all_urls',
|
||||
@@ -332,10 +421,13 @@ class SiteController extends Controller
|
||||
'sha256_cert_fingerprints' => $fingerprints,
|
||||
],
|
||||
],
|
||||
], 200, [
|
||||
],
|
||||
200,
|
||||
[
|
||||
'Cache-Control' => 'no-store, no-cache, must-revalidate',
|
||||
'Pragma' => 'no-cache',
|
||||
]);
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
public function privacy(): View
|
||||
@@ -350,12 +442,14 @@ class SiteController extends Controller
|
||||
|
||||
private function detectPricingCurrency(Request $request): string
|
||||
{
|
||||
$country = strtoupper((string) ($request->header('CF-IPCountry')
|
||||
?? $request->header('X-Country-Code')
|
||||
?? $request->header('X-Geo-Country')
|
||||
?? $request->header('X-Appengine-Country')
|
||||
?? $request->header('CloudFront-Viewer-Country')
|
||||
?? ''));
|
||||
$country = strtoupper(
|
||||
(string) ($request->header('CF-IPCountry') ??
|
||||
($request->header('X-Country-Code') ??
|
||||
($request->header('X-Geo-Country') ??
|
||||
($request->header('X-Appengine-Country') ??
|
||||
($request->header('CloudFront-Viewer-Country') ??
|
||||
''))))),
|
||||
);
|
||||
|
||||
return $country === 'ID' ? 'IDR' : 'USD';
|
||||
}
|
||||
@@ -421,7 +515,8 @@ class SiteController extends Controller
|
||||
->orderByDesc('id')
|
||||
->get();
|
||||
}
|
||||
$limitReached = $keywordLimit !== null && $activeKeywordCount >= $keywordLimit;
|
||||
$limitReached =
|
||||
$keywordLimit !== null && $activeKeywordCount >= $keywordLimit;
|
||||
|
||||
return view('site.emoji-detail', [
|
||||
'emoji' => $match,
|
||||
@@ -438,28 +533,64 @@ class SiteController extends Controller
|
||||
|
||||
public function robotsTxt(): Response
|
||||
{
|
||||
$base = rtrim(config('app.url', request()->getSchemeAndHttpHost()), '/');
|
||||
$body = "User-agent: *\nAllow: /\n\nSitemap: ".$base."/sitemap.xml\n";
|
||||
$base = rtrim(
|
||||
config('app.url', request()->getSchemeAndHttpHost()),
|
||||
'/',
|
||||
);
|
||||
$body =
|
||||
"User-agent: *\nAllow: /\n\nSitemap: ".$base."/sitemap.xml\n";
|
||||
|
||||
return response($body, 200)->header('Content-Type', 'text/plain; charset=UTF-8');
|
||||
return response($body, 200)->header(
|
||||
'Content-Type',
|
||||
'text/plain; charset=UTF-8',
|
||||
);
|
||||
}
|
||||
|
||||
public function sitemapXml(): Response
|
||||
{
|
||||
$data = $this->loadDataset();
|
||||
$items = is_array($data['emojis'] ?? null) ? $data['emojis'] : [];
|
||||
$base = rtrim(config('app.url', request()->getSchemeAndHttpHost()), '/');
|
||||
$base = rtrim(
|
||||
config('app.url', request()->getSchemeAndHttpHost()),
|
||||
'/',
|
||||
);
|
||||
|
||||
$lastUpdatedTs = isset($data['last_updated_ts']) ? (int) $data['last_updated_ts'] : time();
|
||||
$lastUpdated = gmdate('Y-m-d\TH:i:s\Z', $lastUpdatedTs);
|
||||
$lastUpdatedTs = isset($data['last_updated_ts'])
|
||||
? (int) $data['last_updated_ts']
|
||||
: time();
|
||||
$lastUpdated = gmdate("Y-m-d\TH:i:s\Z", $lastUpdatedTs);
|
||||
|
||||
$urls = [
|
||||
['loc' => $base.'/', 'priority' => '0.8', 'changefreq' => 'daily'],
|
||||
['loc' => $base.'/api-docs', 'priority' => '0.5', 'changefreq' => 'weekly'],
|
||||
['loc' => $base.'/pricing', 'priority' => '0.7', 'changefreq' => 'weekly'],
|
||||
['loc' => $base.'/privacy', 'priority' => '0.3', 'changefreq' => 'monthly'],
|
||||
['loc' => $base.'/terms', 'priority' => '0.3', 'changefreq' => 'monthly'],
|
||||
['loc' => $base.'/support', 'priority' => '0.4', 'changefreq' => 'weekly'],
|
||||
[
|
||||
'loc' => $base.'/',
|
||||
'priority' => '0.8',
|
||||
'changefreq' => 'daily',
|
||||
],
|
||||
[
|
||||
'loc' => $base.'/api-docs',
|
||||
'priority' => '0.5',
|
||||
'changefreq' => 'weekly',
|
||||
],
|
||||
[
|
||||
'loc' => $base.'/pricing',
|
||||
'priority' => '0.7',
|
||||
'changefreq' => 'weekly',
|
||||
],
|
||||
[
|
||||
'loc' => $base.'/privacy',
|
||||
'priority' => '0.3',
|
||||
'changefreq' => 'monthly',
|
||||
],
|
||||
[
|
||||
'loc' => $base.'/terms',
|
||||
'priority' => '0.3',
|
||||
'changefreq' => 'monthly',
|
||||
],
|
||||
[
|
||||
'loc' => $base.'/support',
|
||||
'priority' => '0.4',
|
||||
'changefreq' => 'weekly',
|
||||
],
|
||||
];
|
||||
|
||||
foreach ($items as $item) {
|
||||
@@ -475,10 +606,15 @@ class SiteController extends Controller
|
||||
}
|
||||
|
||||
$xml = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
|
||||
$xml .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'."\n";
|
||||
$xml .=
|
||||
'<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'.
|
||||
"\n";
|
||||
foreach ($urls as $url) {
|
||||
$xml .= " <url>\n";
|
||||
$xml .= ' <loc>'.htmlspecialchars((string) $url['loc'], ENT_XML1)."</loc>\n";
|
||||
$xml .=
|
||||
' <loc>'.
|
||||
htmlspecialchars((string) $url['loc'], ENT_XML1).
|
||||
"</loc>\n";
|
||||
$xml .= ' <lastmod>'.$lastUpdated."</lastmod>\n";
|
||||
$xml .= ' <changefreq>'.$url['changefreq']."</changefreq>\n";
|
||||
$xml .= ' <priority>'.$url['priority']."</priority>\n";
|
||||
@@ -486,7 +622,10 @@ class SiteController extends Controller
|
||||
}
|
||||
$xml .= '</urlset>'."\n";
|
||||
|
||||
return response($xml, 200)->header('Content-Type', 'application/xml; charset=UTF-8');
|
||||
return response($xml, 200)->header(
|
||||
'Content-Type',
|
||||
'application/xml; charset=UTF-8',
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -542,8 +681,12 @@ class SiteController extends Controller
|
||||
return '';
|
||||
}
|
||||
|
||||
$base = trim((string) config('dewemoji.apk_release.r2_public_base_url', ''));
|
||||
$objectKey = trim((string) config("dewemoji.apk_release.r2_keys.{$key}", ''));
|
||||
$base = trim(
|
||||
(string) config('dewemoji.apk_release.r2_public_base_url', ''),
|
||||
);
|
||||
$objectKey = trim(
|
||||
(string) config("dewemoji.apk_release.r2_keys.{$key}", ''),
|
||||
);
|
||||
if ($base === '' || $objectKey === '') {
|
||||
return '';
|
||||
}
|
||||
@@ -581,32 +724,32 @@ class SiteController extends Controller
|
||||
if ($subcategory === 'family' || str_starts_with($name, 'family:')) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~\bwoman: beard\b~i', $name)) {
|
||||
if (preg_match("~\bwoman: beard\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~\bmen with bunny ears\b~i', $name)) {
|
||||
if (preg_match("~\bmen with bunny ears\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~\bpregnant man\b~i', $name)) {
|
||||
if (preg_match("~\bpregnant man\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if ($category === 'people & body') {
|
||||
if (preg_match('~\bmen holding hands\b~i', $name)) {
|
||||
if (preg_match("~\bmen holding hands\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~\bwomen holding hands\b~i', $name)) {
|
||||
if (preg_match("~\bwomen holding hands\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~kiss:.*\bman,\s*man\b~i', $name)) {
|
||||
if (preg_match("~kiss:.*\bman,\s*man\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~kiss:.*\bwoman,\s*woman\b~i', $name)) {
|
||||
if (preg_match("~kiss:.*\bwoman,\s*woman\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~couple.*\bman,\s*man\b~i', $name)) {
|
||||
if (preg_match("~couple.*\bman,\s*man\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
if (preg_match('~couple.*\bwoman,\s*woman\b~i', $name)) {
|
||||
if (preg_match("~couple.*\bwoman,\s*woman\b~i", $name)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail as MustVerifyEmailContract;
|
||||
use Illuminate\Auth\MustVerifyEmail;
|
||||
use App\Notifications\ResetPasswordNotification;
|
||||
use App\Notifications\VerifyEmailNotification;
|
||||
use Illuminate\Auth\MustVerifyEmail;
|
||||
use Illuminate\Contracts\Auth\MustVerifyEmail as MustVerifyEmailContract;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
@@ -13,7 +13,7 @@ use Illuminate\Notifications\Notifiable;
|
||||
class User extends Authenticatable implements MustVerifyEmailContract
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\UserFactory> */
|
||||
use HasFactory, Notifiable, MustVerifyEmail;
|
||||
use HasFactory, MustVerifyEmail, Notifiable;
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
@@ -58,7 +58,7 @@ class User extends Authenticatable implements MustVerifyEmailContract
|
||||
|
||||
public function sendEmailVerificationNotification(): void
|
||||
{
|
||||
$this->notify(new VerifyEmailNotification());
|
||||
$this->notify(new VerifyEmailNotification);
|
||||
}
|
||||
|
||||
public function sendPasswordResetNotification($token): void
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use App\Mail\MailketingTransport;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Mail\MailketingTransport;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Native\Desktop\Facades\Window;
|
||||
use Native\Desktop\Contracts\ProvidesPhpIni;
|
||||
use Native\Desktop\Facades\Window;
|
||||
|
||||
class NativeAppServiceProvider implements ProvidesPhpIni
|
||||
{
|
||||
|
||||
@@ -23,12 +23,14 @@ class PayPalPlanSyncService
|
||||
$token = $this->getAccessToken($mode);
|
||||
if (! $token) {
|
||||
Log::warning('PayPal plan sync aborted: missing access token', ['mode' => $mode]);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
$productId = $this->ensureProduct($mode, $token);
|
||||
if (! $productId) {
|
||||
Log::warning('PayPal plan sync aborted: missing product id', ['mode' => $mode]);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
@@ -58,12 +60,14 @@ class PayPalPlanSyncService
|
||||
$keepIds[] = $currentPlanId;
|
||||
}
|
||||
$result['skipped']++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$newPlanId = $this->createPlan($mode, $token, $productId, $plan->code, $plan->name, $amountUsd, $plan->period);
|
||||
if (! $newPlanId) {
|
||||
$result['skipped']++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -105,6 +109,7 @@ class PayPalPlanSyncService
|
||||
{
|
||||
$rate = (int) config('dewemoji.pricing.usd_rate', 15000);
|
||||
$usd = $rate > 0 ? $idrAmount / $rate : 0;
|
||||
|
||||
return number_format(max($usd, 1), 2, '.', '');
|
||||
}
|
||||
|
||||
@@ -138,6 +143,7 @@ class PayPalPlanSyncService
|
||||
|
||||
if (! $res->successful()) {
|
||||
Log::warning('PayPal auth failed', ['body' => $res->body()]);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -181,6 +187,7 @@ class PayPalPlanSyncService
|
||||
'body' => $create->body(),
|
||||
]);
|
||||
}
|
||||
|
||||
return $createdId;
|
||||
}
|
||||
|
||||
@@ -188,6 +195,7 @@ class PayPalPlanSyncService
|
||||
'status' => $create->status(),
|
||||
'body' => $create->body(),
|
||||
]);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -244,6 +252,7 @@ class PayPalPlanSyncService
|
||||
'body' => $res->body(),
|
||||
]);
|
||||
}
|
||||
|
||||
return $planId;
|
||||
}
|
||||
|
||||
@@ -252,6 +261,7 @@ class PayPalPlanSyncService
|
||||
'status' => $res->status(),
|
||||
'body' => $res->body(),
|
||||
]);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,7 @@ class PaypalWebhookProcessor
|
||||
public function __construct(
|
||||
private readonly SubscriptionTransitionService $subscriptionTransition,
|
||||
private readonly KeywordQuotaService $keywordQuota
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param array<string,mixed> $payload
|
||||
@@ -68,6 +67,7 @@ class PaypalWebhookProcessor
|
||||
$subscriptionId,
|
||||
$planCode
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@ class SubscriptionTransitionService
|
||||
$sub->status = 'canceled';
|
||||
$sub->canceled_at = now();
|
||||
$sub->save();
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -80,6 +81,7 @@ class SubscriptionTransitionService
|
||||
'new_plan' => $newPlanCode,
|
||||
'old_subscription_id' => $sub->provider_ref,
|
||||
]);
|
||||
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,7 @@ class EmojiCatalogService
|
||||
{
|
||||
public function __construct(
|
||||
private readonly SettingsService $settings
|
||||
) {
|
||||
}
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @return array<string,mixed>|null
|
||||
@@ -203,10 +202,12 @@ class EmojiCatalogService
|
||||
$emojiId = (int) ($row['emoji_id'] ?? 0);
|
||||
if ($slug !== '' && DB::table('emojis')->where('slug', $slug)->exists()) {
|
||||
$skipped++;
|
||||
|
||||
continue;
|
||||
}
|
||||
if ($emojiId > 0 && DB::table('emojis')->where('emoji_id', $emojiId)->exists()) {
|
||||
$skipped++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -509,7 +510,6 @@ class EmojiCatalogService
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $input
|
||||
* @return array<int,string>
|
||||
*/
|
||||
private function normalizeArray(mixed $input): array
|
||||
|
||||
@@ -31,6 +31,7 @@ class KeywordQuotaService
|
||||
->where('user_id', $userId)
|
||||
->where('is_active', false)
|
||||
->update(['is_active' => true]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -55,4 +56,3 @@ class KeywordQuotaService
|
||||
->update(['is_active' => false]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@ class LiveSqlImportService
|
||||
$valuesRaw = $matches[3];
|
||||
|
||||
$columns = array_map(
|
||||
static fn (string $col): string => trim($col, " `"),
|
||||
static fn (string $col): string => trim($col, ' `'),
|
||||
explode(',', $columnsRaw)
|
||||
);
|
||||
|
||||
@@ -260,20 +260,24 @@ class LiveSqlImportService
|
||||
if ($escape) {
|
||||
$buffer .= $this->unescapeChar($ch);
|
||||
$escape = false;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($ch === '\\\\') {
|
||||
$escape = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($ch === '\'') {
|
||||
$inString = false;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$buffer .= $ch;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -282,12 +286,14 @@ class LiveSqlImportService
|
||||
$currentRow = [];
|
||||
$buffer = '';
|
||||
$valueIsString = false;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($ch === '\'') {
|
||||
$inString = true;
|
||||
$valueIsString = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -295,6 +301,7 @@ class LiveSqlImportService
|
||||
$currentRow[] = $this->convertValue($buffer, $valueIsString);
|
||||
$buffer = '';
|
||||
$valueIsString = false;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -306,6 +313,7 @@ class LiveSqlImportService
|
||||
$buffer = '';
|
||||
$valueIsString = false;
|
||||
$inRow = false;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Cache;
|
||||
class SettingsService
|
||||
{
|
||||
private const CACHE_KEY = 'dw_settings_all';
|
||||
|
||||
private const CACHE_TTL = 30;
|
||||
|
||||
/**
|
||||
@@ -20,6 +21,7 @@ class SettingsService
|
||||
foreach (Setting::all(['key', 'value']) as $setting) {
|
||||
$out[$setting->key] = $setting->value;
|
||||
}
|
||||
|
||||
return $out;
|
||||
});
|
||||
}
|
||||
@@ -27,6 +29,7 @@ class SettingsService
|
||||
public function get(string $key, mixed $default = null): mixed
|
||||
{
|
||||
$all = $this->all();
|
||||
|
||||
return array_key_exists($key, $all) ? $all[$key] : $default;
|
||||
}
|
||||
|
||||
|
||||
@@ -29,4 +29,3 @@ return new class extends Migration
|
||||
Schema::dropIfExists('licenses');
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -28,4 +28,3 @@ return new class extends Migration
|
||||
Schema::dropIfExists('license_activations');
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -26,4 +26,3 @@ return new class extends Migration
|
||||
Schema::dropIfExists('usage_logs');
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration {
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('admin_audit_logs', function (Blueprint $table): void {
|
||||
|
||||
@@ -22,4 +22,3 @@ return new class extends Migration
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace Database\Seeders;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
<?php
|
||||
|
||||
use App\Http\Controllers\Api\V1\EmojiApiController;
|
||||
use App\Http\Controllers\Api\V1\SystemController;
|
||||
use App\Http\Controllers\Api\V1\AdminUserController;
|
||||
use App\Http\Controllers\Api\V1\AdminAnalyticsController;
|
||||
use App\Http\Controllers\Api\V1\AdminPricingController;
|
||||
use App\Http\Controllers\Api\V1\AdminSettingsController;
|
||||
use App\Http\Controllers\Api\V1\AdminSubscriptionController;
|
||||
use App\Http\Controllers\Api\V1\AdminAnalyticsController;
|
||||
use App\Http\Controllers\Api\V1\AdminUserController;
|
||||
use App\Http\Controllers\Api\V1\AdminWebhookController;
|
||||
use App\Http\Controllers\Api\V1\EmojiApiController;
|
||||
use App\Http\Controllers\Api\V1\ExtensionController;
|
||||
use App\Http\Controllers\Api\V1\PricingController;
|
||||
use App\Http\Controllers\Api\V1\SystemController;
|
||||
use App\Http\Controllers\Api\V1\UserController;
|
||||
use App\Http\Controllers\Api\V1\UserKeywordController;
|
||||
use App\Http\Controllers\Api\V1\PricingController;
|
||||
use App\Http\Controllers\Billing\PayPalController;
|
||||
use App\Http\Controllers\Billing\PakasirController;
|
||||
use App\Http\Controllers\Billing\PayPalController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::options('/v1/{any}', function () {
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Foundation\Inspiring;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Schedule;
|
||||
use App\Services\LiveSqlImportService;
|
||||
use App\Services\Billing\PaypalWebhookProcessor;
|
||||
use App\Services\Billing\PayPalPlanSyncService;
|
||||
use App\Mail\TestMailketing;
|
||||
use App\Models\Order;
|
||||
use App\Models\Payment;
|
||||
use App\Models\Subscription;
|
||||
use App\Models\WebhookEvent;
|
||||
use App\Services\Billing\PayPalPlanSyncService;
|
||||
use App\Services\Billing\PaypalWebhookProcessor;
|
||||
use App\Services\LiveSqlImportService;
|
||||
use Illuminate\Foundation\Inspiring;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use App\Mail\TestMailketing;
|
||||
use Illuminate\Support\Facades\Schedule;
|
||||
|
||||
Artisan::command('inspire', function () {
|
||||
$this->comment(Inspiring::quote());
|
||||
@@ -32,6 +32,7 @@ Artisan::command('dewemoji:webhooks:process {--limit=100 : Max events to process
|
||||
|
||||
if (empty($statuses)) {
|
||||
$this->error('No statuses provided.');
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -68,6 +69,7 @@ Artisan::command('dewemoji:webhooks:process {--limit=100 : Max events to process
|
||||
}
|
||||
|
||||
$this->info("Processed {$processed} events, failed {$failed}.");
|
||||
|
||||
return 0;
|
||||
})->purpose('Process pending webhook events');
|
||||
|
||||
@@ -94,11 +96,13 @@ Artisan::command('mailketing:test {email : Recipient email address}', function (
|
||||
$email = (string) $this->argument('email');
|
||||
|
||||
try {
|
||||
Mail::to($email)->send(new TestMailketing());
|
||||
Mail::to($email)->send(new TestMailketing);
|
||||
$this->info("Mailketing test email sent to {$email}.");
|
||||
|
||||
return 0;
|
||||
} catch (\Throwable $e) {
|
||||
$this->error('Mailketing test failed: '.$e->getMessage());
|
||||
|
||||
return 1;
|
||||
}
|
||||
})->purpose('Send a Mailketing API test email');
|
||||
@@ -117,5 +121,6 @@ Artisan::command('dewemoji:normalize-statuses', function () {
|
||||
->update(['status' => 'canceled']);
|
||||
|
||||
$this->info("Normalized statuses: subscriptions={$subs}, orders={$orders}, payments={$payments}");
|
||||
|
||||
return 0;
|
||||
})->purpose('Normalize legacy cancelled status spelling to canceled');
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
use App\Http\Controllers\Dashboard\AdminDashboardController;
|
||||
use App\Http\Controllers\Dashboard\AdminEmojiCatalogController;
|
||||
use App\Http\Controllers\Dashboard\UserDashboardController;
|
||||
use App\Http\Controllers\ProfileController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::middleware('auth')->prefix('dashboard')->name('dashboard.')->group(function () {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
use App\Http\Controllers\Billing\BillingPaymentController;
|
||||
use App\Http\Controllers\Billing\PakasirController;
|
||||
use App\Http\Controllers\Billing\PayPalController;
|
||||
use App\Http\Controllers\ProfileController;
|
||||
use App\Http\Controllers\Web\SiteController;
|
||||
use App\Http\Controllers\Billing\PayPalController;
|
||||
use App\Http\Controllers\Billing\PakasirController;
|
||||
use App\Http\Controllers\Billing\BillingPaymentController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::get('/', [SiteController::class, 'home'])->name('home');
|
||||
|
||||
Reference in New Issue
Block a user