Consolidate clearing member user pointers into clear_cached_users()

src/mod/share.mod/share.cc

@@ -1389,8 +1389,6 @@ static void share_read_stream(int idx, bd::Stream& stream) {
 
     Context;
     clear_userlist(u);          /* Clear new, obsolete, user list.      */
-    clear_chanlist();           /* Remove all user references from the
-                                 * channel lists.                       */
 
     userlist = ou;              /* Revert to old user list.             */
     lastuser = NULL;            /* Reset last accessed user ptr.        */
@@ -1416,8 +1414,7 @@ static void share_read_stream(int idx, bd::Stream& stream) {
   /* SUCCESS! */
 
   loading = 0;
-  clear_chanlist();             /* Remove all user references from the
-                                 * channel lists.                       */
+
   userlist = u;                 /* Set new user list.                   */
   lastuser = NULL;              /* Reset last accessed user ptr.        */
   putlog(LOG_BOTS, "*", "%s.", "Userlist transfer complete; switched over");

src/userrec.cc

@@ -192,6 +192,8 @@ void clear_cached_users()
 
   if (!conf.bot->hub) {
     Auth::NullUsers();
+    clear_chanlist();           /* Remove all user references from the
+                                 * channel lists.                       */
   }
 }
 
@@ -234,8 +236,6 @@ void clear_userlist(struct userrec *bu)
     struct chanset_t *cst = NULL;
 
     clear_cached_users();
-
-    clear_chanlist();
     lastuser = NULL;
 
     while (global_ign)