Only return chatroom that belongs to non-gateway services

Send an unsubscribe when removing a bookmark
Set the parent service when requesting the chatroom disco#info

app/Info.php

@@ -74,6 +74,24 @@ class Info extends Model
         }
     }
 
+    public function scopeRestrictMucServices($query)
+    {
+        $query->whereIn('parent', function ($query) {
+            $query->select('server')
+                ->from('infos')
+                ->whereIn('id', function ($query) {
+                    $query->select('info_id')
+                        ->from('identities')
+                        ->where('category', 'conference');
+                })
+                ->whereNotIn('id', function ($query) {
+                    $query->select('info_id')
+                        ->from('identities')
+                        ->where('category', 'gateway');
+                });
+        });
+    }
+
     public function setReactionsrestrictionsAttribute(array $arr)
     {
         $this->attributes['reactionsrestrictions'] = serialize($arr);

app/Message.php

@@ -657,7 +657,7 @@ class Message extends Model
 
         if ($post = $xmppUri->getPost()) {
             $this->postid = $post->id;
-        } else {
+        } elseif($xmppUri->getServer() && $xmppUri->getNode() && $xmppUri->getNodeItemId()) {
             $getItem = new GetItem;
             $getItem->setTo($xmppUri->getServer())
                 ->setNode($xmppUri->getNode())

app/Widgets/Chat/_chat_header.tpl

@@ -111,16 +111,6 @@
                         {/if}
                     </span>
 
-                    {if="$conference && $conference->info && $conference->info->name"}
-                        <span class="second" title="{$conference->info->name}">
-                            {$conference->info->name}
-                        </span>
-                    {/if}
-
-                    {if="$conference && $conference->info && $conference->isGroupChat() && $conference->subject && $conference->info->name"}
-                        <span class="second">•</span>
-                    {/if}
-
                     {if="$conference && $conference->isGroupChat() && $subject = $conference->subject"}
                         <span class="second" title="{$subject}">
                             {$subject}

app/Widgets/Rooms/Rooms.php

@@ -167,8 +167,11 @@ class Rooms extends Base
                 ->get() as $room
         ) {
             if (!$room->info) {
+                $jid = explodeJid($room->conference);
+
                 $request = new Request;
                 $request->setTo($room->conference)
+                    ->setParent($jid['server'])
                     ->request();
             }
 
@@ -284,8 +287,11 @@ class Rooms extends Base
             return;
         }
 
+        $jid = explodeJid($room);
+
         $r = new Request;
         $r->setTo($room)
+            ->setParent($jid['server'])
             ->request();
 
         $p = new Muc;
@@ -295,7 +301,6 @@ class Rooms extends Base
             $nickname = $this->user->username;
         }
 
-        $jid = explodeJid($room);
         $capability = \App\Info::where('server', $jid['server'])
             ->where('node', '')
             ->first();
@@ -308,10 +313,6 @@ class Rooms extends Base
             if ($capability->isMAM2()) {
                 $p->enableMAM2();
             }
-        } else {
-            $r = new Request;
-            $r->setTo($jid['server'])
-                ->request();
         }
 
         $m = new GetMembers;

app/Widgets/RoomsExplore/RoomsExplore.php

@@ -29,11 +29,13 @@ class RoomsExplore extends Base
         }
 
         $view->assign('vcards', Contact::whereIn('id', $keys)->get()->keyBy('id'));
-        $view->assign('bookmarks', $this->user->session
-                                        ->conferences()
-                                        ->whereIn('conference', $keys)
-                                        ->get()
-                                        ->keyBy('conference')
+        $view->assign(
+            'bookmarks',
+            $this->user->session
+                ->conferences()
+                ->whereIn('conference', $keys)
+                ->get()
+                ->keyBy('conference')
         );
         $view->assign('results', $results);
         $view->assign('global', $packet->content['global']);
@@ -79,7 +81,7 @@ class RoomsExplore extends Base
         } else {
             $s = new Search;
             $s->setKeyword($keyword)
-              ->request();
+                ->request();
         }
     }
 
@@ -88,6 +90,7 @@ class RoomsExplore extends Base
         $view = $this->tpl();
         $rooms = \App\Info::whereCategory('conference')
             ->restrictUserHost()
+            ->restrictMucServices()
             ->whereType('text')
             ->where('mucpublic', true)
             ->where('mucpersistent', true)
