Changeset 595

Timestamp:

02/23/05 18:25:37 (4 years ago)

Author:

jajcus

Message:

- per-user presence control: working one-way subscriptions, directed presence and privacy-lists
- ignore list
- customizable status messages for available, unavailable and invisible modes

Files:

• trunk/src/message.c (modified) (8 diffs)
• trunk/src/presence.c (modified) (19 diffs)
• trunk/src/presence.h (modified) (1 diff)
• trunk/src/register.c (modified) (1 diff)
• trunk/src/sessions.c (modified) (16 diffs)
• trunk/src/sessions.h (modified) (2 diffs)
• trunk/src/stream.h (modified) (1 diff)
• trunk/src/users.c (modified) (12 diffs)
• trunk/src/users.h (modified) (3 diffs)

trunk/src/message.c

@@ -51 +51 @@
-void message_locale(struct stream_s *s,const char *from, const char *to,
-                                const char *args, xmlnode msg);
+void message_ignore_unknown(struct stream_s *s,const char *from, const char *to,
+                                const char *args, xmlnode msg);
+void message_ignore(struct stream_s *s,const char *from, const char *to,
+                                const char *args, xmlnode msg);
+void message_unignore(struct stream_s *s,const char *from, const char *to,
+                                const char *args, xmlnode msg);
+void message_status(struct stream_s *s,const char *from, const char *to,
+                                const char *args, xmlnode msg);
+void message_offline_status(struct stream_s *s,const char *from, const char *to,
+                                const char *args, xmlnode msg);
-
-MsgCommand msg_commands[]={
-        {"get roster","gr",N_("Download user list from server"),message_get_roster,0},
-        {"friends only","fo",N_("\"Only for friends\" mode"),message_friends_only,0},
-
+
+
+
-        {"locale","loc",N_("Set user locale (language)"),message_locale,0},
+        {"ignore_unknown","iu",N_("Ignore messages from unknown users"),message_ignore_unknown,0},
+        {"ignore","ig",N_("Add a user to, or view the ignore list"),message_ignore,0},
+        {"unignore","ui",N_("Remove a user from, or view the ignore list"),message_unignore,0},
+        {"status","st",N_("Status message to show to GG users. Use 'off' to use Jabber status."),message_status,0},
+        {"offline_status","os",N_("Status message to show to GG users when not available. Use 'off' to use the one set with the command described above."),message_offline_status,0},
-        {NULL,NULL,NULL,0},
-};
@@ -288 +305 @@
-Session *session;
-User *user;
-int
+gboolean
-
-        session=session_get_by_jid(from,stream,0);
@@ -295 +312 @@
-        else
-                user=user_get_by_jid(from);
-1
-0
+TRUE
+FALSE
-        else on=!user->friends_only;
-
@@ -319 +336 @@
-Session *session;
-User *user;
+char *m;
-int on;
-
@@ -326 +344 @@
-        else
-                user=user_get_by_jid(from);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else on=!user->invisible;
-
-        if (user->invisible==on){
-                message_send(stream,to,from,1,_("No change."),0);
-                return;
-        }
-        user->invisible=on;
-
-
-
-
-
+
+
+
+
+
+
+
-
-        if (session!=NULL) session_send_status(session);
-
+        user_save(user);
+}
+
+void message_status(struct stream_s *stream,const char *from, const char *to,
+                                const char *args, xmlnode msg){
+Session *session;
+User *user;
+char *m;
+
+        session=session_get_by_jid(from,stream,0);
+        if (session!=NULL)
+                user=session->user;
+        else
+                user=user_get_by_jid(from);
+
+        g_free(user->status);
+        if (args) {
+                if (!g_strcasecmp(args,"off")) user->status=NULL;
+                else user->status=g_strndup(args,70);
+        }
+        else user->status=NULL;
+
+        m=g_strdup_printf(_("status: %s%s%s"),
+                        (user->status?"`":""),
+                        (user->status?user->status:_("not set")),
+                        (user->status?"'":""));
+        message_send(stream,to,from,1,m,0);
+        g_free(m);
+
+        if (session!=NULL) session_send_status(session);
+        user_save(user);
+}
+
+void message_offline_status(struct stream_s *stream,const char *from, const char *to,
+                                const char *args, xmlnode msg){
+Session *session;
+User *user;
+char *m;
+
+        session=session_get_by_jid(from,stream,0);
+        if (session!=NULL)
+                user=session->user;
+        else
+                user=user_get_by_jid(from);
+
+        g_free(user->offline_status);
+        if (args) {
+                if (!g_strcasecmp(args,"off")) user->offline_status=NULL;
+                else user->offline_status=g_strndup(args,70);
+        }
+        else user->offline_status=NULL;
+
+        m=g_strdup_printf(_("offline status: %s%s%s"),
+                        (user->offline_status?"`":""),
+                        (user->offline_status?user->offline_status:_("not set")),
+                        (user->offline_status?"'":""));
+        message_send(stream,to,from,1,m,0);
+        g_free(m);
+
+        if (session!=NULL) session_send_status(session);
-        user_save(user);
-}
@@ -369 +462 @@
-}
-
+void message_ignore_unknown(struct stream_s *stream,const char *from, const char *to,
+                                const char *args, xmlnode msg){
+Session *session;
+User *user;
+int on;
+
+        session=session_get_by_jid(from,stream,0);
+        if (session!=NULL)
+                user=session->user;
+        else
+                user=user_get_by_jid(from);
+        if (args && g_strcasecmp(args,"on")==0) on=TRUE;
+        else if (args && g_strcasecmp(args,"off")==0) on=FALSE;
+        else on=!user->ignore_unknown;
+
+        if (user->ignore_unknown==on){
+                message_send(stream,to,from,1,_("No change."),0);
+                return;
+        }
+        user->ignore_unknown=on;
+
+        if (on)
+                message_send(stream,to,from,1,_("ignore unknown: on"),0);
+        else
+                message_send(stream,to,from,1,_("ignore unknown: off"),0);
+
+        if (session!=NULL) session_send_status(session);
+
+        user_save(user);
+}
+
+
+void message_ignore(struct stream_s *stream,const char *from, const char *to,
+                                const char *args, xmlnode msg){
+Session *session;
+User *user;
+uin_t uin;
+Contact *c;
+gchar *m;
+
+        session=session_get_by_jid(from,stream,0);
+        if (session!=NULL)
+                user=session->user;
+        else
+                user=user_get_by_jid(from);
+
+        if (args && *args) uin=atoi(args);
+        else uin=0;
+
+        if (uin<=0) {
+                GList *it;
+                m=g_strdup(_("\nMessages from the following GG numbers will be ignored:"));
+                for(it=user->contacts;it;it=it->next){
+                        c=(Contact *)it->data;
+                        if (!c->ignored) continue;
+                        m=g_strdup_printf(_("%s\n  %li"),m,(long)c->uin);
+                }
+                message_send(stream,to,from,1,m,0);
+                g_free(m);
+                return;
+        }
+
+        c=user_get_contact(user,uin,TRUE);
+        c->ignored=TRUE;
+        if (session) session_update_contact(session,c);
+                
+        m=g_strdup_printf(_("\nMessages from GG number %li will be ignored."),(long)uin);
+        message_send(stream,to,from,1,m,0);
+        g_free(m);
+
+        user_save(user);
+}
+
+void message_unignore(struct stream_s *stream,const char *from, const char *to,
+                                const char *args, xmlnode msg){
+Session *session;
+User *user;
+uin_t uin;
+Contact *c;
+gchar *m;
+
+        session=session_get_by_jid(from,stream,0);
+        if (session!=NULL)
+                user=session->user;
+        else
+                user=user_get_by_jid(from);
+
+        if (args && *args) uin=atoi(args);
+        else uin=0;
+
+        if (uin<=0) {
+                message_ignore(stream,from,to,NULL,msg);
+                return;
+        }
+
+        c=user_get_contact(user,uin,FALSE);
+        if (c) {
+                c->ignored=FALSE;
+                user_check_contact(user,c);
+                if (session) session_update_contact(session,c);
+        }
+                
+        m=g_strdup_printf(_("\nMessages from GG number %li will NOT be ignored."),(long)uin);
+        message_send(stream,to,from,1,m,0);
+        g_free(m);
+        
+        user_save(user);
+}
-
-int message_to_me(struct stream_s *stream,const char *from,
-                const char *to,const char *body,xmlnode tag){
-
+,ignored
-const char *ce;
-char *args,*p;
@@ -378 +579 @@
-Session *sess;
-char *msg;
+GList *it;
-
-        sess=session_get_by_jid(from,stream,1);
@@ -417 +619 @@
-        msg=g_strdup_printf(_("%s\n  friends only: %s"),msg,user->friends_only?_("on"):_("off"));
-        msg=g_strdup_printf(_("%s\n  invisible: %s"),msg,user->invisible?_("on"):_("off"));
+        msg=g_strdup_printf(_("%s\n  ignore unknown: %s"),msg,user->ignore_unknown?_("on"):_("off"));
-        msg=g_strdup_printf(_("%s\n  locale: %s"),msg,user->locale?user->locale:_("_default_"));
+        ignored=0;
+        for(it=user->contacts;it;it=it->next){
+                Contact * c=(Contact *)it->data;
+                if (c->ignored) ignored++;
+        }
+        msg=g_strdup_printf(_("%s\n  number of ignored users: %i"),msg,ignored);
-        msg=g_strdup_printf(_("%s\n\nRegistered as: %u"),msg,user->uin);
-        if (sess->ggs) msg=g_strdup_printf("%s\n  %s",msg,session_get_info_string(sess));

trunk/src/presence.c

@@ -66 +66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-xmlnode pres;
-
@@ -94 +79 @@
-        }
-        xmlnode_put_attrib(pres,"to",to);
-subscri
+pro
-        stream_write(stream,pres);
-        xmlnode_free(pres);
@@ -100 +85 @@
-}
-
-d
+
-xmlnode pres;
-
@@ -113 +98 @@
-        }
-        xmlnode_put_attrib(pres,"to",to);
-d
+
-        stream_write(stream,pres);
-        xmlnode_free(pres);
@@ -119 +104 @@
-}
-
-un
+
-xmlnode pres;
-
@@ -132 +117 @@
-        }
-        xmlnode_put_attrib(pres,"to",to);
-un
+
-        stream_write(stream,pres);
-        xmlnode_free(pres);
@@ -138 +123 @@
-}
-
-
+d
-xmlnode pres;
-
@@ -151 +136 @@
-        }
-        xmlnode_put_attrib(pres,"to",to);
-
+d
-        stream_write(stream,pres);
-        xmlnode_free(pres);
@@ -157 +142 @@
-}
-
-
-
-
+
-xmlnode pres;
-xmlnode n;
-
-        pres=xmlnode_new_tag("presence");
@@ -173 +155 @@
-        }
-        xmlnode_put_attrib(pres,"to",to);
+        xmlnode_put_attrib(pres,"type","unsubscribe");
+        stream_write(stream,pres);
+        xmlnode_free(pres);
+        return 0;
+}
+
+int presence_send(struct stream_s *stream,const char *from,
+                const char *to,int available,const char *show,
+                const char *status,GTime timestamp){
+xmlnode pres;
+xmlnode n;
+
+        pres=xmlnode_new_tag("presence");
+        if (from!=NULL)
+                xmlnode_put_attrib(pres,"from",from);
+        else{
+                char *jid;
+                jid=jid_my_registered();
+                xmlnode_put_attrib(pres,"from",jid);
+                g_free(jid);
+        }
+        xmlnode_put_attrib(pres,"to",to);
-
-        /* if (available==-1) xmlnode_put_attrib(pres,"type","invisible");
@@ -229 +233 @@
-User *u;
-Session *s;
-
+
+
+
-
-        u=user_get_by_jid(from);
@@ -248 +254 @@
-        }
-        s=session_get_by_jid(from,stream,0);
-        if (!s){
-                g_warning(N_("Couldn't find or open session for '%s'"),from);
-                return -1;
-        }
-        debug(L_("Subscribing %s to %s..."),from,to);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-}
-
-int presence_unsubscribed(struct stream_s *stream,const char *from,const char *to){
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-}
@@ -274 +394 @@
-Session *s;
-User *u;
+Contact *c;
-uin_t uin;
-int status;
@@ -312 +433 @@
-
-        uin=jid_get_uin(to);
+
+        c=user_get_contact(u,uin,TRUE);
+        if (!c) {
+                return -1;
+        }
+        if (c->subscribe==SUB_FROM) c->subscribe=SUB_NONE;
+        else if (c->subscribe==SUB_BOTH) c->subscribe=SUB_TO;
+        user_save(u);
+
+        if (s) session_update_contact(s,c);     
+
-        status=0;
-        stat=NULL;
@@ -333 +465 @@
-        if (available) presence_send(stream,jid_build_full(uin),u->jid,available,show,stat,timestamp);
-        else presence_send(stream,jid_build(uin),u->jid,available,show,stat,timestamp);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (!s){
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-}
@@ -436 +577 @@
-        if (!strcmp(type,"available")){
-                if (jid_has_uin(to))
-0
+presence_direct_available(stream,from,to)
-                else
-                        return presence(stream,from,to,1,show,status,priority);
@@ -442 +583 @@
-        else if (!strcmp(type,"unavailable")){
-                if (jid_has_uin(to))
-0
+presence_direct_unavailable(stream,from,to)
-                else
-                        return presence(stream,from,to,0,show,status,priority);
@@ -448 +589 @@
-        if (!strcmp(type,"invisible")){
-                if (jid_has_uin(to))
-0
+presence_direct_unavailable(stream,from,to)
-                else
-                        return presence(stream,from,to,-1,show,status,priority);
@@ -457 +598 @@
-                return presence_unsubscribe(stream,from,to);
-        else if (!strcmp(type,"subscribed"))
-
+d
-        else if (!strcmp(type,"unsubscribed"))
-                return presence_unsubscribed(stream,from,to);

trunk/src/presence.h

@@ -38 +38 @@
-                const char *to,int available,const char *show,
-                const char *status,GTime timestamp);
-
+ const char *from, 
-
-int jabber_presence(struct stream_s *stream,xmlnode tag);

trunk/src/register.c

@@ -223 +223 @@
-        g_free(newpasswdW);
-        g_free(qaW);
-
+ 
-                r=add_request(RT_PASSWD,from,to,id,form,gghttp,s);
-                r->data=g_strdup(newpasswd);
-        }
-        
-        return 0;
-}

trunk/src/sessions.c

@@ -187 +187 @@
-
-        jid=(char *)data;
-
+NULL,
-        g_free(jid);
-        return FALSE;
@@ -260 +260 @@
-char *ujid;
-char *show;
+Contact *c;
+
+        c=user_get_contact(s->user,uin,FALSE);
+        if (c==NULL) {
+                debug(L_("%s got notification from unknown contact %i, ignoring.."),s->user->jid,uin);
+                return 0;
+        }
+        if (!c->got_probe && c->subscribe!=SUB_TO && c->subscribe!=SUB_BOTH) {
+                debug(L_("%s got notification from contact %i whose presence was not requested, ignoring.."),s->user->jid,uin);
+                return 0;
+        }
-
-        available=status_gg_to_jabber(status,&show,&desc);
@@ -272 +283 @@
-        presence_send(s->s,ujid,s->user->jid,available,show,desc,0);
-        g_free(ujid);
-        return 0;
-}
-
-int session_send_notify(Session *s){
-GList *it;
-uin_t *userlist;
-int userlist_len;
-int i;
-
-        g_assert(s!=NULL);
-        userlist_len=g_list_length(s->user->contacts);
-        userlist=g_new(uin_t,userlist_len+1);
-
-        i=0;
-        for(it=g_list_first(s->user->contacts);it;it=it->next)
-                userlist[i++]=((Contact *)it->data)->uin;
-
-        userlist[i]=0;
-
-        debug("gg_notify(%p,%p,%i)",s->ggs,userlist,userlist_len);
-        gg_notify(s->ggs,userlist,userlist_len);
-
-        g_free(userlist);
-        return 0;
-}
@@ -373 +361 @@
-int chat;
-GIOCondition cond;
-Resource *r;
-time_t timestamp;
-
@@ -441 +428 @@
-                        if (s->user->contacts) session_send_notify(s);
-
-
-
-
-
-
+
-                        if (s->timeout_func) g_source_remove(s->timeout_func);
-                        s->ping_timeout_func=
@@ -498 +481 @@
-                                                        event->event.msg.msgclass,
-                                                        (unsigned long)event->event.msg.time);
+                        
-                        if (event->event.msg.sender==0){
-                                if (!user_sys_msg_received(s->user,event->event.msg.msgclass)) break;
@@ -511 +495 @@
-                        }
-                        else{
+                                Contact *c=user_get_contact(s->user,
+                                                event->event.msg.sender,0);
+                                if ((!c && s->user->ignore_unknown) 
+                                                || (c && c->ignored)) {
+                                        debug(L_("Ignoring the message."));
+                                        break;
+                                }
-                                jid=jid_build_full(event->event.msg.sender);
-                                if ((event->event.msg.msgclass&GG_CLASS_CHAT)!=0) chat=1;
@@ -623 +614 @@
-
-/* returns: -1 on error, 1 on status change, 0 on no change */
-int session_make_status(Session *s
+static int session_do_make_status(Session *s, Resource *r, gboolean send_presence
-int status;
-
-
-
-
+
+
+
+
+
+
-        status=status_jabber_to_gg(r->available,r->show,r->status);
-
+
+
+
+
+
+
+
-        else if (s->user->friends_only) status|=GG_STATUS_FRIENDS_MASK;
-
-        if (status==s->gg_status){
-                if (r->status!=NULL && s->gg_status_descr!=NULL
-r->status
+status_descr
-                if (r->status==NULL && s->gg_status_descr==NULL) return 0;
-        }
-        g_free(s->gg_status_descr);
-r->status
+status_descr
-        s->gg_status=status;
+        if (send_presence) {
+                presence_send(s->s,NULL,s->user->jid,r->available,r->show,s->gg_status_descr,0);
+        }
-        return 1;
-}
+
+Resource *session_get_cur_resource(Session *s){
+GList *it;
+Resource *r=NULL;
+int maxprio;
+
+        maxprio=-129;
+        for(it=g_list_last(s->resources);it;it=it->prev){
+                Resource *r1=(Resource *)it->data;
+                if (r1->priority>maxprio){
+                        r=r1;
+                        maxprio=r1->priority;
+                }
+        }
+        return r;
+}
+
+/* returns: -1 on error, 1 on status change, 0 on no change */
+int session_make_status(Session *s, gboolean send_presence){
+Resource *r;
+
+        r=session_get_cur_resource(s);
+        return session_do_make_status(s,r,send_presence);
+}
+
-
-static int session_try_login(Session *s){
@@ -664 +691 @@
-        login_params.protocol_version=GG_DEFAULT_PROTOCOL_VERSION;
-
-
+, FALSE
-        if (r!=-1){
-                debug(L_("Setting gg status to %i (%s)"),s->gg_status,s->gg_status_descr);
@@ -734 +761 @@
-User *u;
-char *njid;
+GList *it;
-
-        g_assert(sessions_jid!=NULL);
@@ -751 +779 @@
-        u=user_get_by_jid(jid);
-        if (!u) return NULL;
+
+        debug(L_("User loaded processing his subscriptions."));
+        for(it=u->contacts;it;it=it->next){
+                Contact *c;
+                char *c_jid;
+                c=(Contact *)it->data;
+                if (c->subscribe == SUB_UNDEFINED) {
+                        c_jid=jid_build(c->uin);
+                        presence_send_subscribe(stream,c_jid,u->jid);
+                        g_free(c_jid);
+                }
+                else if (c->subscribe == SUB_FROM || c->subscribe == SUB_BOTH){
+                        c_jid=jid_build(c->uin);
+                        presence_send_probe(stream,c_jid,u->jid);
+                        g_free(c_jid);
+                }
+        }
-        debug(L_("Creating new session"));
-        return session_create(u,jid,NULL,NULL,stream,delay_login);
-}
-
-Resource *session_get_cur_resource(Session *s){
-GList *it;
-Resource *r=NULL;
-int maxprio;
-
-        maxprio=-129;
-        for(it=g_list_last(s->resources);it;it=it->prev){
-                Resource *r1=(Resource *)it->data;
-                if (r1->priority>maxprio){
-                        r=r1;
-                        maxprio=r1->priority;
-                }
-        }
-        return r;
-}
-
-int session_send_status(Session *s){
-int r;
@@ -776 +805 @@
-        g_assert(s!=NULL);
-        if (s->ggs==NULL) return -1;
-
+, s->connected
-        if (r==-1) return -1;
-        if (r==0) return 0;
@@ -804 +833 @@
-                return;
-        }
-
-
+