From 48a02683e80b61bafd6a975314bdeae5363a4b7f Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Wed, 31 May 2023 11:03:01 +0200
Subject: [PATCH] get only one entry
---
MatrixPlugin.php | 12 ++++++------
plugin.manifest | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/MatrixPlugin.php b/MatrixPlugin.php
index e5f7128..772e3ff 100644
--- a/MatrixPlugin.php
+++ b/MatrixPlugin.php
@@ -135,8 +135,8 @@ class MatrixPlugin extends StudIPPlugin implements StandardPlugin
*/
public function invite($event, $membership)
{
- if ($matrix = MatrixAccount::findByUser_id($membership->user_id) &&
- $room = MatrixRoom::findByRange_id($membership->seminar_id)) {
+ if ($matrix = MatrixAccount::findOneByUser_id($membership->user_id) &&
+ $room = MatrixRoom::findOneByRange_id($membership->seminar_id)) {
MatrixClient::get()->inviteIntoRoom(
MatrixAccount::requireSystemAccount(),
$room->getLinkedRoom(),
@@ -153,8 +153,8 @@ class MatrixPlugin extends StudIPPlugin implements StandardPlugin
*/
public function uninvite($event, $membership)
{
- if ($matrix = MatrixAccount::findByUser_id($membership->user_id) &&
- $room = MatrixRoom::findByRange_id($membership->seminar_id)) {
+ if ($matrix = MatrixAccount::findOneByUser_id($membership->user_id) &&
+ $room = MatrixRoom::findOneByRange_id($membership->seminar_id)) {
MatrixClient::get()->leaveRoom(
$matrix->getLinkedAccount(),
$room->getLinkedRoom()
@@ -171,7 +171,7 @@ class MatrixPlugin extends StudIPPlugin implements StandardPlugin
*/
public function unregister($event, $user)
{
- if ($account = MatrixAccount::findByUser_id($user->id)) {
+ if ($account = MatrixAccount::findOneByUser_id($user->id)) {
if (MatrixClient::get()->deactivateAccount($account->getLinkedAccount())) {
$account->delete();
}
@@ -186,7 +186,7 @@ class MatrixPlugin extends StudIPPlugin implements StandardPlugin
*/
public function deleteRoom($event, $course)
{
- if ($room = MatrixRoom::findByRange_id($course->id)) {
+ if ($room = MatrixRoom::findOneByRange_id($course->id)) {
MatrixClient::get()->deleteRoom(
MatrixAccount::requireSystemAccount(),
$room->getLinkedRoom()
diff --git a/plugin.manifest b/plugin.manifest
index 23e71f4..c25c2a6 100644
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
pluginname=Matrix-Chat
pluginclassname=MatrixPlugin
origin=data-quest
-version=1.4.2
+version=1.4.3
screenshot=assets/images/matrix_logo.png
description=Matrix chat for Stud.IP courses
studipMinVersion=4.5
--
GitLab