* Removed the semi-broken "chat room" functionality in the chat system, and

  replaced it with direct mapping to the actual Citadel room the user is in.
* Display masqueraded roomname in chat, if applicable.  Fixes bug #19.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 5bdd516f5cefd9fe3870408dd442cdaba7931d02..d9729533ddb5a7f64a77ac71c9f96a36e74b713a 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 1.487  2000/03/12 00:21:35  ajc
+* Removed the semi-broken "chat room" functionality in the chat system, and
+  replaced it with direct mapping to the actual Citadel room the user is in.
+* Display masqueraded roomname in chat, if applicable.  Fixes bug #19.
+
 Revision 1.486  2000/03/11 21:29:37  ajc
 * SM_ flags for CtdlSaveMsgPointerInRoom() need to be a bit bucket, not an
   enum, since more than one can be passed.  Changed SM_DONT_BUMP_REF_COUNT
@@ -1729,3 +1734,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
+

diff --git a/citadel/policy.c b/citadel/policy.c
index f3df450b5939c58b7166666fc6e57dac1919a946..3beea2bb289aa3eaecf6ac05d789e2dcbba14d8a 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -16,7 +16,6 @@
 #include "support.h"
 #include "user_ops.h"
 #include "msgbase.h"
-#include "serv_chat.h"
 #include "citserver.h"
 #include "tools.h"
 

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 12c74727f1a984562c3d539a80723441c3de5552..2c4cfa7eb2ef28d3f5958f8c50370d8d10e488fd 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -17,7 +17,6 @@
 #include "support.h"
 #include "user_ops.h"
 #include "msgbase.h"
-#include "serv_chat.h"
 #include "citserver.h"
 #include "control.h"
 #include "tools.h"

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 6416b78b254e14f8152640452e3c575b44201f76..6d428a18b5a7e68fa667fe45ba61980fd92081a1 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -49,7 +49,7 @@ char *Dynamic_Module_Init(void)
        return "$Id$";
 }
 
