Changeset 3fbce97 for irc.h

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• irc.h (modified) (7 diffs)

irc.h

@@ -49 +49 @@
         USTATUS_SHUTDOWN = 8,   /* Now used to indicate we're shutting down.
                                    Currently just blocks irc_vawrite(). */
+        USTATUS_CAP_PENDING = 16,
+        USTATUS_SASL_PLAIN_PENDING = 32,
 
         /* Not really status stuff, but other kinds of flags: For slightly
@@ -65 +67 @@
 } irc_status_t;
 
+typedef enum {
+        CAP_SASL = (1 << 0),
+        CAP_MULTI_PREFIX = (1 << 1),
+        CAP_EXTENDED_JOIN = (1 << 2),
+        CAP_AWAY_NOTIFY = (1 << 3),
+        CAP_USERHOST_IN_NAMES = (1 << 4),
+} irc_cap_flag_t;
+
 struct irc_user;
 
@@ -102 +112 @@
 
         struct bee *b;
+        guint32 caps;
 } irc_t;
 
@@ -302 +313 @@
 gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name);
 void irc_channel_update_ops(irc_channel_t *ic, char *value);
+char irc_channel_user_get_prefix(irc_channel_user_t *icu);
 char *set_eval_irc_channel_ops(struct set *set, char *value);
 gboolean irc_channel_wants_user(irc_channel_t *ic, irc_user_t *iu);
@@ -331 +343 @@
                                      irc_channel_user_flags_t old_flags, irc_channel_user_flags_t new_flags);
 void irc_send_invite(irc_user_t *iu, irc_channel_t *ic);
+void irc_send_cap(irc_t *irc, char *subcommand, char *body);
+void irc_send_away_notify(irc_user_t *iu);
 
 /* irc_user.c */
@@ -344 +358 @@
 char *set_eval_timezone(struct set *set, char *value);
 char *irc_format_timestamp(irc_t *irc, time_t msg_ts);
+char *set_eval_self_messages(struct set *set, char *value);
 
 /* irc_im.c */
@@ -349 +364 @@
 void bee_irc_user_nick_reset(irc_user_t *iu);
 
+/* irc_cap.c */
+void irc_cmd_cap(irc_t *irc, char **cmd);
+
 #endif