@@ -95,10 +98,10 @@ class RoomsExplore extends Base
             ->orderBy('occupants', 'desc');
 
         if ($keyword) {
-            $rooms = $rooms->where(function($query) use ($keyword) {
-                $query->where('name', 'like', '%'.$keyword.'%')
-                    ->orWhere('server', 'like', '%'.$keyword.'%')
-                    ->orWhere('description', 'like', '%'.$keyword.'%');
+            $rooms = $rooms->where(function ($query) use ($keyword) {
+                $query->where('name', 'like', '%' . $keyword . '%')
+                    ->orWhere('server', 'like', '%' . $keyword . '%')
+                    ->orWhere('description', 'like', '%' . $keyword . '%');
             });
         }
 
@@ -106,11 +109,13 @@ class RoomsExplore extends Base
 
         $view->assign('vcards', Contact::whereIn('id', $rooms->pluck('server'))->get()->keyBy('id'));
         $view->assign('rooms', $rooms);
-        $view->assign('bookmarks', $this->user->session
-                                        ->conferences()
-                                        ->whereIn('conference', $rooms->pluck('server'))
-                                        ->get()
-                                        ->keyBy('conference')
+        $view->assign(
+            'bookmarks',
+            $this->user->session
+                ->conferences()
+                ->whereIn('conference', $rooms->pluck('server'))
+                ->get()
+                ->keyBy('conference')
         );
 
         $this->rpc('MovimTpl.fill', '#roomsexplore_local', $view->draw('_roomsexplore_local'));

app/Widgets/RoomsUtils/RoomsUtils.php

@@ -34,6 +34,7 @@ use Moxl\Xec\Action\Presence\Muc;
 use Moxl\Xec\Action\Presence\Unavailable;
 
 use Illuminate\Database\Capsule\Manager as DB;
+use Moxl\Xec\Action\Register\Remove;
 
 class RoomsUtils extends Base
 {
@@ -557,6 +558,10 @@ class RoomsUtils extends Base
         $d->setId($room)
             ->setVersion($conference->bookmarkversion)
             ->request();
+
+        $unregister = new Remove;
+        $unregister->setTo($room)
+            ->request();
     }
 
     /**

app/Widgets/RoomsUtils/_rooms_drawer.tpl

@@ -65,7 +65,7 @@
         {if="$conference->subject"}
             <li>
                 <span class="primary icon gray">
-                    <i class="material-symbols">short_text</i>
+                    <i class="material-symbols">info_i</i>
                 </span>
                 <div>
                     <p class="line">
@@ -77,7 +77,25 @@
                     </p>
                     <p class="all">
                         {autoescape="off"}
-                            {$conference->subject|addUrls}
+                            {$conference->subject|addUrls|nl2br}
+                        {/autoescape}
+                    </p>
+                </div>
+            </li>
+        {/if}
+
+        {if="$conference->info->description"}
+            <li>
+                <span class="primary icon gray">
+                    <i class="material-symbols">short_text</i>
+                </span>
+                <div>
+                    <p class="line">
+                        {$c->__('information.description')}
+                    </p>
+                    <p class="all">
+                        {autoescape="off"}
+                            {$conference->info->description|addUrls|nl2br}
                         {/autoescape}
                     </p>
                 </div>

src/Moxl/API.php

@@ -18,7 +18,7 @@ class API
         if ($me->id && $me->session && $me->session->resource) {
             $iq->setAttribute(
                 'from',
-                $me->id.'/'.$me->session->resource
+                $me->id . '/' . $me->session->resource
             );
         }
 

src/Moxl/Stanza/Register.php

@@ -34,13 +34,13 @@ class Register
         \Moxl\API::request(\Moxl\API::iqWrapper($query, $to, 'set'));
     }
 
-    public static function remove()
+    public static function remove(?string $to)
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $query = $dom->createElementNS('jabber:iq:register', 'query');
         $query->appendChild($dom->createElement('remove'));
 
-        \Moxl\API::request(\Moxl\API::iqWrapper($query, false, 'set'));
+        \Moxl\API::request(\Moxl\API::iqWrapper($query, $to ?? false, 'set'));
     }
 
     public static function changePassword($to, $username, $password)

src/Moxl/Xec/Action/Register/Remove.php

@@ -7,10 +7,12 @@ use Moxl\Stanza\Register;
 
 class Remove extends Action
 {
+    protected ?string $_to = null;
+
     public function request()
     {
         $this->store();
-        Register::remove();
+        Register::remove($this->_to);
     }
 
     public function handle(?\SimpleXMLElement $stanza = null, ?\SimpleXMLElement $parent = null)
@@ -20,7 +22,10 @@ class Remove extends Action
 
     public function error(string $errorId, ?string $message = null)
     {
-        $this->pack($message);
-        $this->deliver();
+        // We don't handle errors for now if we unregister from a specific thing
+        if ($this->_to == null) {
+            $this->pack($message);
+            $this->deliver();
+        }
     }
 }