-void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
+void allwrite(char *cmdbuf, int flag, char *username)
 {
        FILE *fp;
        char bcast[256];
@@ -83,7 +83,8 @@ void allwrite(char *cmdbuf, int flag, char *roomname, char *username)
        time(&now);
        clnew->next = NULL;
        clnew->chat_time = now;
-       safestrncpy(clnew->chat_room, roomname, sizeof clnew->chat_room);
+       safestrncpy(clnew->chat_room, CC->quickroom.QRname,
+                       sizeof clnew->chat_room);
        clnew->chat_room[sizeof clnew->chat_room - 1] = 0;
        if (username) {
                safestrncpy(clnew->chat_username, username,
@@ -157,24 +158,43 @@ void do_chat_listing(int allflag)
 {
        struct CitContext *ccptr;
        int count = 0;
+       int count_elsewhere = 0;
        char roomname[ROOMNAMELEN];
 
        if ((allflag == 0) || (allflag == 1))
                cprintf(":|\n:| Users currently in chat:\n");
        begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-               if (ccptr->cs_flags & CS_CHAT) ++count;
+               if (ccptr->cs_flags & CS_CHAT) {
+                       if (!strcasecmp(ccptr->quickroom.QRname,
+                          CC->quickroom.QRname)) {
+                               ++count;
+                       }
+                       else {
+                               ++count_elsewhere;
+                       }
+               }
+
+               GenerateRoomDisplay(roomname, ccptr, CC);
+               if ((CC->usersupp.axlevel < 6)
+                  && (strlen(ccptr->fake_roomname)>0)) {
+                       strcpy(roomname, ccptr->fake_roomname);
+               }
+
                if ((ccptr->cs_flags & CS_CHAT)
                    && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
-                       if ((allflag == 0) || (allflag == 1))
-                               cprintf(":| %-25s <%s>\n", (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user, ccptr->chat_room);
+                       if ((allflag == 0) || (allflag == 1)) {
+                               cprintf(":| %-25s <%s>:\n",
+                                       (ccptr->fake_username[0]) ? ccptr->fake_username : ccptr->curr_user,
+                                       roomname);
+                       }
                }
        }
 
        if (allflag == 1) {
                cprintf(":|\n:| Users not in chat:\n");
                for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-                       GenerateRoomDisplay(roomname, ccptr, CC);
+
                        if (((ccptr->cs_flags & CS_CHAT) == 0)
                            && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
                                cprintf(":| %-25s <%s>:\n",
@@ -186,10 +206,15 @@ void do_chat_listing(int allflag)
        end_critical_section(S_SESSION_TABLE);
 
        if (allflag == 2) {
-               if (count > 1) 
+               if (count > 1) {
                        cprintf(":|There are %d users here.\n", count);
-               else
+               }
+               else {
                        cprintf(":|Note: you are the only one here.\n");
+               }
+               if (count_elsewhere > 0) {
+                       cprintf(":|There are %d users chatting in other rooms.\n", count_elsewhere);
+               }
        }
 
        cprintf(":|\n");
@@ -210,7 +235,6 @@ void cmd_chat(char *argbuf)
                cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
                return;
        }
-       strcpy(CC->chat_room, "Main room");
 
        CC->cs_flags = CC->cs_flags | CS_CHAT;
        cprintf("%d Entering chat mode (type '/help' for available commands)\n",
@@ -219,7 +243,7 @@ void cmd_chat(char *argbuf)
        MyLastMsg = ChatLastMsg;
 
        if ((CC->cs_flags & CS_STEALTH) == 0) {
-               allwrite("<entering chat>", 0, CC->chat_room, NULL);
+               allwrite("<entering chat>", 0, NULL);
        }
        strcpy(cmdbuf, "");
 
@@ -238,8 +262,7 @@ void cmd_chat(char *argbuf)
 
                if (retval < 0) {       /* socket broken? */
                        if ((CC->cs_flags & CS_STEALTH) == 0) {
-                               allwrite("<disconnected>", 0,
-                                       CC->chat_room, NULL);
+                               allwrite("<disconnected>", 0, NULL);
                        }
                        return;
                }
@@ -264,7 +287,7 @@ void cmd_chat(char *argbuf)
 
                                if (!strcmp(cmdbuf, "000")) {
                                        if ((CC->cs_flags & CS_STEALTH) == 0) {
-                                               allwrite("<exiting chat>", 0, CC->chat_room, NULL);
+                                               allwrite("<exiting chat>", 0, NULL);
                                        }
                                        sleep(1);
                                        cprintf("000\n");
@@ -282,7 +305,6 @@ void cmd_chat(char *argbuf)
                                        cprintf(":|/whobbs (list users in chat -and- elsewhere) \n");
                                        cprintf(":|/me     ('action' line, ala irc) \n");
                                        cprintf(":|/msg    (send private message, ala irc) \n");
-                                       cprintf(":|/join   (join new room) \n");
                                        cprintf(":|/quit   (return to the BBS) \n");
                                        cprintf(":|\n");
                                        ok_cmd = 1;
@@ -296,36 +318,23 @@ void cmd_chat(char *argbuf)
                                        ok_cmd = 1;
                                }
                                if (!strncasecmp(cmdbuf, "/me ", 4)) {
-                                       allwrite(&cmdbuf[4], 1, CC->chat_room, NULL);
+                                       allwrite(&cmdbuf[4], 1, NULL);
                                        ok_cmd = 1;
                                }
                                if (!strncasecmp(cmdbuf, "/msg ", 5)) {
                                        ok_cmd = 1;
                                        strptr1 = &cmdbuf[5];
                                        if ((t_context = find_context(&strptr1))) {
-                                               allwrite(strptr1, 2, "", CC->curr_user);
+                                               allwrite(strptr1, 2, CC->curr_user);
                                                if (strcasecmp(CC->curr_user, t_context->curr_user))
-                                                       allwrite(strptr1, 2, "", t_context->curr_user);
+                                                       allwrite(strptr1, 2, t_context->curr_user);
                                        } else
                                                cprintf(":|User not found.\n", cmdbuf);
                                        cprintf("\n");
                                }
-                               if (!strncasecmp(cmdbuf, "/join ", 6)) {
-                                       ok_cmd = 1;
-                                       allwrite("<changing rooms>", 0, CC->chat_room, NULL);
-                                       if (!cmdbuf[6])
-                                               strcpy(CC->chat_room, "Main room");
-                                       else {
-                                               strncpy(CC->chat_room, &cmdbuf[6],
-                                                  sizeof CC->chat_room);
-                                               CC->chat_room[sizeof CC->chat_room - 1] = 0;
-                                       }
-                                       allwrite("<joining room>", 0, CC->chat_room, NULL);
-                                       cprintf("\n");
-                               }
                                if ((cmdbuf[0] != '/') && (strlen(cmdbuf) > 0)) {
                                        ok_cmd = 1;
-                                       allwrite(cmdbuf, 0, CC->chat_room, NULL);
+                                       allwrite(cmdbuf, 0, NULL);
                                }
                                if ((!ok_cmd) && (cmdbuf[0]) && (cmdbuf[0] != '\n'))
                                        cprintf(":|Command %s is not understood.\n", cmdbuf);
@@ -343,7 +352,7 @@ void cmd_chat(char *argbuf)
                        ThisLastMsg = ChatLastMsg;
                        for (clptr = ChatQueue; clptr != NULL; clptr = clptr->next) {
                                if ((clptr->chat_seq > MyLastMsg) && ((!clptr->chat_username[0]) || (!strncasecmp(un, clptr->chat_username, 32)))) {
-                                       if ((!clptr->chat_room[0]) || (!strncasecmp(CC->chat_room, clptr->chat_room, ROOMNAMELEN))) {
+                                       if ((!clptr->chat_room[0]) || (!strncasecmp(CC->quickroom.QRname, clptr->chat_room, ROOMNAMELEN))) {
                                                cprintf("%s\n", clptr->chat_text);
                                        }
                                }

diff --git a/citadel/serv_chat.h b/citadel/serv_chat.h
index 855b9ac3861e2ba79dda7967dc6c2ed67319b3fd..18222f5dc1c0ade238452c67fec8d441cb0e0a86 100644 (file)
--- a/citadel/serv_chat.h
+++ b/citadel/serv_chat.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 void ChatUnloadingTest(void);
-void allwrite (char *cmdbuf, int flag, char *roomname, char *username);
+void allwrite (char *cmdbuf, int flag, char *username);
 t_context *find_context (char **unstr);
 void do_chat_listing (int allflag);
 void cmd_chat (char *argbuf);

diff --git a/citadel/server.h b/citadel/server.h
index 9b105bf85db544ba70bd8254680c72cdc723ad83..e265e5564e7011eda4c790adeb7df01b9d671aee 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -88,7 +88,6 @@ struct CitContext {
        char upl_path[256];
        char upl_comment[256];
        char upl_filedir[256];
-       char chat_room[20];     /* The chat room */
        char dl_is_net;
        char upload_type;
 
@@ -147,8 +146,8 @@ struct ChatLine {
        int chat_seq;
        time_t chat_time;
        char chat_text[256];
-       char chat_room[20];
        char chat_username[32];
+       char chat_room[ROOMNAMELEN];
 };
 
 /*