summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/irc/irc-command.c74
-rw-r--r--src/plugins/irc/irc-server.c15
-rw-r--r--src/plugins/irc/irc-server.h2
3 files changed, 56 insertions, 35 deletions
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index b9cc42ed1..ceb73a9cd 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -840,28 +840,46 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
}
else
{
- name = irc_server_get_name_without_port (argv[i]);
- ptr_server = irc_server_alloc ((name) ? name : argv[i]);
- if (name)
- free (name);
- if (ptr_server)
+ if ((strncmp (argv[i], "irc", 3) == 0)
+ && strstr (argv[i], "://"))
{
- ptr_server->temp_server = 1;
- weechat_config_option_set (ptr_server->options[IRC_SERVER_OPTION_ADDRESSES],
- argv[i], 1);
- weechat_printf (NULL,
- _("%s: server %s%s%s created (temporary server, NOT SAVED!)"),
- IRC_PLUGIN_NAME,
- IRC_COLOR_CHAT_SERVER,
- ptr_server->name,
- IRC_COLOR_RESET);
- irc_server_apply_command_line_options (ptr_server,
- argc, argv);
- if (!irc_command_connect_one_server (ptr_server, 0, 0))
- connect_ok = 0;
+ /* read server using URL format */
+ ptr_server = irc_server_alloc_with_url (argv[i]);
+ if (ptr_server)
+ {
+ irc_server_apply_command_line_options (ptr_server,
+ argc, argv);
+ if (!irc_command_connect_one_server (ptr_server, 0, 0))
+ connect_ok = 0;
+ }
}
else
{
+ /* create server with address */
+ name = irc_server_get_name_without_port (argv[i]);
+ ptr_server = irc_server_alloc ((name) ? name : argv[i]);
+ if (name)
+ free (name);
+ if (ptr_server)
+ {
+ ptr_server->temp_server = 1;
+ weechat_config_option_set (ptr_server->options[IRC_SERVER_OPTION_ADDRESSES],
+ argv[i], 1);
+ weechat_printf (NULL,
+ _("%s: server %s%s%s created "
+ "(temporary server, NOT SAVED!)"),
+ IRC_PLUGIN_NAME,
+ IRC_COLOR_CHAT_SERVER,
+ ptr_server->name,
+ IRC_COLOR_RESET);
+ irc_server_apply_command_line_options (ptr_server,
+ argc, argv);
+ if (!irc_command_connect_one_server (ptr_server, 0, 0))
+ connect_ok = 0;
+ }
+ }
+ if (!ptr_server)
+ {
weechat_printf (NULL,
_("%s%s: unable to create server "
"\"%s\""),
@@ -4784,15 +4802,18 @@ irc_command_init ()
"%(irc_channel_nicks_hosts)", &irc_command_ban, NULL);
weechat_hook_command ("connect",
N_("connect to IRC server(s)"),
- N_("[<server> [<server>...] | <hostname>[/<port>]] "
- "[-<option>[=<value>]] [-no<option>] [-nojoin] "
- "[-switch]"
+ N_("<server> [<server>...] [-<option>[=<value>]] "
+ "[-no<option>] [-nojoin] [-switch]"
" || -all|-open [-nojoin] [-switch]"),
- N_(" server: internal server name to connect "
- "(server must have been created by /server add)\n"
- " hostname: hostname (or IP) of a server (this "
- "will create a TEMPORARY server)\n"
- " port: port for server (6667 by default)\n"
+ N_(" server: server name, which can be:\n"
+ " - internal server name (created by "
+ "/server add, recommended usage)\n"
+ " - hostname/port or IP/port (this "
+ "will create a TEMPORARY server), port is 6667 "
+ "by default\n"
+ " - URL with format: "
+ "irc[6][s]://[nickname[:password]@]"
+ "irc.example.org[:port][/#channel1][,#channel2[...]]\n"
" option: set option for server (for boolean "
"option, value can be omitted)\n"
" nooption: set boolean option to 'off' (for "
@@ -4810,6 +4831,7 @@ irc_command_init ()
" /connect irc6.oftc.net/6667 -ipv6\n"
" /connect irc6.oftc.net/6697 -ipv6 -ssl\n"
" /connect my.server.org/6697 -ssl -password=test\n"
+ " /connect irc://nick@irc.oftc.net/#channel\n"
" /connect -switch"),
"%(irc_servers)|-all|-open|-nojoin|-switch|%*",
&irc_command_connect, NULL);
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index eb76285e5..6f5c84055 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -705,11 +705,10 @@ irc_server_alloc (const char *name)
/*
* irc_server_alloc_with_url: init a server with url of this form:
* irc://nick:pass@irc.toto.org:6667
- * returns: 1 = ok
- * 0 = error
+ * return server pointer, or NULL if error
*/
-int
+struct t_irc_server *
irc_server_alloc_with_url (const char *irc_url)
{
char *irc_url2, *pos_server, *pos_nick, *pos_password;
@@ -720,7 +719,7 @@ irc_server_alloc_with_url (const char *irc_url)
irc_url2 = strdup (irc_url);
if (!irc_url2)
- return 0;
+ return NULL;
pos_server = NULL;
pos_nick = NULL;
@@ -733,10 +732,10 @@ irc_server_alloc_with_url (const char *irc_url)
ssl = 0;
pos_server = strstr (irc_url2, "://");
- if (!pos_server)
+ if (!pos_server || !pos_server[3])
{
free (irc_url2);
- return 0;
+ return NULL;
}
pos_server[0] = '\0';
pos_server += 3;
@@ -796,7 +795,7 @@ irc_server_alloc_with_url (const char *irc_url)
if (!pos)
{
free (irc_url2);
- return 0;
+ return NULL;
}
pos[0] = '\0';
pos++;
@@ -900,7 +899,7 @@ irc_server_alloc_with_url (const char *irc_url)
free (irc_url2);
- return (ptr_server) ? 1 : 0;
+ return ptr_server;
}
/*
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index 86f5254bf..67d431829 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -230,7 +230,7 @@ extern char irc_server_get_prefix_mode_for_char (struct t_irc_server *server,
extern char irc_server_get_prefix_char_for_mode (struct t_irc_server *server,
char mode);
extern struct t_irc_server *irc_server_alloc (const char *name);
-extern int irc_server_alloc_with_url (const char *irc_url);
+extern struct t_irc_server *irc_server_alloc_with_url (const char *irc_url);
extern void irc_server_apply_command_line_options (struct t_irc_server *server,
int argc, char **argv);
extern void irc_server_free_all ();
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 15:24:06 +0000