@@ -474,17 +474,17 @@ final class Server
474474 return rooms[room_name];
475475 }
476476
477- void grant_room_membership (string room_name, string actor, string target)
477+ bool grant_room_membership (string room_name, string actor, string target)
478478 {
479479 if (actor == target)
480- return ;
480+ return false ;
481481
482482 RoomMemberType actor_type;
483483 const owner = db.get_room_owner(room_name);
484484 if (actor != owner) {
485485 actor_type = db.get_room_member_type(room_name, actor);
486486 if (actor_type != RoomMemberType.operator)
487- return ;
487+ return false ;
488488 }
489489
490490 auto target_user = get_user(target);
@@ -493,7 +493,7 @@ final class Server
493493 server_username, actor,
494494 text(" user " , target, " is not logged in." )
495495 );
496- return ;
496+ return false ;
497497 }
498498
499499 if (! target_user.accept_room_invitations) {
@@ -505,7 +505,7 @@ final class Server
505505 " do so before trying to add them again."
506506 )
507507 );
508- return ;
508+ return false ;
509509 }
510510
511511 if (target == owner) {
@@ -516,7 +516,7 @@ final class Server
516516 room_name
517517 )
518518 );
519- return ;
519+ return false ;
520520 }
521521
522522 if (! db.add_room_member(room_name, target)) {
@@ -527,7 +527,7 @@ final class Server
527527 " is already a member of room " , room_name
528528 )
529529 );
530- return ;
530+ return false ;
531531 }
532532
533533 void send_user_msg (string room_username) {
@@ -560,21 +560,23 @@ final class Server
560560 " ] by operator [" , actor, " ]"
561561 )
562562 );
563+
564+ return true ;
563565 }
564566
565- void cancel_room_membership (string room_name, string actor, string target)
567+ bool cancel_room_membership (string room_name, string actor, string target)
566568 {
567569 const owner = db.get_room_owner(room_name);
568570 if (actor != target && actor != owner) {
569571 const actor_type = db.get_room_member_type(room_name, actor);
570572 if (actor_type != RoomMemberType.operator)
571- return ;
573+ return false ;
572574 }
573575
574576 cancel_room_operatorship(room_name, actor, target);
575577
576578 if (! db.del_room_member(room_name, target))
577- return ;
579+ return false ;
578580
579581 void send_user_msg (string room_username) {
580582 auto room_user = get_user(room_username);
@@ -599,24 +601,26 @@ final class Server
599601 auto target_user = get_user(target);
600602 if (target_user ! is null )
601603 target_user.room_membership_canceled(room_name);
604+
605+ return true ;
602606 }
603607
604- void grant_room_operatorship (string room_name, string actor, string target)
608+ bool grant_room_operatorship (string room_name, string actor, string target)
605609 {
606610 if (actor == target)
607- return ;
611+ return false ;
608612
609613 const owner = db.get_room_owner(room_name);
610614 if (actor != owner)
611- return ;
615+ return false ;
612616
613617 auto target_user = get_user(target);
614618 if (target_user is null ) {
615619 send_pm(
616620 server_username, actor,
617621 text(" user " , target, " is not logged in." )
618622 );
619- return ;
623+ return false ;
620624 }
621625
622626 if (! db.grant_room_operatorship(room_name, target)) {
@@ -628,7 +632,7 @@ final class Server
628632 : " must first be a member of room " , room_name
629633 );
630634 send_pm(server_username, actor, message);
631- return ;
635+ return false ;
632636 }
633637
634638 void send_user_msg (string room_username) {
@@ -649,17 +653,18 @@ final class Server
649653 server_username, owner,
650654 text(" User " , target, " is now an operator of room " , room_name)
651655 );
656+ return true ;
652657 }
653658
654- void cancel_room_operatorship (string room_name, string actor,
659+ bool cancel_room_operatorship (string room_name, string actor,
655660 string target)
656661 {
657662 const owner = db.get_room_owner(room_name);
658663 if (actor != target && actor != owner)
659- return ;
664+ return false ;
660665
661666 if (! db.revoke_room_operatorship(room_name, target))
662- return ;
667+ return false ;
663668
664669 void send_user_msg (string room_username) {
665670 auto room_user = get_user(room_username);
@@ -684,6 +689,8 @@ final class Server
684689 auto target_user = get_user(target);
685690 if (target_user ! is null )
686691 target_user.room_operatorship_canceled(room_name);
692+
693+ return true ;
687694 }
688695
689696 auto joined_rooms ()
0 commit comments