mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-23 11:39:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert: chat changes

Browse Source
This commit is contained in:
HDVinnie
2024-06-23 13:05:24 -04:00
parent 5ca88559e6
commit 9cbeb30ad1
3 changed files with 242 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/API/ChatController.php
+16 -13
View File
@@ -34,6 +34,9 @@ use App\Repositories\ChatRepository;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
/**
* @see \Tests\Feature\Http\Controllers\API\ChatControllerTest
*/
class ChatController extends Controller
{
/**
@@ -98,19 +101,19 @@ class ChatController extends Controller
}
/* MESSAGES */
public function messages(int $roomId): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
public function messages($roomId): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
{
return ChatMessageResource::collection($this->chatRepository->messages($roomId));
}
/* MESSAGES */
public function privateMessages(Request $request, int $targetId): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
public function privateMessages(Request $request, $targetId): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
{
return ChatMessageResource::collection($this->chatRepository->privateMessages($request->user()->id, $targetId));
}
/* MESSAGES */
public function botMessages(Request $request, int $botId): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
public function botMessages(Request $request, $botId): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
{
$runbot = null;
$bot = Bot::findOrFail($botId);
@@ -178,11 +181,11 @@ class ChatController extends Controller
$message = '/bot gift'.substr((string) $message, \strlen($trip) + 1, \strlen((string) $message));
}
if ($target === 'system') {
if ($target == 'system') {
$runbot = new SystemBot($this->chatRepository);
}
if ($which === null) {
if ($which == null) {
foreach ($bots as $bot) {
if ($message && str_starts_with((string) $message, '/'.$bot->command)) {
$which = 'echo';
@@ -191,7 +194,7 @@ class ChatController extends Controller
} elseif ($message && str_starts_with((string) $message, '@'.$bot->command)) {
$message = substr((string) $message, 1 + \strlen((string) $bot->command), \strlen((string) $message));
$which = 'private';
} elseif ($message && $receiverId === 1 && $bot->id === $botId) {
} elseif ($message && $receiverId == 1 && $bot->id == $botId) {
if (str_starts_with((string) $message, '/'.$bot->command)) {
$message = substr((string) $message, 1 + \strlen((string) $bot->command), \strlen((string) $message));
}
@@ -207,13 +210,13 @@ class ChatController extends Controller
$which = 'message';
}
if ($which !== null) {
if ($which != null) {
break;
}
}
}
if ($which !== null && $which !== 'skip' && !$runbot) {
if ($which != null && $which != 'skip' && !$runbot) {
if ($bot->is_systembot) {
$runbot = new SystemBot($this->chatRepository);
} elseif ($bot->is_nerdbot) {
@@ -236,7 +239,7 @@ class ChatController extends Controller
fn () => UserEcho::with(['room', 'target', 'bot'])->where('user_id', '=', $user1Id)->get()
);
if ($echoes->doesntContain(fn ($echo) => $echo->target_id === $user2Id)) {
if ($echoes->doesntContain(fn ($echo) => $echo->target_id == $user2Id)) {
UserEcho::create([
'user_id' => $user1Id,
'target_id' => $user2Id,
@@ -258,7 +261,7 @@ class ChatController extends Controller
fn () => UserAudible::with(['room', 'target', 'bot'])->where('user_id', '=', $user1Id)->get()
);
if ($audibles->doesntContain(fn ($audible) => $audible->target_id === $user2Id)) {
if ($audibles->doesntContain(fn ($audible) => $audible->target_id == $user2Id)) {
UserAudible::create([
'user_id' => $user1Id,
'target_id' => $user2Id,
@@ -274,7 +277,7 @@ class ChatController extends Controller
}
$roomId = 0;
$ignore = $botId > 0 && $receiverId === 1 ? true : null;
$ignore = $botId > 0 && $receiverId == 1 ? true : null;
$save = true;
$echo = true;
$message = $this->chatRepository->privateMessage($userId, $roomId, $message, $receiverId, null, $ignore);
@@ -295,7 +298,7 @@ class ChatController extends Controller
return response('success');
}
public function deleteMessage(Request $request, int $id): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
public function deleteMessage(Request $request, $id): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
{
$message = Message::find($id);
@@ -477,7 +480,7 @@ class ChatController extends Controller
fn () => UserEcho::with(['room', 'target', 'bot'])->where('user_id', '=', $user->id)->get(),
);
if ($echoes->doesntContain(fn ($echo) => $echo->room_id === $room->id)) {
if ($echoes->doesntContain(fn ($echo) => $echo->room_id == $room->id)) {
UserEcho::create([
'user_id' => $user->id,
'room_id' => $room->id,