1 files changed, 44 insertions, 3 deletions

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index fa66fbe9..b8e31035 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -304,7 +304,7 @@ static void twitter_main_loop_start(struct im_connection *ic)
 
 struct groupchat *twitter_groupchat_init(struct im_connection *ic)
 {
-	char *name_hint;
+	char *name_hint, *tmp;
 	struct groupchat *gc;
 	struct twitter_data *td = ic->proto_data;
 	GSList *l;
@@ -315,7 +315,14 @@ struct groupchat *twitter_groupchat_init(struct im_connection *ic)
 
 	td->timeline_gc = gc = imcb_chat_new(ic, "twitter/timeline");
 
-	name_hint = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
+	tmp = set_getstr(&ic->acc->set, "channel_name");
+	
+	if (tmp == NULL || strlen(tmp) == 0) {
+		name_hint = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
+	} else {
+		name_hint = g_strdup(tmp);
+	}
+
 	imcb_chat_name_hint(gc, name_hint);
 	g_free(name_hint);
 
@@ -518,6 +525,23 @@ static char *set_eval_commands(set_t * set, char *value)
 	}
 }
 
+static char *set_eval_channel_name(set_t * set, char *value)
+{
+	size_t len;
+
+	if (value == NULL) {
+		return NULL;
+	}
+
+	len = strlen(value);
+
+	if (len < MAX_NICK_LENGTH && len > 0) {
+		return value;
+	} else {
+		return NULL;
+	}
+}
+
 static char *set_eval_mode(set_t * set, char *value)
 {
 	if (g_strcasecmp(value, "one") == 0 ||
@@ -584,6 +608,9 @@ static void twitter_init(account_t * acc)
 	s = set_add(&acc->set, "long_ids", "2", set_eval_long_ids, acc);
 	s->flags |= ACC_SET_OFFLINE_ONLY;
 
+	s = set_add(&acc->set, "channel_name", NULL, set_eval_channel_name, acc);
+	s->flags |= ACC_SET_OFFLINE_ONLY;
+
 	s = set_add(&acc->set, "_last_tweet", "0", NULL, acc);
 	s->flags |= SET_HIDDEN | SET_NOSAVE;
 
@@ -670,7 +697,9 @@ static void twitter_login(account_t * acc)
 	td->log_length += 1;
 
 	td->log = g_new0(struct twitter_log_data, td->log_length);
+	td->filter_log = g_new0(struct twitter_log_data, td->log_length);
 	td->log_id = -1;
+	td->filter_log_id = -1;
 
 	s = set_getstr(&ic->acc->set, "mode");
 	if (g_strcasecmp(s, "one") == 0) {
@@ -1005,7 +1034,8 @@ static void twitter_handle_command(struct im_connection *ic, char *message)
 
 		twitter_report_spam(ic, screen_name);
 		goto eof;
-	} else if (g_strcasecmp(cmd[0], "rt") == 0 && cmd[1]) {
+	} else if ((g_strcasecmp(cmd[0], "rt") == 0 ||
+		    g_strcasecmp(cmd[0], "retweet") == 0) && cmd[1]) {
 		id = twitter_message_id_from_command_arg(ic, cmd[1], NULL);
 
 		td->last_status_id = 0;
@@ -1044,7 +1074,18 @@ static void twitter_handle_command(struct im_connection *ic, char *message)
 			twitter_status_show_url(ic, id);
 		}
 		goto eof;
+	} else if (g_strcasecmp(cmd[0], "quote") == 0 && cmd[1]) {
+		id = twitter_message_id_from_command_arg(ic, cmd[1], NULL);
 
+		td->last_status_id = 0;
+		if (id) {
+			twitter_status_quote_post(ic, id, cmd[2]);
+		} else {
+			twitter_log(ic, "User '%s' does not exist or didn't "
+				    "post any statuses recently", cmd[1]);
+		}
+
+		goto eof;
 	} else if (g_strcasecmp(cmd[0], "post") == 0) {
 		message += 5;
 		allow_post = TRUE;