Skip to content

Yodo - You only debug once #6935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nickvergessen wants to merge 13 commits into from
Closed

Yodo - You only debug once #6935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f004976
Handle all user status changes in case of "End meeting for all" in 1 …
nickvergessen Feb 10, 2022
904236d
Bump NC api lib
nickvergessen Feb 25, 2022
4fd2566
Add an integration test for the company call case
nickvergessen Feb 25, 2022
b30d0ea
Reset all in_call flags in one go
nickvergessen Feb 25, 2022
8c12796
Need to be combined with setLastMessage and delayed
nickvergessen Feb 25, 2022
114a9dd
Only calculate the room name once instead of loading all participants
nickvergessen Feb 25, 2022
d32e490
fixup! Need to be combined with setLastMessage and delayed
nickvergessen Feb 26, 2022
3925520
Combine last_activity and last_message update where possible
nickvergessen Feb 26, 2022
222dd2a
Emit a event so the HPB can send the update to the participants
nickvergessen Mar 2, 2022
dc54521
Deduplicate getting the room and participant in case some annotations…
nickvergessen Mar 4, 2022
6f3f404
Inject the room instead of querying it over and over again
nickvergessen Mar 4, 2022
f22cf58
Inject the attendee as well when loaded already
nickvergessen Mar 4, 2022
4733de6
Add chat case of company call
nickvergessen Mar 4, 2022
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
Prev Previous commit
Next Next commit
Reset all in_call flags in one go 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Feb 25, 2022
commit b30d0ea71805941b5a5ec3ef6dc99d32f47d5d8b
12 changes: 12 additions & 0 deletions lib/Model/SessionMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

namespace OCA\Talk\Model;

use OCA\Talk\Participant;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
Expand Down Expand Up @@ -90,6 +91,17 @@ public function deleteByIds(array $ids): int {
return $delete->executeStatement();
}

/**
* @param int[] $ids
*/
public function resetInCallByIds(array $ids): void {
$update = $this->db->getQueryBuilder();
$update->update($this->getTableName())
->set('in_call', $update->createNamedParameter(Participant::FLAG_DISCONNECTED, IQueryBuilder::PARAM_INT))
->where($update->expr()->in('id', $update->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
$update->executeStatement();
}

public function createSessionFromRow(array $row): Session {
return $this->mapRowToEntity([
'id' => $row['s_id'],
Expand Down
6 changes: 5 additions & 1 deletion lib/Service/ParticipantService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,8 @@ public function endCallForEveryone(Room $room, Participant $moderator): void {
$this->changeInCall($room, $participant, Participant::FLAG_DISCONNECTED, true);
}

$this->sessionMapper->resetInCallByIds($changedSessionIds);

$event->setSessionIds($changedSessionIds);
$event->setUserIds($changedUserIds);

Expand Down Expand Up @@ -957,7 +959,9 @@ public function changeInCall(Room $room, Participant $participant, int $flags, b
}

$session->setInCall($flags);
$this->sessionMapper->update($session);
if (!$endCallForEveryone) {
$this->sessionMapper->update($session);
}

if ($flags !== Participant::FLAG_DISCONNECTED) {
$attendee = $participant->getAttendee();
Expand Down